durable_decorator 0.0.6 → 0.0.8

data/lib/durable_decorator/base.rb

@@ -22,7 +22,7 @@ module DurableDecorator
         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)
+        alias_definitions clazz, method_name, Util.method_sha(old_method)
         redefine_method clazz, method_name, &block
 
         store_redefinition clazz, method_name, old_method, block
@@ -42,14 +42,10 @@ module DurableDecorator
       def validate_decoration_meta clazz, method_name, old_method, meta
         return unless meta
 
-        chill_meta = {}
-        meta.each do |k,v|
-          chill_meta[k.to_sym] = v
-        end
+        chill_meta = Util.symbolized_hash(meta)
 
         raise InvalidDecorationError, "The hash provided to the decorator is invalid" unless DECORATION_MODES.include? chill_meta[:mode] and chill_meta[:sha] and !chill_meta[:sha].empty?
-        
-        raise TamperedDefinitionError, "Method SHA mismatch, the definition has been tampered with" unless method_sha(old_method) == chill_meta[:sha]
+        raise TamperedDefinitionError, "Method SHA mismatch, the definition has been tampered with" unless Util.method_sha(old_method) == chill_meta[:sha]
       end
 
       def validate_method_arity clazz, method_name, old_method, &block
@@ -90,63 +86,35 @@ module DurableDecorator
         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)]
+        !REDEFINITIONS[Util.full_method_name(clazz, method_name)]
       end
 
       def store_redefinition clazz, name, old_method, new_method
-        methods = REDEFINITIONS[full_method_name(clazz, name)] ||= []
+        methods = REDEFINITIONS[Util.full_method_name(clazz, name)] ||= []
        
         to_store = [new_method]
         to_store.unshift(old_method) if original_redefinition?(clazz, name)
         
         to_store.each do |method|
-          methods << method_hash(name, method)
+          methods << Util.method_hash(name, method)
         end
 
         true
       end
 
-      def method_hash name, method
-        {
-          :name => name,
-          :sha => method_sha(method) 
-        }
-      end
-
-      def method_sha method
-        Digest::SHA1.hexdigest(method.source.gsub(/\s+/, ' '))
-      end
-
       def redefined? clazz, method_name, &block
         begin
           result =
             overrides = REDEFINITIONS[clazz][method_name] and
-            overrides.select{|o| o == method_hash(method_name)}.first and
+            overrides.select{|o| o == Util.method_hash(method_name)}.first and
             true
         rescue
           false
         end
       end
 
-      def logger
-        return @logger if @logger
-
-        @logger = Logging.logger(STDOUT)
-        @logger.level = :warn
-        @logger
-      end
-
       def determine_sha target
         raise "Please provide a fully qualified method name: Module::Clazz#instance_method or ::clazz_method" unless target.match(/\.|#/)
 
@@ -158,7 +126,7 @@ module DurableDecorator
           clazz.method(method_name)
         end
 
-        method_sha(method)
+        Util.method_sha(method)
       end
     end
   end

data/lib/durable_decorator/util.rb

@@ -0,0 +1,44 @@
+module DurableDecorator
+  class Util
+    class << self
+      def symbolized_hash hash
+        chill_hash = {}
+
+        hash.each do |k,v|
+          chill_hash[k.to_sym] = v
+        end
+
+        chill_hash
+      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 method_hash name, method
+        {
+          :name => name,
+          :sha => method_sha(method) 
+        }
+      end
+
+      def method_sha method
+        Digest::SHA1.hexdigest(method.source.gsub(/\s+/, ' '))
+      end
+
+      def logger
+        return @logger if @logger
+
+        @logger = Logging.logger(STDOUT)
+        @logger.level = :warn
+        @logger
+      end
+    end
+  end
+end

data/lib/durable_decorator/version.rb

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

data/lib/durable_decorator.rb

@@ -8,6 +8,7 @@ require 'logging'
 require "durable_decorator/version"
 require "durable_decorator/constantizer"
 require "durable_decorator/base"
+require "durable_decorator/util"
 
 # errors
 require "durable_decorator/bad_arity_error"

data/spec/durable_decorator_spec.rb

@@ -41,32 +41,32 @@ describe DurableDecorator::Base do
 
       context 'for double decorations' do
         before do
-          @original_sha = DurableDecorator::Base.determine_sha("ExampleClass#one_param_method")
-
           ExampleClass.class_eval do
             durably_decorate :one_param_method do |another_string|
               "#{one_param_method_935888f04d9e132be458591d5755cb8131fec457('check')} and #{another_string}"
             end
           end
-
-         @redef_sha = DurableDecorator::Base.determine_sha("ExampleClass#one_param_method")
         end
 
         it 'works with explicit method version invocation' do
           ExampleClass.class_eval do
             durably_decorate :one_param_method do |boolean|
               if boolean
-                one_param_method_original("check and ")
+                one_param_method_original("older")
               else
-                "latest"
+                # 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
               end
             end
           end
 
           instance = ExampleClass.new
-          instance.one_param_method(true).should == "original: check and "
-          instance.one_param_method(false).should == 'latest'
-          @original_sha.should_not == @redef_sha
+          instance.one_param_method(true).should == "original: older"
+          instance.one_param_method(false).should == 'original: check and newer'
         end
 
         it 'work with short explicit method version invocation' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: durable_decorator
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-19 00:00:00.000000000 Z
+date: 2013-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: method_source
@@ -129,6 +129,7 @@ files:
 - lib/durable_decorator/invalid_decoration_error.rb
 - lib/durable_decorator/tampered_definition_error.rb
 - lib/durable_decorator/undefined_method_error.rb
+- lib/durable_decorator/util.rb
 - lib/durable_decorator/version.rb
 - spec/durable_decorator_spec.rb
 - spec/example_class.rb