mongo_mapper_acts_as_list 0.3.2 → 0.3.3

data/lib/mongo_mapper/plugins/acts_as_list.rb

@@ -13,64 +13,66 @@ module MongoMapper
       
       
       module ClassMethods
-        
         def acts_as_list(options = {})
-          configuration = { :column => "position", :scope => {} }
-          configuration.update(options) if options.is_a?(Hash)
           
           
           
+          def self.included(base)
+            include Comparable
+          end
+          
+          
+          
+          configuration = { :column => "position", :scope => {} }
+          configuration.update(options) if options.is_a?(Hash)
           configuration[:scope] = "#{configuration[:scope]}_id".intern if 
             configuration[:scope].is_a?(Symbol) && configuration[:scope].to_s !~ /_id$/
 
 
 
           if configuration[:scope].is_a?(Symbol)
-            scope_condition_method = %(
-              def scope_condition
-                { "#{configuration[:scope].to_s}" => send(:#{configuration[:scope].to_s}) }.symbolize_keys!
-              end
-            )
-            
+            define_method "scope_condition" do
+              { configuration[:scope] => send(configuration[:scope].to_s) }.symbolize_keys!
+            end
           elsif configuration[:scope].is_a?(Array)
-            scope_condition_method = %(
-              def scope_condition
-                attrs = %w(#{configuration[:scope].join(" ")}).inject({}) do |memo, column| 
-                  memo[column.intern] = send(column.intern)
-                  memo
-                end
-                attrs.symbolize_keys!
-              end
-            )
+            define_method "scope_condition" do
+              configuration[:scope].inject({}) { |memo, column| 
+                memo[column.intern] = send(column.intern)
+                memo
+              }.symbolize_keys!
+            end
           else
-            
-            scope_condition_method = %(
-              def scope_condition 
-                #{configuration[:scope].to_json} 
-              end
-            )
+            define_method "scope_condition" do
+              configuration[:scope].to_json
+            end
           end
-      
-      
-      
-          class_eval <<-EOV
+          
+          
+          
+          define_method "position_column" do
+            "#{configuration[:column]}"
+          end
+          
+          
+          
+          key configuration[:column], Integer
+          
+          
+          
+          before_destroy :decrement_positions_on_lower_items
+          before_create  :add_to_list_bottom
+          
+          
+          
+          class_eval <<-EOV          
             def acts_as_list_class
               ::#{self.name}
             end
-
-            def position_column
-              '#{configuration[:column]}'
-            end
-
-            #{scope_condition_method}
-            
-            key '#{configuration[:column]}', Integer
-
-            before_destroy :decrement_positions_on_lower_items
-            before_create  :add_to_list_bottom
           EOV
+          
+          
+          
         end
-    
       end
 
 
@@ -81,6 +83,10 @@ module MongoMapper
       
       module InstanceMethods
         
+        def <=>(other)
+          self[position_column] <=> other[position_column]
+        end
+        
         # Insert the item at the given position (defaults to the top position of 1).
         def insert_at(position = 1)
           insert_at_position(position)

data/lib/mongo_mapper/plugins/version.rb

@@ -8,7 +8,7 @@ module MongoMapper
       
       
       
-      Version = '0.3.2'
+      Version = '0.3.3'
       
       
       

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongo_mapper_acts_as_list
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-10-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongo_mapper
-  requirement: &70330524729220 !ruby/object:Gem::Requirement
+  requirement: &70196084473160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70330524729220
+  version_requirements: *70196084473160
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70330524728780 !ruby/object:Gem::Requirement
+  requirement: &70196084470020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70330524728780
+  version_requirements: *70196084470020
 description: This is a port of classic Rails' acts_as_list to Mongo Mapper. This Mongo
   Mapper plugin provides the capabilities for sorting and reordering a number of objects
   in a list. If you do not specify custom position column in the options, a key named
@@ -63,7 +63,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -342600062179569977
+      hash: 1708410481327726767
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: