contracts 0.0.9 → 0.1.0

data/lib/contracts.rb

@@ -2,12 +2,21 @@ require 'decorators'
 require 'builtin_contracts'
 module Contracts
   def self.included(base)
-    base.extend MethodDecorators
+    common base
   end
 
   def self.extended(base)
-    base.extend MethodDecorators
+    common base
   end
+
+  def self.common base
+    base.extend MethodDecorators
+    base.class_eval do
+      def Contract(*args)
+        self.class.Contract(*args)
+      end
+    end
+  end    
 end
 
 # This is the main Contract class. When you write a new contract, you'll
@@ -206,17 +215,3 @@ class Contract < Decorator
     end
   end
 end
-
-# convenience function for small scripts.
-# Use as:
-#   
-#   use_contracts self
-#
-# And then you can use contracts on functions
-# that aren't in any module or class.
-def use_contracts(this)
-  this.class.send(:include, Contracts)
-  def this.Contract(*args)
-    self.class.Contract(*args)
-  end
-end

data/lib/foo.rb

@@ -1,14 +1,9 @@
 require 'contracts'
-use_contracts(self)
+include Contracts
 
-Contract Num, Num => Num
-def add x, y
-  x + 1
-end
-
-Contract nil => Num
-def test
+Contract Num => Num
+def a(b)
   3
 end
 
-p test
+p a("asd")

metadata

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