acts_as 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 331305a38b4977b14717964024b46dee217d8d97
-  data.tar.gz: 5877875beb1520d6d7d5bd432fe2a939676fef14
+  metadata.gz: 514a5965f8825f4c4bc1f2cb8155585c042f891c
+  data.tar.gz: 81513cdac4a29c051fd3be2240e0b9cc1a3f74b7
 SHA512:
-  metadata.gz: 960ba568858dea22691683756c693a5000b2399b3909903729239ed68e968c8ab50d39f232c2193a247f96ef2bbfe4214ca51a35a91886177835469491d989b1
-  data.tar.gz: c4635cb0ef46a62abbf6b66843c1c82c7eaf464d85adab78ea8f9f75576010c4a90585943872204ff02a0181496356f450d094b293518445977f4a9aeb0bf26c
+  metadata.gz: fa3a00abcba6a4fe27727232a9a3b142d5934343106417147d703fe2707a973793c642ff861fb7f0bcb3de54cbb668946b03cfaaa14286e0251f7b88f0430ae0
+  data.tar.gz: 0608465f2b7ffa2f0027df6bed6113253da3acafdc3c37e2ea590d564af6c045702e2374d6cce49c75e700886e2ab512bf7a49356344002db34deeb12183edff

data/lib/acts_as/version.rb

@@ -1,3 +1,3 @@
 module ActsAs
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

data/lib/acts_as.rb

@@ -25,12 +25,8 @@ module ActsAs
     end
   end
 
-  private
-
   def acts_as_field_match?(method)
-    @association_match = self.class.acts_as_fields.select do |association, fields|
-      fields.select { |f| method.to_s.include?(f) }.any?
-    end.keys.first
+    @association_match = self.class.acts_as_fields_match(method)
     @association_match && send(@association_match).respond_to?(method)
   end
 
@@ -49,6 +45,37 @@ module ActsAs
       @acts_as_fields ||= {}
     end
 
+    def acts_as_fields_match(method)
+      acts_as_fields.select do |association, fields|
+        fields.select { |f| method.to_s.include?(f) }.any?
+      end.keys.first
+    end
+
+    def where(opts, *rest)
+      return self if opts.blank?
+      relation = super
+      #TODO support nested attribute joins like Guns.where(rebels: {strength: 10}))
+      # for now, only first level joins will happen automagically
+      detected_associations = opts.keys.map {|attr| acts_as_fields_match(attr) }
+                                       .reject {|attr| attr.nil?}
+      return relation.joins(detected_associations) if detected_associations.any?
+      relation
+    end
+
+    def expand_hash_conditions_for_aggregates(attrs)
+      attrs = super(attrs)
+      expanded_attrs = {}
+
+      attrs.each do |attr, value|
+        if (association = acts_as_fields_match(attr))
+          expanded_attrs[new.send(association).class.table_name] = { attr => value }
+        else
+          expanded_attrs[attr] = value
+        end
+      end
+      expanded_attrs
+    end
+
     private
 
     def override_method_missing

data/spec/acts_as_spec.rb

@@ -21,6 +21,10 @@ class Clan < ActiveRecord::Base
   end
 end
 
+class XWing < ActiveRecord::Base
+  belongs_to :rebel
+end
+
 class Rebel < User
   acts_as :profile, class_name: 'RebelProfile'
   acts_as :clan, prefix: %w( name ), with: %w( delegate_at_will )
@@ -98,4 +102,17 @@ describe ActsAs do
       rebel.strength.should == 23
     end
   end
+
+  describe 'automagic .where hash syntax helpers' do
+    it 'should auto-expand acted attributes' do
+      Rebel.where(strength: rebel.strength).should include(rebel)
+      Rebel.where(strength: rebel.strength, name: 'Jimbo').should_not include(rebel)
+    end
+
+    it 'should auto-expand acted attribuets that are nested as well' do
+      pending 'support nested attributes'
+      xwing = XWing.create!(rebel: rebel)
+      XWing.joins(rebel: :clan).where(rebel: {strength: rebel.strength}).should include(xwing)
+    end
+  end
 end

data/spec/support/active_record.rb

@@ -27,4 +27,9 @@ ActiveRecord::Migration.create_table :clans do |t|
   t.integer :strength, default: 50
   t.boolean :cool
   t.timestamps
+end
+
+ActiveRecord::Migration.create_table :x_wings do |t|
+  t.integer :rebel_id
+  t.timestamps
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acts_as
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - winfred
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-24 00:00:00.000000000 Z
+date: 2013-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler