contracts 0.2.3 → 0.2.4

data/lib/decorators.rb

@@ -39,11 +39,11 @@ module MethodDecorators
       if is_class_method
         decorator = klass.new(self, method(name), *args)
         @decorated_methods[:class_methods][name] = decorator
-        is_private = self.private_methods.include?(name)
+        is_private = self.private_methods.include?(name.to_s)
       else
         decorator = klass.new(self, instance_method(name), *args)
         @decorated_methods[:instance_methods][name] = decorator
-        is_private = self.private_instance_methods.include?(name)
+        is_private = self.private_instance_methods.include?(name.to_s)
       end
     end
 
@@ -53,11 +53,16 @@ module MethodDecorators
     # on its own, after doing it's decorating of course.
     class_eval <<-ruby_eval, __FILE__, __LINE__ + 1
       def #{is_class_method ? "self." : ""}#{name}(*args, &blk)
-        this = self#{is_class_method ? "" : ".class"}
-        unless this.respond_to?(:decorated_methods) && !this.decorated_methods.nil?
+        current = self#{is_class_method ? "" : ".class"}
+        ancestors = current.ancestors
+        ancestors.shift # first one is just the class itself
+        while current && !current.respond_to?(:decorated_methods) || current.decorated_methods.nil?
+          current = ancestors.shift
+        end
+        if !current.respond_to?(:decorated_methods) || current.decorated_methods.nil?
           raise "Couldn't find decorator for method " + self.class.name + ":#{name}.\nDoes this method look correct to you? If you are using contracts from rspec, rspec wraps classes in it's own class.\nLook at the specs for contracts.ruby as an example of how to write contracts in this case."
         end
-        this.decorated_methods[#{is_class_method ? ":class_methods" : ":instance_methods"}][#{name.inspect}].call_with(self, *args, &blk)
+        current.decorated_methods[#{is_class_method ? ":class_methods" : ":instance_methods"}][#{name.inspect}].call_with(self, *args, &blk)
       end
       #{is_private ? "private #{name.inspect}" : ""}
     ruby_eval

metadata

@@ -1,50 +1,68 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: contracts
-version: !ruby/object:Gem::Version
-  version: 0.2.3
+version: !ruby/object:Gem::Version 
+  hash: 31
   prerelease: 
+  segments: 
+  - 0
+  - 2
+  - 4
+  version: 0.2.4
 platform: ruby
-authors:
+authors: 
 - Aditya Bhargava
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-07 00:00:00.000000000 Z
+
+date: 2012-06-07 00:00:00 Z
 dependencies: []
-description: This library provides contracts for Ruby. Contracts let you clearly express
-  how your code behaves, and free you from writing tons of boilerplate, defensive
-  code.
+
+description: This library provides contracts for Ruby. Contracts let you clearly express how your code behaves, and free you from writing tons of boilerplate, defensive code.
 email: bluemangroupie@gmail.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - lib/builtin_contracts.rb
 - lib/contracts.rb
 - lib/decorators.rb
 - lib/testable.rb
 homepage: http://github.com/egonSchiele/contracts.ruby
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Contracts for Ruby.
 test_files: []
+