durable_decorator 0.0.4 → 0.0.6

data/README.md

@@ -5,7 +5,7 @@
 [![Build Status](https://travis-ci.org/jumph4x/durable_decorator.png)](https://travis-ci.org/jumph4x/durable_decorator)
 [![Code Climate](https://codeclimate.com/github/jumph4x/durable_decorator.png)](https://codeclimate.com/github/jumph4x/durable_decorator)
 
-This is a project for modifying the behavior of gems outside of your reach. You may be using a large Rails Engine and be wanting to simple decorate some existing behavior, but at the same time you want to inherit original behavior. 
+This is a project for modifying the behavior of gems outside of your reach. You may be using a large Rails Engine and be wanting to simply decorate some existing behavior, but at the same time you want to inherit original behavior. 
 
 ## On tracking new decorators and managing fragility
 
@@ -33,8 +33,8 @@ class ExampleClass
 end
 
 class ExampleClass
-  decorate :string_method do
-    string_method_old + " and new"
+  durably_decorate :string_method do
+    string_method_original + " and new"
   end
 end
 
@@ -67,15 +67,15 @@ ExampleClass.class_eval do
     sha: 'WE-IGNORE-THE-ABOVE'
   }
 
-  decorate :string_method, meta do
-    string_method_old + " and new"
+  durably_decorate :string_method, meta do
+    string_method_original + " and new"
   end
 end
 
 DurableDecorator::TamperedDefinitionError: Method SHA mismatch, the definition has been tampered with
 ```
 
-DurableDecorator also maintains explicit versions of each method overriden by creating aliases with appended SHAs of the form ```some_method_1234abcd``` so you can always target explicit method versions without relying on ```some_method_old```.
+DurableDecorator also maintains explicit versions of each method overriden by creating aliases with appended SHAs of the form ```some_method_1234abcd``` so you can always target explicit method versions without relying on ```some_method_original```.
 
 ### No more suprise monkey patching
 Once you decorate the method and seal it with its SHA, if some gem tries to come in and overwrite your work **BEFORE** decorate-time, DurableDecorator will warn you. Similarly, expect to see an exception bubble up if the definition of the original method has changed and requires a review and a re-hash. 

data/lib/durable_decorator/base.rb

@@ -1,4 +1,4 @@
-require 'digest/md5'
+require 'digest/sha1'
 
 module DurableDecorator
   class Base
@@ -6,6 +6,10 @@ module DurableDecorator
       DECORATION_MODES = ['strict']
       REDEFINITIONS = {}
 
+      def reset!
+        REDEFINITIONS.clear
+      end
+
       def redefine clazz, method_name, meta, &block
         if method_name.to_s.match /^self\./
           redefine_instance (class << clazz; self; end), method_name.to_s.gsub("self.",''), meta, &block
@@ -17,6 +21,7 @@ module DurableDecorator
       def redefine_instance clazz, method_name, meta, &block
         return unless old_method = existing_method(clazz, method_name, meta, &block)
 
+        alias_original clazz, method_name
         alias_definitions clazz, method_name, method_sha(old_method)
         redefine_method clazz, method_name, &block
 
@@ -65,24 +70,48 @@ module DurableDecorator
         end
       end
 
+      def redefinitions
+        REDEFINITIONS
+      end
+
       def alias_definitions clazz, method_name, old_sha
         clazz.class_eval do
           alias_method("#{method_name}_#{old_sha}", method_name)
-          alias_method("#{method_name}_old", method_name)
+          alias_method("#{method_name}_#{old_sha[0..3]}", method_name)
+          alias_method("#{method_name}_#{old_sha[0..5]}", method_name)
         end
       end
 
+      def alias_original clazz, method_name
+        return unless original_redefinition? clazz, method_name
+
+        clazz.class_eval do
+          alias_method("#{method_name}_original", method_name)
+        end
+      end
+
+      def class_name clazz
+        name = clazz.name || ''
+        name = clazz.to_s if name.empty?
+        name.to_sym
+      end
+
+      def full_method_name clazz, method_name
+        "#{class_name(clazz)}##{method_name}"
+      end
+
+      def original_redefinition? clazz, method_name
+        !REDEFINITIONS[full_method_name(clazz, method_name)]
+      end
+
       def store_redefinition clazz, name, old_method, new_method
-        class_name = clazz.name || ''
-        class_name = "Meta#{clazz.superclass.to_s}" if class_name.empty?
-        class_index = REDEFINITIONS[class_name.to_sym] ||= {}
-        method_index = class_index[name.to_sym] ||= []
+        methods = REDEFINITIONS[full_method_name(clazz, name)] ||= []
        
         to_store = [new_method]
-        to_store.unshift(old_method) if method_index.empty?
+        to_store.unshift(old_method) if original_redefinition?(clazz, name)
         
         to_store.each do |method|
-          method_index << method_hash(name, method)
+          methods << method_hash(name, method)
         end
 
         true
@@ -96,7 +125,7 @@ module DurableDecorator
       end
 
       def method_sha method
-        Digest::MD5.hexdigest(method.source.gsub(/\s+/, ' '))
+        Digest::SHA1.hexdigest(method.source.gsub(/\s+/, ' '))
       end
 
       def redefined? clazz, method_name, &block

data/lib/durable_decorator/version.rb

@@ -1,3 +1,3 @@
 module DurableDecorator
-  VERSION = "0.0.4"
+  VERSION = "0.0.6"
 end

data/lib/durable_decorator.rb

@@ -21,18 +21,18 @@ end
 # monkey-patching Ruby core to create an API
 Object.class_eval do
   class << self
-    def decorate method_name, meta = nil, &block
+    def durably_decorate method_name, meta = nil, &block
       DurableDecorator::Base.redefine self, method_name, meta, &block
     end
 
-    def decorate_singleton method_name, meta = nil, &block
-      decorate "self.#{method_name}", meta, &block
+    def durably_decorate_singleton method_name, meta = nil, &block
+      durably_decorate "self.#{method_name}", meta, &block
     end
   end
 end
 
 Module.class_eval do
-  def decorate method_name, meta = nil, &block
+  def durably_decorate method_name, meta = nil, &block
     DurableDecorator::Base.redefine self, method_name, meta, &block
   end
 end

data/spec/durable_decorator_spec.rb

@@ -3,34 +3,34 @@ require 'spec_helper'
 describe DurableDecorator::Base do
 
   context 'with classes' do
-  # Spec uses ./example_class.rb 
+  # Spec uses ./example_class.rb
     context 'for existing instance methods' do
-      it 'guarantees access to #method_old' do
+      it 'guarantees access to #method_original' do
         ExampleClass.class_eval do
-          decorate :no_param_method do 
-            no_param_method_old + " and a new string"
+          durably_decorate :no_param_method do
+            no_param_method_original + " and a new string"
           end
         end
 
         instance = ExampleClass.new
         instance.no_param_method.should == 'original and a new string'
-      end 
+      end
 
       context 'with incorrect arity' do
         it 'throws an error' do
           lambda{
             ExampleClass.class_eval do
-              decorate(:no_param_method){|a,b| }
+              durably_decorate(:no_param_method){|a,b| }
             end
           }.should raise_error(DurableDecorator::BadArityError)
         end
       end
 
       context 'for methods with parameters' do
-        it 'guarantees access to #method_old' do
+        it 'guarantees access to #method_original' do
           ExampleClass.class_eval do
-            decorate :one_param_method do |another_string|
-              "#{one_param_method_old('check')} and #{another_string}"
+            durably_decorate :one_param_method do |another_string|
+              "#{one_param_method_original('check')} and #{another_string}"
             end
           end
 
@@ -44,8 +44,8 @@ describe DurableDecorator::Base do
           @original_sha = DurableDecorator::Base.determine_sha("ExampleClass#one_param_method")
 
           ExampleClass.class_eval do
-            decorate :one_param_method do |another_string|
-              "#{one_param_method_1884eb7af7abbccec3fd4048f99363a3('check')} and #{another_string}"
+            durably_decorate :one_param_method do |another_string|
+              "#{one_param_method_935888f04d9e132be458591d5755cb8131fec457('check')} and #{another_string}"
             end
           end
 
@@ -54,9 +54,9 @@ describe DurableDecorator::Base do
 
         it 'works with explicit method version invocation' do
           ExampleClass.class_eval do
-            decorate :one_param_method do |boolean|
+            durably_decorate :one_param_method do |boolean|
               if boolean
-                one_param_method_old("")
+                one_param_method_original("check and ")
               else
                 "latest"
               end
@@ -68,18 +68,24 @@ describe DurableDecorator::Base do
           instance.one_param_method(false).should == 'latest'
           @original_sha.should_not == @redef_sha
         end
+
+        it 'work with short explicit method version invocation' do
+          instance = ExampleClass.new
+          instance.one_param_method_9358('').should == "original: "
+          instance.one_param_method_935888('').should == "original: "
+        end
       end
 
       context 'for strict definitions' do
         context 'with the correct SHA' do
-          it 'guarantees access to #method_old' do
+          it 'guarantees access to #method_original' do
             ExampleClass.class_eval do
               meta = {
                 :mode => 'strict',
-                :sha => 'ba3114b2d46caa684b3f7ba38d6f74b2'
+                :sha => 'd54f9c7ea2038fac0ae2ff9af49c56f35761725d'
               }
-              decorate :no_param_method, meta do 
-                no_param_method_old + " and a new string"
+              durably_decorate :no_param_method, meta do
+                no_param_method_original + " and a new string"
               end
             end
 
@@ -96,8 +102,8 @@ describe DurableDecorator::Base do
                   :mode => 'strict',
                   :sha => '1234wrong'
                 }
-                decorate :no_param_method, meta do 
-                  no_param_method_old + " and a new string"
+                durably_decorate :no_param_method, meta do
+                  no_param_method_original + " and a new string"
                 end
               end
             }.should raise_error(DurableDecorator::TamperedDefinitionError)
@@ -111,8 +117,8 @@ describe DurableDecorator::Base do
                 meta = {
                   :mode => 'strict'
                 }
-                decorate :no_param_method, meta do 
-                  no_param_method_old + " and a new string"
+                durably_decorate :no_param_method, meta do
+                  no_param_method_original + " and a new string"
                 end
               end
             }.should raise_error(DurableDecorator::InvalidDecorationError)
@@ -125,38 +131,38 @@ describe DurableDecorator::Base do
       it 'throws an error' do
         lambda{
           ExampleClass.class_eval do
-            decorate(:integer_method){ }
+            durably_decorate(:integer_method){ }
           end
         }.should raise_error(DurableDecorator::UndefinedMethodError)
       end
     end
 
     context 'for existing class methods' do
-      it 'guarantees access to ::method_old' do
+      it 'guarantees access to ::method_original' do
         ExampleClass.class_eval do
-          decorate_singleton :clazz_level do 
-            clazz_level_old + " and a new string"
+          durably_decorate_singleton :clazz_level do
+            clazz_level_original + " and a new string"
           end
         end
 
         ExampleClass.clazz_level.should == 'original and a new string'
-      end 
+      end
 
       context 'with incorrect arity' do
         it 'throws an error' do
           lambda{
             ExampleClass.class_eval do
-              decorate_singleton(:clazz_level){|a,b| }
+              durably_decorate_singleton(:clazz_level){|a,b| }
             end
           }.should raise_error(DurableDecorator::BadArityError)
         end
       end
 
       context 'for methods with parameters' do
-        it 'guarantees access to ::method_old' do
+        it 'guarantees access to ::method_original' do
           ExampleClass.class_eval do
-            decorate_singleton :clazz_level_paramed do |another_string|
-              "#{clazz_level_paramed_old('check')} and #{another_string}"
+            durably_decorate_singleton :clazz_level_paramed do |another_string|
+              "#{clazz_level_paramed_original('check')} and #{another_string}"
             end
           end
 
@@ -169,7 +175,7 @@ describe DurableDecorator::Base do
       it 'throws an error' do
         lambda{
           ExampleClass.class_eval do
-            decorate_singleton(:integer_method){ }
+            durably_decorate_singleton(:integer_method){ }
           end
         }.should raise_error(DurableDecorator::UndefinedMethodError)
       end
@@ -177,25 +183,25 @@ describe DurableDecorator::Base do
   end
 
   context 'with modules' do
-  # Spec uses ./sample_module.rb 
+  # Spec uses ./sample_module.rb
     context 'for existing methods' do
-      it 'guarantees access to #method_old' do
+      it 'guarantees access to #method_original' do
         Sample.class_eval do
-          decorate :module_method do 
-            module_method_old + " and a new string"
+          durably_decorate :module_method do
+            module_method_original + " and a new string"
           end
         end
 
         o = Object.new
         o.extend(Sample)
         o.module_method.should == 'original and a new string'
-      end 
+      end
 
       context 'with incorrect arity' do
         it 'throws an error' do
           lambda{
             Sample.class_eval do
-              decorate(:module_method){|a,b| }
+              durably_decorate(:module_method){|a,b| }
             end
           }.should raise_error(DurableDecorator::BadArityError)
         end
@@ -206,7 +212,7 @@ describe DurableDecorator::Base do
       it 'throws an error' do
         lambda{
           Sample.class_eval do
-            decorate(:integer_method){ }
+            durably_decorate(:integer_method){ }
           end
         }.should raise_error(DurableDecorator::UndefinedMethodError)
       end
@@ -226,14 +232,14 @@ describe DurableDecorator::Base do
       context 'when the target is an instance method' do
         it 'should return the sha' do
           DurableDecorator::Base.determine_sha('ExampleClass#no_param_method').should ==
-            'ba3114b2d46caa684b3f7ba38d6f74b2'
+            'd54f9c7ea2038fac0ae2ff9af49c56f35761725d'
         end
       end
 
       context 'when the target is a class method' do
         it 'should return the sha' do
           DurableDecorator::Base.determine_sha('ExampleClass.clazz_level').should ==
-            'c5a3870a3934ce8d2145b841e42a8ad4'
+            'f6490bec1af021697ed8e5990f0d1db3976f065f'
         end
       end
     end

data/spec/spec_helper.rb

@@ -5,5 +5,7 @@ RSpec.configure do |config|
   config.before(:each) do
     load 'example_class.rb'
     load 'sample_module.rb'
+
+    DurableDecorator::Base.reset!
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: durable_decorator
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-14 00:00:00.000000000 Z
+date: 2013-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: method_source