activerecord-delegation-expected_behaviour 1.0.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 879e4bcf5822aee3c6dda3aed6786da196a114dc
-  data.tar.gz: a6bb723ac40a764b15c73fa809cd84fa389989b0
+  metadata.gz: fc9524166ef902464385e71aa84a89e4825439fe
+  data.tar.gz: '08f19408bf4d8ca070017ef3241af11b46cf3367'
 SHA512:
-  metadata.gz: 408cb2ea634b2d24e4592abab60f2134f2c2b2e31e839d1265c0cf7021429f02842e382d28dd72413dbb18685e3b04ab33ae44ef61473f65b2d350e0225219c2
-  data.tar.gz: 1ae9a946714b7a373b67486f003587f2a382fcb1a42f01268861c003f207dd698b59ced273c51e89ab38a91b9a0dd2d1068dc404ccfc512b2c3a0aa11beeafa5
+  metadata.gz: 1d0f4bd9c6313020137ec2f8006a6e30be9a53e709e82c3df8d7eec992efb95a1381ee8e67cb0c7aa838b65ea8399828f538ea9db0e74771bb21346061647704
+  data.tar.gz: 536e9fb52d82b7bfda121577fb301543b03158274f5ac9168e9bfa1159df9cfe7d22e821be264f0093dcd225a7d597b78c0eb20ed4290763cdb9fb96ae21d8ae

data/README.md

@@ -4,11 +4,14 @@ Prefer some class methods over methods from Enumerable on ActiveRecord relations
 
 ## Rationale
 
-In Rails 5 you can no longer call some ActiveRecord class methods named like their Enumerable counterparts:
+In Rails 5 you can no longer call some ActiveRecord class methods named
+like their Enumerable counterparts:
 
 ```:encode_with, :to_ary, :join, :[], :&, :|, :+, :-, :sample, :reverse, :compact, :in_groups, :in_groups_of, :to_sentence, :to_formatted_s, :shuffle, :split, :index```
         
-This gem reinstates the expected behaviour, where you can always get the method from Enumerable by calling to_a on the relation.
+This gem reinstates the expected behaviour, where you can always
+get the method from Enumerable by calling to_a on the relation,
+whilst being able to define it as class method on the relation model.
 
 See: https://github.com/rails/rails/issues/26949
 

data/lib/activerecord-delegation-expected_behaviour.rb

@@ -3,19 +3,32 @@ require 'active_record'
 module ActiveRecord
   module Delegation
     module ExpectedBehaviour
-      VERSION = '1.0.0'
+      VERSION = '1.1.1'
       
-      UNEXPECTED_METHODS = [:encode_with, :to_ary, :join, :[], :&, :|, :+, :-,
-        :sample, :reverse, :compact, :in_groups, :in_groups_of,
-        :to_sentence, :to_formatted_s, :shuffle, :split, :index]
+      REDELEGATED_METHODS = [:encode_with, :to_ary, :join, :[], :&, :|, :+, :-, :sample,
+        :reverse, :compact, :in_groups, :in_groups_of, :to_sentence, :to_formatted_s,
+        :shuffle, :split, :index]
       
-      def self.included(base)
-        base.module_eval do
-          UNEXPECTED_METHODS.each { |method| remove_method(method) }
+      REDELEGATED_METHODS.each do |method|
+        if method =~ /[^\]]=$/
+          define_method(method) { |arg| delegate_to_klass_or_records(method, arg) }
+        else
+          define_method(method) { |*args, &block| delegate_to_klass_or_records(method, *args, &block) }
         end
       end
+      
+      protected
+
+      def delegate_to_klass_or_records(method, *args, &block)
+        if @klass.respond_to?(method)
+          scoping { @klass.public_send(method, *args, &block) }
+        else
+          records.public_send(method, *args, &block)
+        end
+      end
+      
     end
   end
 end
 
-ActiveRecord::Delegation.include ActiveRecord::Delegation::ExpectedBehaviour
+ActiveRecord::Delegation.prepend ActiveRecord::Delegation::ExpectedBehaviour

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-delegation-expected_behaviour
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Matthias Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-13 00:00:00.000000000 Z
+date: 2017-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord