contracts 0.9 → 0.10

data/spec/override_validators_spec.rb

@@ -0,0 +1,162 @@
+RSpec.describe Contract do
+  describe ".override_validator" do
+    around do |example|
+      Contract.reset_validators
+      example.run
+      Contract.reset_validators
+    end
+
+    it "allows to override simple validators" do
+      Contract.override_validator(Hash) do |contract|
+        lambda do |arg|
+          return false unless arg.is_a?(Hash)
+          # Any hash in my system should have :it_is_a_hash key!
+          return false unless arg.key?(:it_is_a_hash)
+          contract.keys.all? do |k|
+            Contract.valid?(arg[k], contract[k])
+          end
+        end
+      end
+
+      klass = Class.new do
+        include Contracts
+
+        Contract ({ :a => Contracts::Num, :b => String }) => nil
+        def something(opts)
+          nil
+        end
+      end
+
+      obj = klass.new
+
+      expect do
+        obj.something(:a => 35, :b => "hello")
+      end.to raise_error(ContractError)
+
+      expect do
+        obj.something(
+          :a => 35,
+          :b => "hello",
+          :it_is_a_hash => true
+        )
+      end.not_to raise_error
+    end
+
+    it "allows to override valid contract" do
+      Contract.override_validator(:valid) do |contract|
+        if contract.respond_to?(:in_valid_state?)
+          lambda do |arg|
+            contract.in_valid_state? && contract.valid?(arg)
+          end
+        else
+          lambda { |arg| contract.valid?(arg) }
+        end
+      end
+
+      stateful_contract = Class.new(Contracts::CallableClass) do
+        def initialize(contract)
+          @contract = contract
+          @state = 0
+        end
+
+        def in_valid_state?
+          @state < 3
+        end
+
+        def valid?(arg)
+          @state += 1
+          Contract.valid?(arg, @contract)
+        end
+      end
+
+      klass = Class.new do
+        include Contracts
+
+        Contract stateful_contract[Contracts::Num] => Contracts::Num
+        def only_three_times(x)
+          x * x
+        end
+      end
+
+      obj = klass.new
+
+      expect(obj.only_three_times(3)).to eq(9)
+      expect(obj.only_three_times(3)).to eq(9)
+      expect(obj.only_three_times(3)).to eq(9)
+
+      expect do
+        obj.only_three_times(3)
+      end.to raise_error(ContractError)
+
+      expect do
+        obj.only_three_times(3)
+      end.to raise_error(ContractError)
+    end
+
+    it "allows to override class validator" do
+      # Make contracts accept all rspec doubles
+      Contract.override_validator(:class) do |contract|
+        lambda do |arg|
+          arg.is_a?(RSpec::Mocks::Double) ||
+            arg.is_a?(contract)
+        end
+      end
+
+      klass = Class.new do
+        include Contracts
+
+        Contract String => String
+        def greet(name)
+          "hello, #{name}"
+        end
+      end
+
+      obj = klass.new
+
+      expect(obj.greet("world")).to eq("hello, world")
+
+      expect do
+        obj.greet(4)
+      end.to raise_error(ContractError)
+
+      expect(obj.greet(double("name"))).to match(
+        /hello, #\[Double "name"\]/
+      )
+    end
+
+    it "allows to override default validator" do
+      spy = double("spy")
+
+      Contract.override_validator(:default) do |contract|
+        lambda do |arg|
+          spy.log("#{arg} == #{contract}")
+          arg == contract
+        end
+      end
+
+      klass = Class.new do
+        include Contracts
+
+        Contract 1, Contracts::Num => Contracts::Num
+        def gcd(_, b)
+          b
+        end
+
+        Contract Contracts::Num, Contracts::Num => Contracts::Num
+        def gcd(a, b)
+          gcd(b % a, a)
+        end
+      end
+
+      obj = klass.new
+
+      expect(spy).to receive(:log).with("8 == 1").ordered.once
+      expect(spy).to receive(:log).with("5 == 1").ordered.once
+      expect(spy).to receive(:log).with("3 == 1").ordered.once
+      expect(spy).to receive(:log).with("2 == 1").ordered.once
+      expect(spy).to receive(:log).with("1 == 1").ordered.once
+
+      obj.gcd(8, 5)
+    end
+  end
+end

data/spec/ruby_version_specific/contracts_spec_2.1.rb

@@ -1,6 +1,6 @@
 class GenericExample
-  Contract String, Bool, Args[Symbol], Float, { e: Range, f: Maybe[Num] }, Proc =>
-           [Proc, Hash, Num, Range, Float, ArrayOf[Symbol], Bool, String]
+  Contract String, Bool, Args[Symbol], Float, KeywordArgs[e: Range, f: Optional[Num]], Proc =>
+           [Proc, Hash, Maybe[Num], Range, Float, ArrayOf[Symbol], 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
@@ -50,6 +50,14 @@ RSpec.describe "Contracts:" do
           @o.complicated("a", true, :b, 2.0, e: "bad") { |x| x }
         end.to raise_error(ContractError)
       end
+
+      it "should fail when passed nil to an optional argument which contract shouldnt accept nil" do
+        expect 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
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: contracts
 version: !ruby/object:Gem::Version
-  version: '0.9'
+  version: '0.10'
 platform: ruby
 authors:
 - Aditya Bhargava
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-24 00:00:00.000000000 Z
+date: 2015-07-07 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
@@ -28,20 +28,26 @@ files:
 - TODO.markdown
 - TUTORIAL.md
 - benchmarks/bench.rb
+- benchmarks/hash.rb
 - benchmarks/invariants.rb
 - benchmarks/io.rb
 - benchmarks/wrap_test.rb
 - contracts.gemspec
 - lib/contracts.rb
 - lib/contracts/builtin_contracts.rb
+- lib/contracts/call_with.rb
 - lib/contracts/decorators.rb
-- lib/contracts/eigenclass.rb
+- lib/contracts/engine.rb
+- lib/contracts/engine/base.rb
+- lib/contracts/engine/eigenclass.rb
+- lib/contracts/engine/target.rb
 - lib/contracts/errors.rb
 - lib/contracts/formatters.rb
 - lib/contracts/invariants.rb
+- lib/contracts/method_handler.rb
 - lib/contracts/method_reference.rb
-- lib/contracts/modules.rb
 - lib/contracts/support.rb
+- lib/contracts/validators.rb
 - lib/contracts/version.rb
 - script/rubocop.rb
 - spec/builtin_contracts_spec.rb
@@ -49,6 +55,7 @@ files:
 - spec/fixtures/fixtures.rb
 - spec/invariants_spec.rb
 - spec/module_spec.rb
+- spec/override_validators_spec.rb
 - spec/ruby_version_specific/contracts_spec_1.9.rb
 - spec/ruby_version_specific/contracts_spec_2.0.rb
 - spec/ruby_version_specific/contracts_spec_2.1.rb
@@ -74,9 +81,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: 

data/lib/contracts/eigenclass.rb

@@ -1,38 +0,0 @@
-module Contracts
-  module Eigenclass
-    def self.extended(eigenclass)
-      return if eigenclass.respond_to?(:owner_class=)
-
-      class << eigenclass
-        attr_accessor :owner_class
-      end
-    end
-
-    def self.lift(base)
-      return NullEigenclass if Support.eigenclass? base
-
-      eigenclass = Support.eigenclass_of base
-
-      eigenclass.extend(Eigenclass) unless eigenclass.respond_to?(:owner_class=)
-
-      unless eigenclass.respond_to?(:pop_decorators)
-        eigenclass.extend(MethodDecorators)
-        eigenclass.send(:include, Contracts)
-      end
-
-      eigenclass.owner_class = base
-
-      eigenclass
-    end
-
-    module NullEigenclass
-      def self.owner_class
-        self
-      end
-
-      def self.pop_decorators
-        []
-      end
-    end
-  end
-end

data/lib/contracts/modules.rb

@@ -1,17 +0,0 @@
-module Contracts
-  module Modules
-    def self.included(base)
-      common(base)
-    end
-
-    def self.extended(base)
-      common(base)
-    end
-
-    def self.common(base)
-      return unless base.instance_of?(Module)
-      base.extend(MethodDecorators)
-      Eigenclass.lift(base)
-    end
-  end
-end