acts_as_list 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf7464bb2c953b31ccf95b2e3017ce77cf9e40bc
-  data.tar.gz: f65a617c773c1c5ebad2b85827fc675da6c23d2c
+  metadata.gz: a58bb02b59b9251aa9959060342f81fe5aa83467
+  data.tar.gz: 6b8f6ba9c5f16cbe5a93cacb754b721b3dd40b56
 SHA512:
-  metadata.gz: 664518e270eafe5380772fe9dab0d661ab6184b526648ba1322f28d4c04040e9d412f00b011abe072eb289d73dc422be0aa411b1e759d2933c5ea05d08ef8773
-  data.tar.gz: ffd987ff9646c697fe2972ff2516bcc66286d528c71af311e8fe27524568d5eaad6ee774cd351345a2c8aaad8326fd9c42bd83dd9acf77d3f34dfb2a98d99d2d
+  metadata.gz: 5c25e5a32b9def627747a36a7fe4e232ae946b3cde83039c4a893dfc4e8469808fc6ceefac353b4f6bd5e251eb6b0d28df3b00a0d8c69b7b2b1c96ce81eafb42
+  data.tar.gz: 1494350922d065eab1cf1bd0309b56a9a0246055a0eb61f45401682f3f7fa21060ac8367b138a2e29644ba24de838864061a176d2e89711a676c76469d6e897a

data/.gitignore

@@ -9,3 +9,4 @@ pkg/*
 .ruby-version
 # Appraisal generated lockfiles
 *.gemfile.lock
+.DS_Store

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Change Log
 
+## [v0.8.0](https://github.com/swanandp/acts_as_list/tree/v0.8.0) (2016-08-23)
+[Full Changelog](https://github.com/swanandp/acts_as_list/compare/v0.7.7...v0.8.0)
+
+**Closed issues:**
+
+- Behavior with DB default seems unclear [\#219](https://github.com/swanandp/acts_as_list/issues/219)
+
+**Merged pull requests:**
+
+- No longer a need specify additional rbx gems [\#225](https://github.com/swanandp/acts_as_list/pull/225) ([brendon](https://github.com/brendon))
+- Fix position when no serial positions [\#223](https://github.com/swanandp/acts_as_list/pull/223) ([jpalumickas](https://github.com/jpalumickas))
+- Bug: Specifying a position with add\_new\_at: :top fails to insert at that position [\#220](https://github.com/swanandp/acts_as_list/pull/220) ([brendon](https://github.com/brendon))
+
 ## [v0.7.7](https://github.com/swanandp/acts_as_list/tree/v0.7.7) (2016-08-18)
 [Full Changelog](https://github.com/swanandp/acts_as_list/compare/v0.7.6...v0.7.7)
 
@@ -70,6 +83,7 @@
 
 **Merged pull requests:**
 
+- Fix position when no serial positions [\#208](https://github.com/swanandp/acts_as_list/pull/208) ([PoslinskiNet](https://github.com/PoslinskiNet))
 - Removed duplicated assignment [\#207](https://github.com/swanandp/acts_as_list/pull/207) ([shunwen](https://github.com/shunwen))
 - Quote all identifiers [\#205](https://github.com/swanandp/acts_as_list/pull/205) ([fabn](https://github.com/fabn))
 - Start testing Rails 5 [\#203](https://github.com/swanandp/acts_as_list/pull/203) ([brendon](https://github.com/brendon))

data/Gemfile

@@ -3,12 +3,6 @@ source "http://rubygems.org"
 gem "sqlite3", platforms: [:ruby]
 gem "activerecord-jdbcsqlite3-adapter", platforms: [:jruby]
 
-platforms :rbx do
-  gem "rubysl", "~> 2.0"
-  gem "rubinius-developer_tools"
-  gem "rubysl-test-unit"
-end
-
 gem "rack", "~> 1", platforms: [:ruby_19, :ruby_20, :ruby_21, :jruby]
 
 gemspec
@@ -18,6 +12,6 @@ gem "appraisal"
 gem "github_changelog_generator", "1.9.0"
 
 group :test do
-	gem "minitest", "~> 5.0"
+  gem "minitest", "~> 5.0"
   gem "test_after_commit", "~> 0.4.2"
 end

data/gemfiles/rails_3_2.gemfile

@@ -16,10 +16,4 @@ group :test do
   gem "after_commit_exception_notification"
 end
 
-platforms :rbx do
-  gem "rubysl", "~> 2.0"
-  gem "rubinius-developer_tools"
-  gem "rubysl-test-unit"
-end
-
 gemspec :path => "../"

data/gemfiles/rails_4_2.gemfile

@@ -15,10 +15,4 @@ group :test do
   gem "test_after_commit", "~> 0.4.2"
 end
 
-platforms :rbx do
-  gem "rubysl", "~> 2.0"
-  gem "rubinius-developer_tools"
-  gem "rubysl-test-unit"
-end
-
 gemspec :path => "../"

data/gemfiles/rails_5_0.gemfile

@@ -15,10 +15,4 @@ group :test do
   gem "test_after_commit", "~> 0.4.2"
 end
 
-platforms :rbx do
-  gem "rubysl", "~> 2.0"
-  gem "rubinius-developer_tools"
-  gem "rubysl-test-unit"
-end
-
 gemspec :path => "../"

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

@@ -42,102 +42,102 @@ module ActiveRecord
             configuration[:scope] = :"#{configuration[:scope]}_id"
           end
 
-          if configuration[:scope].is_a?(Symbol)
-            scope_methods = %(
-              def scope_condition
-                { #{configuration[:scope]}: send(:#{configuration[:scope]}) }
-              end
-
-              def scope_changed?
-                changed.include?(scope_name.to_s)
-              end
-            )
-          elsif configuration[:scope].is_a?(Array)
-            scope_methods = %(
-              def scope_condition
-                #{configuration[:scope]}.inject({}) do |hash, column|
-                  hash.merge!({ column.to_sym => read_attribute(column.to_sym) })
-                end
-              end
-
-              def scope_changed?
-                (scope_condition.keys & changed.map(&:to_sym)).any?
-              end
-            )
-          else
-            scope_methods = %(
-              def scope_condition
-                "#{configuration[:scope]}"
-              end
-
-              def scope_changed?() false end
-            )
-          end
-
-          quoted_position_column = connection.quote_column_name(configuration[:column])
-          quoted_position_column_with_table_name = "#{quoted_table_name}.#{quoted_position_column}"
+          caller_class = self
 
-          class_eval <<-EOV, __FILE__, __LINE__ + 1
-            def self.acts_as_list_top
-              #{configuration[:top_of_list]}.to_i
+          class_eval do
+            define_singleton_method :acts_as_list_top do
+              configuration[:top_of_list].to_i
             end
 
-            def acts_as_list_top
-              #{configuration[:top_of_list]}.to_i
+            define_method :acts_as_list_top do
+              configuration[:top_of_list].to_i
             end
 
-            def acts_as_list_class
-              ::#{self.name}
+            define_method :acts_as_list_class do
+              caller_class
             end
 
-            def position_column
-              '#{configuration[:column]}'
+            define_method :position_column do
+              configuration[:column]
             end
 
-            def scope_name
-              '#{configuration[:scope]}'
+            define_method :scope_name do
+              configuration[:scope]
             end
 
-            def add_new_at
-              '#{configuration[:add_new_at]}'
+            define_method :add_new_at do
+              configuration[:add_new_at]
             end
 
-            def #{configuration[:column]}=(position)
-              write_attribute(:#{configuration[:column]}, position)
+            define_method :"#{configuration[:column]}=" do |position|
+              write_attribute(configuration[:column], position)
               @position_changed = true
             end
 
-            #{scope_methods}
+            if configuration[:scope].is_a?(Symbol)
+              define_method :scope_condition do
+                { configuration[:scope] => send(:"#{configuration[:scope]}") }
+              end
+
+              define_method :scope_changed? do
+                changed.include?(scope_name.to_s)
+              end
+            elsif configuration[:scope].is_a?(Array)
+              define_method :scope_condition do
+                configuration[:scope].inject({}) do |hash, column|
+                  hash.merge!({ column.to_sym => read_attribute(column.to_sym) })
+                end
+              end
+
+              define_method :scope_changed? do
+                (scope_condition.keys & changed.map(&:to_sym)).any?
+              end
+            else
+              define_method :scope_condition do
+                eval "%{#{configuration[:scope]}}"
+              end
+
+              define_method :scope_changed? do
+                false
+              end
+            end
 
             # only add to attr_accessible
             # if the class has some mass_assignment_protection
-
             if defined?(accessible_attributes) and !accessible_attributes.blank?
-              attr_accessible :#{configuration[:column]}
+              attr_accessible :"#{configuration[:column]}"
+            end
+
+            define_singleton_method :quoted_position_column do
+              @_quoted_position_column ||= connection.quote_column_name(configuration[:column])
+            end
+
+            define_singleton_method :quoted_position_column_with_table_name do
+              @_quoted_position_column_with_table_name ||= "#{caller_class.quoted_table_name}.#{quoted_position_column}"
             end
 
-            scope :in_list, lambda { where(%q{#{quoted_position_column_with_table_name} IS NOT NULL}) }
+            scope :in_list, lambda { where("#{quoted_position_column_with_table_name} IS NOT NULL") }
 
-            def self.decrement_all
-              update_all_with_touch %q(#{quoted_position_column} = (#{quoted_position_column_with_table_name} - 1))
+            define_singleton_method :decrement_all do
+              update_all_with_touch "#{quoted_position_column} = (#{quoted_position_column_with_table_name} - 1)"
             end
 
-            def self.increment_all
-              update_all_with_touch %q(#{quoted_position_column} = (#{quoted_position_column_with_table_name} + 1))
+            define_singleton_method :increment_all do
+              update_all_with_touch "#{quoted_position_column} = (#{quoted_position_column_with_table_name} + 1)"
             end
 
-            def self.update_all_with_touch(updates)
+            define_singleton_method :update_all_with_touch do |updates|
               record = new
               attrs = record.send(:timestamp_attributes_for_update_in_model)
               now = record.send(:current_time_from_proper_timezone)
 
-              query = attrs.map { |attr| %(\#{connection.quote_column_name(attr)} = :now) }
+              query = attrs.map { |attr| "#{connection.quote_column_name(attr)} = :now" }
               query.push updates
               query = query.join(", ")
 
               update_all([query, now: now])
             end
-          EOV
+          end
 
           attr_reader :position_changed
 

data/lib/acts_as_list/version.rb

@@ -1,7 +1,7 @@
 module ActiveRecord
   module Acts
     module List
-      VERSION = '0.8.0'
+      VERSION = '0.8.1'
     end
   end
 end

data/test/test_list.rb

@@ -228,7 +228,7 @@ class ListTest < ActsAsListTestCase
         ActiveRecord::Base.connection_pool.with_connection do |c|
           n.times do
             begin
-              ListMixin.where(parent_id: 1).order(:pos).last.insert_at(1)
+              ListMixin.where(parent_id: 1).order('pos').last.insert_at(1)
             rescue Exception
               # ignore SQLite3::SQLException due to table locking
             end
@@ -578,19 +578,19 @@ class MultipleListsTest < ActsAsListTestCase
   end
 
   def test_check_scope_order
-    assert_equal [1, 2, 3, 4], ListMixin.where(:parent_id => 1).order(:pos).map(&:id)
-    assert_equal [5, 6, 7, 8], ListMixin.where(:parent_id => 2).order(:pos).map(&:id)
+    assert_equal [1, 2, 3, 4], ListMixin.where(:parent_id => 1).order('pos').map(&:id)
+    assert_equal [5, 6, 7, 8], ListMixin.where(:parent_id => 2).order('pos').map(&:id)
     ListMixin.find(4).update_attributes(:parent_id => 2, :pos => 2)
-    assert_equal [1, 2, 3], ListMixin.where(:parent_id => 1).order(:pos).map(&:id)
-    assert_equal [5, 4, 6, 7, 8], ListMixin.where(:parent_id => 2).order(:pos).map(&:id)
+    assert_equal [1, 2, 3], ListMixin.where(:parent_id => 1).order('pos').map(&:id)
+    assert_equal [5, 4, 6, 7, 8], ListMixin.where(:parent_id => 2).order('pos').map(&:id)
   end
 
   def test_check_scope_position
     assert_equal [1, 2, 3, 4], ListMixin.where(:parent_id => 1).map(&:pos)
     assert_equal [1, 2, 3, 4], ListMixin.where(:parent_id => 2).map(&:pos)
     ListMixin.find(4).update_attributes(:parent_id => 2, :pos => 2)
-    assert_equal [1, 2, 3], ListMixin.where(:parent_id => 1).order(:pos).map(&:pos)
-    assert_equal [1, 2, 3, 4, 5], ListMixin.where(:parent_id => 2).order(:pos).map(&:pos)
+    assert_equal [1, 2, 3], ListMixin.where(:parent_id => 1).order('pos').map(&:pos)
+    assert_equal [1, 2, 3, 4, 5], ListMixin.where(:parent_id => 2).order('pos').map(&:pos)
   end
 end
 
@@ -622,51 +622,51 @@ class MultipleListsArrayScopeTest < ActsAsListTestCase
   end
 
   def test_order_after_all_scope_properties_are_changed
-    assert_equal [1, 2, 3, 4], ArrayScopeListMixin.where(:parent_id => 1, :parent_type => 'anything').order(:pos).map(&:id)
-    assert_equal [5, 6, 7, 8], ArrayScopeListMixin.where(:parent_id => 2, :parent_type => 'something').order(:pos).map(&:id)
+    assert_equal [1, 2, 3, 4], ArrayScopeListMixin.where(:parent_id => 1, :parent_type => 'anything').order('pos').map(&:id)
+    assert_equal [5, 6, 7, 8], ArrayScopeListMixin.where(:parent_id => 2, :parent_type => 'something').order('pos').map(&:id)
     ArrayScopeListMixin.find(2).update_attributes(:parent_id => 2, :pos => 2,:parent_type => 'something')
-    assert_equal [1, 3, 4], ArrayScopeListMixin.where(:parent_id => 1,:parent_type => 'anything').order(:pos).map(&:id)
-    assert_equal [5, 2, 6, 7, 8], ArrayScopeListMixin.where(:parent_id => 2,:parent_type => 'something').order(:pos).map(&:id)
+    assert_equal [1, 3, 4], ArrayScopeListMixin.where(:parent_id => 1,:parent_type => 'anything').order('pos').map(&:id)
+    assert_equal [5, 2, 6, 7, 8], ArrayScopeListMixin.where(:parent_id => 2,:parent_type => 'something').order('pos').map(&:id)
   end
 
   def test_position_after_all_scope_properties_are_changed
     assert_equal [1, 2, 3, 4], ArrayScopeListMixin.where(:parent_id => 1, :parent_type => 'anything').map(&:pos)
     assert_equal [1, 2, 3, 4], ArrayScopeListMixin.where(:parent_id => 2, :parent_type => 'something').map(&:pos)
     ArrayScopeListMixin.find(4).update_attributes(:parent_id => 2, :pos => 2, :parent_type => 'something')
-    assert_equal [1, 2, 3], ArrayScopeListMixin.where(:parent_id => 1, :parent_type => 'anything').order(:pos).map(&:pos)
-    assert_equal [1, 2, 3, 4, 5], ArrayScopeListMixin.where(:parent_id => 2, :parent_type => 'something').order(:pos).map(&:pos)
+    assert_equal [1, 2, 3], ArrayScopeListMixin.where(:parent_id => 1, :parent_type => 'anything').order('pos').map(&:pos)
+    assert_equal [1, 2, 3, 4, 5], ArrayScopeListMixin.where(:parent_id => 2, :parent_type => 'something').order('pos').map(&:pos)
   end
 
   def test_order_after_one_scope_property_is_changed
-    assert_equal [1, 2, 3, 4], ArrayScopeListMixin.where(:parent_id => 1, :parent_type => 'anything').order(:pos).map(&:id)
-    assert_equal [9, 10, 11, 12], ArrayScopeListMixin.where(:parent_id => 3, :parent_type => 'anything').order(:pos).map(&:id)
+    assert_equal [1, 2, 3, 4], ArrayScopeListMixin.where(:parent_id => 1, :parent_type => 'anything').order('pos').map(&:id)
+    assert_equal [9, 10, 11, 12], ArrayScopeListMixin.where(:parent_id => 3, :parent_type => 'anything').order('pos').map(&:id)
     ArrayScopeListMixin.find(2).update_attributes(:parent_id => 3, :pos => 2)
-    assert_equal [1, 3, 4], ArrayScopeListMixin.where(:parent_id => 1,:parent_type => 'anything').order(:pos).map(&:id)
-    assert_equal [9, 2, 10, 11, 12], ArrayScopeListMixin.where(:parent_id => 3,:parent_type => 'anything').order(:pos).map(&:id)
+    assert_equal [1, 3, 4], ArrayScopeListMixin.where(:parent_id => 1,:parent_type => 'anything').order('pos').map(&:id)
+    assert_equal [9, 2, 10, 11, 12], ArrayScopeListMixin.where(:parent_id => 3,:parent_type => 'anything').order('pos').map(&:id)
   end
 
   def test_position_after_one_scope_property_is_changed
     assert_equal [1, 2, 3, 4], ArrayScopeListMixin.where(:parent_id => 1, :parent_type => 'anything').map(&:pos)
     assert_equal [1, 2, 3, 4], ArrayScopeListMixin.where(:parent_id => 3, :parent_type => 'anything').map(&:pos)
     ArrayScopeListMixin.find(4).update_attributes(:parent_id => 3, :pos => 2)
-    assert_equal [1, 2, 3], ArrayScopeListMixin.where(:parent_id => 1, :parent_type => 'anything').order(:pos).map(&:pos)
-    assert_equal [1, 2, 3, 4, 5], ArrayScopeListMixin.where(:parent_id => 3, :parent_type => 'anything').order(:pos).map(&:pos)
+    assert_equal [1, 2, 3], ArrayScopeListMixin.where(:parent_id => 1, :parent_type => 'anything').order('pos').map(&:pos)
+    assert_equal [1, 2, 3, 4, 5], ArrayScopeListMixin.where(:parent_id => 3, :parent_type => 'anything').order('pos').map(&:pos)
   end
 
   def test_order_after_moving_to_empty_list
-    assert_equal [1, 2, 3, 4], ArrayScopeListMixin.where(:parent_id => 1, :parent_type => 'anything').order(:pos).map(&:id)
-    assert_equal [], ArrayScopeListMixin.where(:parent_id => 4, :parent_type => 'anything').order(:pos).map(&:id)
+    assert_equal [1, 2, 3, 4], ArrayScopeListMixin.where(:parent_id => 1, :parent_type => 'anything').order('pos').map(&:id)
+    assert_equal [], ArrayScopeListMixin.where(:parent_id => 4, :parent_type => 'anything').order('pos').map(&:id)
     ArrayScopeListMixin.find(2).update_attributes(:parent_id => 4, :pos => 1)
-    assert_equal [1, 3, 4], ArrayScopeListMixin.where(:parent_id => 1,:parent_type => 'anything').order(:pos).map(&:id)
-    assert_equal [2], ArrayScopeListMixin.where(:parent_id => 4,:parent_type => 'anything').order(:pos).map(&:id)
+    assert_equal [1, 3, 4], ArrayScopeListMixin.where(:parent_id => 1,:parent_type => 'anything').order('pos').map(&:id)
+    assert_equal [2], ArrayScopeListMixin.where(:parent_id => 4,:parent_type => 'anything').order('pos').map(&:id)
   end
 
   def test_position_after_moving_to_empty_list
     assert_equal [1, 2, 3, 4], ArrayScopeListMixin.where(:parent_id => 1, :parent_type => 'anything').map(&:pos)
     assert_equal [], ArrayScopeListMixin.where(:parent_id => 4, :parent_type => 'anything').map(&:pos)
     ArrayScopeListMixin.find(2).update_attributes(:parent_id => 4, :pos => 1)
-    assert_equal [1, 2, 3], ArrayScopeListMixin.where(:parent_id => 1, :parent_type => 'anything').order(:pos).map(&:pos)
-    assert_equal [1], ArrayScopeListMixin.where(:parent_id => 4, :parent_type => 'anything').order(:pos).map(&:pos)
+    assert_equal [1, 2, 3], ArrayScopeListMixin.where(:parent_id => 1, :parent_type => 'anything').order('pos').map(&:pos)
+    assert_equal [1], ArrayScopeListMixin.where(:parent_id => 4, :parent_type => 'anything').order('pos').map(&:pos)
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_list
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-23 00:00:00.000000000 Z
+date: 2016-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord