From 63bc0067c03891d166f807f674ccb31523636192 Mon Sep 17 00:00:00 2001
From: Matchu <matchu1993@gmail.com>
Date: Wed, 3 Aug 2011 10:18:03 -0400
Subject: [PATCH 1/2] user#assign_closeted_to_items! now assigns when there are
 duplicates

---
 app/models/user.rb | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 12ffecbf..a96f3efa 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -52,13 +52,18 @@ class User < ActiveRecord::Base
     # N^2 searching the items list for items that match the given IDs or vice
     # versa, and everything stays a lovely O(n)
     items_by_id = {}
-    items.each { |item| items_by_id[item.id] = item }
+    items.each do |item|
+      items_by_id[item.id] ||= []
+      items_by_id[item.id] << item
+    end
     closet_hangers.where(:item_id => items_by_id.keys).each do |hanger|
-      item = items_by_id[hanger.item_id]
-      if hanger.owned?
-        item.owned = true
-      else
-        item.wanted = true
+      items = items_by_id[hanger.item_id]
+      items.each do |item|
+        if hanger.owned?
+          item.owned = true
+        else
+          item.wanted = true
+        end
       end
     end
   end

From bad1eb13a52a4a7e127feb7d7fb51919c68c7f82 Mon Sep 17 00:00:00 2001
From: Matchu <matchu1993@gmail.com>
Date: Wed, 3 Aug 2011 10:33:13 -0400
Subject: [PATCH 2/2] compare Your Items to someone elses list

---
 app/helpers/closet_hangers_helper.rb          |  7 ++
 app/stylesheets/closet_hangers/_index.sass    | 19 ++++-
 .../closet_hangers/_closet_hanger.html.haml   |  2 +-
 app/views/closet_hangers/index.html.haml      |  2 +
 public/javascripts/closet_hangers/index.js    | 16 ++++-
 public/stylesheets/compiled/screen.css        | 69 ++++++++++++-------
 6 files changed, 84 insertions(+), 31 deletions(-)

diff --git a/app/helpers/closet_hangers_helper.rb b/app/helpers/closet_hangers_helper.rb
index 7e71e9d8..dbab3425 100644
--- a/app/helpers/closet_hangers_helper.rb
+++ b/app/helpers/closet_hangers_helper.rb
@@ -5,6 +5,13 @@ module ClosetHangersHelper
     'hidden' unless @user.closet_hangers.empty?
   end
 
+  def closet_hanger_partial_class(hanger)
+    'object'.tap do |class_name|
+      class_name << ' user-owns' if hanger.item.owned?
+      class_name << ' user-wants' if hanger.item.wanted?
+    end
+  end
+
   def closet_hanger_verb(owned, positive=true)
     ClosetHanger.verb(closet_hanger_subject, owned, positive)
   end
diff --git a/app/stylesheets/closet_hangers/_index.sass b/app/stylesheets/closet_hangers/_index.sass
index 9364af11..66f9c501 100644
--- a/app/stylesheets/closet_hangers/_index.sass
+++ b/app/stylesheets/closet_hangers/_index.sass
@@ -81,7 +81,7 @@ body.closet_hangers-index
   #cancel-contact-link
     margin-left: 1em
 
-  #toggle-help
+  #toggle-help, #toggle-compare
     +awesome-button
     cursor: pointer
     display: none
@@ -303,6 +303,11 @@ body.closet_hangers-index
       font-size: 85%
       padding-left: 2em
 
+  .closet-hangers-group
+    &[data-owned=true] .user-wants, &[data-owned=false] .user-owns
+      background: $module-bg-color
+      font-weight: bold
+
   &.current-user
     #closet-hangers
       .object:hover
@@ -386,3 +391,15 @@ body.closet_hangers-index
       #toggle-help
         display: inline
 
+  &.js
+    #toggle-compare
+      display: inline
+
+    #closet-hangers.comparing
+      .object
+        display: none
+
+      .closet-hangers-group
+        &[data-owned=true] .user-wants, &[data-owned=false] .user-owns
+          display: inline-block
+
diff --git a/app/views/closet_hangers/_closet_hanger.html.haml b/app/views/closet_hangers/_closet_hanger.html.haml
index 63c6a936..d63492bb 100644
--- a/app/views/closet_hangers/_closet_hanger.html.haml
+++ b/app/views/closet_hangers/_closet_hanger.html.haml
@@ -1,5 +1,5 @@
 - show_controls ||= false # we could do user check here, but may as well do it once
-.object{'data-item-id' => closet_hanger.item_id, 'data-quantity' => closet_hanger.quantity}
+%div{'class' => closet_hanger_partial_class(closet_hanger), 'data-item-id' => closet_hanger.item_id, 'data-quantity' => closet_hanger.quantity}
   = render :partial => 'items/item_link', :locals => {:item => closet_hanger.item}
   .quantity{:class => "quantity-#{closet_hanger.quantity}"}
     %span= closet_hanger.quantity
diff --git a/app/views/closet_hangers/index.html.haml b/app/views/closet_hangers/index.html.haml
index c8aa24a4..27e27efa 100644
--- a/app/views/closet_hangers/index.html.haml
+++ b/app/views/closet_hangers/index.html.haml
@@ -8,6 +8,8 @@
       = submit_tag 'Search', :name => nil
 - else
   - title "#{@user.name}'s Items"
+  - secondary_nav do
+    %span#toggle-compare Compare with Your Items
 
 - canonical_path user_closet_hangers_path(@user)
 
diff --git a/public/javascripts/closet_hangers/index.js b/public/javascripts/closet_hangers/index.js
index bfa4a025..17855fdc 100644
--- a/public/javascripts/closet_hangers/index.js
+++ b/public/javascripts/closet_hangers/index.js
@@ -45,6 +45,19 @@
 	  $(this).closest('.closet-hangers-group').toggleClass('hidden');
 	});
 
+	var hangersElQuery = '#closet-hangers';
+  var hangersEl = $(hangersElQuery);
+
+	/*
+
+    Compare with Your Items
+
+  */
+
+  $('#toggle-compare').click(function () {
+    hangersEl.toggleClass('comparing');
+  });
+
   /*
 
     Hanger forms
@@ -62,9 +75,6 @@
   var body = $(document.body).addClass("js");
   if(!body.hasClass("current-user")) return false;
 
-  var hangersElQuery = '#closet-hangers';
-  var hangersEl = $(hangersElQuery);
-
   $.fn.disableForms = function () {
     return this.data("formsDisabled", true).find("input").attr("disabled", "disabled").end();
   }
diff --git a/public/stylesheets/compiled/screen.css b/public/stylesheets/compiled/screen.css
index 45d43f7e..a0359c42 100644
--- a/public/stylesheets/compiled/screen.css
+++ b/public/stylesheets/compiled/screen.css
@@ -713,7 +713,7 @@ body.closet_hangers-index #cancel-contact-link {
   margin-left: 1em;
 }
 /* line 84, ../../../app/stylesheets/closet_hangers/_index.sass */
-body.closet_hangers-index #toggle-help {
+body.closet_hangers-index #toggle-help, body.closet_hangers-index #toggle-compare {
   /* http://www.zurb.com/blog_uploads/0000/0617/buttons-03.html */
   -moz-border-radius: 5px;
   -webkit-border-radius: 5px;
@@ -734,15 +734,15 @@ body.closet_hangers-index #toggle-help {
   display: none;
 }
 /* line 34, ../../../app/stylesheets/partials/clean/_mixins.sass */
-body.closet_hangers-index #toggle-help:hover {
+body.closet_hangers-index #toggle-help:hover, body.closet_hangers-index #toggle-compare:hover {
   background-color: #005300;
 }
 /* line 53, ../../../app/stylesheets/partials/clean/_mixins.sass */
-body.closet_hangers-index #toggle-help:hover {
+body.closet_hangers-index #toggle-help:hover, body.closet_hangers-index #toggle-compare:hover {
   color: white;
 }
 /* line 55, ../../../app/stylesheets/partials/clean/_mixins.sass */
-body.closet_hangers-index #toggle-help:active {
+body.closet_hangers-index #toggle-help:active, body.closet_hangers-index #toggle-compare:active {
   top: 1px;
 }
 /* line 89, ../../../app/stylesheets/closet_hangers/_index.sass */
@@ -1139,17 +1139,22 @@ body.closet_hangers-index .closet-list-autocomplete-item a, body.closet_hangers-
   font-size: 85%;
   padding-left: 2em;
 }
-/* line 309, ../../../app/stylesheets/closet_hangers/_index.sass */
+/* line 307, ../../../app/stylesheets/closet_hangers/_index.sass */
+body.closet_hangers-index .closet-hangers-group[data-owned=true] .user-wants, body.closet_hangers-index .closet-hangers-group[data-owned=false] .user-owns {
+  background: #eeffee;
+  font-weight: bold;
+}
+/* line 314, ../../../app/stylesheets/closet_hangers/_index.sass */
 body.closet_hangers-index.current-user #closet-hangers .object:hover form {
   display: inline;
 }
-/* line 312, ../../../app/stylesheets/closet_hangers/_index.sass */
+/* line 317, ../../../app/stylesheets/closet_hangers/_index.sass */
 body.closet_hangers-index.current-user #closet-hangers .object:hover .closet-hanger-destroy {
   position: absolute;
   right: 18px;
   top: 52px;
 }
-/* line 317, ../../../app/stylesheets/closet_hangers/_index.sass */
+/* line 322, ../../../app/stylesheets/closet_hangers/_index.sass */
 body.closet_hangers-index.current-user #closet-hangers .object:hover .closet-hanger-destroy input {
   /* http://www.zurb.com/blog_uploads/0000/0617/buttons-03.html */
   -moz-border-radius: 5px;
@@ -1190,7 +1195,7 @@ body.closet_hangers-index.current-user #closet-hangers .object:hover .closet-han
 body.closet_hangers-index.current-user #closet-hangers .object:hover .closet-hanger-destroy input:hover {
   background-color: #999999;
 }
-/* line 320, ../../../app/stylesheets/closet_hangers/_index.sass */
+/* line 325, ../../../app/stylesheets/closet_hangers/_index.sass */
 body.closet_hangers-index.current-user #closet-hangers .object:hover .quantity {
   -moz-opacity: 1;
   -webkit-opacity: 1;
@@ -1200,80 +1205,92 @@ body.closet_hangers-index.current-user #closet-hangers .object:hover .quantity {
   top: 0;
   padding: 0;
 }
-/* line 326, ../../../app/stylesheets/closet_hangers/_index.sass */
+/* line 331, ../../../app/stylesheets/closet_hangers/_index.sass */
 body.closet_hangers-index.current-user #closet-hangers .object:hover .quantity span {
   display: none;
 }
-/* line 329, ../../../app/stylesheets/closet_hangers/_index.sass */
+/* line 334, ../../../app/stylesheets/closet_hangers/_index.sass */
 body.closet_hangers-index.current-user #closet-hangers .object:hover .quantity input[type=number] {
   padding: 2px;
   width: 2em;
 }
-/* line 333, ../../../app/stylesheets/closet_hangers/_index.sass */
+/* line 338, ../../../app/stylesheets/closet_hangers/_index.sass */
 body.closet_hangers-index.current-user #closet-hangers .object:hover .quantity input[type=submit] {
   font-size: 85%;
 }
-/* line 338, ../../../app/stylesheets/closet_hangers/_index.sass */
+/* line 343, ../../../app/stylesheets/closet_hangers/_index.sass */
 body.closet_hangers-index.current-user.js #closet-hangers .object:hover .quantity {
   display: block;
 }
-/* line 341, ../../../app/stylesheets/closet_hangers/_index.sass */
+/* line 346, ../../../app/stylesheets/closet_hangers/_index.sass */
 body.closet_hangers-index.current-user.js #closet-hangers .object:hover .quantity input[type=number] {
   width: 2.5em;
 }
-/* line 344, ../../../app/stylesheets/closet_hangers/_index.sass */
+/* line 349, ../../../app/stylesheets/closet_hangers/_index.sass */
 body.closet_hangers-index.current-user.js #closet-hangers .object:hover .quantity input[type=submit] {
   display: none;
 }
-/* line 347, ../../../app/stylesheets/closet_hangers/_index.sass */
+/* line 352, ../../../app/stylesheets/closet_hangers/_index.sass */
 body.closet_hangers-index.current-user.js #closet-hangers .object.loading {
   background: #eeffee;
   outline: 1px solid #006600;
 }
-/* line 351, ../../../app/stylesheets/closet_hangers/_index.sass */
+/* line 356, ../../../app/stylesheets/closet_hangers/_index.sass */
 body.closet_hangers-index.current-user.js #closet-hangers .object.loading .quantity {
   display: block;
 }
-/* line 354, ../../../app/stylesheets/closet_hangers/_index.sass */
+/* line 359, ../../../app/stylesheets/closet_hangers/_index.sass */
 body.closet_hangers-index.current-user.js #closet-hangers .object.loading .quantity span:after {
   content: "…";
 }
-/* line 358, ../../../app/stylesheets/closet_hangers/_index.sass */
+/* line 363, ../../../app/stylesheets/closet_hangers/_index.sass */
 body.closet_hangers-index.current-user.js #closet-hangers-contact form {
   display: none;
 }
-/* line 361, ../../../app/stylesheets/closet_hangers/_index.sass */
+/* line 366, ../../../app/stylesheets/closet_hangers/_index.sass */
 body.closet_hangers-index.current-user.js #closet-hangers-contact .edit-contact-link, body.closet_hangers-index.current-user.js #closet-hangers-contact #cancel-contact-link {
   display: inline;
 }
-/* line 365, ../../../app/stylesheets/closet_hangers/_index.sass */
+/* line 370, ../../../app/stylesheets/closet_hangers/_index.sass */
 body.closet_hangers-index.current-user.js #closet-hangers-contact.editing form {
   display: block;
 }
-/* line 368, ../../../app/stylesheets/closet_hangers/_index.sass */
+/* line 373, ../../../app/stylesheets/closet_hangers/_index.sass */
 body.closet_hangers-index.current-user.js #closet-hangers-contact.editing .edit-contact-link {
   display: none;
 }
-/* line 373, ../../../app/stylesheets/closet_hangers/_index.sass */
+/* line 378, ../../../app/stylesheets/closet_hangers/_index.sass */
 body.closet_hangers-index.current-user.js .closet-hangers-group header .show, body.closet_hangers-index.current-user.js .closet-hangers-group header .hide {
   cursor: pointer;
 }
-/* line 376, ../../../app/stylesheets/closet_hangers/_index.sass */
+/* line 381, ../../../app/stylesheets/closet_hangers/_index.sass */
 body.closet_hangers-index.current-user.js .closet-hangers-group header .hide {
   display: block;
 }
-/* line 380, ../../../app/stylesheets/closet_hangers/_index.sass */
+/* line 385, ../../../app/stylesheets/closet_hangers/_index.sass */
 body.closet_hangers-index.current-user.js .closet-hangers-group.hidden header .hide, body.closet_hangers-index.current-user.js .closet-hangers-group.hidden .closet-hangers-group-content {
   display: none;
 }
-/* line 383, ../../../app/stylesheets/closet_hangers/_index.sass */
+/* line 388, ../../../app/stylesheets/closet_hangers/_index.sass */
 body.closet_hangers-index.current-user.js .closet-hangers-group.hidden header .show {
   display: block;
 }
-/* line 386, ../../../app/stylesheets/closet_hangers/_index.sass */
+/* line 391, ../../../app/stylesheets/closet_hangers/_index.sass */
 body.closet_hangers-index.current-user.js #toggle-help {
   display: inline;
 }
+/* line 395, ../../../app/stylesheets/closet_hangers/_index.sass */
+body.closet_hangers-index.js #toggle-compare {
+  display: inline;
+}
+/* line 399, ../../../app/stylesheets/closet_hangers/_index.sass */
+body.closet_hangers-index.js #closet-hangers.comparing .object {
+  display: none;
+}
+/* line 403, ../../../app/stylesheets/closet_hangers/_index.sass */
+body.closet_hangers-index.js #closet-hangers.comparing .closet-hangers-group[data-owned=true] .user-wants, body.closet_hangers-index.js #closet-hangers.comparing .closet-hangers-group[data-owned=false] .user-owns {
+  display: inline-block;
+}
 
 /* line 2, ../../../app/stylesheets/partials/_secondary_nav.sass */
 body.closet_hangers-petpage #title {