expectation 1.1.0 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0e82b68f20c078cadb99ae70a9fe2d3f73288680
-  data.tar.gz: 071efc275974c5a339a4f4178cdaf6dd042f398d
+SHA256:
+  metadata.gz: fd26fdbaac868c56921c0b06bd78be417e6cc5bd43fc59294359ff45423038b0
+  data.tar.gz: 9219259ffe130aca8133e1782cf39f367515ec2d77191cf3bc55478655306679
 SHA512:
-  metadata.gz: 7cb4aa141fe72c1ca03c748add680c855b8c20e2b946386c3380a342515054fc8de7b32e8f5c32cc3e46f7a18ee1c9a0c16f4e816bed7503a146ad65f455d59b
-  data.tar.gz: 6b9ebdad0ceadeb168cd26587a5ca0407b7e8c5151fa6daebced22366d0d1cd10ddee17033862ae2c612bf03c71ae4f82f6d33ea9d1c9f8474aafc8580fa1a01
+  metadata.gz: e3e700ce9a1ad71ce9a955e10a6a0741c2cd57fca8615e674d4def6ee254dc0b1c2dfd906a783cad5cd9d9dfb56295ae3061343043777ca0e326a9586740029f
+  data.tar.gz: 894475f57725b47289a0d40ee433b27c15746d9732bae78d976d99d15332c104be7c372331ab05d76efa217be29e11a77808ecfc033ac6192ccf17eba12eed27

data/lib/contracts.rb

@@ -11,15 +11,17 @@
 #
 # We currently support the following annotations:
 #
-# - expects!
-# - returns!
+# - +Expects
+# - +Returns
+# - +Nothrows
+# - +Runtime
 #
 # == Example
 #
 #   class Foo
 #
-#     +Expects(value1: Fixnum, value2: /.@./)
-#     +Returns(Fixnum)
+#     +Expects(value1: Integer, value2: /.@./)
+#     +Returns(Integer)
 #
 #     def bar(value1, value2)
 #     end
@@ -31,7 +33,7 @@ module Contracts
   class Error < ArgumentError; end
 
   (class << self; self; end).class_eval do
-    attr :logger, true
+    attr_accessor :logger
   end
   self.logger = Logger.new(STDOUT)
 
@@ -149,7 +151,7 @@ module Contracts
     #
     # contains the method once the contract is initialized, which happens
     # in the Class#{singleton_,}method_added callback.
-    attr :method, true
+    attr_accessor :method
 
     #
     # Returns a description of the method; i.e. Class#name or Class.name

data/lib/expectation/matcher.rb

@@ -8,6 +8,8 @@
 # The Expectation::Matcher module implements the logic to match a value
 # against a pattern.
 
+require "uri"
+
 module Expectation::Matcher
   class Mismatch < ArgumentError
     attr_reader :value, :expectation, :info
@@ -21,8 +23,8 @@ module Expectation::Matcher
     def to_s
       message = "#{value.inspect} does not match #{expectation.inspect}"
       case info
-      when nil    then  message
-      when Fixnum then  "#{message}, at index #{info}"
+      when nil     then message
+      when Integer then "#{message}, at index #{info}"
       else              "#{message}, at key #{info.inspect}"
       end
     end
@@ -52,19 +54,25 @@ module Expectation::Matcher
             when Array    then
               if expectation.length == 1
                 # Array as "array of elements matching an expectation"; for example
-                # [1,2,3] => [Fixnum]
+                # [1,2,3] => [Integer]
                 e = expectation.first
                 value.each_with_index { |v, idx| match!(v, e, idx) }
               else
                 # Array as "object matching one of given expectations
-                expectation.any? { |e| _match?(value, e) }
+                expectation.any? { |exp| _match?(value, exp) }
               end
             when Proc     then expectation.arity == 0 ? expectation.call : expectation.call(value)
             when Regexp   then value.is_a?(String) && expectation =~ value
             when :__block then value.call
             when Hash     then Hash === value &&
                                expectation.each { |key, exp| match! value[key], exp, key }
-            else               expectation === value
+            when Module
+              if expectation == URI
+                _match_uri?(value)
+              else
+                expectation === value
+              end
+            else expectation === value
     end
 
     return if match
@@ -73,6 +81,13 @@ module Expectation::Matcher
 
   private
 
+  def _match_uri?(value)
+    URI.parse(value)
+    true
+  rescue URI::InvalidURIError
+    false
+  end
+
   def _match?(value, expectation)
     match! value, expectation
     true

data/lib/expectation/version.rb

@@ -4,6 +4,25 @@
 # License::   Distributes under the terms of the Modified BSD License,
 #             see LICENSE.BSD for details.
 module Expectation
-  # The expectation gem's version.
-  VERSION = '1.1.0'
+  module GemHelper
+    extend self
+
+    def version(name)
+      spec = Gem.loaded_specs[name]
+      version = spec.version.to_s
+      version += "+unreleased" if unreleased?(spec)
+      version
+    end
+
+    private
+
+    def unreleased?(spec)
+      return false unless defined?(Bundler::Source::Gemspec)
+      return true if spec.source.is_a?(::Bundler::Source::Gemspec)
+      return true if spec.source.is_a?(::Bundler::Source::Path)
+      false
+    end
+  end
+
+  VERSION = GemHelper.version "expectation"
 end

data/lib/expectation.rb

@@ -8,6 +8,7 @@
 module Expectation; end
 
 require_relative "core/exception"
+require_relative "expectation/version"
 require_relative "expectation/matcher"
 require_relative "expectation/multi_matcher"
 require_relative "expectation/assertions"
@@ -57,7 +58,7 @@ module Expectation
 end
 
 def expect!(*args, &block)
-  Expectation.expect! *args, &block
+  Expectation.expect!(*args, &block)
 rescue Expectation::Error
-  $ERROR_INFO.reraise_with_current_backtrace!
+  $!.reraise_with_current_backtrace!
 end

data/test/contracts_test.rb

@@ -125,7 +125,7 @@ class ContractsTest < Test::Unit::TestCase
   end
 
   class Foo
-    +Expects(v: Fixnum)
+    +Expects(v: Integer)
     def throw_on_one(v)
       raise if v == 1
     end
@@ -155,7 +155,7 @@ class ContractsTest < Test::Unit::TestCase
     foo.wait_for 0.001
     foo.wait_for 0.02
 
-    e = assert_raise(Contracts::Error) {
+    assert_raise(Contracts::Error) {
       foo.wait_for 10
     }
 

data/test/expection_test.rb

@@ -37,13 +37,13 @@ class ExpectationTest < Test::Unit::TestCase
   end
 
   def test_array_expectations
-    assert_expectation! 1 => [Fixnum, String]
-    assert_expectation! 1 => [String, Fixnum]
+    assert_expectation! 1 => [Integer, String]
+    assert_expectation! 1 => [String, Integer]
     assert_failed_expectation! 1 => [NilClass, String]
   end
 
   def test_multi_expectations
-    assert_expectation! 1 => Fixnum | String
+    assert_expectation! 1 => Integer | String
     assert_expectation! 1 => String | 1
     assert_failed_expectation! 1 => NilClass | String
     assert_expectation! 1 => NilClass | String | 1

data/test/matching_test.rb

@@ -26,7 +26,7 @@ class MatchingTest < Test::Unit::TestCase
 
   def test_int_expectations
     assert_match 1, 1
-    assert_match 1, Fixnum
+    assert_match 1, Integer
     assert_match 1, Integer
     assert_match 1, 0..2
     assert_match 1, 0..1
@@ -76,4 +76,12 @@ class MatchingTest < Test::Unit::TestCase
     assert_mismatch({ :key => "Foo" }, { :key => [Integer,"Bar"] })
     assert_match({ :other_key => "Foo" }, { :key => [nil, "Foo"] })
   end
+
+  def test_uri_expectations
+    assert_match    "http://foo/bar", URI
+    assert_match    "/foo/bar", URI
+    assert_mismatch " foo", URI
+    assert_mismatch nil, URI
+    assert_mismatch 1, URI
+  end
 end

data/test/test_helper.rb

@@ -24,13 +24,13 @@ require "expectation"
 class Test::Unit::TestCase
   def assert_expectation!(*expectation, &block)
     assert_nothing_raised do
-      expect! *expectation, &block
+      expect!(*expectation, &block)
     end
   end
 
   def assert_failed_expectation!(*expectation, &block)
     assert_raise(Expectation::Error) {
-      expect! *expectation, &block
+      expect!(*expectation, &block)
     }
   end
 end

data/test/version_test.rb

@@ -0,0 +1,10 @@
+# Author::    radiospiel  (mailto:eno@radiospiel.org)
+# Copyright:: Copyright (c) 2011, 2012 radiospiel
+# License::   Distributes under the terms  of the Modified BSD License, see LICENSE.BSD for details.
+require_relative 'test_helper'
+
+class VersionTest < Test::Unit::TestCase
+  def test_returns_a_version
+    assert_match(/\d\.\d\.\d/,Expectation::VERSION)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: expectation
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.5
 platform: ruby
 authors:
 - radiospiel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-20 00:00:00.000000000 Z
+date: 2022-07-24 00:00:00.000000000 Z
 dependencies: []
 description: Defensive programming with expectations
 email: eno@radiospiel.org
@@ -32,35 +32,11 @@ files:
 - test/contracts_module_test.rb
 - test/contracts_singleton_test.rb
 - test/contracts_test.rb
-- test/coverage/assets/0.10.0/application.css
-- test/coverage/assets/0.10.0/application.js
-- test/coverage/assets/0.10.0/colorbox/border.png
-- test/coverage/assets/0.10.0/colorbox/controls.png
-- test/coverage/assets/0.10.0/colorbox/loading.gif
-- test/coverage/assets/0.10.0/colorbox/loading_background.png
-- test/coverage/assets/0.10.0/favicon_green.png
-- test/coverage/assets/0.10.0/favicon_red.png
-- test/coverage/assets/0.10.0/favicon_yellow.png
-- test/coverage/assets/0.10.0/loading.gif
-- test/coverage/assets/0.10.0/magnify.png
-- test/coverage/assets/0.10.0/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
-- test/coverage/assets/0.10.0/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
-- test/coverage/assets/0.10.0/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
-- test/coverage/assets/0.10.0/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
-- test/coverage/assets/0.10.0/smoothness/images/ui-bg_glass_75_dadada_1x400.png
-- test/coverage/assets/0.10.0/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
-- test/coverage/assets/0.10.0/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
-- test/coverage/assets/0.10.0/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
-- test/coverage/assets/0.10.0/smoothness/images/ui-icons_222222_256x240.png
-- test/coverage/assets/0.10.0/smoothness/images/ui-icons_2e83ff_256x240.png
-- test/coverage/assets/0.10.0/smoothness/images/ui-icons_454545_256x240.png
-- test/coverage/assets/0.10.0/smoothness/images/ui-icons_888888_256x240.png
-- test/coverage/assets/0.10.0/smoothness/images/ui-icons_cd0a0a_256x240.png
-- test/coverage/index.html
 - test/exception_extension_test.rb
 - test/expection_test.rb
 - test/matching_test.rb
 - test/test_helper.rb
+- test/version_test.rb
 homepage: http://github.com/radiospiel/expectation
 licenses: []
 metadata: {}
@@ -72,15 +48,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Defensive programming with expectations