contracts 0.2.0 → 0.2.1

data/lib/builtin_contracts.rb

@@ -264,6 +264,7 @@ module Contracts
     end
 
     def valid?(vals)
+      return false unless vals.is_a?(Array)
       vals.all? do |val|
         res, _ = Contract.valid?(val, @contract)
         res

data/lib/contracts.rb

@@ -1,6 +1,9 @@
 require 'decorators'
 require 'builtin_contracts'
 
+class ContractError < ArgumentError
+end
+
 module Contracts
   def self.included(base)
     common base
@@ -77,7 +80,11 @@ class Contract < Decorator
               end
 
     if RUBY_VERSION =~ /^1\.8/
-      position = data[:method].__file__ + ":" + data[:method].__line__.to_s
+      if data[:method].respond_to?(:__file__)
+        position = data[:method].__file__ + ":" + data[:method].__line__.to_s
+      else
+        position = data[:method].inspect
+      end
     else
       file, line = data[:method].source_location
       position = file + ":" + line.to_s
@@ -105,7 +112,7 @@ class Contract < Decorator
   #     exit
   #   end
   def self.failure_callback(data)
-    raise failure_msg(data)
+    raise ContractError, failure_msg(data)
   end
 
   # Used to verify if an argument satisfies a contract.

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: contracts
 version: !ruby/object:Gem::Version 
+  hash: 21
   prerelease: 
-  version: 0.2.0
+  segments: 
+  - 0
+  - 2
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Aditya Bhargava
@@ -25,8 +30,6 @@ files:
 - lib/builtin_contracts.rb
 - lib/contracts.rb
 - lib/decorators.rb
-- lib/decorators_aliased.rb
-- lib/decorators_old.rb
 - lib/testable.rb
 homepage: http://github.com/egonSchiele/contracts.ruby
 licenses: []
@@ -41,17 +44,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Contracts for Ruby.

data/lib/decorators_aliased.rb

@@ -1,102 +0,0 @@
-module MethodDecorators
-  def self.extended(klass)
-    klass.class_eval do
-      @@__decorated_methods ||= {}
-      def self.__decorated_methods
-        @@__decorated_methods
-      end
-
-      def self.__decorated_methods_set(k, v)
-        @@__decorated_methods[k] = v
-      end
-    end
-  end
-
-  # first, when you write a contract, the decorate method gets called which
-  # sets the @decorators variable. Then when the next method after the contract
-  # is defined, method_added is called and we look at the @decorators variable
-  # to find the decorator for that method. This is how we associate decorators
-  # with methods.
-  def method_added(name)
-    common_method_added name, false
-    super
-  end
-
-  # For Ruby 1.9
-  def singleton_method_added name
-    common_method_added name, true
-    super
-  end
-
-  def common_method_added name, is_class_method
-    return unless @decorators
-
-    decorators = @decorators.dup
-    @decorators = nil
-
-    decorators.each do |klass, args|
-      # a reference to the method gets passed into the contract here. This is good because
-      # we are going to redefine this method with a new name below...so this reference is
-      # now the *only* reference to the old method that exists.
-      if klass.respond_to? :new
-        if is_class_method
-          decorator = klass.new(*args)
-        else
-          decorator = klass.new(*args)
-        end
-      else
-        decorator = klass
-      end
-      __decorated_methods_set(name, decorator)
-    end
-
-    # in place of this method, we are going to define our own method. This method
-    # just calls the decorator passing in all args that were to be passed into the method.
-    # The decorator in turn has a reference to the actual method, so it can call it
-    # on its own, after doing it's decorating of course.
-    alias_method :"original_#{name}", name
-    class_eval %{
-      def #{is_class_method ? "self." : ""}#{name}(*args, &blk)
-        this = self#{is_class_method ? "" : ".class"}
-        #this.__decorated_methods[#{name.inspect}].check_args(*args, &blk)
-  raise unless args[0].is_a?(Numeric)
-  raise unless args[1].is_a?(Numeric)
-
-        res = self.send :"original_#{name}", *args, &blk
-  raise unless res.is_a?(Numeric)
-        #this.__decorated_methods[#{name.inspect}].check_res(res)
-        res
-      end
-      }, __FILE__, __LINE__ + 1
-  end    
-
-  def decorate(klass, *args)
-    @decorators ||= []
-    @decorators << [klass, args]
-  end
-end
-
-class Decorator
-  # an attr_accessor for a class variable:
-  class << self; attr_accessor :decorators; end
-
-  def self.inherited(klass)
-    name = klass.name.gsub(/^./) {|m| m.downcase}
-
-    return if name =~ /^[^A-Za-z_]/ || name =~ /[^0-9A-Za-z_]/
-
-    # the file and line parameters set the text for error messages
-    # make a new method that is the name of your decorator.
-    # that method accepts random args and a block.
-    # inside, `decorate` is called with those params.
-    MethodDecorators.module_eval <<-ruby_eval, __FILE__, __LINE__ + 1
-      def #{klass}(*args, &blk)
-        decorate(#{klass}, *args, &blk)
-      end
-    ruby_eval
-  end
-
-  def initialize(klass, method)
-    @method = method
-  end
-end

data/lib/decorators_old.rb

@@ -1,97 +0,0 @@
-module MethodDecorators
-  def self.extended(klass)
-    class << klass
-      attr_accessor :decorated_methods
-    end
-  end
-
-  # first, when you write a contract, the decorate method gets called which
-  # sets the @decorators variable. Then when the next method after the contract
-  # is defined, method_added is called and we look at the @decorators variable
-  # to find the decorator for that method. This is how we associate decorators
-  # with methods.
-  def method_added(name)
-    common_method_added name, false
-    super
-  end
-
-  def singleton_method_added name
-    common_method_added name, true
-    super
-  end
-
-  def common_method_added name, is_class_method
-    return unless @decorators
-
-    decorators = @decorators.dup
-    @decorators = nil
-    @decorated_methods ||= Hash.new {|h,k| h[k] = []}
-
-    # attr_accessor on the class variable decorated_methods
-    class << self; attr_accessor :decorated_methods; end
-
-    decorators.each do |klass, args|
-      # a reference to the method gets passed into the contract here. This is good because
-      # we are going to redefine this method with a new name below...so this reference is
-      # now the *only* reference to the old method that exists.
-      if klass.respond_to? :new
-        if is_class_method
-          decorator = klass.new(self, method(name), *args)
-        else
-          decorator = klass.new(self, instance_method(name), *args)
-        end
-      else
-        decorator = klass
-      end
-      @decorated_methods[name] << decorator
-    end
-
-    # in place of this method, we are going to define our own method. This method
-    # just calls the decorator passing in all args that were to be passed into the method.
-    # The decorator in turn has a reference to the actual method, so it can call it
-    # on its own, after doing it's decorating of course.
-    class_eval <<-ruby_eval, __FILE__, __LINE__ + 1
-      def #{is_class_method ? "self." : ""}#{name}(*args, &blk)
-        ret = nil
-        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    
-    ruby_eval
-  end    
-
-  def decorate(klass, *args)
-    @decorators ||= []
-    @decorators << [klass, args]
-  end
-end
-
-class Decorator
-  # an attr_accessor for a class variable:
-  class << self; attr_accessor :decorators; end
-
-  def self.inherited(klass)
-    name = klass.name.gsub(/^./) {|m| m.downcase}
-
-    return if name =~ /^[^A-Za-z_]/ || name =~ /[^0-9A-Za-z_]/
-
-    # the file and line parameters set the text for error messages
-    # make a new method that is the name of your decorator.
-    # that method accepts random args and a block.
-    # inside, `decorate` is called with those params.
-    MethodDecorators.module_eval <<-ruby_eval, __FILE__, __LINE__ + 1
-      def #{klass}(*args, &blk)
-        decorate(#{klass}, *args, &blk)
-      end
-    ruby_eval
-  end
-
-  def initialize(klass, method)
-    @method = method
-  end
-end