contracts 0.0.8 → 0.0.9

data/lib/contracts.rb

@@ -20,6 +20,12 @@ class Contract < Decorator
   attr_accessor :contracts, :klass, :method
   # decorator_name :contract
   def initialize(klass, method, *contracts)
+    if contracts[-1].is_a? Hash
+      # internally we just convert that return value syntax back to an array
+      contracts = contracts[0, contracts.size - 1] + contracts[-1].keys + contracts[-1].values
+    else
+      fail "It looks like your contract for #{method} doesn't have a return value. A contract should be written as `Contract arg1, arg2 => return_value`."
+    end
     @klass, @method, @contracts = klass, method, contracts
   end
 
@@ -115,17 +121,6 @@ class Contract < Decorator
 
   def call_with(this, *args, &blk)
     _args = blk ? args + [blk] : args
-    if _args.size != @contracts.size - 1
-      # so it's not *args
-      unless @contracts.any? { |contract| contract.is_a? Contracts::Args }
-        raise %{The number of arguments doesn't match the number of contracts.
-Did you forget to write a contract for the return value of the function?
-Or if you want a variable number of arguments using *args, use the Args contract.
-Args: #{args.inspect}
-Contracts: #{@contracts.map { |t| t.is_a?(Class) ? t.name : t.class.name }.join(", ")}}
-      end
-    end
-
     res = Contract.validate_all(_args, @contracts[0, @contracts.size - 1], @klass, @method)
     return if res == false
 
@@ -144,10 +139,8 @@ Contracts: #{@contracts.map { |t| t.is_a?(Class) ? t.name : t.class.name }.join(
       # class method
       result = @method.call(*args, &blk)
     end
-    
-    if args.size == @contracts.size - 1
-      Contract.validate(result, @contracts[-1], @klass, @method, @contracts)
-    end
+
+    Contract.validate(result, @contracts[-1], @klass, @method, @contracts)
     result
   end
 

data/lib/foo.rb

@@ -1,15 +1,14 @@
 require 'contracts'
 use_contracts(self)
 
-add = Proc.new do |x|
-  1
+Contract Num, Num => Num
+def add x, y
+  x + 1
 end
 
-Contract ArrayOf[Num], Func[String, Num], ArrayOf[Num]
-def map nums, func
-  nums.map do |num|
-    func.call(num)
-  end
+Contract nil => Num
+def test
+  3
 end
 
-p map([1, 2, 3], add)
+p test

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: contracts
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 0
-  - 8
-  version: 0.0.8
+  - 9
+  version: 0.0.9
 platform: ruby
 authors: 
 - Aditya Bhargava