contracts 0.1.0 → 0.1.1

data/lib/builtin_contracts.rb

@@ -10,7 +10,7 @@ And then use these or write your own!
 
 A simple example:
 
-  Contract Num, Num, Num
+  Contract Num, Num => Num
   def add(a, b)
      a + b
    end
@@ -353,6 +353,8 @@ module Contracts
     end
   end
 
+  # Used to define contracts on functions passed in as arguments.
+  # Example: <tt>Func[Num => Num] # the function should take a number and return a number</tt>
   class Func < CallableClass
     attr_reader :contracts    
     def initialize(*contracts)

data/lib/contracts.rb

@@ -124,6 +124,10 @@ class Contract < Decorator
     end
   end
 
+  def [](*args, &blk)
+    call(*args, &blk)
+  end
+
   def call(*args, &blk)
     call_with(nil, *args, &blk)
   end

data/lib/decorators.rb

@@ -53,11 +53,15 @@ module MethodDecorators
     class_eval <<-ruby_eval, __FILE__, __LINE__ + 1
       def #{is_class_method ? "self." : ""}#{name}(*args, &blk)
         ret = nil
-        self.#{is_class_method ? "" : "class."}decorated_methods[#{name.inspect}].each do |decorator|
+        this = self#{is_class_method ? "" : ".class"}
+        unless this.respond_to?(:decorated_methods) && !this.decorated_methods.nil?
+          raise "Couldn't find decorator for method " + self.class.name + ":#{name}.\nDoes this method look correct to you? If you are using contracts from rspec, rspec wraps classes in it's own class.\nLook at the specs for contracts.ruby as an example of how to write contracts in this case."
+        end
+        this.decorated_methods[#{name.inspect}].each do |decorator|
           ret = decorator.call_with(self, *args, &blk)
         end
         ret
-      end
+      end    
     ruby_eval
   end    
 

data/lib/foo.rb

@@ -1,9 +1,13 @@
 require 'contracts'
 include Contracts
 
-Contract Num => Num
-def a(b)
-  3
+Contract ArrayOf[Num], Func[Num => Num] => ArrayOf[Num]
+def map(arr, func)
+  ret = []
+  arr.each do |x|
+    ret << func[x]
+  end
+  ret
 end
 
-p a("asd")
+p map([1, 2, 3], lambda { |x| x + 1 })

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: contracts
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Aditya Bhargava