ruby_contracts 0.3.0 → 0.3.1

data/lib/ruby_contracts/dsl.rb

@@ -60,23 +60,16 @@ module Contracts
         __contracts = __contracts_for(name.to_s, @__contracts)
         @__contracts = Contracts::List.new
 
-        if !__contracts.empty?
+        if !__contracts.first.empty?
           @__skip_other_contracts_definitions = true
-          original_method_name = "#{name}_without_contracts"
-          define_method(original_method_name, instance_method(name))
-
-          method = <<-EOM
-            def #{name}(*args, &block)
-              __args = block.nil? ? args : args + [block]
-              self.class.__eval_before_contracts("#{name}", self, __args)
-              result = #{original_method_name}(*args, &block)
-              self.class.__eval_after_contracts("#{name}", self, __args, result)
-              return result
-            end
-          EOM
-
-          class_eval method
-
+          original_method = instance_method(name)
+          define_method(name) do |*args, &block|
+            __args = block.nil? ? args : args + [block]
+            self.class.__eval_before_contracts(name.to_s, self, __args)
+            result = original_method.bind(self).(*args, &block)
+            self.class.__eval_after_contracts(name.to_s, self, __args, result)
+            return result
+          end
           @__skip_other_contracts_definitions = false
         end
       end

data/lib/ruby_contracts/version.rb

@@ -1,3 +1,3 @@
 module RubyContracts
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/test/fixtures/inheritance_classes.rb

@@ -15,11 +15,11 @@ class Parent
   pre  "n > minimum_incr" do |n| n > minimum_incr end
   post "value == old value + n" do "[dummy]" end
   def increment(n)
-    value += n
+    @value += n
   end
 
   def to_s
-    value.to_s
+    @value.to_s
   end
 end
 
@@ -35,3 +35,9 @@ class ChildWithAddedPrecondition < Parent
     @value += n
   end
 end
+
+class ChildWithSuper < Parent
+  def increment(n)
+    super
+  end
+end

data/test/inheritance_test.rb

@@ -46,5 +46,13 @@ describe 'the contracts behavior in an inheritance context' do
         end
       end
     end
+
+    describe 'the super keyword usage' do
+      let(:child) { ChildWithSuper.new(10, 3) }
+
+      it 'does not raise any error' do
+        child.increment(5).wont_be_nil
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_contracts
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-16 00:00:00.000000000 Z
+date: 2013-06-17 00:00:00.000000000 Z
 dependencies: []
 description: Micro DSL to add pre & post condition to methods. It tries to bring some
   design by contract in the Ruby world.