active_record-acts_as 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d5548c95a54d8cbe26c5714273ec3ca3a3bf0ff
-  data.tar.gz: 70a127389d745b09cf38eba99f120cc9fa42e692
+  metadata.gz: 4dd0c165fcfb62ca39a5698738d617bbed6a29e8
+  data.tar.gz: 1e4f6b5f4de2ac6c2bb2a0aa037c71e9dbdd692c
 SHA512:
-  metadata.gz: 18d8183369e11b5b136f76e2b94d3d4ffad186113f1266031a92f6960abea9a45577ab5e718a5130b4b609939ea62f49f4993e0df777cf646d669ac074f0795c
-  data.tar.gz: cf442a282239a0a618dbf78b10ff234286537ba38fb2a5c78b098d9b3754ec268591405e9d4fbf6ee8eb2f5a20c9068fce9d922c28596227138012afb8835f71
+  metadata.gz: 01980d25e52b92204c22b1588ba3d704be0f1f9814f96401bde32bb3152b3910e06c11036df3fca9a10167233081f30f911bc4d371546dea9363307b36ab5217
+  data.tar.gz: 0c10073d6a0d907ac594e76d55144aca04a15d4b709d535218e75f0795536b5886dcfe82cddc14fc0dd207d99ef49701bd85e0b6e7ee21836e1e8ceb025b3d2c

data/README.md

@@ -90,6 +90,10 @@ Pen.create name: 'Penie!', price: 0.8, color: 'red'
   # => #<Pen id: 1, color: "red">
 Pen.where price: 0.8
   # => [#<Pen id: 1, color: "red">]
+pen = Pen.where(name: 'new pen', color: 'black').first_or_initialize
+  # => #<Pen id: nil, color: "black">
+pen.name
+  # => "new pen"
 Product.where price: 0.8
   # => [#<Product id: 1, name: "Penie!", price: 0.8, store_id: nil, actable_id: 1, actable_type: "Pen">]
 pen = Pen.new
@@ -108,7 +112,7 @@ Product.first.specific
   # => #<Pen ...>
 ```
 
-In +has_many+ case you can use subclasses:
+In `has_many` case you can use subclasses:
 
 ```Ruby
 store = Store.create

data/lib/active_record/acts_as/querying.rb

@@ -1,35 +1,25 @@
 
 module ActiveRecord
-  module ActsAs
-    module Querying
-      def where(opts = :chain, *rest)
-        if opts.is_a? Hash
-          opts, acts_as_opts = opts.partition { |k,v| attribute_names.include?(k.to_s) }
-          opts, acts_as_opts = Hash[opts], Hash[acts_as_opts]
-          opts[acting_as_model.table_name] = acts_as_opts
-        end
-        super(opts, *rest)
-      end
-
-      def find_by(*args)
-        where(*args).take
-      end
-
-      def find_by!(*args)
-        where(*args).take!
+  module QueryMethods
+    def where_with_acts_as(opts = :chain, *rest)
+      if acting_as? && opts.is_a?(Hash)
+        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?
       end
+      where_without_acts_as(opts, *rest)
     end
+    alias_method_chain :where, :acts_as
   end
 
   class Relation
-    alias_method :scope_for_create_without_acting_as, :scope_for_create
-
-    def scope_for_create
+    def scope_for_create_with_acts_as
       @scope_for_create ||= if acting_as?
         where_values_hash.merge(where_values_hash(acting_as_model.table_name)).merge(create_with_value)
       else
         where_values_hash.merge(create_with_value)
       end
     end
+    alias_method_chain :scope_for_create, :acts_as
   end
 end

data/lib/active_record/acts_as/relation.rb

@@ -20,7 +20,6 @@ module ActiveRecord
           alias_method :acting_as=, "#{name}=".to_sym
 
           include ActsAs::InstanceMethods
-          extend  ActsAs::Querying
         end
 
         def acting_as?(other = nil)

data/lib/active_record/acts_as/version.rb

@@ -1,6 +1,6 @@
 
 module ActiveRecord
   module ActsAs
-    VERSION = "1.0.0"
+    VERSION = "1.0.1"
   end
 end

data/lib/active_record/acts_as.rb

@@ -1,3 +1,5 @@
+require 'active_support'
+require 'active_record'
 require 'active_record/acts_as/version'
 require 'active_record/acts_as/relation'
 require 'active_record/acts_as/migration'

data/spec/acts_as_spec.rb

@@ -158,7 +158,7 @@ RSpec.describe "ActiveRecord::Base model with #acts_as called" do
   context "Querying" do
     before(:each) { clear_database }
 
-    it ".where works with supermodel attributes" do
+    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')
@@ -168,7 +168,7 @@ RSpec.describe "ActiveRecord::Base model with #acts_as called" do
       expect(Pen.where(price: 0.8)).to_not include(black_pen)
     end
 
-    it "find_by works with supermodel attributes" do
+    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')
@@ -179,9 +179,9 @@ RSpec.describe "ActiveRecord::Base model with #acts_as called" do
     end
 
     it "includes supermodel attributes in Relation.scope_for_create" do
-      relation = Pen.where(name: 'new name')
-      expect(relation.scope_for_create.keys).to include(:name)
-      expect(relation.scope_for_create[:name]).to eq('new name')
+      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')
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record-acts_as
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Hassan Zamani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-03 00:00:00.000000000 Z
+date: 2014-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3