wildcard_matchers 0.1.2 → 0.1.3

data/.travis.yml

@@ -1,4 +1,4 @@
 rvm:
   - 1.9.2
   - 1.9.3
-  - ruby-head
+  - 2.0.0

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.1.3
+* more error handling
+
 ## 0.1.2
 * minor bug fix and refactoring
 

data/README.md

@@ -1,4 +1,4 @@
-# wildcard_matchers [![Build Status](https://secure.travis-ci.org/okitan/wildcard_matchers.png?branch=master)](http://travis-ci.org/okitan/wildcard_matchers) [![Dependency Status](https://gemnasium.com/okitan/capybara-json.png)](https://gemnasium.com/okitan/capybara-json)
+# wildcard_matchers [![Build Status](https://secure.travis-ci.org/okitan/wildcard_matchers.png?branch=master)](http://travis-ci.org/okitan/wildcard_matchers) [![Dependency Status](https://gemnasium.com/okitan/wildcard_matchers.png)](https://gemnasium.com/okitan/wildcard_matchers)
 
 ## General Usage
 

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/wildcard_matchers/matchers/hash_includes.rb

@@ -6,8 +6,9 @@ module WildcardMatchers
     class HashIncludes < ::WildcardMatchers::WildcardMatcher
       protected
       def wildcard_match(actual)
-        unless actual.is_a?(Hash)
-          errors.push "#{position}: expect #{actual} to Hash"
+        unless actual && actual.is_a?(Hash)
+          errors.push "#{position}: expect #{actual.inspect} to Hash"
+          return
         end
 
         hash_to_match = {}

data/lib/wildcard_matchers/matchers/is_uri.rb

@@ -7,12 +7,17 @@ module WildcardMatchers
     class IsUri < ::WildcardMatchers::WildcardMatcher
       protected
       def wildcard_match(actual)
+        unless actual
+          errors.push "#{position}: expect uri but nil"
+          return
+        end
+
         uri = nil
         begin
           require "addressable/uri"
           uri = ::Addressable::URI.parse(actual) # if actual is ::URI re-parse
         rescue LoadError
-          require "uri".tapp
+          require "uri"
           uri = actual.is_a?(::URI) ? actual : ::URI.parse(actual)
         end
 

data/lib/wildcard_matchers/wildcard_matcher.rb

@@ -10,7 +10,7 @@ module WildcardMatchers
 
     def ===(actual)
       @errors = []
-      wildcard_match(actual)
+      wildcard_match_with_catch_exception(actual)
       errors.empty?
     end
 
@@ -22,6 +22,13 @@ module WildcardMatchers
     end
 
     protected
+    # I'd like to use prepend
+    def wildcard_match_with_catch_exception(actual)
+      wildcard_match(actual)
+    rescue => e
+      errors.push "#{position}: <#{e.inspect}:#{e.message}> for expect #{actual.inspect} to #{expectation.inspect}"
+    end
+
     def wildcard_match(actual)
       case expectation
       when self.class
@@ -53,7 +60,7 @@ module WildcardMatchers
   class ArrayMatcher < WildcardMatcher
     protected
     def wildcard_match(actual)
-      unless actual.is_a?(Array)
+      unless actual and actual.is_a?(Array)
         errors << "#{position}: expect #{actual.inspect} to #{expectation.inspect}"
         return
       end
@@ -72,7 +79,7 @@ module WildcardMatchers
   class HashMatcher < WildcardMatcher
     protected
     def wildcard_match(actual)
-      unless actual.is_a?(Hash)
+      unless actual and actual.is_a?(Hash)
         errors << "#{position}: expect #{actual.inspect} to #{expectation.inspect}"
         return
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wildcard_matchers
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-06 00:00:00.000000000 Z
+date: 2013-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facets