active_record-acts_as 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64cbfe3c6d86757fceca3cd920138468bac93d4b
-  data.tar.gz: 4687d0558602f189e3c771174aa986afadf3b4cb
+  metadata.gz: 7387f8a9b958e1010c9c86367631e5be078d6329
+  data.tar.gz: 31705e7f709ae00673bc2cf9bddcf72cc7a2eda9
 SHA512:
-  metadata.gz: 26021ad15fd01db7dcbad29e912ed2a6b96a66ed148f8e442bca9f8c5ace9786c4171b6d318773639a1de20b04ce0a28420f72ef1dd0d2c5a218189ead20c883
-  data.tar.gz: 3912076316e37325948021045815231891e045fa5ac5488830399d68b61d5d1e5296fc20a771efbc4ee7184a56b2ad79db76b7e459fd6a817f20f74e01a80e17
+  metadata.gz: 507a0fd8e3609ceb749a1f8a3ee9ae051de0094fb769778a661ff91f0ed9bf0bb4f8001267c68db76f70f02f64f0c088d48533c599f40d76b12eacf1e8932b04
+  data.tar.gz: aebd0d7c848b0f53639491582c3d29187ed0d152324d861ebfbbb0441f792c83a61f95bb8d0d8ccce6993be6f899203dc0d1c790ac523c09d16d3f55179a4e85

data/README.md

@@ -44,6 +44,7 @@ Back to example above, all you have to do is to mark `Product` as `actable` and
 ```Ruby
 class Product < ActiveRecord::Base
   actable
+  belongs_to :store
 
   validates_presence_of :name, :price
 

data/lib/active_record/acts_as.rb

@@ -3,6 +3,7 @@ require 'active_record'
 require 'active_record/acts_as/version'
 require 'active_record/acts_as/relation'
 require 'active_record/acts_as/migration'
+require 'active_record/acts_as/class_methods'
 require 'active_record/acts_as/instance_methods'
 require 'active_record/acts_as/querying'
 

data/lib/active_record/acts_as/class_methods.rb

@@ -0,0 +1,14 @@
+module ActiveRecord
+  module ActsAs
+    module ClassMethods
+      def self.included(module_)
+        module_.alias_method_chain :_reflections, :acts_as
+      end
+
+      def _reflections_with_acts_as
+        @_reflections_acts_as_cache ||=
+          _reflections_without_acts_as.reverse_merge(acting_as_model._reflections)
+      end
+    end
+  end
+end

data/lib/active_record/acts_as/instance_methods.rb

@@ -72,6 +72,22 @@ module ActiveRecord
         acting_as_persisted? ? super | (acting_as.attribute_names - [acting_as_reflection.type, acting_as_reflection.foreign_key]) : super
       end
 
+      def has_attribute?(attr_name, as_original_class = false)
+        if as_original_class
+          super(attr_name)
+        else
+          super(attr_name) || acting_as.has_attribute?(attr_name)
+        end
+      end
+
+      def column_for_attribute(name)
+        if has_attribute?(name, true)
+          super(name)
+        else
+          acting_as.column_for_attribute(name)
+        end
+      end
+
 
       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)

data/lib/active_record/acts_as/relation.rb

@@ -22,6 +22,9 @@ module ActiveRecord
           alias_method :acting_as=, "#{name}=".to_sym
 
           include ActsAs::InstanceMethods
+          singleton_class.module_eval do
+            include ActsAs::ClassMethods
+          end
         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.6"
+    VERSION = "1.0.7"
   end
 end

data/spec/acts_as_spec.rb

@@ -111,6 +111,40 @@ RSpec.describe "ActiveRecord::Base model with #acts_as called" do
     end
   end
 
+  describe "#has_attribute?" do
+    context "when the attribute is defined on the superclass" do
+      it "queries the superclass" do
+        expect(pen.has_attribute?(:name)).to be_truthy
+      end
+    end
+
+    context "when the attribute is defined on the subclass" do
+      it "queries the subclass" do
+        expect(pen.has_attribute?(:color)).to be_truthy
+      end
+    end
+  end
+
+  describe "#column_for_attribute" do
+    context "when the attribute is defined on the superclass" do
+      it "queries the superclass" do
+        expect(pen.column_for_attribute(:name)).to eq(pen.product.column_for_attribute(:name))
+      end
+    end
+
+    context "when the attribute is defined on the subclass" do
+      it "queries the subclass" do
+        expect(pen.column_for_attribute(:color)).not_to be_nil
+      end
+    end
+  end
+
+  describe "._reflections" do
+    it "merges the reflections on both superclass and subclass" do
+      expect(Pen._reflections.length).to eq(Product._reflections.length + 1)
+    end
+  end
+
   it "have supermodel attributes accessible on creation" do
     expect{Pen.create(pen_attributes)}.to_not raise_error
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record-acts_as
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Hassan Zamani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-16 00:00:00.000000000 Z
+date: 2015-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -117,6 +117,7 @@ files:
 - Rakefile
 - active_record-acts_as.gemspec
 - lib/active_record/acts_as.rb
+- lib/active_record/acts_as/class_methods.rb
 - lib/active_record/acts_as/instance_methods.rb
 - lib/active_record/acts_as/migration.rb
 - lib/active_record/acts_as/querying.rb
@@ -149,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Simulate multi-table inheritance for activerecord models