ruby_contracts 0.3.1 → 0.3.2

data/lib/ruby_contracts/dsl.rb

@@ -9,6 +9,10 @@ module Contracts
       end
     end
 
+    def implies(arg1, arg2)
+      ! arg1 || arg2
+    end
+
     module ClassMethods
       def inherited(subclass)
         super
@@ -77,9 +81,10 @@ module Contracts
       def __eval_before_contracts(name, context, arguments)
         last_failure_msg = nil
         __contracts_for(name).each do |contracts|
-          next if contracts.empty?
+          before_contracts = contracts.before_contracts
+          next if before_contracts.empty?
           success = true
-          contracts.before_contracts.each do |contract|
+          before_contracts.each do |contract|
             begin
               unless satisfied = contract.satisfied?(context, arguments)
                 last_failure_msg = contract.message
@@ -100,8 +105,9 @@ module Contracts
 
       def __eval_after_contracts(name, context, arguments, result)
         __contracts_for(name).each do |contracts|
-          next if contracts.empty?
-          contracts.after_contracts.each do |contract|
+          after_contracts = contracts.after_contracts
+          next if after_contracts.empty?
+          after_contracts.each do |contract|
             begin
               unless satisfied = contract.satisfied?(context, arguments, result)
               __contract_failure!(name, contract.message, result, arguments)

data/lib/ruby_contracts/version.rb

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

data/test/dsl_test.rb

@@ -0,0 +1,17 @@
+require 'test_helper'
+
+require_relative 'fixtures/dsl_classes'
+
+describe 'the implies keyword' do
+  it 'should be false and raise a Contracts::Error when the condition is true but the implication is false' do
+    proc { FalseImplies.new.method1 }.must_raise Contracts::Error
+  end
+
+  it 'should be true and not produce any Contracts::Error when the condition is false' do
+    TrueImplies.new.method1.must_be_nil
+  end
+
+  it 'should be true and not produce any Contracts::Error when the condition is true and the implication is true' do
+    TrueImplies.new.method2.must_be_nil
+  end
+end

data/test/fixtures/dsl_classes.rb

@@ -0,0 +1,19 @@
+class FalseImplies
+  include Contracts::DSL
+
+  pre "true -> false" do implies(true, false) end
+  def method1
+  end
+end
+
+class TrueImplies
+  include Contracts::DSL
+
+  pre "false -> true" do implies(false, true) end
+  def method1
+  end
+
+  pre "true -> true" do implies(true, true) end
+  def method2
+  end
+end

data/test/fixtures/inheritance_classes.rb

@@ -1,6 +1,5 @@
 class Parent
   include Contracts::DSL
-  EPSILON = 1e-7
   attr_reader :value, :minimum_incr
 
   type :in => [Numeric, Numeric]
@@ -13,7 +12,7 @@ class Parent
 
   type :in => [Numeric], :out => Numeric
   pre  "n > minimum_incr" do |n| n > minimum_incr end
-  post "value == old value + n" do "[dummy]" end
+  post "result >= n" do |result, n| result >= n  end
   def increment(n)
     @value += n
   end
@@ -36,6 +35,13 @@ class ChildWithAddedPrecondition < Parent
   end
 end
 
+class ChildWithAddedPostcondition < Parent
+  post "true" do true end
+  def increment(n)
+    @value += n
+  end
+end
+
 class ChildWithSuper < Parent
   def increment(n)
     super

data/test/inheritance_test.rb

@@ -46,13 +46,31 @@ describe 'the contracts behavior in an inheritance context' do
         end
       end
     end
+  end
 
-    describe 'the super keyword usage' do
-      let(:child) { ChildWithSuper.new(10, 3) }
+  describe 'the redifinition of an existing method with postcondition' do
+    describe 'the child\'s overriden method call' do
+      describe 'the child specifies no postcondition' do
+        let(:child) { ChildWithRedef.new(10,3) }
+        it 'satisfies the parent postconditions' do
+          child.increment(4).wont_be_nil
+        end
+      end
 
-      it 'does not raise any error' do
-        child.increment(5).wont_be_nil
+      describe 'the child specifies additionnal postconditions' do
+        let(:child) { ChildWithAddedPostcondition.new(10, 3) }
+        it 'satisfies the parent preconditions' do
+          proc { child.increment(2) }.must_raise Contracts::Error
+        end
       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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_contracts
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-17 00:00:00.000000000 Z
+date: 2013-06-27 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.
@@ -34,6 +34,8 @@ files:
 - lib/ruby_contracts/precondition.rb
 - lib/ruby_contracts/version.rb
 - ruby_contracts.gemspec
+- test/dsl_test.rb
+- test/fixtures/dsl_classes.rb
 - test/fixtures/inheritance_classes.rb
 - test/fixtures/preconditions_classes.rb
 - test/inheritance_test.rb
@@ -65,6 +67,8 @@ specification_version: 3
 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/dsl_test.rb
+- test/fixtures/dsl_classes.rb
 - test/fixtures/inheritance_classes.rb
 - test/fixtures/preconditions_classes.rb
 - test/inheritance_test.rb