contracts 0.10.1 → 0.11.0

data/spec/module_spec.rb

@@ -1,7 +1,7 @@
 module Mod
-  include Contracts
+  include Contracts::Core
 
-  Contract Num => Num
+  Contract C::Num => C::Num
   def self.a_module_method a
     a + 1
   end

data/spec/override_validators_spec.rb

@@ -19,7 +19,7 @@ RSpec.describe Contract do
       end
 
       klass = Class.new do
-        include Contracts
+        include Contracts::Core
 
         Contract ({ :a => Contracts::Num, :b => String }) => nil
         def something(opts)
@@ -70,7 +70,7 @@ RSpec.describe Contract do
       end
 
       klass = Class.new do
-        include Contracts
+        include Contracts::Core
 
         Contract stateful_contract[Contracts::Num] => Contracts::Num
         def only_three_times(x)
@@ -103,7 +103,7 @@ RSpec.describe Contract do
       end
 
       klass = Class.new do
-        include Contracts
+        include Contracts::Core
 
         Contract String => String
         def greet(name)
@@ -135,7 +135,7 @@ RSpec.describe Contract do
       end
 
       klass = Class.new do
-        include Contracts
+        include Contracts::Core
 
         Contract 1, Contracts::Num => Contracts::Num
         def gcd(_, b)

data/spec/ruby_version_specific/contracts_spec_1.9.rb

@@ -1,11 +1,11 @@
 class GenericExample
-  Contract Args[String], Num => ArrayOf[String]
+  Contract C::Args[String], C::Num => C::ArrayOf[String]
   def splat_then_arg(*vals, n)
     vals.map { |v| v * n }
   end
 
   if ruby_version <= 1.9
-    Contract ({:foo => Nat}) => nil
+    Contract ({:foo => C::Nat}) => nil
     def nat_test_with_kwarg(a_hash)
     end
   end

data/spec/ruby_version_specific/contracts_spec_2.0.rb

@@ -1,10 +1,10 @@
 class GenericExample
-  Contract Args[String], { repeat: Maybe[Num] } => ArrayOf[String]
+  Contract C::Args[String], { repeat: C::Maybe[C::Num] } => C::ArrayOf[String]
   def splat_then_optional_named(*vals, repeat: 2)
     vals.map { |v| v * repeat }
   end
 
-  Contract ({foo: Nat}) => nil
+  Contract ({foo: C::Nat}) => nil
   def nat_test_with_kwarg(foo: 10)
   end
 end

data/spec/ruby_version_specific/contracts_spec_2.1.rb

@@ -1,6 +1,6 @@
 class GenericExample
-  Contract String, Bool, Args[Symbol], Float, KeywordArgs[e: Range, f: Optional[Num]], Proc =>
-           [Proc, Hash, Maybe[Num], Range, Float, ArrayOf[Symbol], Bool, String]
+  Contract String, C::Bool, C::Args[Symbol], Float, C::KeywordArgs[e: Range, f: C::Optional[C::Num], g: Symbol], Proc =>
+           [Proc, Hash, C::Maybe[C::Num], Range, Float, C::ArrayOf[Symbol], C::Bool, String]
   def complicated(a, b = true, *c, d, e:, f:2, **g, &h)
     h.call [h, g, f, e, d, c, b, a]
   end
@@ -15,7 +15,7 @@ RSpec.describe "Contracts:" do
     describe "really complicated method signature" do
       it "should work with default named args used" do
         expect do
-          @o.complicated("a", false, :b, 2.0, e: (1..5)) { |x| x }
+          @o.complicated("a", false, :b, 2.0, e: (1..5), g: :d) { |x| x }
         end.to_not raise_error
       end
 
@@ -56,7 +56,7 @@ RSpec.describe "Contracts:" do
           @o.complicated("a", true, :b, :c, 2.0, e: (1..5), f: nil, g: :d) do |x|
             x
           end
-        end.to raise_error(ContractError, /Expected: \(KeywordArgs\[{:e=>Range, :f=>Optional\[Num\]}\]\)/)
+        end.to raise_error(ContractError, /Expected: \(KeywordArgs\[{:e=>Range, :f=>Optional\[Num\], :g=>Symbol}\]\)/)
       end
     end
   end

data/spec/validators_spec.rb

@@ -0,0 +1,25 @@
+require "spec_helper"
+
+module Contracts
+  RSpec.describe "range contract validator" do
+    subject(:o) { GenericExample.new }
+
+    it "passes when value is in range" do
+      expect do
+        o.method_with_range_contract(5)
+      end.not_to raise_error(ContractError)
+    end
+
+    it "fails when value is not in range" do
+      expect do
+        o.method_with_range_contract(300)
+      end.to raise_error(ContractError, /Expected: 1\.\.10/)
+    end
+
+    it "fails when value is incorrect" do
+      expect do
+        o.method_with_range_contract("hello world")
+      end.to raise_error(ContractError, /Expected: 1\.\.10.*Actual: "hello world"/m)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: contracts
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.11.0
 platform: ruby
 authors:
 - Aditya Bhargava
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-16 00:00:00.000000000 Z
+date: 2015-07-30 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
@@ -37,6 +37,7 @@ files:
 - lib/contracts.rb
 - lib/contracts/builtin_contracts.rb
 - lib/contracts/call_with.rb
+- lib/contracts/core.rb
 - lib/contracts/decorators.rb
 - lib/contracts/engine.rb
 - lib/contracts/engine/base.rb
@@ -63,6 +64,7 @@ files:
 - spec/spec_helper.rb
 - spec/support.rb
 - spec/support_spec.rb
+- spec/validators_spec.rb
 homepage: http://github.com/egonSchiele/contracts.ruby
 licenses: []
 metadata: {}
@@ -82,9 +84,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Contracts for Ruby.
 test_files: []
-has_rdoc: