acts_as_list 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0cf6c26261c5ef1690443023c346ddf8de5f5a95
-  data.tar.gz: 419d7210f9a06bd54a113da0b8e8c929f716f4b6
+  metadata.gz: bfacc8a69876f7c5ccd4935f23c19c536f0d22a6
+  data.tar.gz: 2bc0fca1b08221c3a200a8f9da5bf6576583dd7a
 SHA512:
-  metadata.gz: 07d0a625d3d0ea4344b4fea41be748b0191a0495edd5255e679c3c543b3101e70711f47595f5f6009f2490f01cf7c8e5683370254a65d654bed00ec7e6eb5265
-  data.tar.gz: aaea3b5d86259b0564ea278a7dc936b2826b82a66d6c25e8abc33cb9124d434fb4a57de70c01751176ef285d8d36a25f8b62b9b60e18a6dcf198713fbe5cd2d6
+  metadata.gz: 73e20a1ce4c86cedd029f7b9b661294c64ce44befcc578be2b9ff7e48a39aaad23d2d0b83991e327da4ba640fdaa90da02ad8a5ab4f39b2220290c08144eeaa2
+  data.tar.gz: f62dbda7b65bd7e57a355ecb0774382acd0250d299096a688c8e647de3d20e9e8f97b3d08b73c451971da54d8fc972b59b4da9c40cbe7778cb76057a77f01a8a

data/.travis.yml

@@ -1,6 +1,5 @@
 language: ruby
 rvm:
-  - 1.9.2
   - 1.9.3
   - 2.0.0
   - 2.1.0
@@ -9,7 +8,3 @@ rvm:
 gemfile:
  - gemfiles/rails3/Gemfile
  - gemfiles/rails4/Gemfile
-matrix:
-  allow_failures:
-    - rvm: 1.9.2
-      gemfile: gemfiles/rails4/Gemfile

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

@@ -43,7 +43,7 @@ module ActiveRecord
           if configuration[:scope].is_a?(Symbol)
             scope_methods = %(
               def scope_condition
-                self.class.send(:sanitize_sql_hash_for_conditions, { :#{configuration[:scope].to_s} => send(:#{configuration[:scope].to_s}) })
+                { :#{configuration[:scope].to_s} => send(:#{configuration[:scope].to_s}) }
               end
 
               def scope_changed?
@@ -54,7 +54,7 @@ module ActiveRecord
             scope_methods = %(
               def attrs
                 %w(#{configuration[:scope].join(" ")}).inject({}) do |memo,column|
-                  memo[column.intern] = send(column.intern); memo
+                  memo[column.intern] = read_attribute(column.intern); memo
                 end
               end
 
@@ -63,7 +63,7 @@ module ActiveRecord
               end
 
               def scope_condition
-                self.class.send(:sanitize_sql_hash_for_conditions, attrs)
+                attrs
               end
             )
           else
@@ -84,7 +84,7 @@ module ActiveRecord
             end
 
             def acts_as_list_class
-              ::#{self.name}
+              self.class
             end
 
             def position_column
@@ -222,7 +222,7 @@ module ActiveRecord
         def higher_item
           return nil unless in_list?
           acts_as_list_class.unscoped do
-            acts_as_list_class.where("#{scope_condition} AND #{position_column} < #{(send(position_column).to_i).to_s}").
+            acts_as_list_class.where(scope_condition).where("#{position_column} < #{(send(position_column).to_i).to_s}").
             order("#{acts_as_list_class.table_name}.#{position_column} DESC").first
           end
         end
@@ -243,7 +243,7 @@ module ActiveRecord
         def lower_item
           return nil unless in_list?
           acts_as_list_class.unscoped do
-            acts_as_list_class.where("#{scope_condition} AND #{position_column} > #{(send(position_column).to_i).to_s}").
+            acts_as_list_class.where(scope_condition).where("#{position_column} > #{(send(position_column).to_i).to_s}").
             order("#{acts_as_list_class.table_name}.#{position_column} ASC").first
           end
         end
@@ -304,7 +304,7 @@ module ActiveRecord
           end
 
           # Overwrite this method to define the scope of the list changes
-          def scope_condition() "1" end
+          def scope_condition() {} end
 
           # Returns the bottom position number in the list.
           #   bottom_position_in_list    # => 2
@@ -316,9 +316,9 @@ module ActiveRecord
           # Returns the bottom item
           def bottom_item(except = nil)
             conditions = scope_condition
-            conditions = "#{conditions} AND #{self.class.primary_key} != #{self.class.connection.quote(except.id)}" if except
+            conditions = except ? "#{self.class.primary_key} != #{self.class.connection.quote(except.id)}" : {}
             acts_as_list_class.unscoped do
-              acts_as_list_class.in_list.where(conditions).order("#{acts_as_list_class.table_name}.#{position_column} DESC").first
+              acts_as_list_class.in_list.where(scope_condition).where(conditions).order("#{acts_as_list_class.table_name}.#{position_column} DESC").first
             end
           end
 
@@ -335,8 +335,8 @@ module ActiveRecord
           # This has the effect of moving all the higher items up one.
           def decrement_positions_on_higher_items(position)
             acts_as_list_class.unscoped do
-              acts_as_list_class.where(
-                "#{scope_condition} AND #{position_column} <= #{position}"
+              acts_as_list_class.where(scope_condition).where(
+                "#{position_column} <= #{position}"
               ).update_all(
                 "#{position_column} = (#{position_column} - 1)"
               )
@@ -348,8 +348,8 @@ module ActiveRecord
             return unless in_list?
             position ||= send(position_column).to_i
             acts_as_list_class.unscoped do
-              acts_as_list_class.where(
-                "#{scope_condition} AND #{position_column} > #{position}"
+              acts_as_list_class.where(scope_condition).where(
+                "#{position_column} > #{position}"
               ).update_all(
                 "#{position_column} = (#{position_column} - 1)"
               )
@@ -360,8 +360,8 @@ module ActiveRecord
           def increment_positions_on_higher_items
             return unless in_list?
             acts_as_list_class.unscoped do
-              acts_as_list_class.where(
-                "#{scope_condition} AND #{position_column} < #{send(position_column).to_i}"
+              acts_as_list_class.where(scope_condition).where(
+                "#{position_column} < #{send(position_column).to_i}"
               ).update_all(
                 "#{position_column} = (#{position_column} + 1)"
               )
@@ -373,8 +373,8 @@ module ActiveRecord
             avoid_id_condition = avoid_id ? " AND #{self.class.primary_key} != #{self.class.connection.quote(avoid_id)}" : ''
 
             acts_as_list_class.unscoped do
-              acts_as_list_class.where(
-                "#{scope_condition} AND #{position_column} >= #{position}#{avoid_id_condition}"
+              acts_as_list_class.where(scope_condition).where(
+                "#{position_column} >= #{position}#{avoid_id_condition}"
               ).update_all(
                 "#{position_column} = (#{position_column} + 1)"
               )
@@ -385,7 +385,7 @@ module ActiveRecord
           def increment_positions_on_all_items
             acts_as_list_class.unscoped do
               acts_as_list_class.where(
-                "#{scope_condition}"
+                scope_condition
               ).update_all(
                 "#{position_column} = (#{position_column} + 1)"
               )
@@ -403,8 +403,10 @@ module ActiveRecord
               # e.g., if moving an item from 2 to 5,
               # move [3, 4, 5] to [2, 3, 4]
               acts_as_list_class.unscoped do
-                acts_as_list_class.where(
-                  "#{scope_condition} AND #{position_column} > #{old_position} AND #{position_column} <= #{new_position}#{avoid_id_condition}"
+                acts_as_list_class.where(scope_condition).where(
+                  "#{position_column} > #{old_position}"
+                ).where(
+                  "#{position_column} <= #{new_position}#{avoid_id_condition}"
                 ).update_all(
                   "#{position_column} = (#{position_column} - 1)"
                 )
@@ -415,8 +417,10 @@ module ActiveRecord
               # e.g., if moving an item from 5 to 2,
               # move [2, 3, 4] to [3, 4, 5]
               acts_as_list_class.unscoped do
-                acts_as_list_class.where(
-                  "#{scope_condition} AND #{position_column} >= #{new_position} AND #{position_column} < #{old_position}#{avoid_id_condition}"
+                acts_as_list_class.where(scope_condition).where(
+                  "#{position_column} >= #{new_position}"
+                ).where(
+                  "#{position_column} < #{old_position}#{avoid_id_condition}"
                 ).update_all(
                   "#{position_column} = (#{position_column} + 1)"
                 )
@@ -450,7 +454,7 @@ module ActiveRecord
             new_position = send(position_column).to_i
 
             return unless acts_as_list_class.unscoped do
-              acts_as_list_class.where("#{scope_condition} AND #{position_column} = #{new_position}").count > 1
+              acts_as_list_class.where(scope_condition).where("#{position_column} = #{new_position}").count > 1
             end
             shuffle_positions_on_intermediate_items old_position, new_position, id
           end

data/lib/acts_as_list/version.rb

@@ -1,7 +1,7 @@
 module ActiveRecord
   module Acts
     module List
-      VERSION = '0.5.0'
+      VERSION = '0.6.0'
     end
   end
 end

data/test/shared_list.rb

@@ -45,7 +45,7 @@ module Shared
 
     def test_injection
       item = ListMixin.new(parent_id: 1)
-      assert_equal '"mixins"."parent_id" = 1', item.scope_condition
+      assert_equal({ parent_id: 1 }, item.scope_condition)
       assert_equal "pos", item.position_column
     end
 

data/test/shared_list_sub.rb

@@ -61,7 +61,7 @@ module Shared
 
     def test_injection
       item = ListMixin.new("parent_id"=>1)
-      assert_equal '"mixins"."parent_id" = 1', item.scope_condition
+      assert_equal({ parent_id: 1 }, item.scope_condition)
       assert_equal "pos", item.position_column
     end
 
@@ -118,5 +118,10 @@ module Shared
       assert_equal 1, ListMixin.where(id: 3).first.pos
       assert_equal 2, ListMixin.where(id: 4).first.pos
     end
+
+    def test_acts_as_list_class
+      assert_equal TheSubClass1, TheSubClass1.new.acts_as_list_class
+      assert_equal TheSubClass2, TheSubClass2.new.acts_as_list_class
+    end
   end
 end

data/test/shared_top_addition.rb

@@ -28,7 +28,7 @@ module Shared
 
     def test_injection
       item = TopAdditionMixin.new(parent_id: 1)
-      assert_equal '"mixins"."parent_id" = 1', item.scope_condition
+      assert_equal({ parent_id: 1 }, item.scope_condition)
       assert_equal "pos", item.position_column
     end
 

data/test/test_list.rb

@@ -13,13 +13,17 @@ def setup_db(position_options = {})
     t.column :parent_type, :string
     t.column :created_at, :datetime
     t.column :updated_at, :datetime
+    t.column :state, :integer
   end
-  
-  ActiveRecord::Base.connection.schema_cache.clear!
-  [ Mixin, ListMixin, ListMixinSub1, ListMixinSub2, ListWithStringScopeMixin,
+
+  mixins = [ Mixin, ListMixin, ListMixinSub1, ListMixinSub2, ListWithStringScopeMixin,
     ArrayScopeListMixin, ZeroBasedMixin, DefaultScopedMixin,
-    DefaultScopedWhereMixin, TopAdditionMixin, NoAdditionMixin ].each do |klass|
-    
+    DefaultScopedWhereMixin, TopAdditionMixin, NoAdditionMixin ]
+
+  mixins << EnumArrayScopeListMixin if rails_4
+
+  ActiveRecord::Base.connection.schema_cache.clear!
+  mixins.each do |klass|
     klass.reset_column_information
   end
 end
@@ -33,6 +37,10 @@ def rails_3
   defined?(ActiveRecord::VERSION) && ActiveRecord::VERSION::MAJOR >= 3
 end
 
+def rails_4
+  defined?(ActiveRecord::VERSION) && ActiveRecord::VERSION::MAJOR >= 4
+end
+
 def teardown_db
   ActiveRecord::Base.connection.tables.each do |table|
     ActiveRecord::Base.connection.drop_table(table)
@@ -66,6 +74,15 @@ class ArrayScopeListMixin < Mixin
   acts_as_list column: "pos", scope: [:parent_id, :parent_type]
 end
 
+if rails_4
+  class EnumArrayScopeListMixin < Mixin
+    STATE_VALUES = %w(active archived)
+    enum state: STATE_VALUES
+
+    acts_as_list column: "pos", scope: [:parent_id, :state]
+  end
+end
+
 class ZeroBasedMixin < Mixin
   acts_as_list column: "pos", top_of_list: 0, scope: [:parent_id]
 end
@@ -92,6 +109,19 @@ class NoAdditionMixin < Mixin
   acts_as_list column: "pos", add_new_at: nil, scope: :parent_id
 end
 
+class TheBaseClass < ActiveRecord::Base
+  self.abstract_class = true
+  acts_as_list column: "pos", scope: :parent
+end
+
+class TheSubClass1 < TheBaseClass
+  self.table_name = 'mixins'
+end
+
+class TheSubClass2 < TheBaseClass
+  self.table_name = 'mixins'
+end
+
 class ActsAsListTestCase < Minitest::Test
   # No default test required as this class is abstract.
   # Need for test/unit.
@@ -459,6 +489,25 @@ class MultipleListsTest < ActsAsListTestCase
   end
 end
 
+if rails_4
+  class EnumArrayScopeListMixinTest < ActsAsListTestCase
+    def setup
+      setup_db
+      EnumArrayScopeListMixin.create! :parent_id => 1, :state => EnumArrayScopeListMixin.states['active']
+      EnumArrayScopeListMixin.create! :parent_id => 1, :state => EnumArrayScopeListMixin.states['archived']
+      EnumArrayScopeListMixin.create! :parent_id => 2, :state => EnumArrayScopeListMixin.states["active"]
+      EnumArrayScopeListMixin.create! :parent_id => 2, :state => EnumArrayScopeListMixin.states["archived"]
+    end
+
+    def test_positions
+      assert_equal [1], EnumArrayScopeListMixin.where(:parent_id => 1, :state => EnumArrayScopeListMixin.states['active']).map(&:pos)
+      assert_equal [1], EnumArrayScopeListMixin.where(:parent_id => 1, :state => EnumArrayScopeListMixin.states['archived']).map(&:pos)
+      assert_equal [1], EnumArrayScopeListMixin.where(:parent_id => 2, :state => EnumArrayScopeListMixin.states['active']).map(&:pos)
+      assert_equal [1], EnumArrayScopeListMixin.where(:parent_id => 2, :state => EnumArrayScopeListMixin.states['archived']).map(&:pos)
+    end
+  end
+end
+
 class MultipleListsArrayScopeTest < ActsAsListTestCase
   def setup
     setup_db

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_list
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -10,34 +10,34 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-31 00:00:00.000000000 Z
+date: 2014-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
 description: This "acts_as" extension provides the capabilities for sorting and reordering
@@ -49,9 +49,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gemtest
-- .gitignore
-- .travis.yml
+- ".gemtest"
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - MIT-LICENSE
 - README.md
@@ -82,17 +82,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: acts_as_list
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A gem allowing a active_record model to act_as_list.