decors 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7759f5e7d47d9e741ae03ea06cb02acaff1f984e
-  data.tar.gz: 2b41184cffff4ba470f4730fe68c3fe52e779518
+  metadata.gz: 2bb31ed84c4aa6d83763802dd3ffed2c76b3fdd8
+  data.tar.gz: 60f07758499467ca63547d13bcff6354a845d3a9
 SHA512:
-  metadata.gz: 7abe88ecad1024a83fefd0629af2120689063b0335d0fcb8f5711a071213c5919177804ddd9d377f38faffc7e0bf0aaa7cd9772b42e4df15376326850328c219
-  data.tar.gz: 66d71eea9cd047431f76e349f4a95e15cdf06d60bcaaaa7103831f4eb12539fe3622ead623755a9e68ba820b77c6c10fc09708ab1e09fbe7a131f1644f46c7ec
+  metadata.gz: 8a2651655043a8bc0742fe60db5385989d7e415ae7a2728a3247b61934d7069af5a8b4b02cebde2523228433b0f278aa5805ab273886b7636dae829f725deb06
+  data.tar.gz: ac7ee42f12a9945822fd48017e33977d7b1a364a2ab20b157d6293cbc0847f73254e4a54d0d2dee8f754c45b6e7147c03530dad9033c10ecd55fce356f6e8502

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Decors changelog
 
+## Version 0.3 (Released August 24, 2017)
+
+- (feature) expose decorated method before and after decoration (https://github.com/getbannerman/decors/issues/10)
+  :warning: this is a breaking change. `decorated_method` that was referring to the method before decoration now refers to the method after decoration. `undecorated_method` refers to the method before decoration.
+
 ## Version 0.2 (Released May 10, 2017)
 
 - (bugfix) nested singleton handling (https://github.com/getbannerman/decors/issues/2)

data/lib/decors.rb

@@ -3,5 +3,5 @@ require 'decors/decorator_definition'
 require 'decors/method_added'
 
 module Decors
-    VERSION = '0.2.0'
+    VERSION = '0.3.0'
 end

data/lib/decors/decorator_base.rb

@@ -1,9 +1,11 @@
 module Decors
     class DecoratorBase
-        attr_reader :decorated_class, :decorated_method, :decorator_args, :decorator_kwargs, :decorator_block
+        attr_reader :decorated_class, :undecorated_method, :decorated_method, :decorator_args,
+            :decorator_kwargs, :decorator_block
 
-        def initialize(decorated_class, decorated_method, *args, **kwargs, &block)
+        def initialize(decorated_class, undecorated_method, decorated_method, *args, **kwargs, &block)
             @decorated_class = decorated_class
+            @undecorated_method = undecorated_method
             @decorated_method = decorated_method
             @decorator_args = args
             @decorator_kwargs = kwargs
@@ -15,7 +17,7 @@ module Decors
         end
 
         def undecorated_call(instance, *args, &block)
-            decorated_method.bind(instance).call(*args, &block)
+            undecorated_method.bind(instance).call(*args, &block)
         end
 
         def decorated_method_name

data/lib/decors/method_added.rb

@@ -5,6 +5,10 @@ module Decors
         module Handler
             private
 
+            METHOD_CALLED_TOO_EARLY_HANDLER = ->(*) {
+                raise 'You cannot call a decorated method before its decorator is initialized'
+            }
+
             def declared_decorators
                 @declared_decorators ||= []
             end
@@ -15,14 +19,14 @@ module Decors
                 return if @_ignore_additions || declared_decorators.empty?
                 decorator_class, params, blk = declared_decorators.pop
 
+                undecorated_method = clazz.instance_method(method_name)
+                decorator = METHOD_CALLED_TOO_EARLY_HANDLER
+                clazz.send(:define_method, method_name) { |*args, &block| decorator.call(self, *args, &block) }
                 decorated_method = clazz.instance_method(method_name)
-
                 @_ignore_additions = true
-                decorator = decorator_class.new(clazz, decorated_method, *params, &blk)
+                decorator = decorator_class.new(clazz, undecorated_method, decorated_method, *params, &blk)
                 @_ignore_additions = false
-
-                clazz.send(:define_method, method_name) { |*args, &block| decorator.call(self, *args, &block) }
-                clazz.send(Decors::Utils.method_visibility(decorated_method), method_name)
+                clazz.send(Decors::Utils.method_visibility(undecorated_method), method_name)
             end
         end
 

data/spec/decors_spec.rb

@@ -12,10 +12,37 @@ describe Decors do
         }
     }
 
+    context 'Check decorated_method & undecorated_method' do
+        let(:instance) { TestClass.new }
+
+        before {
+            stub_class(:SimpleDecorator, inherits: [::Decors::DecoratorBase])
+            call_method = call_proc
+            SimpleDecorator.send(:define_method, :call){ |*| instance_eval(&call_method) }
+            TestClass.class_eval {
+                define_decorator :SimpleDecorator, SimpleDecorator
+                SimpleDecorator()
+                def test; 42 end
+            }
+        }
+
+        context 'Check decorated_method value' do
+            let(:call_proc) { proc { decorated_method } }
+            it { expect(instance.test).to eq TestClass.instance_method(:test) }
+        end
+
+        context 'Check undecorated_method value' do
+            let(:call_proc) { proc { undecorated_method } }
+            it { expect(instance.test.bind(instance).call).to eq 42 }
+            it { expect(instance.test.bind(instance).call).not_to eq TestClass.instance_method(:test) }
+
+        end
+    end
+
     context 'when simple case decorator' do
         before {
             stub_class(:SimpleDecorator, inherits: [::Decors::DecoratorBase]) {
-                def initialize(decorated_class, decorated_method, *deco_args, **deco_kwargs, &deco_block)
+                def initialize(decorated_class, undecorated_method, decorated_method, *deco_args, **deco_kwargs, &deco_block)
                     super
                     Spy.passed_args(*deco_args, **deco_kwargs, &deco_block)
                 end
@@ -30,7 +57,7 @@ describe Decors do
         }
 
         context 'It receive all the parameters at initialization' do
-            it { expect(SimpleDecorator).to receive(:new).with(TestClass, anything, 1, 2, a: 3).and_call_original }
+            it { expect(SimpleDecorator).to receive(:new).with(TestClass, anything, anything, 1, 2, a: 3).and_call_original }
             it { expect(Spy).to receive(:arguments).with(args: [1, 2], kwargs: { a: 3 }, evald_block: 'ok') }
 
             after {
@@ -88,7 +115,7 @@ describe Decors do
     context 'when decorator is defining a method during initialization' do
         before {
             stub_class(:StrangeDecorator, inherits: [::Decors::DecoratorBase]) {
-                def initialize(decorated_class, decorated_method, *deco_args, **deco_kwargs, &deco_block)
+                def initialize(decorated_class, undecorated_method, decorated_method, *deco_args, **deco_kwargs, &deco_block)
                     super
                     decorated_class.send(:define_method, :foo) { 42 }
                 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decors
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Vivien Meyet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-10 00:00:00.000000000 Z
+date: 2017-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry