acts_as_list 0.1.5 → 0.1.6

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3

data/Gemfile

@@ -2,3 +2,5 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in acts_as_list-rails3.gemspec
 gemspec
+
+gem 'rake'

data/README.md

@@ -2,7 +2,7 @@
 
 ## Description
 
-This `acts_as extension` provides the capabilities for sorting and reordering a number of objects in a list. The class that has this specified needs to have a `position` column defined as an integer on the mapped database table.
+This `acts_as` extension provides the capabilities for sorting and reordering a number of objects in a list. The class that has this specified needs to have a `position` column defined as an integer on the mapped database table.
 
 
 ## Example
@@ -22,6 +22,17 @@ This `acts_as extension` provides the capabilities for sorting and reordering a
 ## Notes
 If the `position` column has a default value, then there is a slight change in behavior, i.e if you have 4 items in the list, and you insert 1, with a default position 0, it would be pushed to the bottom of the list. Please look at the tests for this and some recent pull requests for discussions related to this.
 
+## Versions
+All versions `0.1.5` onwards require Rails 3.0.x and higher.
+
+## Build Status
+[![Build Status](https://secure.travis-ci.org/swanandp/acts_as_list.png)](https://secure.travis-ci.org/swanandp/acts_as_list)
+
+## Roadmap
+
+1. Sort based feature
+2. Rails 4 compatibility and bye bye Rails 2! Older versions would of course continue to work with Rails 2, but there won't be any support on those.
+
 ## Contributing to `acts_as_list`
  
 - Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
@@ -31,6 +42,7 @@ If the `position` column has a default value, then there is a slight change in b
 - Commit and push until you are happy with your contribution
 - Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
 - Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
+- I would recommend using Rails 3.1.x and higher for testing the build before a pull request. The current test harness does not quite work with 3.0.x. The plugin itself works, but the issue lies with testing infrastructure.
 
 ## Copyright
 

data/Rakefile

@@ -12,11 +12,9 @@ desc 'Test the acts_as_list plugin.'
 Rake::TestTask.new(:test) do |t|
   t.libs << 'lib' << 'test'
   t.pattern = 'test/**/test_*.rb'
-  t.verbose = true
+  t.verbose = false
 end
 
-
-
 # Run the rdoc task to generate rdocs for this gem
 require 'rdoc/task'
 RDoc::Task.new do |rdoc|

data/acts_as_list.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
 
 
   # Dependencies (installed via 'bundle install')...
-  s.add_development_dependency("bundler", ["~> 1.0.0"])
+  s.add_development_dependency("bundler", [">= 1.0.0"])
   s.add_development_dependency("activerecord", [">= 1.15.4.7794"])
   s.add_development_dependency("rdoc")
   s.add_development_dependency("sqlite3")

data/init.rb

@@ -1,2 +1,4 @@
 $:.unshift "#{File.dirname(__FILE__)}/lib"
 require 'acts_as_list'
+
+ActsAsList::Railtie.insert

data/lib/acts_as_list.rb

@@ -1,2 +1,22 @@
 require 'acts_as_list/active_record/acts/list'
-ActiveRecord::Base.class_eval { include ActiveRecord::Acts::List }
+
+module ActsAsList
+  if defined? Rails::Railtie
+    require 'rails'
+    class Railtie < Rails::Railtie
+      initializer 'acts_as_list.insert_into_active_record' do
+        ActiveSupport.on_load :active_record do
+          ActsAsList::Railtie.insert
+        end
+      end
+    end
+  end
+
+  class Railtie
+    def self.insert
+      if defined?(ActiveRecord)
+        ActiveRecord::Base.send(:include, ActiveRecord::Acts::List)
+      end
+    end
+  end
+end

data/lib/acts_as_list/active_record/acts/list.rb

@@ -32,8 +32,9 @@ module ActiveRecord
         #   Example: <tt>acts_as_list :scope => 'todo_list_id = #{todo_list_id} AND completed = 0'</tt>
         # * +top_of_list+ - defines the integer used for the top of the list. Defaults to 1. Use 0 to make the collection
         #   act more like an array in its indexing.
+        # * +add_new_at+ - specifies whether objects get added to the :top or :bottom of the list. (default: +bottom+)
         def acts_as_list(options = {})
-          configuration = { :column => "position", :scope => "1 = 1", :top_of_list => 1}
+          configuration = { :column => "position", :scope => "1 = 1", :top_of_list => 1, :add_new_at => :bottom}
           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$/
@@ -58,7 +59,7 @@ module ActiveRecord
           end
 
           class_eval <<-EOV
-            include ActiveRecord::Acts::List::InstanceMethods
+            include ::ActiveRecord::Acts::List::InstanceMethods
 
             def acts_as_list_top
               #{configuration[:top_of_list]}.to_i
@@ -75,7 +76,7 @@ module ActiveRecord
             #{scope_condition_method}
 
             after_destroy :decrement_positions_on_lower_items
-            before_validation :add_to_list_bottom, :on => :create
+            before_create :add_to_list_#{configuration[:add_new_at]}
           EOV
         end
       end
@@ -198,6 +199,7 @@ module ActiveRecord
         private
           def add_to_list_top
             increment_positions_on_all_items
+            self[position_column] = acts_as_list_top
           end
 
           def add_to_list_bottom

data/lib/acts_as_list/version.rb

@@ -1,7 +1,7 @@
 module ActiveRecord
   module Acts
     module List
-      VERSION = "0.1.5"
+      VERSION = "0.1.6"
     end
   end
 end

data/test/shared.rb

@@ -4,4 +4,5 @@ module Shared
   autoload :ListSub,        'shared_list_sub'
   autoload :ZeroBased,      'shared_zero_based'
   autoload :ArrayScopeList, 'shared_array_scope_list'
+  autoload :TopAddition,    'shared_top_addition'
 end

data/test/shared_list.rb

@@ -102,17 +102,6 @@ module Shared
       assert_equal 5, new4.pos
     end
 
-    def test_insert_middle_with_unsaved_item
-      assert_equal [1, 2, 3, 4], ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos').map(&:id)
-
-      # new item, not saved yet
-      insert_this = ListMixin.new(:parent_id => 5)
-      insert_this.insert_at(2)
-
-      assert_equal [1, 2, 3, 4, 5], ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos').map(&:pos)
-      assert_equal [1, 5, 2, 3, 4], ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos').map(&:id)
-    end
-
     def test_delete_middle
       assert_equal [1, 2, 3, 4], ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos').map(&:id)
 

data/test/shared_list_sub.rb

@@ -52,7 +52,7 @@ module Shared
       new = ListMixinSub1.create("parent_id" => 20)
       assert_equal 2, new.pos
 
-      new = ListMixinSub2.create("parent_id" => 20)
+      new = ListMixinSub1.create("parent_id" => 20)
       assert_equal 3, new.pos
 
       new4 = ListMixin.create("parent_id" => 20)

data/test/shared_top_addition.rb

@@ -0,0 +1,87 @@
+module Shared
+  module TopAddition
+    def setup
+      (1..4).each { |counter| TopAdditionMixin.create! :pos => counter, :parent_id => 5 }
+    end
+
+    def test_reordering
+      assert_equal [4, 3, 2, 1], TopAdditionMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos').map(&:id)
+
+      TopAdditionMixin.find(2).move_lower
+      assert_equal [4, 3, 1, 2], TopAdditionMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos').map(&:id)
+
+      TopAdditionMixin.find(2).move_higher
+      assert_equal [4, 3, 2, 1], TopAdditionMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos').map(&:id)
+
+      TopAdditionMixin.find(1).move_to_bottom
+      assert_equal [4, 3, 2, 1], TopAdditionMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos').map(&:id)
+
+      TopAdditionMixin.find(1).move_to_top
+      assert_equal [1, 4, 3, 2], TopAdditionMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos').map(&:id)
+
+      TopAdditionMixin.find(2).move_to_bottom
+      assert_equal [1, 4, 3, 2], TopAdditionMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos').map(&:id)
+
+      TopAdditionMixin.find(4).move_to_top
+      assert_equal [4, 1, 3, 2], TopAdditionMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos').map(&:id)
+    end
+
+    def test_injection
+      item = TopAdditionMixin.new(:parent_id => 1)
+      assert_equal '"mixins"."parent_id" = 1', item.scope_condition
+      assert_equal "pos", item.position_column
+    end
+
+    def test_insert
+      new = TopAdditionMixin.create(:parent_id => 20)
+      assert_equal 1, new.pos
+      assert new.first?
+      assert new.last?
+
+      new = TopAdditionMixin.create(:parent_id => 20)
+      assert_equal 1, new.pos
+      assert new.first?
+      assert !new.last?
+
+      new = TopAdditionMixin.create(:parent_id => 20)
+      assert_equal 1, new.pos
+      assert new.first?
+      assert !new.last?
+
+      new = TopAdditionMixin.create(:parent_id => 0)
+      assert_equal 1, new.pos
+      assert new.first?
+      assert new.last?
+    end
+
+    def test_insert_at
+      new = TopAdditionMixin.create(:parent_id => 20)
+      assert_equal 1, new.pos
+
+      new = TopAdditionMixin.create(:parent_id => 20)
+      assert_equal 1, new.pos
+
+      new = TopAdditionMixin.create(:parent_id => 20)
+      assert_equal 1, new.pos
+
+      new4 = TopAdditionMixin.create(:parent_id => 20)
+      assert_equal 1, new4.pos
+
+      new4.insert_at(3)
+      assert_equal 3, new4.pos
+    end
+
+    def test_delete_middle
+      assert_equal [4, 3, 2, 1], TopAdditionMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos').map(&:id)
+
+      TopAdditionMixin.find(2).destroy
+
+      assert_equal [4, 3, 1], TopAdditionMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos').map(&:id)
+
+      assert_equal 3, TopAdditionMixin.find(1).pos
+      assert_equal 2, TopAdditionMixin.find(3).pos
+      assert_equal 1, TopAdditionMixin.find(4).pos
+    end
+
+  end
+end

data/test/test_list.rb

@@ -69,6 +69,10 @@ class DefaultScopedMixin < Mixin
   default_scope { order('pos ASC') }
 end
 
+class TopAdditionMixin < Mixin
+  acts_as_list :column => "pos", :add_new_at => :top, :scope => :parent_id
+end
+
 class ActsAsListTestCase < Test::Unit::TestCase
   # No default test required a this class is abstract.
   # Need for test/unit.
@@ -232,3 +236,22 @@ class DefaultScopedTest < ActsAsListTestCase
   end
 
 end
+
+#class TopAdditionMixin < Mixin
+
+class TopAdditionTest < ActsAsListTestCase
+  include Shared::TopAddition
+  def setup
+    setup_db
+    super
+  end
+end
+
+class TopAdditionTestWithDefault < ActsAsListTestCase
+  include Shared::TopAddition
+
+  def setup
+    setup_db_with_default
+    super
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_list
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -11,22 +11,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-24 00:00:00.000000000 Z
+date: 2012-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2152300140 !ruby/object:Gem::Requirement
+  requirement: &2152347900 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2152300140
+  version_requirements: *2152347900
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2152299540 !ruby/object:Gem::Requirement
+  requirement: &2152347320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: 1.15.4.7794
   type: :development
   prerelease: false
-  version_requirements: *2152299540
+  version_requirements: *2152347320
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2152299080 !ruby/object:Gem::Requirement
+  requirement: &2152346840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152299080
+  version_requirements: *2152346840
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2152298480 !ruby/object:Gem::Requirement
+  requirement: &2152346240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,7 +56,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152298480
+  version_requirements: *2152346240
 description: This "acts_as" extension provides the capabilities for sorting and reordering
   a number of objects in a list. The class that has this specified needs to have a
   "position" column defined as an integer on the mapped database table.
@@ -68,9 +68,9 @@ extra_rdoc_files: []
 files:
 - .gemtest
 - .gitignore
+- .travis.yml
 - Gemfile
 - README.md
-- README.rdoc
 - Rakefile
 - acts_as_list.gemspec
 - init.rb
@@ -82,6 +82,7 @@ files:
 - test/shared_array_scope_list.rb
 - test/shared_list.rb
 - test/shared_list_sub.rb
+- test/shared_top_addition.rb
 - test/shared_zero_based.rb
 - test/test_list.rb
 homepage: http://github.com/swanandp/acts_as_list
@@ -114,5 +115,6 @@ test_files:
 - test/shared_array_scope_list.rb
 - test/shared_list.rb
 - test/shared_list_sub.rb
+- test/shared_top_addition.rb
 - test/shared_zero_based.rb
 - test/test_list.rb

data/README.rdoc

@@ -1,35 +0,0 @@
-= ActsAsList
-
-== Description
-
-This acts_as extension provides the capabilities for sorting and reordering a number of objects in a list. The class that has this specified needs to have a +position+ column defined as an integer on the mapped database table.
-
-
-== Example
-
-  class TodoList < ActiveRecord::Base
-    has_many :todo_items, :order => "position"
-  end
-
-  class TodoItem < ActiveRecord::Base
-    belongs_to :todo_list
-    acts_as_list :scope => :todo_list
-  end
-
-  todo_list.first.move_to_bottom
-  todo_list.last.move_higher
-
-== Contributing to acts_as_list
- 
-* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
-* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
-* Fork the project
-* Start a feature/bugfix branch
-* Commit and push until you are happy with your contribution
-* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
-* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
-
-== Copyright
-
-Copyright (c) 2007 David Heinemeier Hansson, released under the MIT license
-