active_record-acts_as 2.1.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71fdceb0ce3b5629016ebb56a04e7663d1fbefdd
-  data.tar.gz: 9b7bb83ea854a435bf8c6a0198c33e4fdd552e8e
+  metadata.gz: 12fa1c4f20906b7d2352269034b053732a66ff54
+  data.tar.gz: 7589a0647e201e2d3105344038e71aa1bb66508a
 SHA512:
-  metadata.gz: ade1a531d8a638c8c14c0f7758f2790e09869463b5e8da0f7042e7043198b9401176b8a58e0ee453159997596ff0b9f62750b559b1253313aa86b56510a28a40
-  data.tar.gz: 4a1665b6991794b478bde0d027199eee0d956c6c8a099c94c215c49250470907bb1c6493513c3ce43c8068d31277d181d72ebdee6c420ba8b6d34ea556975181
+  metadata.gz: e147a8073f32ee2c4ee4bb81c5f13e45e88f2057eac38c8c22b1a7165123a7a5d69550fb719626e76deb2598fa6a9c3b780861c4ff6b31b6f000fc4f33aa33c2
+  data.tar.gz: 378cf9642978a153cbf16a4c2339d21b9fde016724f540fb0df5dbc3be60f7a7bceca384c5d5098fd311ee18fb8f0e49f772fc9c86e8f9a6d155d18d61e18dd5

data/.travis.yml

@@ -1,9 +1,9 @@
 language: ruby
 sudo: false
 rvm:
-  - 2.2.6
-  - 2.3.3
-  - 2.4.0
+  - 2.2.7
+  - 2.3.4
+  - 2.4.1
 before_install:
   - gem update --system
   - gem update bundler

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.1.1] - 2017-03-22
+### Fixed
+- Fix querying subclass with `where`, for `enum` (and possibly other) attributes the detection whether the attribute is defined on the superclass or subclass didn't work.
+
 ## [2.1.0] - 2017-03-17
 ### Added
 - Access superobjects from query on submodel by calling `.actables`
@@ -57,7 +61,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.1.0...HEAD
+[Unreleased]: https://github.com/krautcomputing/active_record-acts_as/compare/v2.1.1...HEAD
+[2.1.1]: https://github.com/krautcomputing/active_record-acts_as/compare/v2.1.0...v2.1.1
 [2.1.0]: https://github.com/krautcomputing/active_record-acts_as/compare/v2.0.9...v2.1.0
 [2.0.9]: https://github.com/krautcomputing/active_record-acts_as/compare/v2.0.8...v2.0.9
 [2.0.8]: https://github.com/krautcomputing/active_record-acts_as/compare/v2.0.7...v2.0.8

data/README.md

@@ -172,6 +172,11 @@ acts_as :person, -> { includes(:friends) }
 Make sure you know what you are doing when overwriting `polymorphic` option.
 
 
+## Caveats
+
+Multiple `acts_as` in the same class are not supported!
+
+
 ## Migrating from acts_as_relation
 
 Replace `acts_as_superclass` in models with `actable` and if you where using

data/lib/active_record/acts_as/class_methods.rb

@@ -18,6 +18,19 @@ module ActiveRecord
       def actables
         acting_as_model.where(actable_id: select(:id))
       end
+
+      def method_missing(method, *args, &block)
+        if acting_as_model.respond_to?(method)
+          result = acting_as_model.public_send(method, *args, &block)
+          if result.is_a?(ActiveRecord::Relation)
+            all.joins(acting_as_name.to_sym).merge(result)
+          else
+            result
+          end
+        else
+          super
+        end
+      end
     end
   end
 end

data/lib/active_record/acts_as/instance_methods.rb

@@ -13,16 +13,6 @@ module ActiveRecord
         super || acting_as.changed? || (defined?(@_acting_as_changed) ? @_acting_as_changed : false)
       end
 
-      def acting_as_foreign_key
-        acting_as[acting_as_reflection.foreign_key]
-      end
-
-      # Is the superclass persisted to the database?
-      def acting_as_persisted?
-        return false if acting_as.nil?
-        !acting_as.id.nil? && !acting_as_foreign_key.nil?
-      end
-
       def actable_must_be_valid
         if validates_actable
           unless acting_as.valid?
@@ -96,7 +86,11 @@ module ActiveRecord
       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)
+        if as_original_class
+          super(name, include_private)
+        else
+          super(name, include_private) || acting_as.respond_to?(name)
+        end
       end
 
       def self_respond_to?(name, include_private = false)
@@ -110,26 +104,10 @@ 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)
-          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
+        if !self_respond_to?(method) && acting_as.respond_to?(method)
+          acting_as.send(method, *args, &block)
         else
-          # If the superclass doesn't have it, use this class's methods
-          false
+          super
         end
       end
     end

data/lib/active_record/acts_as/version.rb

@@ -1,6 +1,6 @@
 module ActiveRecord
   module ActsAs
-    VERSION = "2.1.1"
+    VERSION = "2.2.0"
   end
 end
 

data/spec/acts_as_spec.rb

@@ -86,17 +86,6 @@ RSpec.describe "ActiveRecord::Base model with #acts_as called" do
     end
   end
 
-  describe "#acting_as_foreign_key" do
-    let(:product_foreign_key_value) do
-      pen.acting_as[pen.acting_as.actable_reflection.foreign_key]
-    end
-    it "return acts_as foreign key value" do
-      pen.save
-      expect(pen.acting_as_foreign_key).to eq(product_foreign_key_value)
-      expect(pen.acting_as_foreign_key).to eq(pen.id)
-    end
-  end
-
   describe "#acting_as=" do
     it "sets acts_as model" do
       product = Product.new(name: 'new product', price: 0.99)
@@ -370,6 +359,14 @@ RSpec.describe "ActiveRecord::Base model with #acts_as called" do
     end
   end
 
+  describe '#respond.to?' do
+    it 'returns true for instance methods of the supermodel and submodel' do
+      red_pen = Pen.create!(name: 'red pen', price: 0.8, color: 'red')
+      expect(red_pen.respond_to?(:pen_instance_method)).to eq(true)
+      expect(red_pen.respond_to?(:present)).to eq(true)
+    end
+  end
+
   describe ".actables" do
     before(:each) { clear_database }
 
@@ -385,6 +382,25 @@ RSpec.describe "ActiveRecord::Base model with #acts_as called" do
     end
   end
 
+  context 'class methods' do
+    before(:each) { clear_database }
+
+    context 'when the class method returns a scope' do
+      it 'works' do
+        cheap_pen     = Pen.create!(name: 'cheap pen',     price: 0.5, color: 'blue')
+        expensive_pen = Pen.create!(name: 'expensive pen', price: 1,   color: 'red')
+
+        expect(Pen.with_price_higher_than(0.5).to_a).to eq([expensive_pen])
+      end
+    end
+
+    context 'when the class methods returns anything else' do
+      it 'works' do
+        expect(Pen.test_class_method).to eq('test')
+      end
+    end
+  end
+
   context "Querying" do
     before(:each) { clear_database }
 

data/spec/models.rb

@@ -10,6 +10,14 @@ class Product < ActiveRecord::Base
   validates_presence_of :name, :price
   store :settings, accessors: [:global_option]
 
+  def self.with_price_higher_than(price)
+    where('price > ?', price)
+  end
+
+  def self.test_class_method
+    'test'
+  end
+
   def present
     "#{name} - $#{price}"
   end
@@ -35,6 +43,9 @@ class Pen < ActiveRecord::Base
   belongs_to :pen_collection, touch: true
 
   validates_presence_of :color
+
+  def pen_instance_method
+  end
 end
 
 class Buyer < ActiveRecord::Base

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record-acts_as
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0
 platform: ruby
 authors:
 - Hassan Zamani
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-22 00:00:00.000000000 Z
+date: 2017-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -184,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Simulate multi-table inheritance for activerecord models