active_record-acts_as 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34fc19a0853dc464c318bb8da5d55542940a7428
-  data.tar.gz: 9343cbe6c7b873b2a55af6e937042dc2fca10554
+  metadata.gz: 35b482727f031a96a8549a8a8801a8cd8ee4f2af
+  data.tar.gz: fbd614d7466868481fae7ea7fe20930c19310124
 SHA512:
-  metadata.gz: fdedabb5d9cff8c513c70f799b2a35527e896d37c452ea4c99ef01cff726988542179c85465588d70c701275c51b598b54f0cb164f5de63f814a67f470a98205
-  data.tar.gz: 8df4505d0d20012f9675dba4acd8512ebfc2d8c6cb64a9088853ccff6125af156132ec7cedae895810f5ac019d6f0c15543169da77e3b4c2fbed8779a60580ae
+  metadata.gz: 60436ebc291619e730fcd600429378d82e4647ae5ed17ddffe3df9c596798b9a7ba0d98000ccd4a59b7ecdd18079d620e14b904c9f1b9c55e7cb3aa3915e9d0f
+  data.tar.gz: d0c69a18ef2329e3fcdfbc751c73d68ef28ea76f798f2c717e9c5693547443bf401a3a07bd5bc6cc1597b934b05a676c002dfec1fc7b167211c947ef472aed78

data/.gitignore

@@ -20,3 +20,5 @@ tmp
 *.o
 *.a
 mkmf.log
+.ruby-gemset
+.ruby-version

data/README.md

@@ -57,7 +57,9 @@ class Pen < ActiveRecord::Base
 end
 
 class Book < ActiveRecord::Base
-  acts_as :product
+  # In case you don't wish to validate
+  # this model against Product
+  acts_as :product, validates_actable: false
 end
 
 class Store < ActiveRecord::Base
@@ -113,6 +115,13 @@ Product.first.specific
   # => #<Pen ...>
 ```
 
+If you have to come back to the parent object from the specific, the `acting_as` returns the parent element:
+
+```Ruby
+Pen.first.acting_as
+  # => #<Product ...>
+```
+
 In `has_many` case you can use subclasses:
 
 ```Ruby

data/lib/active_record/acts_as/instance_methods.rb

@@ -10,10 +10,18 @@ module ActiveRecord
         super || acting_as?(klass)
       end
 
+      # Is the superclass persisted to the database?
+      def acting_as_persisted?
+        return false if acting_as.nil?
+        !acting_as.id.nil? && !acting_as.actable_id.nil?
+      end
+
       def actable_must_be_valid
-        unless acting_as.valid?
-          acting_as.errors.each do |att, message|
-            errors.add(att, message)
+        if validates_actable
+          unless acting_as.valid?
+            acting_as.errors.each do |att, message|
+              errors.add(att, message)
+            end
           end
         end
       end
@@ -37,16 +45,20 @@ module ActiveRecord
       private :write_attribute
 
       def attributes
-        acting_as.attributes.except(acting_as_reflection.type, acting_as_reflection.foreign_key).merge(super)
+        acting_as_persisted? ? acting_as.attributes.except(acting_as_reflection.type, acting_as_reflection.foreign_key).merge(super) : super
       end
 
       def attribute_names
-        super | (acting_as.attribute_names - [acting_as_reflection.type, acting_as_reflection.foreign_key])
+        acting_as_persisted? ? super | (acting_as.attribute_names - [acting_as_reflection.type, acting_as_reflection.foreign_key]) : super
       end
 
 
-      def respond_to?(name, include_private = false)
-        super || acting_as.respond_to?(name)
+      def respond_to?(name, include_private = false, as_original_class = false)
+        as_original_class ? super(name, include_private) : super(name, include_private) || acting_as.respond_to?(name)
+      end
+
+      def self_respond_to?(name, include_private = false)
+        respond_to? name, include_private, true
       end
 
       def dup
@@ -56,10 +68,26 @@ module ActiveRecord
       end
 
       def method_missing(method, *args, &block)
+        uses_superclass_for?(method) ? acting_as.send(method, *args, &block) : super
+      end
+
+      def uses_superclass_for?(method)
+        responds_locally = self_respond_to?(method)
         if acting_as.respond_to?(method)
-          acting_as.send(method, *args, &block)
+          if responds_locally
+            false
+          else
+            # Only use getters if the superclass has
+            # an instance that is linked to this class instance.
+            if acting_as_persisted?
+              true
+            else
+              responds_locally ? false : true
+            end
+          end
         else
-          super
+          # If the superclass doesn't have it, use this class's methods
+          false
         end
       end
     end

data/lib/active_record/acts_as/relation.rb

@@ -9,6 +9,8 @@ module ActiveRecord
           options, scope = scope, nil if Hash === scope
           options = {as: :actable, dependent: :destroy, validate: false, autosave: true}.merge options
 
+          cattr_reader(:validates_actable) { options.delete(:validates_actable) == false ? false : true }
+
           reflections = has_one name, scope, options
           default_scope -> { eager_load(name) }
           validate :actable_must_be_valid

data/lib/active_record/acts_as/version.rb

@@ -1,6 +1,6 @@
 
 module ActiveRecord
   module ActsAs
-    VERSION = "1.0.3"
+    VERSION = "1.0.4"
   end
 end

data/spec/actable_spec.rb

@@ -31,9 +31,14 @@ RSpec.describe "ActiveRecord::Base subclass with #actable" do
   end
 
   describe ".specific" do
-    it "return specific submodel" do
-      pen.save
-      expect(Product.find(pen.acting_as.id).specific).to eq(pen)
+    context "returns specific submodel" do
+      it "unless the submodel instance association doesn't exist" do
+        expect(subject.new.specific).to be_nil
+      end
+      it "if the submodel instance association exists" do
+        pen.save
+        expect(Product.find(pen.acting_as.id).specific).to eq(pen)
+      end
     end
   end
 

data/spec/acts_as_spec.rb

@@ -5,7 +5,9 @@ RSpec.describe "ActiveRecord::Base model with #acts_as called" do
 
   let(:pen_attributes) { {name: 'pen', price: 0.8, color: 'red'} }
   let(:pen) { Pen.new pen_attributes }
+  let(:isolated_pen) { IsolatedPen.new color: 'red' }
   let(:store) { Store.new name: 'biggerman' }
+  let(:product) { Product.new store: store }
 
   it "has a has_one relation" do
     association = subject.reflect_on_all_associations.find { |r| r.name == :product }
@@ -129,16 +131,25 @@ RSpec.describe "ActiveRecord::Base model with #acts_as called" do
       expect { Product.find(product_id) }.to raise_error(ActiveRecord::RecordNotFound)
     end
 
-    it "validates supermodel attribures upon validation" do
-      p = Pen.new
-      expect(p).to be_invalid
-      expect(p.errors.keys).to include(:name, :price, :color)
-      p.name = 'testing'
-      expect(p).to be_invalid
-      p.color = 'red'
-      expect(p).to be_invalid
-      p.price = 0.8
-      expect(p).to be_valid
+    context "validates supermodel attributes" do
+      it "upon validate" do
+        p = Pen.new
+        expect(p).to be_invalid
+        expect(p.errors.keys).to include(:name, :price, :color)
+        p.name = 'testing'
+        expect(p).to be_invalid
+        p.color = 'red'
+        expect(p).to be_invalid
+        p.price = 0.8
+        expect(p).to be_valid
+      end
+      it "unless validates_actable is set to false" do
+        p = IsolatedPen.new
+        expect(p).to be_invalid
+        expect(p.errors.keys).to include(:color)
+        p.color = 'red'
+        expect(p).to be_valid
+      end
     end
 
     it "can set assosications defined in supermodel" do
@@ -156,12 +167,26 @@ RSpec.describe "ActiveRecord::Base model with #acts_as called" do
       expect(pen.store).to eq(store)
     end
 
-    it "includes supermodel attributes in .to_json responce" do
-      expect(pen.to_json).to eq('{"id":null,"name":"pen","price":0.8,"store_id":null,"color":"red"}')
+    context "includes supermodel attributes in .to_json response" do
+      it "unless the submodel instance association doesn't exist" do
+        expect(JSON.parse(isolated_pen.to_json)).to eq(JSON.parse('{"id":null,"color":"red"}'))
+      end
+      it "if the submodel instance association exists" do
+        p = Product.new(name: 'Test Pen', price: 0.8, actable: pen)
+        p.save
+        expect(JSON.parse(pen.to_json)).to eq(JSON.parse('{"id":' + pen.id.to_s + ',"name":"pen","price":0.8,"store_id":null,"color":"red"}'))
+      end
     end
 
-    it "includes supermodel attribute names in .attribute_names responce" do
-      expect(pen.attribute_names).to include("id", "color", "name", "price", "store_id")
+    context "includes supermodel attribute names in .attribute_names response" do
+      it "unless the submodel instance association doesn't exist" do
+        expect(pen.attribute_names).to include("id", "color")
+      end
+      it "if the submodel instance association exists" do
+        p = Product.new(name: 'Test Pen', price: 0.8, actable: pen)
+        p.save
+        expect(pen.attribute_names).to include("id", "color", "name", "price", "store_id")
+      end
     end
   end
 

data/spec/models.rb

@@ -21,6 +21,13 @@ class Pen < ActiveRecord::Base
   validates_presence_of :color
 end
 
+class IsolatedPen < ActiveRecord::Base
+  self.table_name = :pens
+  acts_as :product, validates_actable: false
+
+  validates_presence_of :color
+end
+
 class Store < ActiveRecord::Base
   has_many :products
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record-acts_as
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Hassan Zamani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-06 00:00:00.000000000 Z
+date: 2015-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3