[myexperiment-hackers] [2192] trunk: added favourited element to users

[noreply]

Revision

2192

Author

dgc

Date

2009-05-11 09:16:14 -0400 (Mon, 11 May 2009)

Log Message

added favourited element to users

Modified Paths

• trunk/app/models/user.rb
• trunk/config/tables.xml
• trunk/vendor/plugins/acts_as_bookmarkable/lib/acts_as_bookmarkable.rb

Diff

Modified: trunk/app/models/user.rb (2191 => 2192)

--- trunk/app/models/user.rb	2009-05-08 16:32:35 UTC (rev 2191)
+++ trunk/app/models/user.rb	2009-05-11 13:16:14 UTC (rev 2192)
@@ -60,6 +60,7 @@
   end
   
   acts_as_tagger
+  acts_as_bookmarker
   
   has_many :ratings,
            :order => "created_at DESC",
@@ -77,10 +78,6 @@
            :order => "created_at DESC",
            :dependent => :destroy
   
-  has_many :bookmarks, 
-           :order => "created_at DESC",
-           :dependent => :destroy
-  
   has_many :reviews,
            :order => "updated_at DESC",
            :dependent => :destroy

Modified: trunk/config/tables.xml

(Binary files differ)

Modified: trunk/vendor/plugins/acts_as_bookmarkable/lib/acts_as_bookmarkable.rb (2191 => 2192)

--- trunk/vendor/plugins/acts_as_bookmarkable/lib/acts_as_bookmarkable.rb	2009-05-08 16:32:35 UTC (rev 2191)
+++ trunk/vendor/plugins/acts_as_bookmarkable/lib/acts_as_bookmarkable.rb	2009-05-11 13:16:14 UTC (rev 2192)
@@ -10,13 +10,18 @@
       module ClassMethods
         def acts_as_bookmarkable
           has_many :bookmarks, :as => :bookmarkable, :dependent => :destroy
-          include Juixe::Acts::Bookmarkable::InstanceMethods
-          extend Juixe::Acts::Bookmarkable::SingletonMethods
+          include Juixe::Acts::Bookmarkable::BookmarkableInstanceMethods
+          extend Juixe::Acts::Bookmarkable::BookmarkableSingletonMethods
         end
+
+        def acts_as_bookmarker
+          has_many :bookmarks, :order => "created_at DESC", :dependent => :destroy
+          include Juixe::Acts::Bookmarkable::BookmarkerInstanceMethods
+        end
       end
       
-      # This module contains class methods
-      module SingletonMethods
+      # This module contains class methods for bookmarkables
+      module BookmarkableSingletonMethods
         # Helper class method to lookup comments for
         # the mixin commentable type written by a given user.  
         # This method is NOT equivalent to Bookmark.find_bookmarks_for_user
@@ -30,8 +35,8 @@
         end
       end
       
-      # This module contains instance methods
-      module InstanceMethods
+      # This module contains instance methods for bookmarkables
+      module BookmarkableInstanceMethods
         # Check to see if a user already bookmaked this bookmarkable
         def bookmarked_by_user?(user)
           rtn = false
@@ -44,6 +49,15 @@
         end
       end
       
+      # This module contains instance methods for bookmarkers
+      module BookmarkerInstanceMethods
+        # Get all the bookmarked items for this user
+        def bookmarked_items
+          Bookmark.find(:all, :conditions => ["user_id = ?", self.id]).map do |b|
+            b.bookmarkable
+          end
+        end
+      end
     end
   end
 end