acts_as_list_mongoid 0.2.2 → 0.2.4

data/Gemfile

@@ -1,4 +1,13 @@
 source :rubygems
 
-gem 'mongoid',                  '>= 2.0.0.beta.14'
+gem 'mongoid',                  '>= 2.0.1'
 gem "mongoid_embedded_helper",  '>= 0.2.5'
+
+group :development do
+  gem "shoulda",  ">= 0"
+  gem "cutter",   ">= 0"
+  gem "rspec",    ">= 2.5"
+  gem "bundler",  "~> 1.0.10"
+  gem "jeweler",  "~> 1.6.4"
+  gem "rcov",     ">= 0"
+end

data/Rakefile

@@ -1,9 +1,19 @@
+# encoding: utf-8
+
 require 'rubygems'
+require 'bundler'
+begin
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
+end
 require 'rake'
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
+require 'jeweler'
+Jeweler::Tasks.new do |gem|
+  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
     gem.name        = "acts_as_list_mongoid"
     gem.summary     = %Q{acts_as_list for Mongoid}
     gem.description = %Q{Make your Mongoid model acts as a list. This acts_as extension provides the capabilities for sorting and reordering a number of objects in a list.
@@ -11,12 +21,36 @@ begin
     gem.email       = "kmandrup@gmail.com"
     gem.homepage    = "http://github.com/rails/acts_as_list"
     gem.authors     = ["Kristian Mandrup"]
-    gem.add_dependency "mongoid", ">= 2.0.0.beta.14"
-    gem.add_dependency "mongoid_embedded_helper", ">= 0.2.5"
-    # gem.add_development_dependency "yard"
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+  # dependencies defined in Gemfile
+end
+Jeweler::RubygemsDotOrgTasks.new
+
+require 'rake/testtask'
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'lib' << 'test'
+  test.pattern = 'test/**/test_*.rb'
+  test.verbose = true
+end
+
+require 'rcov/rcovtask'
+Rcov::RcovTask.new do |test|
+  test.libs << 'test'
+  test.pattern = 'test/**/test_*.rb'
+  test.verbose = true
+  test.rcov_opts << '--exclude "gems/*"'
 end
 
+task :default => :test
+
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "acts_as_list_mongoid #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end
+
+
+

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.4

data/acts_as_list_mongoid.gemspec

@@ -1,68 +1,77 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{acts_as_list_mongoid}
-  s.version = "0.2.2"
+  s.name = "acts_as_list_mongoid"
+  s.version = "0.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = %q{2010-11-27}
-  s.description = %q{Make your Mongoid model acts as a list. This acts_as extension provides the capabilities for sorting and reordering a number of objects in a list.
-      The instances that take part in the list should have a +position+ field of type Integer.}
-  s.email = %q{kmandrup@gmail.com}
+  s.date = "2011-09-30"
+  s.description = "Make your Mongoid model acts as a list. This acts_as extension provides the capabilities for sorting and reordering a number of objects in a list.\n      The instances that take part in the list should have a +position+ field of type Integer."
+  s.email = "kmandrup@gmail.com"
   s.extra_rdoc_files = [
     "README.markdown"
   ]
   s.files = [
     ".DS_Store",
-     ".gitignore",
-     ".rspec",
-     "Gemfile",
-     "README.markdown",
-     "Rakefile",
-     "VERSION",
-     "acts_as_list_mongoid.gemspec",
-     "example/example.rb",
-     "init.rb",
-     "lib/.DS_Store",
-     "lib/acts_as_list_mongoid.rb",
-     "lib/init.rb",
-     "lib/mongoid/acts_as_list.rb",
-     "model/embedded_item.rb",
-     "model/referenced_category.rb",
-     "spec/.rspec",
-     "spec/acts_as_list/embedded_item_spec.rb",
-     "spec/acts_as_list/referenced_category_spec.rb",
-     "spec/spec_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/rails/acts_as_list}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{acts_as_list for Mongoid}
-  s.test_files = [
+    ".rspec",
+    "Gemfile",
+    "README.markdown",
+    "Rakefile",
+    "VERSION",
+    "acts_as_list_mongoid.gemspec",
+    "example/example.rb",
+    "init.rb",
+    "lib/.DS_Store",
+    "lib/acts_as_list_mongoid.rb",
+    "lib/init.rb",
+    "lib/mongoid/acts_as_list.rb",
+    "model/embedded_item.rb",
+    "model/referenced_category.rb",
+    "spec/.rspec",
     "spec/acts_as_list/embedded_item_spec.rb",
-     "spec/acts_as_list/referenced_category_spec.rb",
-     "spec/spec_helper.rb"
+    "spec/acts_as_list/referenced_category_spec.rb",
+    "spec/spec_helper.rb"
   ]
+  s.homepage = "http://github.com/rails/acts_as_list"
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.10"
+  s.summary = "acts_as_list for Mongoid"
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<mongoid>, [">= 2.0.0.beta.14"])
+      s.add_runtime_dependency(%q<mongoid>, [">= 2.0.1"])
       s.add_runtime_dependency(%q<mongoid_embedded_helper>, [">= 0.2.5"])
+      s.add_development_dependency(%q<shoulda>, [">= 0"])
+      s.add_development_dependency(%q<cutter>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, [">= 2.5"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.0.10"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_development_dependency(%q<rcov>, [">= 0"])
     else
-      s.add_dependency(%q<mongoid>, [">= 2.0.0.beta.14"])
+      s.add_dependency(%q<mongoid>, [">= 2.0.1"])
       s.add_dependency(%q<mongoid_embedded_helper>, [">= 0.2.5"])
+      s.add_dependency(%q<shoulda>, [">= 0"])
+      s.add_dependency(%q<cutter>, [">= 0"])
+      s.add_dependency(%q<rspec>, [">= 2.5"])
+      s.add_dependency(%q<bundler>, ["~> 1.0.10"])
+      s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_dependency(%q<rcov>, [">= 0"])
     end
   else
-    s.add_dependency(%q<mongoid>, [">= 2.0.0.beta.14"])
+    s.add_dependency(%q<mongoid>, [">= 2.0.1"])
     s.add_dependency(%q<mongoid_embedded_helper>, [">= 0.2.5"])
+    s.add_dependency(%q<shoulda>, [">= 0"])
+    s.add_dependency(%q<cutter>, [">= 0"])
+    s.add_dependency(%q<rspec>, [">= 2.5"])
+    s.add_dependency(%q<bundler>, ["~> 1.0.10"])
+    s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+    s.add_dependency(%q<rcov>, [">= 0"])
   end
 end
 

data/lib/acts_as_list_mongoid.rb

@@ -1,2 +1,8 @@
 require "mongoid"
-require 'mongoid/acts_as_list'
+require 'mongoid/acts_as_list'
+
+class Module
+  def act_as_list
+    self.send :include, ActsAsList::Mongoid
+  end
+end

data/lib/mongoid/acts_as_list.rb

@@ -1,59 +1,56 @@
-require "mongoid"  
+require "mongoid"
 require 'mongoid_embedded_helper'
 require 'mongoid_adjust'
 
 module ActsAsList
-	module Mongoid
-	  class << self
-	    attr_accessor :default_position_column
+  module Mongoid
+    class << self
+      attr_accessor :default_position_column
     end
-	  
-		def self.included(klass)
-			klass.extend InitializerMethods
-			key = self.default_position_column || :position
-      klass.field key, :type => Integer 
-      klass.acts_as_list :column => key.to_s
-		end
 
-		module InitializerMethods
-  		def acts_as_list(options = {})
-  			configuration = { :column => 'position' }
-  			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$/
+    def self.included(klass)
+      klass.extend InitializerMethods
+      key = self.default_position_column || :position
+      klass.field key, :type => Integer
+      klass.acts_as_list :column => key.to_s
+    end
 
-        # write_inheritable_attribute :acts_as_list_options, configuration
-        # class_inheritable_reader :acts_as_list_options
+    module InitializerMethods
+      def acts_as_list(options = {})
+        configuration = { :column => 'position' }
+        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$/
 
         define_method :position_column do
           configuration[:column].to_s
         end
 
         if !configuration[:scope]
-				  define_method :scope_condition do
-				    {position_key.ne => nil}
-				  end
+          define_method :scope_condition do
+            {position_key.ne => nil}
+          end
         elsif configuration[:scope].is_a?(Symbol)
-  				define_method :scope_condition do
-  					{ "#{configuration[:scope].to_s}" => "\#{#{configuration[:scope].to_s}}".to_i }.symbolize_keys!
-  				end
-				else
-				  raise ArgumentError, "acts_as_list must either take a valid scope option or be in an embedded document and use the parent document as scope"
-  			end
-
-  			include ::Mongoid::EmbeddedHelper
-				include InstanceMethods
-				include Fields
-				include Triggers
-				extend Fields
-				extend ClassMethods
-  		end
-  	end   
-  
+          define_method :scope_condition do
+            {configuration[:scope] => self[configuration[:scope]]}
+          end
+        else
+          raise ArgumentError, "acts_as_list must either take a valid scope option or be in an embedded document and use the parent document as scope"
+        end
+
+        include ::Mongoid::EmbeddedHelper
+        include InstanceMethods
+        include Fields
+        include Triggers
+        extend Fields
+        extend ClassMethods
+      end
+    end
+
     module ClassMethods
       def in_scope
         where(scope_condition)
-      end  		
-      
+      end
+
       def move_commands symbol
         case symbol
         when :symbol
@@ -65,15 +62,15 @@ module ActsAsList
         end
       end
     end
-  
-    module InstanceMethods 
+
+    module InstanceMethods
       def move command
         if command.kind_of? Symbol
           case command
           when :highest, :top
             move_to_top
           when :lowest, :bottom
-            move_to_bottom          
+            move_to_bottom
           when :up, :higher
             move_higher
           when :down, :lower
@@ -81,11 +78,11 @@ module ActsAsList
           else
             raise ArgumentError, "unknown move command '#{command}', try one of #{self.class.move_commands_available}"
           end
-        elsif command.kind_of? Hash     
+        elsif command.kind_of? Hash
           other = command.values.first
           cmd = command.keys.first
           case cmd
-          when :to 
+          when :to
             move_to(other)
           when :above
             move_above(other)
@@ -96,10 +93,10 @@ module ActsAsList
           end
         else
           raise ArgumentError, "move command takes either a Symbol or Hash as an argument, not a #{command.class}"
-        end        
+        end
       end
-      
-                
+
+
       def order_by_position conditions, extras = []
         sub_collection = in_collection.where(conditions)
         sub_collection = if embedded?
@@ -108,11 +105,11 @@ module ActsAsList
           sub_collection.order_by(position_key.to_sym.asc)
         end
 
-        if !extras.empty?        
+        if !extras.empty?
           sub_collection = if embedded?
-            sub_collection.sort do |x,y| 
+            sub_collection.sort do |x,y|
               if x.my_position == y.my_position
-                x.created_at <=> y.created_at 
+                x.created_at <=> y.created_at
               else
                x.my_position <=> y.my_position
               end
@@ -121,21 +118,21 @@ module ActsAsList
             sub_collection.order_by(extras)
           end
         end
-        
+
         sub_collection
       end
 
       # conditions, { position_column => 1 }
-      def do_decrement( conditions, options)  
+      def do_decrement( conditions, options)
         in_collection.where(conditions).adjust! position_key => -1
       end
 
-      def do_increment( conditions, options)  
+      def do_increment( conditions, options)
         in_collection.where(conditions).adjust! position_key => 1
       end
-      
+
       def less_than_me
-        { position_key.lt => my_position.to_i}        
+        { position_key.lt => my_position.to_i}
       end
 
       def greater_than_me
@@ -146,7 +143,7 @@ module ActsAsList
         insert_in_list_at(position)
       end
 
-      def move_to(position = 1)    
+      def move_to(position = 1)
         insert_in_list_at(position)
       end
 
@@ -155,23 +152,23 @@ module ActsAsList
         move_to(new_pos)
       end
 
-      def move_above(object)    
+      def move_above(object)
         new_pos = ( self == object ) ? self.my_position : ((object.my_position > self.my_position) ? object.my_position - 1 : object.my_position)
         move_to(new_pos)
       end
 
-  		# Insert the item at the given position (defaults to the top position of 1).
+      # Insert the item at the given position (defaults to the top position of 1).
       def insert_in_list_at(position = 1)
         insert_at_position(position)
       end
 
       # Swap positions with the next lower item, if one exists.
-      def move_lower     
-        low_item = lower_item  
+      def move_lower
+        low_item = lower_item
         return unless low_item
 
-  			low_item.decrement_position
-        increment_position  
+        low_item.decrement_position
+        increment_position
       end
 
       # Swap positions with the next higher item, if one exists.
@@ -205,25 +202,25 @@ module ActsAsList
       def remove_from_list
         if in_list?
           decrement_positions_on_lower_items
-  				set_my_position nil
+          set_my_position nil
         end
       end
 
       # Increase the position of this item without adjusting the rest of the list.
       def increment_position
         return unless in_list?
-  			# in_collection.where(:pos => my_position).
-  			adjust!(position_key => 1) 
-  			save!
+        # in_collection.where(:pos => my_position).
+        adjust!(position_key => 1) 
+        save!
       end
 
       # Decrease the position of this item without adjusting the rest of the list.
       def decrement_position
         return unless in_list?
-        
-        # in_collection.where(:pos => my_position).                 
+
+        # in_collection.where(:pos => my_position).
         adjust!(position_key => -1)
-        save!        
+        save!
       end
 
       # Return +true+ if this object is the first in the list.
@@ -234,25 +231,23 @@ module ActsAsList
 
       # Return +true+ if this object is the last in the list.
       def last?
-        return false unless in_list?      
+        return false unless in_list?
         bottom_pos = bottom_position_in_list
         my_position == bottom_pos
       end
 
       # Return the next higher item in the list.
       def higher_item
-        return nil unless in_list?  
-  			conditions = scope_condition.merge!( less_than_me )
-  			
+        return nil unless in_list?
+        conditions = scope_condition.merge!( less_than_me )
         order_by_position(conditions).last
       end
 
       # Return the next lower item in the list.
       def lower_item
         return nil unless in_list?
-        
-  			conditions = scope_condition.merge!( greater_than_me )
-  			
+
+        conditions = scope_condition.merge!( greater_than_me )
         order_by_position(conditions).first
       end
 
@@ -261,33 +256,32 @@ module ActsAsList
         !my_position.nil?
       end
 
-  		# sorts all items in the list
-  		# if two items have same position, the one created more recently goes first
-  		def sort
-  			conditions = scope_condition
-        
+      # sorts all items in the list
+      # if two items have same position, the one created more recently goes first
+      def sort
+        conditions = scope_condition
         list_items = order_by_position(conditions, :created_at.desc).to_a
-  			
-  			list_items.each_with_index do |list_item, index|
-  				list_item.set_my_position index + 1
-  			end
-  		end
-
-      private 
-      
+
+        list_items.each_with_index do |list_item, index|
+          list_item.set_my_position index + 1
+        end
+      end
+
+      private
+
       def add_to_list_top
         increment_positions_on_all_items
       end
 
-      def add_to_list_bottom    
+      def add_to_list_bottom
         bottom_pos = bottom_position_in_list.to_i
         set_my_position(bottom_pos + 1)
       end
 
       # Overwrite this method to define the scope of the list changes
       def scope_condition
-  			{}
-  		end
+        {}
+      end
 
       # Returns the bottom position number in the list.
       #   bottom_position_in_list    # => 2
@@ -298,38 +292,38 @@ module ActsAsList
 
       # Returns the bottom item
       def bottom_item(except = nil)
-  			conditions = scope_condition
+        conditions = scope_condition
         if except
           conditions.merge!( { position_key.ne => except.my_position } )
         end
 
-  			order_by_position(conditions).last
+        order_by_position(conditions).last
       end
 
       # Forces item to assume the bottom position in the list.
       def assume_bottom_position
-  			pos = bottom_position_in_list(self).to_i + 1 
-  			set_my_position(pos)
+        pos = bottom_position_in_list(self).to_i + 1 
+        set_my_position(pos)
       end
 
       # Forces item to assume the top position in the list.
       def assume_top_position
-  			set_my_position(1)
+        set_my_position(1)
       end
 
       # This has the effect of moving all the higher items up one.
       def decrement_positions_on_higher_items(position)
-  			conditions = scope_condition
-  			conditions.merge!( { position_key.lt => position } )
+        conditions = scope_condition
+        conditions.merge!( { position_key.lt => position } )
 
-  			decrease_all! in_collection.where(conditions)
+        decrease_all! in_collection.where(conditions)
       end
 
       # This has the effect of moving all the lower items up one.
       def decrement_positions_on_lower_items(max_pos = nil)
         return unless in_list?
-  			conditions = scope_condition
-  			conditions.merge!( greater_than_me ) 
+        conditions = scope_condition
+        conditions.merge!( greater_than_me )
         conditions.merge!({ position_key.lt => max_pos} ) if max_pos
 
         decrease_all! in_collection.where(conditions)
@@ -338,8 +332,8 @@ module ActsAsList
       # This has the effect of moving all the higher items down one.
       def increment_positions_on_higher_items(min_pos = nil)
         return unless in_list?
-  			conditions = scope_condition
-  			conditions.merge!( less_than_me )
+        conditions = scope_condition
+        conditions.merge!( less_than_me )
         conditions.merge!({ position_key.gt => min_pos} ) if min_pos
 
         increase_all! in_collection.where(conditions)
@@ -349,90 +343,85 @@ module ActsAsList
         collection.adjust!(position_key => number).each{|doc| doc.save}
       end
 
-      def increase_all! collection        
+      def increase_all! collection
         adjust_all! collection, 1
       end
 
-      def decrease_all! collection        
+      def decrease_all! collection
         adjust_all! collection, -1
       end
-                
+
       # This has the effect of moving all the lower items down one.
       def increment_positions_on_lower_items(position)
-  			conditions = scope_condition
-  			conditions.merge!( { position_key.gte => position } )
+        conditions = scope_condition
+        conditions.merge!( { position_key.gte => position } )
 
-  			increase_all! in_collection.where(conditions)
+        increase_all! in_collection.where(conditions)
       end
 
       # Increments position (<tt>position_column</tt>) of all items in the list.
       def increment_positions_on_all_items
-  			conditions = scope_condition                 
-  			
-  			increase_all! in_collection.where(conditions)
+        conditions = scope_condition
+        increase_all! in_collection.where(conditions)
       end
 
       def insert_at_position(position)
         position = [position, 1].max
         remove_from_list
         increment_positions_on_lower_items(position)
-  			set_my_position(position)
+        set_my_position(position)
       end
     end
 
     module Triggers
-      def after_parentize     
+      def after_parentize
         # should register on root element to be called when root is saved first time!?
-      end			
+      end
 
       def init_list_item!
         self['created_at'] = Time.now
-        self['updated_at'] = Time.now        
+        self['updated_at'] = Time.now
         add_to_list_bottom unless in_list?
-      end			
+      end
 
     end
-    
+
     module Fields
-      def my_position 
+      def my_position
         self[position_column]
       end
 
       def set_my_position new_position
-        if new_position != my_position 
-          self[position_column] = new_position
+        if new_position != my_position
+          self.update_attributes position_column => new_position
           save!
         end
       end
 
-			def [](field_name)
-				self.send field_name
-			end
+      def [](field_name)
+        self.send field_name
+      end
 
-			def []=(key, value)
-        if set_allowed?(key)
-          @attributes[key.to_s] = value 
-        else
-          self.send("#{key}=", value) 
-        end 
-				save!
-			end
+      def []=(key, value)
+        @attributes[key.to_s] = value
+        save!
+      end
 
-			def ==(other)
-				return true if other.equal?(self)
-				return true if other.instance_of?(self.class) and other.respond_to?('_id') and other._id == self._id
-				false
-			end
+      def ==(other)
+        return true if other.equal?(self)
+        return true if other.instance_of?(self.class) and other.respond_to?('_id') and other._id == self._id
+        false
+      end
 
       def position_key
-        position_column.to_sym        
+        position_column.to_sym
       end
-    end      
-  end    
+    end
+  end
 end
 
-class Array            
+class Array
   def init_list!
     each {|i| i.init_list_item! }
   end
-end  
+end