active_record-acts_as 2.4.1 → 2.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0bbaf8a07eceb6c10fd9e9fea3ece8a641aef69
-  data.tar.gz: c5c9b6265ca7464402b6cf8955c28345deee417d
+  metadata.gz: d36aaa8f22e66b7d9fd5c2280f4548e9efe3b3fe
+  data.tar.gz: 9f30018fa7aaaffc40c8c915b0ed6cc7cd8abda3
 SHA512:
-  metadata.gz: 195e8c8b7c28634bb882fdcd693341a2eb8bdad0092c1a43fda14414a55da85dda79b2b04ad5d8bd651e622a7380bc5731a082f9d996aa156968bba316639e64
-  data.tar.gz: 5daea8a73f30a50e7471bbf521a00dbb9313576ec508ba518f24508c1a5262a28dfcae98acb6c389e05da2ed540dce7d5b091452f25444a8b687efae75c895e7
+  metadata.gz: 7b9a24160409f92c1bc8e1e81e85dcd2553c133804507bf1eb848aff3865a65a9bb173a0cc6f237d7877998761acd7d89fa838ff7484486e4a50ba188429d1e0
+  data.tar.gz: 672a6b0320fdaa101567546b887a652a993a61d1ccb0d130d3eb55c332c68b09750d2cceb5990aac57cfbc03fee4536c6d3c20b68f03dbdcac614b1ca56c014d

data/CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.4.2] - 2017-04-20
+### Fixed
+- Fix querying for conditions with hashes.
+
 ## [2.4.1] - 2017-04-19
 ### Fixed
 - Make ActiveRecord::Relation#where! work.
@@ -88,7 +92,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Fixed
 - Fixed `remove_actable` migration helper (https://github.com/hzamani/active_record-acts_as/pull/71, thanks to [nuclearpidgeon](https://github.com/nuclearpidgeon)!)
 
-[Unreleased]: https://github.com/krautcomputing/active_record-acts_as/compare/v2.4.1...HEAD
+[Unreleased]: https://github.com/krautcomputing/active_record-acts_as/compare/v2.4.2...HEAD
+[2.4.2]: https://github.com/krautcomputing/active_record-acts_as/compare/v2.4.1...v2.4.2
 [2.4.1]: https://github.com/krautcomputing/active_record-acts_as/compare/v2.4.0...v2.4.1
 [2.4.0]: https://github.com/krautcomputing/active_record-acts_as/compare/v2.3.1...v2.4.0
 [2.3.1]: https://github.com/krautcomputing/active_record-acts_as/compare/v2.3.0...v2.3.1

data/lib/active_record/acts_as/querying.rb

@@ -1,24 +1,27 @@
 module ActiveRecord
   module ActsAs
     module QueryMethods
-      def where!(opts, *)
+      def where!(opts, *rest)
         if acting_as? && opts.is_a?(Hash)
-          if table_name_opts = opts.delete(klass.table_name)
+          if table_name_opts = opts.delete(table_name)
             opts = opts.merge(table_name_opts)
           end
 
-          # 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 =~ /\./ || column_names.include?(k.to_s) }.map(&:to_h)
+          # Filter out the conditions that should be applied to the `acting_as_model`, which are
+          # those that neither target specific tables explicitly (where the condition value
+          # is a hash or the condition key contains a dot) nor are attributes of the submodel.
+          opts, acts_as_opts = opts.stringify_keys.partition do |k, v|
+            v.is_a?(Hash) ||
+            k =~ /\./     ||
+            column_names.include?(k.to_s)
+          end.map(&:to_h)
 
           if acts_as_opts.any?
             opts[acting_as_model.table_name] = acts_as_opts
           end
         end
 
-        super
+        super opts, *rest
       end
     end
 

data/lib/active_record/acts_as/version.rb

@@ -1,6 +1,6 @@
 module ActiveRecord
   module ActsAs
-    VERSION = "2.4.1"
+    VERSION = "2.4.2"
   end
 end
 

data/spec/acts_as_spec.rb

@@ -440,46 +440,66 @@ RSpec.describe "ActiveRecord::Base model with #acts_as called" do
   end
 
   context "Querying" do
-    before(:each) { clear_database }
+    before do
+      clear_database
+
+      @red_pen   = Pen.create!(name: 'red pen',   price: 0.8, color: 'red')
+      @blue_pen  = Pen.create!(name: 'blue pen',  price: 0.8, color: 'blue')
+      @black_pen = Pen.create!(name: 'black pen', price: 0.9, color: 'black')
 
-    it "respects supermodel attributes in .where" do
-      red_pen   = Pen.create(name: 'red pen',   price: 0.8, color: 'red')
-      blue_pen  = Pen.create(name: 'blue pen',  price: 0.8, color: 'blue')
-      black_pen = Pen.create(name: 'black pen', price: 0.9, color: 'black')
+      @red_pen.pen_caps.create!   size: 'S'
+      @blue_pen.pen_caps.create!  size: 'M'
+      @black_pen.pen_caps.create! size: 'M'
 
-      expect(Pen.where(price: 0.8).to_a).to eq([red_pen, blue_pen])
+      @red_pen.buyers.create!   name: 'Tim'
+      @blue_pen.buyers.create!  name: 'Tim'
+      @black_pen.buyers.create! name: 'John'
     end
 
-    it "respects supermodel attributes in .where!" do
-      red_pen   = Pen.create(name: 'red pen',   price: 0.8, color: 'red')
-      blue_pen  = Pen.create(name: 'blue pen',  price: 0.8, color: 'blue')
-      black_pen = Pen.create(name: 'black pen', price: 0.9, color: 'black')
+    describe '.where and .where!' do
+      it 'respects supermodel attributes' do
+        conditions = { price: 0.8 }
 
-      relation = Pen.all
-      relation.where!(price: 0.8)
-      expect(relation.to_a).to eq([red_pen, blue_pen])
-    end
+        expect(Pen.where(conditions).to_a).to eq([@red_pen, @blue_pen])
+
+        relation = Pen.all
+        relation.where!(conditions)
+        expect(relation.to_a).to eq([@red_pen, @blue_pen])
+      end
+
+      it 'works with hashes' do
+        conditions = {
+          pen_caps: { size: 'M' },
+          buyers: { name: 'Tim' }
+        }
 
-    it "respects supermodel attributes in .find_by" do
-      red_pen   = Pen.create(name: 'red pen',   price: 0.8, color: 'red')
-      blue_pen  = Pen.create(name: 'blue pen',  price: 0.8, color: 'blue')
-      black_pen = Pen.create(name: 'black pen', price: 0.9, color: 'black')
+        expect(Pen.joins(:pen_caps, :buyers).where(conditions).to_a).to eq([@blue_pen])
 
-      expect(Pen.find_by(name: 'red pen')).to   eq(red_pen)
-      expect(Pen.find_by(name: 'blue pen')).to  eq(blue_pen)
-      expect(Pen.find_by(name: 'black pen')).to eq(black_pen)
+        relation = Pen.joins(:pen_caps, :buyers)
+        relation.where!(conditions)
+        expect(relation.to_a).to eq([@blue_pen])
+      end
     end
 
-    it "includes supermodel attributes in Relation.scope_for_create" do
-      relation = Pen.where(name: 'new name', price: 1.4, color: 'red')
-      expect(relation.scope_for_create.keys).to include('name')
-      expect(relation.scope_for_create['name']).to eq('new name')
+    describe '.find_by' do
+      it 'respects supermodel attributes' do
+        expect(Pen.find_by(name: 'red pen')).to   eq(@red_pen)
+        expect(Pen.find_by(name: 'blue pen')).to  eq(@blue_pen)
+        expect(Pen.find_by(name: 'black pen')).to eq(@black_pen)
+      end
+
+      it 'works with specifying the table name' do
+        expect(Pen.find_by('pens.color' => 'red')).to eq(@red_pen)
+      end
     end
 
-    it "works when the submodel table name is specified" do
-      red_pen = Pen.create!(name: 'red pen', price: 0.8, color: 'red')
+    describe '.scope_for_create' do
+      it 'includes supermodel attributes' do
+        relation = Pen.where(name: 'new name', price: 1.4, color: 'red')
 
-      expect(Pen.find_by('pens.color' => 'red')).to eq(red_pen)
+        expect(relation.scope_for_create.keys).to include('name')
+        expect(relation.scope_for_create['name']).to eq('new name')
+      end
     end
   end
 

data/spec/models.rb

@@ -121,10 +121,12 @@ def initialize_schema
     end
 
     create_table :buyers do |t|
+      t.string :name
       t.integer :product_id
     end
 
     create_table :pen_caps do |t|
+      t.string :size
       t.integer :pen_id
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record-acts_as
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.4.2
 platform: ruby
 authors:
 - Hassan Zamani
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-19 00:00:00.000000000 Z
+date: 2017-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3