contracts 0.11.0 → 0.12.0

data/lib/contracts/core.rb

@@ -24,13 +24,22 @@ module Contracts
         end
       end
 
-      base.class_eval do
+      # NOTE: Workaround for `defined?(super)` bug in ruby 1.9.2
+      # source: http://stackoverflow.com/a/11181685
+      # bug: https://bugs.ruby-lang.org/issues/6644
+      base.class_eval <<-RUBY
         # TODO: deprecate
         # Required when contracts are included in global scope
         def Contract(*args)
-          self.class.Contract(*args)
+          if defined?(super)
+            super
+          else
+            self.class.Contract(*args)
+          end
         end
+      RUBY
 
+      base.class_eval do
         def functype(funcname)
           contracts = Engine.fetch_from(self.class).decorated_methods_for(:instance_methods, funcname)
           if contracts.nil?

data/lib/contracts/formatters.rb

@@ -90,7 +90,7 @@ module Contracts
 
       def plain?
         # Not a type of contract that can have a custom to_s defined
-        !@value.is_a?(CallableClass) && @value.class != Class
+        !@value.is_a?(Builtin::CallableClass) && @value.class != Class
       end
 
       def useful_to_s?
@@ -103,7 +103,7 @@ module Contracts
       end
 
       def strip_prefix(val)
-        val.gsub(/^Contracts::/, "")
+        val.gsub(/^Contracts::Builtin::/, "")
       end
     end
 

data/lib/contracts/validators.rb

@@ -31,6 +31,12 @@ module Contracts
         end
       end,
 
+      Regexp => lambda do |contract|
+        lambda do |arg|
+          arg =~ contract
+        end
+      end,
+
       Contracts::Args => lambda do |contract|
         lambda do |arg|
           Contract.valid?(arg, contract.contract)

data/lib/contracts/version.rb

@@ -1,3 +1,3 @@
 module Contracts
-  VERSION = "0.11.0"
+  VERSION = "0.12.0"
 end

data/script/cucumber

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+if ruby -e 'exit(1) unless RUBY_VERSION.to_f >= 2.0'; then
+  bundle exec cucumber
+fi

data/script/docs-release

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+relish push contracts/contracts-ruby

data/script/docs-staging

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+relish push contracts-staging/contracts-ruby

data/spec/builtin_contracts_spec.rb

@@ -392,7 +392,7 @@ RSpec.describe "Contracts:" do
       end
 
       context "given String => Num" do
-        it { expect(Contracts::HashOf[String, Contracts::Num].to_s).to eq("Hash<String, Contracts::Num>") }
+        it { expect(Contracts::HashOf[String, Contracts::Num].to_s).to eq("Hash<String, Contracts::Builtin::Num>") }
       end
     end
   end

data/spec/contracts_spec.rb

@@ -717,4 +717,33 @@ RSpec.describe "Contracts:" do
       expect { c.double("asd") }.to raise_error
     end
   end
+
+  describe "classes with extended modules" do
+    let(:klass) do
+      m = Module.new do
+        include Contracts::Core
+      end
+
+      Class.new do
+        include Contracts::Core
+        extend m
+
+        Contract String => nil
+        def foo(x)
+        end
+      end
+    end
+
+    it "is possible to define it" do
+      expect { klass }.not_to raise_error
+    end
+
+    it "works correctly with methods with passing contracts" do
+      expect { klass.new.foo("bar") }.not_to raise_error
+    end
+
+    it "works correctly with methods with passing contracts" do
+      expect { klass.new.foo(42) }.to raise_error(ContractError, /Expected: String/)
+    end
+  end
 end

data/spec/fixtures/fixtures.rb

@@ -123,6 +123,18 @@ class GenericExample
   def hash_keywordargs(data)
   end
 
+  Contract (/foo/) => nil
+  def should_contain_foo(s)
+  end
+
+  Contract ({ :host => /foo/ }) => nil
+  def hash_containing_foo(s)
+  end
+
+  Contract C::ArrayOf[/foo/] => nil
+  def array_containing_foo(s)
+  end
+
   Contract [C::Or[TrueClass, FalseClass]] => nil
   def array_complex_contracts(data)
   end

data/spec/validators_spec.rb

@@ -1,9 +1,9 @@
 require "spec_helper"
 
-module Contracts
-  RSpec.describe "range contract validator" do
-    subject(:o) { GenericExample.new }
+RSpec.describe "Contract validators" do
+  subject(:o) { GenericExample.new }
 
+  describe "Range" do
     it "passes when value is in range" do
       expect do
         o.method_with_range_contract(5)
@@ -22,4 +22,26 @@ module Contracts
       end.to raise_error(ContractError, /Expected: 1\.\.10.*Actual: "hello world"/m)
     end
   end
+
+  describe "Regexp" do
+    it "should pass for a matching string" do
+      expect { o.should_contain_foo("containing foo") }.to_not raise_error
+    end
+
+    it "should fail for a non-matching string" do
+      expect { o.should_contain_foo("that's not F00") }.to raise_error(ContractError)
+    end
+
+    describe "within a hash" do
+      it "should pass for a matching string" do
+        expect { o.hash_containing_foo(:host => "foo.example.org") }.to_not raise_error
+      end
+    end
+
+    describe "within an array" do
+      it "should pass for a matching string" do
+        expect { o.array_containing_foo(["foo"]) }.to_not raise_error
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: contracts
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Aditya Bhargava
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-30 00:00:00.000000000 Z
+date: 2015-09-20 00:00:00.000000000 Z
 dependencies: []
 description: This library provides contracts for Ruby. Contracts let you clearly express
   how your code behaves, and free you from writing tons of boilerplate, defensive
@@ -18,10 +18,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".rubocop.yml"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .rubocop.yml
+- .travis.yml
 - CHANGELOG.markdown
 - Gemfile
 - README.md
@@ -34,6 +34,36 @@ files:
 - benchmarks/io.rb
 - benchmarks/wrap_test.rb
 - contracts.gemspec
+- cucumber.yml
+- features/README.md
+- features/basics/functype.feature
+- features/basics/simple_example.feature
+- features/builtin_contracts/README.md
+- features/builtin_contracts/and.feature
+- features/builtin_contracts/any.feature
+- features/builtin_contracts/args.feature
+- features/builtin_contracts/array_of.feature
+- features/builtin_contracts/bool.feature
+- features/builtin_contracts/enum.feature
+- features/builtin_contracts/eq.feature
+- features/builtin_contracts/exactly.feature
+- features/builtin_contracts/func.feature
+- features/builtin_contracts/hash_of.feature
+- features/builtin_contracts/keyword_args.feature
+- features/builtin_contracts/maybe.feature
+- features/builtin_contracts/nat.feature
+- features/builtin_contracts/neg.feature
+- features/builtin_contracts/none.feature
+- features/builtin_contracts/not.feature
+- features/builtin_contracts/num.feature
+- features/builtin_contracts/or.feature
+- features/builtin_contracts/pos.feature
+- features/builtin_contracts/range_of.feature
+- features/builtin_contracts/respond_to.feature
+- features/builtin_contracts/send.feature
+- features/builtin_contracts/set_of.feature
+- features/builtin_contracts/xor.feature
+- features/support/env.rb
 - lib/contracts.rb
 - lib/contracts/builtin_contracts.rb
 - lib/contracts/call_with.rb
@@ -51,6 +81,9 @@ files:
 - lib/contracts/support.rb
 - lib/contracts/validators.rb
 - lib/contracts/version.rb
+- script/cucumber
+- script/docs-release
+- script/docs-staging
 - script/rubocop.rb
 - spec/builtin_contracts_spec.rb
 - spec/contracts_spec.rb
@@ -74,17 +107,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Contracts for Ruby.