method_decorator 1.1.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0fcdf1d4b59e01c87c59636931c71bfce8c6a41b
-  data.tar.gz: 93b5ebb80f54dcf5567d28176fae0cbba72c5e5a
+  metadata.gz: 607f30fb2f44469cac0ff14b5b6dd1bfa80164ef
+  data.tar.gz: 09ead13f5c6c41d17b7c9cc129d7ee9a1d324ccc
 SHA512:
-  metadata.gz: 669cebd955590a633211a8a45e394ad42d7c1f12fc439586de5dcd513160feb2d6beef2d669071d0d938c179380da0bb8f96904d39089642f4b9e5839a23bcc4
-  data.tar.gz: 452e1139c1991f8d4d443f39fa68376cfd2d0b686676e584a1694dbadf498011d73c59b84d382579a6530abc729a84197069951c067a68002970620b9b2731f6
+  metadata.gz: 8a2ce94d7ad57315caaa659efa8c621168943db20b656115469254b10850c4dc73bc038eea00b5394ce499df6d5a95618d757d47e134482a753311e8c53ed120
+  data.tar.gz: 973c2a671be37ebcc7bd3924d3e2d581eeb9cc6740dc84fcdaeff99b800e806691635cc0c45f2c0815668cbd6023bfe71907915e1b001b4bccbc4a609f652d83

data/README.rdoc

@@ -1,25 +1,20 @@
 = Method Decorator
 
-Provides a way to dynamically override methods without losing original behavior.
+Provides a way to dynamically overwrite methods without losing original behavior.
 
 == Example
 
-For a given class (with unnecessary complex logic, just to make a point):
-
     class SomeClass
 
         def some_method(some_arg)
             puts some_arg
         end
 
-        include MethodDecorator
-
-        method_to_override = :some_method
-        decorate_method method_to_override do |*args|
-            puts :decorated_some_method
-            call_original_method method_to_override, *args
-        end
+    end
 
+    MethodDecorator.decorate SomeClass, :some_method do |*args|
+        puts :decorated_some_method
+        MethodDecorator.call_original self, :some_method, *args
     end
 
 This call:
@@ -29,4 +24,31 @@ This call:
 Produces this output:
 
     decorated_some_method
-    some arg
+    some arg
+
+== Singleton Classes Support
+
+It works too:
+
+    class SomeClass
+
+        class << self
+
+            def some_method(some_arg)
+                puts some_arg
+            end
+
+        end
+
+    end
+
+    MethodDecorator.decorate SomeClass.singleton_class, :some_method do |*args|
+        puts :decorated_some_method
+        MethodDecorator.call_original self, :some_method, *args
+    end
+
+    SomeClass.some_method 'some arg'
+
+===
+
+{<img src="https://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif" alt="Donate" />}[https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=AMPXM3PW6CTBE]

data/Rakefile

@@ -16,11 +16,12 @@ Rake::TestTask.new(:test) do |t|
   t.test_files = FileList['test/**/test_*.rb']
 end
 
-RDoc::Task.new do |doc|
-  doc.main   = 'README.rdoc'
-  doc.title  = 'Rake -- Ruby Make'
-  doc.rdoc_files = FileList.new %w[lib MIT-LICENSE doc/**/*.rdoc *.rdoc]
-  doc.rdoc_dir = 'html'
+RDoc::Task.new do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title    = 'MethodDecorator'
+  rdoc.options << '--line-numbers'
+  rdoc.rdoc_files.include('README.rdoc')
+  rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
 require 'rspec/core/rake_task'

data/lib/method_decorator/decoration.rb

@@ -0,0 +1,14 @@
+module MethodDecorator
+  class Decoration
+
+    attr_accessor :target_class, :target_name, :target_method, :decoration
+
+    def initialize(target_class, target_method_name, target_method)
+      self.target_class = target_class
+      self.target_name = target_method_name
+      self.target_method = target_method
+      self.decoration = block_given? ? Proc.new : nil
+    end
+
+  end
+end

data/lib/method_decorator/repository.rb

@@ -0,0 +1,27 @@
+require 'method_decorator/decoration'
+
+module MethodDecorator
+  class Repository
+    class << self
+
+      attr_writer :decorations
+
+      def add_decoration(target_class, target_name, &decoration)
+        exists = original_method target_class, target_name
+        target_method = target_class.instance_method target_name
+        decoration = Decoration.new target_class, target_name, target_method, &decoration
+        self.decorations.push(decoration) unless exists
+        not exists
+      end
+
+      def original_method(target_class, target_name)
+        condition = Proc.new { |d| d.target_class.eql?(target_class) and d.target_name.eql?(target_name) }
+        decoration = self.decorations.select(&condition).first
+        decoration ? decoration.target_method : nil
+      end
+
+      def decorations; @decorations ||= [] end
+
+    end
+  end
+end

data/lib/method_decorator/version.rb

@@ -1,3 +1,3 @@
 module MethodDecorator
-  VERSION = '1.1.1'
+  VERSION = '2.0.0'
 end

data/lib/method_decorator.rb

@@ -1,37 +1,29 @@
-module MethodDecorator extend ActiveSupport::Concern
+require 'method_decorator/repository'
 
-  included do
+module MethodDecorator
+  class << self
 
-    class << self
-
-      private
-
-      def decorate_method(target, &block)
-        original_method_name = original_method_name_for target
-        complex_method_name = decorated_method_name_for target
-
-        alias_method original_method_name, target
-        define_method complex_method_name, &block
-        alias_method target, complex_method_name
-      end
-
-      def original_method_name_for(target)
-        "original_#{target}"
-      end
-
-      def decorated_method_name_for(target)
-        "decorated_#{target}"
-      end
+    def decorate(target_class, target_name, &decoration)
+      added = Repository.add_decoration target_class, target_name, &decoration
+      target_class.send :define_method, target_name, &decoration if added
+      added
+    end
 
+    def call_original(target_context, target_name, *original_args, &original_block)
+      target_class = target_class target_context
+      target_method = Repository.original_method target_class, target_name
+      target_method.bind(target_context).call *original_args, &original_block
     end
 
-    private
+    def target_class(target_context)
+      target_type(target_context).eql?(:singleton) ?
+      target_context.singleton_class :
+      target_context.class
+    end
 
-    def call_original_method(target, *args, &block)
-      original_method_name = self.singleton_class.send :original_method_name_for, target
-      send original_method_name, *args, &block
+    def target_type(target_context)
+      target_context.class.eql?(Class) ? :singleton : :class
     end
 
   end
-
 end

data/method_decorator.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |s|
   s.authors     = ['r4z3c']
   s.email       = ['r4z3c.43@gmail.com']
   s.homepage    = 'https://github.com/r4z3c/method_decorator.git'
-  s.summary     = 'Override methods preserving the original behavior'
-  s.description = 'Provides a way to dynamically override methods without losing original behavior'
+  s.summary     = 'Overwrite methods preserving the original behavior'
+  s.description = 'Provides a way to dynamically overwrite methods without losing original behavior'
   s.licenses    = %w(MIT)
 
   s.files = `git ls-files`.split("\n")

data/spec/lib/method_decorator_spec.rb

@@ -12,15 +12,14 @@ describe MethodDecorator do
     expect(target).to receive(:puts).with(some_arg).ordered
   end
 
-  context '' do
+  context 'when singleton method context' do
     let(:target) { SomeClass }
-
     it { subject }
   end
 
-  context '' do
+  context 'when instance method context' do
     let(:target) { SomeClass.new }
-
+    let(:methods) { target.class.send :generated_methods }
     it { subject }
   end
 

data/spec/support/some_class.rb

@@ -1,31 +1,22 @@
 class SomeClass
 
-  def some_method(some_arg)
-    puts some_arg
-  end
-
-  include MethodDecorator
-
-  method_to_override = :some_method
-  decorate_method method_to_override do |*args|
-    puts :decorated_some_method
-    call_original_method method_to_override, *args
-  end
-
   class << self
 
     def some_method(some_arg)
       puts some_arg
     end
 
-    include MethodDecorator
-
-    method_to_override = :some_method
-    decorate_method method_to_override do |*args|
-      puts :decorated_some_method
-      call_original_method method_to_override, *args
-    end
+  end
 
+  def some_method(some_arg)
+    puts some_arg
   end
 
+end
+
+[SomeClass, SomeClass.singleton_class].each do |target_class|
+  MethodDecorator.decorate target_class, :some_method do |*args, &block|
+    puts :decorated_some_method
+    MethodDecorator.call_original self, :some_method, *args, &block
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: method_decorator
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 2.0.0
 platform: ruby
 authors:
 - r4z3c
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-03 00:00:00.000000000 Z
+date: 2016-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,7 +66,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
-description: Provides a way to dynamically override methods without losing original
+description: Provides a way to dynamically overwrite methods without losing original
   behavior
 email:
 - r4z3c.43@gmail.com
@@ -81,6 +81,8 @@ files:
 - README.rdoc
 - Rakefile
 - lib/method_decorator.rb
+- lib/method_decorator/decoration.rb
+- lib/method_decorator/repository.rb
 - lib/method_decorator/version.rb
 - method_decorator.gemspec
 - spec/lib/method_decorator_spec.rb
@@ -109,7 +111,7 @@ rubyforge_project:
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: Override methods preserving the original behavior
+summary: Overwrite methods preserving the original behavior
 test_files:
 - spec/lib/method_decorator_spec.rb
 - spec/spec_helper.rb