active_record-acts_as 2.0.8 → 2.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8708651ac6d764497b6c4e8da34acae1475c3f7d
-  data.tar.gz: aa82c12e20fa93ac1f42af1e642dd5340cc06076
+  metadata.gz: dfc78a4f0d220edb01b5336e81199401fc1da77c
+  data.tar.gz: 2d09cdc24ca238012d043badca0a143a67942e2f
 SHA512:
-  metadata.gz: 1e03ca44f4700ac019b97995bfb7e2c52d281e2357accb77a007f9ad8589f6fb862d0c67910500195925d90d7944a5fec68a5ffbd4dba1835a7a44f593b8b5b2
-  data.tar.gz: 75a8d285074080eb20731ae14a6c4c9713820f7d5bc3513deecea27ba9e51cb786ed8a574dd201d122223c5241343a5a991cf5c051a9393c3178dfc46d0acfb3
+  metadata.gz: 2afb1348df5ac807e39ffaa3ad9cad8ca02fb6177d39a20f03dbedb80f1abab1750096d20c1db652846f81c933c4caecfa8627306032bebb8843dc66e3314052
+  data.tar.gz: ba3005c9fcf570174d6908a939209d0df816b147090554946a6b6321af61d0b25bd950f85d1ce8649473c6db74ef08a71b2175b78c2fe4c19afa1d0d1607dc6f

data/.travis.yml

@@ -10,7 +10,3 @@ before_install:
 gemfile:
   - gemfiles/rails_4.2.gemfile
   - gemfiles/rails_5.0.gemfile
-matrix:
-  allow_failures:
-    - rvm: 2.4.0
-      gemfile: gemfiles/rails_4.2.gemfile

data/lib/active_record/acts_as/querying.rb

@@ -3,11 +3,19 @@ module ActiveRecord
     module QueryMethods
       def where(opts = :chain, *rest)
         if acting_as? && opts.is_a?(Hash)
-          opts = opts.merge(opts.delete(klass.table_name) || {})
+          if table_name_opts = opts.delete(klass.table_name)
+            opts = opts.merge(table_name_opts)
+          end
 
-          opts, acts_as_opts = opts.stringify_keys.partition { |k,v| attribute_method?(k) }
-          opts, acts_as_opts = Hash[opts], Hash[acts_as_opts]
-          opts[acting_as_model.table_name] = acts_as_opts unless acts_as_opts.empty?
+          # Filter out the conditions that should be
+          # applied to the `acting_as_model`. Ignore
+          # conditions that contain a dot or are attributes
+          # of the submodel.
+          opts, acts_as_opts = opts.stringify_keys.partition { |k, _| k =~ /\./ || attribute_method?(k) }.map(&:to_h)
+
+          if acts_as_opts.any?
+            opts[acting_as_model.table_name] = acts_as_opts
+          end
         end
 
         super

data/lib/active_record/acts_as/version.rb

@@ -1,6 +1,6 @@
 module ActiveRecord
   module ActsAs
-    VERSION = "2.0.8"
+    VERSION = "2.0.9"
   end
 end
 

data/spec/acts_as_spec.rb

@@ -416,6 +416,12 @@ RSpec.describe "ActiveRecord::Base model with #acts_as called" do
       expect(relation.scope_for_create.keys).to include('name')
       expect(relation.scope_for_create['name']).to eq('new name')
     end
+
+    it "works when the submodel table name is specified" do
+      red_pen = Pen.create!(name: 'red pen', price: 0.8, color: 'red')
+
+      expect(Pen.find_by('pens.color' => 'red')).to eq(red_pen)
+    end
   end
 
   context 'Namespaces' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record-acts_as
 version: !ruby/object:Gem::Version
-  version: 2.0.8
+  version: 2.0.9
 platform: ruby
 authors:
 - Hassan Zamani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-17 00:00:00.000000000 Z
+date: 2017-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3