acts_as_list 0.7.6 → 0.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac758ea2c45c36f2da4a70277a4e359e32cbebec
-  data.tar.gz: 44cb219c5932187141cb11cb774e2165b9be86f0
+  metadata.gz: d62dacdeb7972152a2ee04cee3cccb8ef26898d7
+  data.tar.gz: fe6b02bfa1c5ed33407d1852c7b988a1848c7cd4
 SHA512:
-  metadata.gz: 32474515db63aa64fea168c43654ebc2d86e24ad5bba2e1e793b0a484ff6d0e40d880c62d559fdf5d830b4213f9ca4a56f5ab776e102daf28e86a1ee1e772dbb
-  data.tar.gz: ab9e2ae5dbe3313a1b69f8cb82019494a10bce07c0343acc88062cd8475774dc2202fa8104cbb156797aae53b87631cabe8766cdf0f627eac7296934ae5dd50b
+  metadata.gz: 6b376b14646463802f4aee7080663eefdb3d7b1a43088df7126f57c84ecfb0a8730470efe4b57758f2b2079d6bd52b19f2a80293b211095318425d5892194897
+  data.tar.gz: fa104b99749d08767074e96f5fea1e97590ee841673660c39d03bb3d2cd50a3d2db2de4d1d195d5503d1bfadec7cbe84e046714f0ab98d0d509bc4c4797949e2

data/Appraisals

@@ -1,15 +1,21 @@
 appraise "rails-3-2" do
-  gem "activerecord", "~> 3.2.21"
+  gem "activerecord", "~> 3.2.22.2"
+  group :test do
+    gem "after_commit_exception_notification"
+  end
 end
 
 appraise "rails-4-1" do
-  gem "activerecord", "~> 4.1.10"
+  gem "activerecord", "~> 4.1.16"
+  group :test do
+    gem "after_commit_exception_notification"
+  end
 end
 
 appraise "rails-4-2" do
-  gem "activerecord", "~> 4.2.1"
+  gem "activerecord", "~> 4.2.7"
 end
 
 appraise "rails-5-0" do
-  gem "activerecord", "~> 5.0.0.rc2"
+  gem "activerecord", "~> 5.0.0"
 end

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Change Log
 
+## [v0.7.6](https://github.com/swanandp/acts_as_list/tree/v0.7.6) (2016-07-15)
+[Full Changelog](https://github.com/swanandp/acts_as_list/compare/v0.7.5...v0.7.6)
+
+**Closed issues:**
+
+- add\_new\_at nil with scope causes NoMethodError [\#211](https://github.com/swanandp/acts_as_list/issues/211)
+
+**Merged pull requests:**
+
+- Add class method acts\_as\_list\_top as reader for configured top\_of\_list [\#213](https://github.com/swanandp/acts_as_list/pull/213) ([krzysiek1507](https://github.com/krzysiek1507))
+- Bugfix/add new at nil on scope change [\#212](https://github.com/swanandp/acts_as_list/pull/212) ([greatghoul](https://github.com/greatghoul))
+
 ## [v0.7.5](https://github.com/swanandp/acts_as_list/tree/v0.7.5) (2016-06-30)
 [Full Changelog](https://github.com/swanandp/acts_as_list/compare/v0.7.4...v0.7.5)
 

data/Gemfile

@@ -9,12 +9,12 @@ platforms :rbx do
   gem "rubysl-test-unit"
 end
 
-# Specify your gem"s dependencies in acts_as_list-rails3.gemspec
+gem "rack", "~> 1", platforms: [:ruby_19, :ruby_20, :ruby_21, :jruby]
+
 gemspec
 
 gem "rake"
 gem "appraisal"
-# Used to automatically generate changelog file
 gem "github_changelog_generator", "1.9.0"
 
 group :test do

data/gemfiles/rails_3_2.gemfile

@@ -4,10 +4,11 @@ source "http://rubygems.org"
 
 gem "sqlite3", :platforms => [:ruby]
 gem "activerecord-jdbcsqlite3-adapter", :platforms => [:jruby]
+gem "rack", "~> 1", :platforms => [:ruby_19, :ruby_20, :ruby_21, :jruby]
 gem "rake"
 gem "appraisal"
 gem "github_changelog_generator", "1.9.0"
-gem "activerecord", "~> 3.2.21"
+gem "activerecord", "~> 3.2.22.2"
 
 group :test do
   gem "minitest", "~> 5.0"

data/gemfiles/rails_4_1.gemfile

@@ -4,10 +4,11 @@ source "http://rubygems.org"
 
 gem "sqlite3", :platforms => [:ruby]
 gem "activerecord-jdbcsqlite3-adapter", :platforms => [:jruby]
+gem "rack", "~> 1", :platforms => [:ruby_19, :ruby_20, :ruby_21, :jruby]
 gem "rake"
 gem "appraisal"
 gem "github_changelog_generator", "1.9.0"
-gem "activerecord", "~> 4.1.10"
+gem "activerecord", "~> 4.1.16"
 
 group :test do
   gem "minitest", "~> 5.0"

data/gemfiles/rails_4_2.gemfile

@@ -4,10 +4,11 @@ source "http://rubygems.org"
 
 gem "sqlite3", :platforms => [:ruby]
 gem "activerecord-jdbcsqlite3-adapter", :platforms => [:jruby]
+gem "rack", "~> 1", :platforms => [:ruby_19, :ruby_20, :ruby_21, :jruby]
 gem "rake"
 gem "appraisal"
 gem "github_changelog_generator", "1.9.0"
-gem "activerecord", "~> 4.2.1"
+gem "activerecord", "~> 4.2.7"
 
 group :test do
   gem "minitest", "~> 5.0"

data/gemfiles/rails_5_0.gemfile

@@ -4,10 +4,11 @@ source "http://rubygems.org"
 
 gem "sqlite3", :platforms => [:ruby]
 gem "activerecord-jdbcsqlite3-adapter", :platforms => [:jruby]
+gem "rack", "~> 1", :platforms => [:ruby_19, :ruby_20, :ruby_21, :jruby]
 gem "rake"
 gem "appraisal"
 gem "github_changelog_generator", "1.9.0"
-gem "activerecord", "~> 5.0.0.beta3"
+gem "activerecord", "~> 5.0.0"
 
 group :test do
   gem "minitest", "~> 5.0"

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

@@ -75,6 +75,7 @@ module ActiveRecord
           end
 
           quoted_position_column = connection.quote_column_name(configuration[:column])
+          quoted_position_column_with_table_name = "#{quoted_table_name}.#{quoted_position_column}"
 
           class_eval <<-EOV, __FILE__, __LINE__ + 1
             def self.acts_as_list_top
@@ -115,14 +116,14 @@ module ActiveRecord
               attr_accessible :#{configuration[:column]}
             end
 
-            scope :in_list, lambda { where(%q{#{quoted_table_name}.#{quoted_position_column} IS NOT NULL}) }
+            scope :in_list, lambda { where(%q{#{quoted_position_column_with_table_name} IS NOT NULL}) }
 
             def self.decrement_all
-              update_all_with_touch %q(#{quoted_position_column} = (#{quoted_table_name}.#{quoted_position_column} - 1))
+              update_all_with_touch %q(#{quoted_position_column} = (#{quoted_position_column_with_table_name} - 1))
             end
 
             def self.increment_all
-              update_all_with_touch %q(#{quoted_position_column} = (#{quoted_table_name}.#{quoted_position_column} + 1))
+              update_all_with_touch %q(#{quoted_position_column} = (#{quoted_position_column_with_table_name} + 1))
             end
 
             def self.update_all_with_touch(updates)
@@ -141,10 +142,10 @@ module ActiveRecord
           attr_reader :position_changed
 
           before_validation :check_top_position
-          
+
           before_destroy :lock!
           after_destroy :decrement_positions_on_lower_items
-          
+
           before_update :check_scope
           after_update :update_positions
 
@@ -259,10 +260,10 @@ module ActiveRecord
           limit ||= acts_as_list_list.count
           position_value = send(position_column)
           acts_as_list_list.
-            where("#{quoted_table_name}.#{quoted_position_column} < ?", position_value).
-            where("#{quoted_table_name}.#{quoted_position_column} >= ?", position_value - limit).
+            where("#{quoted_position_column_with_table_name} < ?", position_value).
+            where("#{quoted_position_column_with_table_name} >= ?", position_value - limit).
             limit(limit).
-            order("#{quoted_table_name}.#{quoted_position_column} ASC")
+            order("#{quoted_position_column_with_table_name} ASC")
         end
 
         # Return the next lower item in the list.
@@ -277,10 +278,10 @@ module ActiveRecord
           limit ||= acts_as_list_list.count
           position_value = send(position_column)
           acts_as_list_list.
-            where("#{quoted_table_name}.#{quoted_position_column} > ?", position_value).
-            where("#{quoted_table_name}.#{quoted_position_column} <= ?", position_value + limit).
+            where("#{quoted_position_column_with_table_name} > ?", position_value).
+            where("#{quoted_position_column_with_table_name} <= ?", position_value + limit).
             limit(limit).
-            order("#{quoted_table_name}.#{quoted_position_column} ASC")
+            order("#{quoted_position_column_with_table_name} ASC")
         end
 
         # Test if this record is in a list
@@ -350,11 +351,11 @@ module ActiveRecord
 
           # Returns the bottom item
           def bottom_item(except = nil)
-            conditions = except ? "#{self.class.primary_key} != #{self.class.connection.quote(except.id)}" : {}
+            conditions = except ? "#{quoted_table_name}.#{self.class.primary_key} != #{self.class.connection.quote(except.id)}" : {}
             acts_as_list_list.in_list.where(
               conditions
             ).order(
-              "#{quoted_table_name}.#{quoted_position_column} DESC"
+              "#{quoted_position_column_with_table_name} DESC"
             ).first
           end
 
@@ -370,27 +371,27 @@ module ActiveRecord
 
           # This has the effect of moving all the higher items up one.
           def decrement_positions_on_higher_items(position)
-            acts_as_list_list.where("#{quoted_position_column} <= #{position}").decrement_all
+            acts_as_list_list.where("#{quoted_position_column_with_table_name} <= ?", position).decrement_all
           end
 
           # This has the effect of moving all the lower items up one.
           def decrement_positions_on_lower_items(position=nil)
             return unless in_list?
             position ||= send(position_column).to_i
-            acts_as_list_list.where("#{quoted_position_column} > #{position}").decrement_all
+            acts_as_list_list.where("#{quoted_position_column_with_table_name} > ?", position).decrement_all
           end
 
           # This has the effect of moving all the higher items down one.
           def increment_positions_on_higher_items
             return unless in_list?
-            acts_as_list_list.where("#{quoted_position_column} < #{send(position_column).to_i}").increment_all
+            acts_as_list_list.where("#{quoted_position_column_with_table_name} < #{send(position_column).to_i}").increment_all
           end
 
           # This has the effect of moving all the lower items down one.
           def increment_positions_on_lower_items(position, avoid_id = nil)
-            avoid_id_condition = avoid_id ? " AND #{self.class.primary_key} != #{self.class.connection.quote(avoid_id)}" : ''
+            avoid_id_condition = avoid_id ? " AND #{quoted_table_name}.#{self.class.primary_key} != #{self.class.connection.quote(avoid_id)}" : ''
 
-            acts_as_list_list.where("#{quoted_position_column} >= #{position}#{avoid_id_condition}").increment_all
+            acts_as_list_list.where("#{quoted_position_column_with_table_name} >= #{position}#{avoid_id_condition}").increment_all
           end
 
           # Increments position (<tt>position_column</tt>) of all items in the list.
@@ -401,7 +402,7 @@ module ActiveRecord
           # Reorders intermediate items to support moving an item from old_position to new_position.
           def shuffle_positions_on_intermediate_items(old_position, new_position, avoid_id = nil)
             return if old_position == new_position
-            avoid_id_condition = avoid_id ? " AND #{self.class.primary_key} != #{self.class.connection.quote(avoid_id)}" : ''
+            avoid_id_condition = avoid_id ? " AND #{quoted_table_name}.#{self.class.primary_key} != #{self.class.connection.quote(avoid_id)}" : ''
 
             if old_position < new_position
               # Decrement position of intermediate items
@@ -409,9 +410,9 @@ module ActiveRecord
               # e.g., if moving an item from 2 to 5,
               # move [3, 4, 5] to [2, 3, 4]
               acts_as_list_list.where(
-                "#{quoted_position_column} > #{old_position}"
+                "#{quoted_position_column_with_table_name} > ?", old_position
               ).where(
-                "#{quoted_position_column} <= #{new_position}#{avoid_id_condition}"
+                "#{quoted_position_column_with_table_name} <= #{new_position}#{avoid_id_condition}"
               ).decrement_all
             else
               # Increment position of intermediate items
@@ -419,23 +420,25 @@ module ActiveRecord
               # e.g., if moving an item from 5 to 2,
               # move [2, 3, 4] to [3, 4, 5]
               acts_as_list_list.where(
-                "#{quoted_position_column} >= #{new_position}"
+                "#{quoted_position_column_with_table_name} >= ?", new_position
               ).where(
-                "#{quoted_position_column} < #{old_position}#{avoid_id_condition}"
+                "#{quoted_position_column_with_table_name} < #{old_position}#{avoid_id_condition}"
               ).increment_all
             end
           end
 
           def insert_at_position(position)
             return set_list_position(position) if new_record?
-            if in_list?
-              old_position = send(position_column).to_i
-              return if position == old_position
-              shuffle_positions_on_intermediate_items(old_position, position)
-            else
-              increment_positions_on_lower_items(position)
+            with_lock do
+              if in_list?
+                old_position = send(position_column).to_i
+                return if position == old_position
+                shuffle_positions_on_intermediate_items(old_position, position)
+              else
+                increment_positions_on_lower_items(position)
+              end
+              set_list_position(position)
             end
-            set_list_position(position)
           end
 
           # used by insert_at_position instead of remove_from_list, as postgresql raises error if position_column has non-null constraint
@@ -452,7 +455,7 @@ module ActiveRecord
             new_position = send(position_column).to_i
 
             return unless acts_as_list_list.where(
-              "#{quoted_position_column} = #{new_position}"
+              "#{quoted_position_column_with_table_name} = #{new_position}"
             ).count > 1
             shuffle_positions_on_intermediate_items old_position, new_position, id
           end
@@ -496,6 +499,10 @@ module ActiveRecord
           def quoted_table_name
             @_quoted_table_name ||= acts_as_list_class.quoted_table_name
           end
+
+          def quoted_position_column_with_table_name
+            @_quoted_position_column_with_table_name ||= "#{quoted_table_name}.#{quoted_position_column}"
+          end
       end
     end
   end

data/lib/acts_as_list/version.rb

@@ -1,7 +1,7 @@
 module ActiveRecord
   module Acts
     module List
-      VERSION = '0.7.6'
+      VERSION = '0.7.7'
     end
   end
 end

data/test/shared_list.rb

@@ -104,6 +104,12 @@ module Shared
 
       new4.reload
       assert_equal 5, new4.pos
+
+      last1 = ListMixin.order('pos').last
+      last2 = ListMixin.order('pos').last
+      last1.insert_at(1)
+      last2.insert_at(1)
+      assert_equal [1, 2, 3, 4, 5], ListMixin.where(parent_id: 20).order('pos').map(&:pos)
     end
 
     def test_delete_middle

data/test/test_list.rb

@@ -1,7 +1,10 @@
 # NOTE: following now done in helper.rb (better Readability)
 require 'helper'
 
-ActiveRecord::Base.establish_connection(adapter: "sqlite3", database: ":memory:")
+ActiveRecord::Base.establish_connection(
+  adapter: "sqlite3",
+  database: 'file:memdb1?mode=memory&cache=shared'
+)
 ActiveRecord::Schema.verbose = false
 
 def setup_db(position_options = {})
@@ -160,6 +163,13 @@ end
 class TheBaseSubclass < TheBaseClass
 end
 
+class DBConfigTest < Minitest::Test
+  def test_db_config
+    # make sure sqlite3 accepts multi threaded access
+    assert_equal "file:memdb1?mode=memory&cache=shared", ActiveRecord::Base.connection.pool.spec.config[:database]
+  end
+end
+
 class QuotedList < ActiveRecord::Base
   self.table_name = 'table-name'
   acts_as_list column: :order
@@ -200,6 +210,37 @@ class ListTest < ActsAsListTestCase
     setup_db
     super
   end
+
+  def test_insert_race_condition
+    # the bigger n is the more likely we will have a race condition
+    n = 1000
+    (1..n).each do |counter|
+      node = ListMixin.new parent_id: 1
+      node.pos = counter
+      node.save!
+    end
+
+    wait_for_it  = true
+    threads = []
+    4.times do |i|
+      threads << Thread.new do
+        true while wait_for_it
+        ActiveRecord::Base.connection_pool.with_connection do |c|
+          n.times do
+            begin
+              ListMixin.where(parent_id: 1).order(:pos).last.insert_at(1)
+            rescue Exception
+              # ignore SQLite3::SQLException due to table locking
+            end
+          end
+        end
+      end
+    end
+    wait_for_it = false
+    threads.each(&:join)
+
+    assert_equal (1..n).to_a, ListMixin.where(parent_id: 1).order('pos').map(&:pos)
+  end
 end
 
 class ListWithCallbackTest < ActsAsListTestCase

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_list
 version: !ruby/object:Gem::Version
-  version: 0.7.6
+  version: 0.7.7
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-15 00:00:00.000000000 Z
+date: 2016-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord