acts_as_list 0.9.8 → 0.9.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 864fb6e920d9bb5ca2b305e4e76b95519b900ecc
-  data.tar.gz: 5ee3657665bae3f1da65b9d91d43a2764b05f6eb
+  metadata.gz: b6d2515099c8746c438ada6bfd3307841f7a66d7
+  data.tar.gz: 3d5980d4d52abd7957daef5f851caceb967fd7e1
 SHA512:
-  metadata.gz: af1bf25445a284d3911f876a8c3fe45c083c1af5cec67f141e72ba1e6035f17011cac9157f74f4e712ff366641d97e0634ef85297771cc868e051d0297e6008d
-  data.tar.gz: 623352d9b387dbe134c14ffe301eac69744e5eb63f49108da683e924f90ea16151015ab6faf296f93e5513eaf7872332a9746cabaf9d459ab2e1dafa83c4d2ba
+  metadata.gz: b9bc5985bcccdd1f02cd4f5f814d5abba57745c29c28ea158a95de849f4e36954a9a944919fbefe418af4518a32d58746a0427474a4055bbe44672d8e4b54e94
+  data.tar.gz: 048b80713d0cf58cbd717d337d58869ae0b5c09704c1a40a9503e6d05a4979be8ee517d9dc2c1877445d2c0194854f5c01a5ad220d8210414ca1ba80afed2fc6

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change Log
 
+## [v0.9.8](https://github.com/swanandp/acts_as_list/tree/v0.9.8) (2017-09-28)
+[Full Changelog](https://github.com/swanandp/acts_as_list/compare/v0.9.7...v0.9.8)
+
+**Closed issues:**
+
+- Deadlocking in update\_positions count query [\#285](https://github.com/swanandp/acts_as_list/issues/285)
+- Updating the position fails uniqueness constraint. [\#275](https://github.com/swanandp/acts_as_list/issues/275)
+
 ## [v0.9.7](https://github.com/swanandp/acts_as_list/tree/v0.9.7) (2017-07-06)
 [Full Changelog](https://github.com/swanandp/acts_as_list/compare/v0.9.6...v0.9.7)
 

data/README.md

@@ -115,6 +115,22 @@ class TodoItem < ActiveRecord::Base
 end
 ```
 
+You can also add multiple scopes in this fashion:
+```ruby
+class TodoItem < ActiveRecord::Base
+  acts_as_list scope: [:kind, :owner_id]
+end
+```
+
+Furthermore, you can optionally include a hash of fixed parameters that will be included in all queries:
+```ruby
+class TodoItem < ActiveRecord::Base
+  acts_as_list scope: [:kind, :owner_id, deleted_at: nil]
+end
+```
+
+This is useful when using this gem in conjunction with the popular [acts_as_paranoid](https://github.com/ActsAsParanoid/acts_as_paranoid) gem.
+
 ## More Options
 - `column`
 default: `position`. Use this option if the column name in your database is different from position.

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

@@ -24,8 +24,17 @@ module ActiveRecord::Acts::List::ScopeMethodDefiner #:nodoc:
         end
       elsif scope.is_a?(Array)
         define_method :scope_condition do
-          scope.inject({}) do |hash, column|
-            hash.merge!({ column.to_sym => read_attribute(column.to_sym) })
+          # The elements of the Array can be symbols, strings, or hashes.
+          # If symbols or strings, they are treated as column names and the current value is looked up.
+          # If hashes, they are treated as fixed values.
+          scope.inject({}) do |hash, column_or_fixed_vals|
+            if column_or_fixed_vals.is_a?(Hash)
+              fixed_vals = column_or_fixed_vals
+              hash.merge!(fixed_vals)
+            else
+              column = column_or_fixed_vals
+              hash.merge!({ column.to_sym => read_attribute(column.to_sym) })
+            end
           end
         end
 

data/lib/acts_as_list/version.rb

@@ -1,7 +1,7 @@
 module ActiveRecord
   module Acts
     module List
-      VERSION = '0.9.8'
+      VERSION = '0.9.9'
     end
   end
 end

data/test/test_list.rb

@@ -80,6 +80,10 @@ class ArrayScopeListMixin < Mixin
   acts_as_list column: "pos", scope: [:parent_id, :parent_type]
 end
 
+class ArrayScopeListWithHashMixin < Mixin
+  acts_as_list column: "pos", scope: [:parent_id, state: nil]
+end
+
 if rails_4
   class EnumArrayScopeListMixin < Mixin
     STATE_VALUES = %w(active archived)
@@ -707,6 +711,20 @@ class MultipleListsArrayScopeTest < ActsAsListTestCase
   end
 end
 
+class ArrayScopeListWithHashTest
+  def setup
+    setup_db
+    @obj1 = ArrayScopeListWithHashMixin.create! :pos => counter, :parent_id => 1, :state => nil
+    @obj2 = ArrayScopeListWithHashMixin.create! :pos => counter, :parent_id => 1, :state => 'anything'
+  end
+
+  def test_scope_condition_correct
+    [@obj1, @obj2].each do |obj|
+      assert_equal({ :parent_id => 1, :state => nil }, obj.scope_condition)
+    end
+  end
+end
+
 require 'timecop'
 
 class TouchTest < ActsAsListTestCase

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_list
 version: !ruby/object:Gem::Version
-  version: 0.9.8
+  version: 0.9.9
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-28 00:00:00.000000000 Z
+date: 2017-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord