acts_as_list 0.9.15 → 0.9.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9a0291b66db99525acb7519c4f07f6213807fab
-  data.tar.gz: 2bd62327801108c1b2e352b60334457a2c61f5ec
+  metadata.gz: 370205f3c55e44c0633e2aabc665fa4489bf4e4c
+  data.tar.gz: 2ce434302042df344231d3b8cb4fc053ba2c39af
 SHA512:
-  metadata.gz: 712b360a8fd332f72fd8ecc3df598f0bdc42d048a14c2662e26f0001af55dbb0c75848cfec246ac2f446eaff3152d7007fc5b7234464b27d4cebda202223e44e
-  data.tar.gz: cc181d9cd3b8644796aebe0ce6e09ebf166fc89970c5617bd56c968a19ac18c3c97f5e8a60d78ac39011b74ab9e09804414844eb18e191052bb3bc9f8a082adb
+  metadata.gz: 4bc4009e669c92bc3822baa35d9560c54d66cd32ef950fad5f2c0f1ff1f6f04cc5d3f747265fc1a7462bf0118ba917aff33256dde5037cfa2398dbe34f6e140b
+  data.tar.gz: 6ee14901baf239084f2c31fa89e63d50b92e6de9113f91cecb3db18f0dae751cbfd50eb5578bd6d4960c6427dc5cfef0f6ab73e167b1d45e1dbe6f4286c0a806

data/Appraisals

@@ -43,5 +43,5 @@ appraise "rails-5-2" do
   group :mysql do
     gem "mysql2", "~> 0.4.10", platforms: [:ruby]
   end
-  gem "activerecord", "~> 5.2.0.rc1"
+  gem "activerecord", "~> 5.2.1"
 end

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change Log
 
+## [v0.9.15](https://github.com/swanandp/acts_as_list/tree/v0.9.15) (2018-06-11)
+[Full Changelog](https://github.com/swanandp/acts_as_list/compare/v0.9.14...v0.9.15)
+
+**Merged pull requests:**
+
+- Fix \#314: `no\_update` is not applied to subclasses [\#315](https://github.com/swanandp/acts_as_list/pull/315) ([YoranBrondsema](https://github.com/YoranBrondsema))
+
 ## [v0.9.14](https://github.com/swanandp/acts_as_list/tree/v0.9.14) (2018-06-05)
 [Full Changelog](https://github.com/swanandp/acts_as_list/compare/v0.9.13...v0.9.14)
 

data/Gemfile

@@ -6,7 +6,10 @@ gemspec
 
 gem "rake"
 gem "appraisal"
-gem "github_changelog_generator", "1.9.0"
+
+group :development do
+  gem "github_changelog_generator", "1.9.0"
+end
 
 group :test do
   gem "minitest", "~> 5.0"

data/gemfiles/rails_3_2.gemfile

@@ -5,9 +5,12 @@ source "http://rubygems.org"
 gem "rack", "~> 1", platforms: [:ruby_19, :ruby_20, :ruby_21]
 gem "rake"
 gem "appraisal"
-gem "github_changelog_generator", "1.9.0"
 gem "activerecord", "~> 3.2.22.2"
 
+group :development do
+  gem "github_changelog_generator", "1.9.0"
+end
+
 group :test do
   gem "minitest", "~> 5.0"
   gem "test_after_commit", "~> 0.4.2"

data/gemfiles/rails_4_1.gemfile

@@ -5,9 +5,12 @@ source "http://rubygems.org"
 gem "rack", "~> 1", platforms: [:ruby_19, :ruby_20, :ruby_21]
 gem "rake"
 gem "appraisal"
-gem "github_changelog_generator", "1.9.0"
 gem "activerecord", "~> 4.1.16"
 
+group :development do
+  gem "github_changelog_generator", "1.9.0"
+end
+
 group :test do
   gem "minitest", "~> 5.0"
   gem "test_after_commit", "~> 0.4.2"

data/gemfiles/rails_4_2.gemfile

@@ -5,9 +5,12 @@ source "http://rubygems.org"
 gem "rack", "~> 1", platforms: [:ruby_19, :ruby_20, :ruby_21]
 gem "rake"
 gem "appraisal"
-gem "github_changelog_generator", "1.9.0"
 gem "activerecord", "~> 4.2.10"
 
+group :development do
+  gem "github_changelog_generator", "1.9.0"
+end
+
 group :test do
   gem "minitest", "~> 5.0"
   gem "test_after_commit", "~> 0.4.2"

data/gemfiles/rails_5_0.gemfile

@@ -5,9 +5,12 @@ source "http://rubygems.org"
 gem "rack", "~> 1", platforms: [:ruby_19, :ruby_20, :ruby_21]
 gem "rake"
 gem "appraisal"
-gem "github_changelog_generator", "1.9.0"
 gem "activerecord", "~> 5.0.6"
 
+group :development do
+  gem "github_changelog_generator", "1.9.0"
+end
+
 group :test do
   gem "minitest", "~> 5.0"
   gem "test_after_commit", "~> 0.4.2"

data/gemfiles/rails_5_1.gemfile

@@ -5,9 +5,12 @@ source "http://rubygems.org"
 gem "rack", "~> 1", platforms: [:ruby_19, :ruby_20, :ruby_21]
 gem "rake"
 gem "appraisal"
-gem "github_changelog_generator", "1.9.0"
 gem "activerecord", "~> 5.1.4"
 
+group :development do
+  gem "github_changelog_generator", "1.9.0"
+end
+
 group :test do
   gem "minitest", "~> 5.0"
   gem "test_after_commit", "~> 0.4.2"

data/gemfiles/rails_5_2.gemfile

@@ -5,9 +5,12 @@ source "http://rubygems.org"
 gem "rack", "~> 1", platforms: [:ruby_19, :ruby_20, :ruby_21]
 gem "rake"
 gem "appraisal"
-gem "github_changelog_generator", "1.9.0"
 gem "activerecord", "~> 5.2.0.rc1"
 
+group :development do
+  gem "github_changelog_generator", "1.9.0"
+end
+
 group :test do
   gem "minitest", "~> 5.0"
   gem "test_after_commit", "~> 0.4.2"

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

@@ -232,7 +232,7 @@ module ActiveRecord
               acts_as_list_class.where(scope_condition)
             end
           else
-            acts_as_list_class.unscope(:where).where(scope_condition)
+            acts_as_list_class.unscope(:select, :where).where(scope_condition)
           end
         end
 

data/lib/acts_as_list/version.rb

@@ -3,7 +3,7 @@
 module ActiveRecord
   module Acts
     module List
-      VERSION = '0.9.15'
+      VERSION = '0.9.16'
     end
   end
 end

data/test/helper.rb

@@ -13,7 +13,7 @@ rescue Bundler::BundlerError => e
 end
 require "active_record"
 require "minitest/autorun"
-require "mocha/minitest"
+require "mocha/mini_test"
 require "#{File.dirname(__FILE__)}/../init"
 
 if defined?(ActiveRecord::VERSION) &&

data/test/test_default_scope_with_select.rb

@@ -0,0 +1,33 @@
+require 'helper'
+
+class Animal < ActiveRecord::Base
+  acts_as_list
+  default_scope -> { select(:name) }
+end
+
+class DefaultScopeWithSelectTest < Minitest::Test
+  def setup
+    ActiveRecord::Base.connection.create_table :animals do |t|
+      t.column :position, :integer
+      t.column :name, :string
+    end
+
+    ActiveRecord::Base.connection.schema_cache.clear!
+    Animal.reset_column_information
+    super
+  end
+
+  def teardown
+    teardown_db
+    super
+  end
+
+  def test_default_scope_with_select
+    animal1 = Animal.create name: 'Fox'
+    animal2 = Animal.create name: 'Panda'
+    animal3 = Animal.create name: 'Wildebeast'
+    assert_equal 1, animal1.position
+    assert_equal 2, animal2.position
+    assert_equal 3, animal3.position
+  end
+end

data/test/test_no_update_for_subclasses.rb

@@ -2,21 +2,21 @@
 
 require 'helper'
 
-class TodoItem < ActiveRecord::Base
+class MasterItem < ActiveRecord::Base
   acts_as_list
 end
 
-class SubTodoItem < TodoItem; end
+class SlaveItem < MasterItem; end
 
 class NoUpdateForSubclassesTestCase < Minitest::Test
   def setup
-    ActiveRecord::Base.connection.create_table :todo_items do |t|
+    ActiveRecord::Base.connection.create_table :master_items do |t|
       t.column :position, :integer
       t.column :type, :string
     end
 
     ActiveRecord::Base.connection.schema_cache.clear!
-    [TodoItem, SubTodoItem].each(&:reset_column_information)
+    [MasterItem, SlaveItem].each(&:reset_column_information)
     super
   end
 
@@ -30,7 +30,7 @@ class NoUpdateForSubclassesTest < NoUpdateForSubclassesTestCase
   def setup
     super
     @item_1, @item_2 = (1..2).map do |counter|
-      SubTodoItem.create!(position: counter)
+      SlaveItem.create!(position: counter)
     end
   end
 
@@ -41,14 +41,14 @@ class NoUpdateForSubclassesTest < NoUpdateForSubclassesTestCase
   end
 
   def test_no_update_for_subclass_instances_with_no_update_on_superclass
-    TodoItem.acts_as_list_no_update { @item_1.update_attributes(position: 2) }
+    MasterItem.acts_as_list_no_update { @item_1.update_attributes(position: 2) }
 
     assert_equal 2, @item_1.reload.position
     assert_equal 2, @item_2.reload.position
   end
 
   def test_no_update_for_subclass_instances_with_no_update_on_subclass
-    SubTodoItem.acts_as_list_no_update { @item_1.update_attributes(position: 2) }
+    SlaveItem.acts_as_list_no_update { @item_1.update_attributes(position: 2) }
 
     assert_equal 2, @item_1.reload.position
     assert_equal 2, @item_2.reload.position

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_list
 version: !ruby/object:Gem::Version
-  version: 0.9.15
+  version: 0.9.16
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-11 00:00:00.000000000 Z
+date: 2018-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -88,6 +88,7 @@ files:
 - test/shared_quoting.rb
 - test/shared_top_addition.rb
 - test/shared_zero_based.rb
+- test/test_default_scope_with_select.rb
 - test/test_joined_list.rb
 - test/test_list.rb
 - test/test_no_update_for_extra_classes.rb
@@ -129,6 +130,7 @@ test_files:
 - test/shared_quoting.rb
 - test/shared_top_addition.rb
 - test/shared_zero_based.rb
+- test/test_default_scope_with_select.rb
 - test/test_joined_list.rb
 - test/test_list.rb
 - test/test_no_update_for_extra_classes.rb