durable_decorator 0.1.2 → 0.2.0

data/.travis.yml

@@ -7,4 +7,3 @@ rvm:
   - 1.9.2
   - jruby-19mode # JRuby in 1.9 mode
   - rbx-19mode
-  - 1.8.7

data/README.md

@@ -24,6 +24,12 @@ And then execute:
 
     $ bundle
 
+## UPGRADING
+
+Prior to Version 0.2.0 original methods would have a suffix of original or SHA.  A recent change has been made to
+use prefix rather than suffix in order to be compatible with example! and example? methods.  Please review your durably decorated
+methods when upgrading to Version 0.2.0.
+
 ## Usage
 
 ```ruby
@@ -35,7 +41,7 @@ end
 
 ExampleClass.class_eval do
   durably_decorate :string_method do
-    string_method_original + " and new"
+    original_string_method + " and new"
   end
 end
 
@@ -65,7 +71,7 @@ DurableDecorator::Base.determine_sha('ExampleClass#no_param_method')
 
 ExampleClass.class_eval do
   durably_decorate :string_method, mode: 'strict', sha: 'WRONG-SHA-123456' do
-    string_method_original + " and new"
+    original_string_method + " and new"
   end
 end
 
@@ -83,7 +89,7 @@ end
 
 ExampleClass.class_eval do
   durably_decorate :string_method, mode: 'strict', sha: 'ba3114b2d46caa684b3f7ba38d6f74b2' do |text|
-    string_method_original(text) + " and new"
+    original_string_method(text) + " and new"
   end
 end
 
@@ -92,7 +98,7 @@ instance.string_method('test')
 # => "original test and new"
 ```
 
-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```.
+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 ```original_some_method```.
 
 DurableDecorator maintains 3 versions of aliases to previous method versions, 2 of which are short-SHA versions, akin to Github:
 ```ruby
@@ -106,14 +112,14 @@ ExampleClass.class_eval do
 end
 
 # 3 explicit aliases preserve access to the original method based on it's original SHA:
-# 4-char SHA, 6-char SHA and the full SHA suffix
+# 4-char SHA, 6-char SHA and the full SHA prefix
 
 instance = ExampleClass.new
-instance.string_method_ba31
+instance._ba31_string_method
 # => "original"
-instance.string_method_ba3114
+instance._ba3114_string_method
 # => "original"
-instance.string_method_ba3114b2d46caa684b3f7ba38d6f74b2
+instance._ba3114b2d46caa684b3f7ba38d6f74b2_string_method
 # => "original"
 ```
 

data/durable_decorator.gemspec

@@ -18,6 +18,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.required_ruby_version = '>= 1.9.2'
+
   spec.add_dependency "method_source"
   spec.add_dependency "logging"
 

data/lib/durable_decorator/base.rb

@@ -51,9 +51,9 @@ module DurableDecorator
 
       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_sha[0..3]}", method_name)
-          alias_method("#{method_name}_#{old_sha[0..5]}", method_name)
+          alias_method("_#{old_sha}_#{method_name}", method_name)
+          alias_method("_#{old_sha[0..3]}_#{method_name}", method_name)
+          alias_method("_#{old_sha[0..5]}_#{method_name}", method_name)
         end
       end
 
@@ -61,7 +61,7 @@ module DurableDecorator
         return unless original_redefinition? clazz, method_name
 
         clazz.class_eval do
-          alias_method("#{method_name}_original", method_name)
+          alias_method("original_#{method_name}", method_name)
         end
       end
 

data/lib/durable_decorator/validator.rb

@@ -16,7 +16,9 @@ module DurableDecorator
         provided_sha = chill_meta[:sha]
 
         raise InvalidDecorationError, "The :mode provided is invalid. Possible modes are: #{DECORATION_MODES.join(", ")}" unless DECORATION_MODES.include? provided_mode
-        raise InvalidDecorationError, "The SHA provided appears to be empty" unless provided_sha and !provided_sha.empty?
+        if provided_mode == 'strict'
+          raise InvalidDecorationError, "The SHA provided appears to be empty" unless provided_sha and !provided_sha.empty?
+        end
         send("handle_#{chill_meta[:mode]}_fault", clazz, method_name, expected_sha, provided_sha) unless expected_sha == provided_sha
       end
 

data/lib/durable_decorator/version.rb

@@ -1,3 +1,3 @@
 module DurableDecorator
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

data/spec/durable_decorator_spec.rb

@@ -5,10 +5,10 @@ describe DurableDecorator::Base do
   context 'with classes' do
   # Spec uses ./example_class.rb
     context 'for existing instance methods' do
-      it 'guarantees access to #method_original' do
+      it 'guarantees access to #original_method' do
         ExampleClass.class_eval do
           durably_decorate :no_param_method do
-            no_param_method_original + " and a new string"
+            original_no_param_method + " and a new string"
           end
         end
 
@@ -27,10 +27,10 @@ describe DurableDecorator::Base do
       end
 
       context 'for methods with parameters' do
-        it 'guarantees access to #method_original' do
+        it 'guarantees access to #original_method' do
           ExampleClass.class_eval do
             durably_decorate :one_param_method do |another_string|
-              "#{one_param_method_original('check')} and #{another_string}"
+              "#{original_one_param_method('check')} and #{another_string}"
             end
           end
 
@@ -43,7 +43,7 @@ describe DurableDecorator::Base do
         before do
           ExampleClass.class_eval do
             durably_decorate :one_param_method do |another_string|
-              "#{one_param_method_935888f04d9e132be458591d5755cb8131fec457('check')} and #{another_string}"
+              "#{_935888f04d9e132be458591d5755cb8131fec457_one_param_method('check')} and #{another_string}"
             end
           end
         end
@@ -52,14 +52,9 @@ describe DurableDecorator::Base do
           ExampleClass.class_eval do
             durably_decorate :one_param_method do |boolean|
               if boolean
-                one_param_method_original("older")
+                original_one_param_method("older")
               else
-                # ugly hack due to inconsistent method_source behavior on 1.8.7
-                if /^ruby 1\.8\.7/ =~ RUBY_DESCRIPTION
-                  one_param_method_0ec3("newer")
-                else
-                  one_param_method_3c39("newer")
-                end
+                _b844_one_param_method("newer")
               end
             end
           end
@@ -71,8 +66,8 @@ describe DurableDecorator::Base do
 
         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: "
+          instance._9358_one_param_method('').should == "original: "
+          instance._935888_one_param_method('').should == "original: "
         end
 
         it 'maintains history of decorations' do
@@ -89,7 +84,7 @@ describe DurableDecorator::Base do
                 :sha => 'd54f9c7ea2038fac0ae2ff9af49c56f35761725d'
               }
               durably_decorate :no_param_method, meta do
-                no_param_method_original + " and a new string"
+                original_no_param_method + " and a new string"
               end
             end
 
@@ -107,7 +102,7 @@ describe DurableDecorator::Base do
                   :sha => '1234wrong'
                 }
                 durably_decorate :no_param_method, meta do
-                  no_param_method_original + " and a new string"
+                  original_no_param_method + " and a new string"
                 end
               end
             }.should raise_error(DurableDecorator::TamperedDefinitionError)
@@ -122,7 +117,7 @@ describe DurableDecorator::Base do
                   :mode => 'strict'
                 }
                 durably_decorate :no_param_method, meta do
-                  no_param_method_original + " and a new string"
+                  original_no_param_method + " and a new string"
                 end
               end
             }.should raise_error(DurableDecorator::InvalidDecorationError)
@@ -132,14 +127,14 @@ describe DurableDecorator::Base do
 
       context 'for soft definitions' do
         context 'with the correct SHA' do
-          it 'guarantees access to #method_original' do
+          it 'guarantees access to #original_method' do
             ExampleClass.class_eval do
               meta = {
                 :mode => 'soft',
                 :sha => 'd54f9c7ea2038fac0ae2ff9af49c56f35761725d'
               }
               durably_decorate :no_param_method, meta do
-                no_param_method_original + " and a new string"
+                original_no_param_method + " and a new string"
               end
             end
 
@@ -156,7 +151,7 @@ describe DurableDecorator::Base do
                 :sha => '1234wrong'
               }
               durably_decorate :no_param_method, meta do
-                no_param_method_original + " and a new string"
+                original_no_param_method + " and a new string"
               end
             end
             @log_output.readline.should match(/invalid SHA/)
@@ -179,10 +174,10 @@ describe DurableDecorator::Base do
             lambda{
               ExampleClass.class_eval do
                 meta = {
-                  :mode => 'soft'
+                  :mode => 'strict'
                 }
                 durably_decorate :no_param_method, meta do
-                  no_param_method_original + " and a new string"
+                  original_no_param_method + " and a new string"
                 end
               end
             }.should raise_error(DurableDecorator::InvalidDecorationError)
@@ -202,10 +197,10 @@ describe DurableDecorator::Base do
     end
 
     context 'for existing class methods' do
-      it 'guarantees access to ::method_original' do
+      it 'guarantees access to ::original_method' do
         ExampleClass.class_eval do
           durably_decorate_singleton :clazz_level do
-            clazz_level_original + " and a new string"
+            original_clazz_level + " and a new string"
           end
         end
 
@@ -223,10 +218,10 @@ describe DurableDecorator::Base do
       end
 
       context 'for methods with parameters' do
-        it 'guarantees access to ::method_original' do
+        it 'guarantees access to ::original_method' do
           ExampleClass.class_eval do
             durably_decorate_singleton :clazz_level_paramed do |another_string|
-              "#{clazz_level_paramed_original('check')} and #{another_string}"
+              "#{original_clazz_level_paramed('check')} and #{another_string}"
             end
           end
 
@@ -249,10 +244,10 @@ describe DurableDecorator::Base do
   context 'with modules' do
   # Spec uses ./sample_module.rb
     context 'for existing methods' do
-      it 'guarantees access to #method_original' do
+      it 'guarantees access to #original_method' do
         Sample.class_eval do
           durably_decorate :module_method do
-            module_method_original + " and a new string"
+            original_module_method + " and a new string"
           end
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: durable_decorator
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-17 00:00:00.000000000 Z
+date: 2013-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: method_source
@@ -133,7 +133,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: