active_record-acts_as 2.3.1 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 649359dfef206fea9b42d2b8ec4c7c303e7711bd
-  data.tar.gz: bdb45afb463b19d4c203fbf33aaa7f7df83eb6b6
+  metadata.gz: 589ce7c704e9fbea72a54a837e5a6937a617abc7
+  data.tar.gz: ffd0002ce231c728cf4508c008c4b033c12ebdf9
 SHA512:
-  metadata.gz: 65771a5b9157b116e2d1bf6c9e27bbd8ee0aba57543a99dff471ed02194ff39edbb85e7d165e562515a7631407979b07bb8e32ef416459ad77bb04f7e569eefa
-  data.tar.gz: 8b86a5551db05eccf02dec335d48d2c10bc13198213a4b5839b4cdaf8a7444536bad7290cfcd83d9c95ab5f99bede21d7eca1ffd5827524cd0ee1ae1a057ac35
+  metadata.gz: a4ddd42dca8305b4b6e10d6045455b54192834004e0289cb1a1073ed99f409342f075467b8c4a63dc812ace6e31b3cd09692ad3a4538cc08af683409833eeeff
+  data.tar.gz: 46701f3ca1f4f00783ef1e2a58763752e5a7ff5d67f20e33ea2ac78a20f170c92ec83750d62f57687e7c1dc6336739fb6083b64deb0e350ecddc88d25380b7ef

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.4.0] - 2017-04-16
+### Changed
+- Don't make all supermodel class methods callable by submodel, only scopes. Add `callable_by_submodel` to supermodel so users can make their own class methods callable by submodels.
+
 ## [2.3.1] - 2017-04-15
 ### Fixed
 - Make calling supermodel class methods work through relations/associations as well
@@ -80,7 +84,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.3.1...HEAD
+[Unreleased]: https://github.com/krautcomputing/active_record-acts_as/compare/v2.4.0...HEAD
+[2.4.0]: https://github.com/krautcomputing/active_record-acts_as/compare/v2.3.1...v2.4.0
 [2.3.1]: https://github.com/krautcomputing/active_record-acts_as/compare/v2.3.0...v2.3.1
 [2.3.0]: https://github.com/krautcomputing/active_record-acts_as/compare/v2.2.1...v2.3.0
 [2.2.1]: https://github.com/krautcomputing/active_record-acts_as/compare/v2.2.0...v2.2.1

data/lib/active_record/acts_as/class_methods.rb

@@ -20,11 +20,11 @@ module ActiveRecord
       end
 
       def respond_to_missing?(method, include_private = false)
-        acting_as_model.respond_to?(method, include_private) || super
+        acting_as_model.methods_callable_by_submodel.include?(method) || super
       end
 
       def method_missing(method, *args, &block)
-        if acting_as_model.respond_to?(method)
+        if acting_as_model.methods_callable_by_submodel.include?(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)

data/lib/active_record/acts_as/relation.rb

@@ -83,6 +83,19 @@ module ActiveRecord
 
           cattr_reader(:actable_reflection) { reflections.stringify_keys[name.to_s] }
 
+          def self.methods_callable_by_submodel
+            @methods_callable_by_submodel ||= Set.new
+          end
+
+          def self.callable_by_submodel(method)
+            @methods_callable_by_submodel ||= Set.new
+            @methods_callable_by_submodel << method
+          end
+
+          def self.scope(*)
+            callable_by_submodel super
+          end
+
           alias_method :specific, name
         end
 

data/lib/active_record/acts_as/version.rb

@@ -1,6 +1,6 @@
 module ActiveRecord
   module ActsAs
-    VERSION = "2.3.1"
+    VERSION = "2.4.0"
   end
 end
 

data/spec/acts_as_spec.rb

@@ -414,18 +414,27 @@ RSpec.describe "ActiveRecord::Base model with #acts_as called" do
   context 'class methods' do
     before(:each) { clear_database }
 
-    context 'when the class method returns a scope' do
-      it 'works' do
+    context 'when they are defined via `scope`' do
+      it 'can be called from the submodel' 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(Product.with_price_higher_than(0.5).to_a).to eq([expensive_pen.acting_as])
         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')
+    context 'when they are not defined via `scope` but made callable by submodel' do
+      it 'can be called from the submodel' do
+        expect(Product.class_method_callable_by_submodel).to eq('class_method_callable_by_submodel')
+        expect(Pen.class_method_callable_by_submodel).to eq('class_method_callable_by_submodel')
+      end
+    end
+
+    context 'when they are neither defined via `scope` nor made callable by submodel' do
+      it 'cannot be called from the submodel' do
+        expect(Product.class_method).to eq('class_method')
+        expect { Pen.class_method }.to raise_error(NoMethodError)
       end
     end
   end

data/spec/models.rb

@@ -10,12 +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)
+  scope :with_price_higher_than, ->(price) { where('price > ?', price) }
+
+  def self.class_method
+    'class_method'
   end
 
-  def self.test_class_method
-    'test'
+  callable_by_submodel def self.class_method_callable_by_submodel
+    'class_method_callable_by_submodel'
   end
 
   def present

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record-acts_as
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.4.0
 platform: ruby
 authors:
 - Hassan Zamani
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-15 00:00:00.000000000 Z
+date: 2017-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3