ruby_contracts 0.2.4 → 0.2.5

data/lib/ruby_contracts/version.rb

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

data/lib/ruby_contracts.rb

@@ -87,13 +87,15 @@ module Contracts
               case type
               when :type
                 classes = args[0]
-                code << "if __args.size < #{classes.size} then\n"
-                code << "  __before_contracts_conjunction << ['#{name}', \"need at least #{classes.size} arguments (%i given)\" % [__args.size], nil, *args]\n"
-                code << "else\n"
+                code << "if __before_contracts_conjunction.empty? then\n"
+                code << "  if __args.size < #{classes.size} then\n"
+                code << "    __before_contracts_conjunction << ['#{name}', \"need at least #{classes.size} arguments (%i given)\" % [__args.size], nil, *args]\n"
+                code << "  else\n"
                 conditions = []
                 classes.each_with_index{ |klass, i| conditions << "__args[#{i}].kind_of?(#{klass})" }
-                code << "  if !(#{conditions.join(' && ')}) then\n"
-                code << "    __before_contracts_conjunction << ['#{name}', 'input type error', nil, *__args]\n"
+                code << "    if !(#{conditions.join(' && ')}) then\n"
+                code << "      __before_contracts_conjunction << ['#{name}', 'input type error', nil, *__args]\n"
+                code << "    end\n"
                 code << "  end\n"
                 code << "end\n"
                 code
@@ -103,8 +105,10 @@ module Contracts
                 contract_method_name = "__verify_contract_#{name}_in_#{count = count + 1}"
                 define_method(contract_method_name) { |*params| self.instance_exec(*params, &args[1]) }
 
-                code << "if !#{contract_method_name}(*__args) then\n"
-                code << "  __before_contracts_conjunction << ['#{name}', \"invalid precondition: #{args[0]}\", nil, *__args]\n"
+                code << "if __before_contracts_conjunction.empty? then\n"
+                code << "  if !#{contract_method_name}(*__args) then\n"
+                code << "    __before_contracts_conjunction << ['#{name}', \"invalid precondition: #{args[0]}\", nil, *__args]\n"
+                code << "  end\n"
                 code << "end\n"
                 code
               else

data/test/fixtures/preconditions_classes.rb

@@ -0,0 +1,14 @@
+class SomeClass
+  include Contracts::DSL
+
+  type :in => [Numeric]
+  def method(num)
+    num + 5
+  end
+
+  type :in => [Numeric]
+  pre 'input should be > 0' do |input| input > 0 end
+  def method2(num)
+    num + 5
+  end
+end

data/test/preconditions_test.rb

@@ -0,0 +1,26 @@
+require 'test_helper'
+
+require_relative 'fixtures/preconditions_classes'
+
+
+describe 'the type precondition' do
+  # method contains only one precondition about the input type
+  # method2 is used to see the behaviour in presence of other preconditions
+
+  let(:instance) { SomeClass.new }
+
+  it 'should raise an exception if there is an unexpected number of arguments' do
+    proc { instance.method() }.must_raise Contracts::Error
+    proc { instance.method2() }.must_raise Contracts::Error
+  end
+
+  it 'should raise an exception if an argument have the wrong type' do
+    proc { instance.method('five') }.must_raise Contracts::Error
+    proc { instance.method2('five') }.must_raise Contracts::Error
+  end
+
+  it 'should run and return normally if there is the expected arguments' do
+    instance.method(5).must_equal 10
+    instance.method2(5).must_equal 10
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_contracts
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-14 00:00:00.000000000 Z
+date: 2013-06-15 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.
@@ -28,7 +28,9 @@ files:
 - lib/ruby_contracts/version.rb
 - ruby_contracts.gemspec
 - test/fixtures/inheritance_classes.rb
+- test/fixtures/preconditions_classes.rb
 - test/inheritance_test.rb
+- test/preconditions_test.rb
 - test/test_helper.rb
 homepage: ''
 licenses: []
@@ -57,6 +59,8 @@ summary: Micro DSL to add pre & post condition to methods. It tries to bring som
   design by contract in the Ruby world.
 test_files:
 - test/fixtures/inheritance_classes.rb
+- test/fixtures/preconditions_classes.rb
 - test/inheritance_test.rb
+- test/preconditions_test.rb
 - test/test_helper.rb
 has_rdoc: