ruby_contracts 0.2.3 → 0.2.4

data/README.md

@@ -1,6 +1,6 @@
 # RubyContracts
 
-RubyContracts is a small DSL to add pre & post condition to methods. It try to bring some design by contract in the Ruby world.
+RubyContracts is a small DSL to add pre & post condition to methods. It tries to bring some design by contract in the Ruby world.
 
 ## Installation
 

data/Rakefile

@@ -1,2 +1,12 @@
 #!/usr/bin/env rake
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
+require 'rake/testtask'
+
+Rake::TestTask.new do |t|
+  t.libs << 'test'
+  t.pattern = 'test/*_test.rb'
+  t.verbose = true
+end
+
+desc "Run tests"
+task :default => :test

data/lib/ruby_contracts/version.rb

@@ -1,3 +1,3 @@
 module RubyContracts
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

data/lib/ruby_contracts.rb

@@ -34,7 +34,7 @@ module Contracts
       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[name][:before] if ancestor_hash.has_key?(name)
+          c[:before] += ancestor_hash[name][:before] if ancestor_hash.has_key?(name)
           c[:after] += ancestor_hash[name][:after] if ancestor_hash.has_key?(name)
           c
         end
@@ -115,8 +115,8 @@ module Contracts
             code << "__before_contracts_disjunction << __before_contracts_conjunction\n"
             code
           end
-          before_contracts << "if __before_contracts_disjunction.any?{|conj| !conj.empty?} then\n"
-          before_contracts << "  self.class.__contract_failure!(*__before_contracts_disjunction.first.first)\n"
+          before_contracts << "unless __before_contracts_disjunction.any?{|conj| conj.empty?} then\n"
+          before_contracts << "  self.class.__contract_failure!(*__before_contracts_disjunction.find{|conj| !conj.empty?}.first)\n"
           before_contracts << "end\n"
 
           after_contracts = __contracts[:after].reduce("") do |code, contract|
@@ -124,7 +124,7 @@ module Contracts
             case type
             when :type
               code << "if !result.kind_of?(#{args[0]}) then\n"
-              code << "self.class.__contract_failure!(name, \"result must be a kind of '#{args[0]}' not '%s'\" % [result.class.to_s], result, *__args)\n"
+              code << "  self.class.__contract_failure!(name, \"result must be a kind of '#{args[0]}' not '%s'\" % [result.class.to_s], result, *__args)\n"
               code << "end\n"
               code
             when :result

data/ruby_contracts.gemspec

@@ -7,8 +7,8 @@ require 'ruby_contracts/version'
 Gem::Specification.new do |gem|
   gem.authors       = ["nicoolas25"]
   gem.email         = ["nicoolas25@gmail.com"]
-  gem.description   = %q{Micro DSL to add pre & post condition to methods. It try to bring some design by contract in the Ruby world.}
-  gem.summary       = %q{Micro DSL to add pre & post condition to methods. It try to bring some design by contract in the Ruby world.}
+  gem.description   = %q{Micro DSL to add pre & post condition to methods. It tries to bring some design by contract in the Ruby world.}
+  gem.summary       = %q{Micro DSL to add pre & post condition to methods. It tries to bring some design by contract in the Ruby world.}
   gem.homepage      = ""
 
   gem.files         = `git ls-files`.split($\)

data/test/fixtures/inheritance_classes.rb

@@ -0,0 +1,37 @@
+class Parent
+  include Contracts::DSL
+  EPSILON = 1e-7
+  attr_reader :value, :minimum_incr
+
+  type :in => [Numeric, Numeric]
+  pre  "val >= 0, mininc > 0" do |v, mininc| v >= 0 && mininc > 0 end
+  post "initialized" do |result, v, mininc| @value == v && @minimum_incr == mininc end
+  def initialize(v, mininc)
+    @value = v
+    @minimum_incr = mininc
+  end
+
+  type :in => [Numeric], :out => Numeric
+  pre  "n > minimum_incr" do |n| n > minimum_incr end
+  post "value == old value + n" do "[dummy]" end
+  def increment(n)
+    value += n
+  end
+
+  def to_s
+    value.to_s
+  end
+end
+
+class ChildWithRedef < Parent
+  def increment(n)
+    @value += n
+  end
+end
+
+class ChildWithAddedPrecondition < Parent
+  pre "n >= minimum_incr" do |n| n >= minimum_incr end
+  def increment(n)
+    @value += n
+  end
+end

data/test/inheritance_test.rb

@@ -0,0 +1,41 @@
+require 'test_helper'
+
+require_relative 'fixtures/inheritance_classes'
+
+describe 'the contracts behavior in an inheritance context' do
+  describe 'the initialization process' do
+    describe 'with valid arguments' do
+      it 'should not raise any exception' do
+        Parent.new(10, 2).wont_be_nil
+        ChildWithRedef.new(10, 2).wont_be_nil
+      end
+    end
+
+    describe 'with invalid arguments' do
+      it 'should raise an Contracts::Error' do
+        proc { ChildWithRedef.new(10, 0) }.must_raise Contracts::Error
+      end
+    end
+  end
+
+
+  describe 'the redifinition of an existing method with precondition' do
+    describe 'the child\'s overriden method call' do
+      describe 'the child specifies no precondition' do
+        let(:child) { ChildWithRedef.new(10,3) }
+        it 'satisfies the parent preconditions' do
+          child.increment(4)
+          proc { child.increment(3) }.must_raise Contracts::Error
+        end
+      end
+
+      describe 'the child specifies additionnal preconditions' do
+        let(:child) { ChildWithAddedPrecondition.new(10, 3) }
+        it 'satisfies the parent OR the child preconditions' do
+          child.increment(3)
+          proc { child.increment(2) }.must_raise Contracts::Error
+        end
+      end
+    end
+  end
+end

data/test/test_helper.rb

@@ -0,0 +1,4 @@
+ENV['ENABLE_ASSERTION'] = '1'
+
+require 'ruby_contracts'
+require 'minitest/autorun'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_contracts
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,9 +9,9 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-13 00:00:00.000000000 Z
+date: 2013-06-14 00:00:00.000000000 Z
 dependencies: []
-description: Micro DSL to add pre & post condition to methods. It try to bring some
+description: Micro DSL to add pre & post condition to methods. It tries to bring some
   design by contract in the Ruby world.
 email:
 - nicoolas25@gmail.com
@@ -27,6 +27,9 @@ files:
 - lib/ruby_contracts.rb
 - lib/ruby_contracts/version.rb
 - ruby_contracts.gemspec
+- test/fixtures/inheritance_classes.rb
+- test/inheritance_test.rb
+- test/test_helper.rb
 homepage: ''
 licenses: []
 post_install_message: 
@@ -50,7 +53,10 @@ rubyforge_project:
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: Micro DSL to add pre & post condition to methods. It try to bring some design
-  by contract in the Ruby world.
-test_files: []
+summary: Micro DSL to add pre & post condition to methods. It tries to bring some
+  design by contract in the Ruby world.
+test_files:
+- test/fixtures/inheritance_classes.rb
+- test/inheritance_test.rb
+- test/test_helper.rb
 has_rdoc: