ruby_contracts 0.1.1 → 0.2.1

data/README.md

@@ -38,6 +38,14 @@ Run this sample with `ENABLE_ASSERTION=1 bundle exec ruby example.rb`.
 
 Without the environment variable `ENABLE_ASSERTION` you have zero overhead and zero verification.
 
+## Class inheritance
+
+When you inherit a class that contains contracts, all contracts must be satified by the subclass.
+
+If you override a method, you still have to satisfy the existing contracts for this method and you can add some others.
+
+See the [issue #1](https://github.com/nicoolas25/ruby_contracts/issues/1) for an example.
+
 ## Contributing
 
 1. Fork it

data/lib/ruby_contracts/version.rb

@@ -1,3 +1,3 @@
 module RubyContracts
-  VERSION = "0.1.1"
+  VERSION = "0.2.1"
 end

data/lib/ruby_contracts.rb

@@ -3,14 +3,40 @@ require "ruby_contracts/version"
 module Contracts
   class Error < Exception ; end
 
+  def self.empty_contracts
+    {:before => [], :after => []}
+  end
+
   module DSL
     def self.included(base)
       base.extend Contracts::DSL::ClassMethods
+      base.__contracts_initialize
     end
 
     module ClassMethods
-      def self.extended(base)
-        base.instance_eval "@__contracts = {:before => [], :after => []}"
+      def inherited(subclass)
+        super
+        subclass.__contracts_initialize
+      end
+
+      def __contracts_initialize
+        @__contracts = Contracts.empty_contracts
+        @__contracts_for = {}
+      end
+
+      def __contracts_for(name, current_contracts=nil)
+        inherited_contracts = ancestors[1..-1].reduce(Contracts.empty_contracts) do |c, klass|
+          ancestor_hash = klass.instance_variable_get('@__contracts_for') || {}
+          c[:before] += ancestor_hash.has_key?(name) ? ancestor_hash[name][:before] : []
+          c[:after] += ancestor_hash.has_key?(name) ? ancestor_hash[name][:after] : []
+          c
+        end
+        current_contracts = @__contracts_for[name] || current_contracts || Contracts.empty_contracts
+
+        contracts = Contracts.empty_contracts
+        contracts[:before] = current_contracts[:before] + inherited_contracts[:before]
+        contracts[:after] = current_contracts[:after] + inherited_contracts[:after]
+        contracts
       end
 
       def __contract_failure!(name, message, result, *args)
@@ -32,16 +58,20 @@ module Contracts
       end
 
       def method_added(name)
-        if ENV['ENABLE_ASSERTION'] && (!@__contracts[:before].empty? || !@__contracts[:after].empty?)
-          __contracts_copy = @__contracts
-          @__contracts = {:before => [], :after => []}
+        super
+
+        return unless ENV['ENABLE_ASSERTION']
+        return if @__contracts_for.has_key?(name)
 
+        __contracts = @__contracts_for[name] ||= __contracts_for(name, @__contracts)
+        @__contracts = Contracts.empty_contracts
+
+        if !__contracts[:before].empty? || !__contracts[:after].empty?
           original_method_name = "#{name}__with_contracts"
           define_method(original_method_name, instance_method(name))
 
-
           count = 0
-          before_contracts = __contracts_copy[:before].reduce("") do |code, contract|
+          before_contracts = __contracts[:before].reduce("") do |code, contract|
             type, *args = contract
             case type
             when :type
@@ -71,7 +101,7 @@ module Contracts
             end
           end
 
-          after_contracts = __contracts_copy[:after].reduce("") do |code, contract|
+          after_contracts = __contracts[:after].reduce("") do |code, contract|
             type, *args = contract
             case type
             when :type

metadata

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