hash_dealer 1.2.0 → 1.2.1

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.2.1

data/hash_dealer.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{hash_dealer}
-  s.version = "1.2.0"
+  s.version = "1.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dan Langevin"]

data/lib/core_extensions.rb

@@ -8,7 +8,8 @@ end
 # The only really important matcher
 class String
   def matcher(opts = {})
-    ":#{self}"
+    # if we have a leading : or a /:xyz - a matcher is already defined
+    self =~ /(^:|\/:)/ ? self : ":#{self}"
   end
 end
 

data/lib/matcher.rb

@@ -20,20 +20,22 @@ end
 # alias as match_json
 RSpec::Matchers.define(:match_list) do |actual|
   
+  def normalize(val)
+    val = JSON.parse(val) if val.is_a?(String)
+    val = val.first if val.is_a?(Array)
+    val
+  end
+  
   match do |expected|
-    actual = JSON.parse(actual) if actual.is_a?(String)
-    expected = JSON.parse(expected) if expected.is_a?(String)  
-    actual = actual.first if actual.is_a?(Array)
-    expected = expected.first if expected.is_a?(Array)
-    PathString.as_sorted_json(actual) == PathString.as_sorted_json(expected)
+    PathString.as_sorted_json(normalize(actual)) == PathString.as_sorted_json(normalize(expected))
   end
     
   failure_message_for_should do |container|
-    "expected #{PathString.as_sorted_json(actual)}\n to equal\n #{PathString.as_sorted_json(container)}"
+    "expected #{PathString.as_sorted_json(normalize(actual))}\n to equal\n #{PathString.as_sorted_json(normalize(container))}"
   end
   
   failure_message_for_should_not do |container|
-    "expected #{PathString.as_sorted_json(actual)}\n not to equal\n #{PathString.as_sorted_json(container)}"
+    "expected #{PathString.as_sorted_json(normalize(actual))}\n not to equal\n #{PathString.as_sorted_json(normalize(container))}"
   end
   
 end

metadata

@@ -2,7 +2,7 @@
 name: hash_dealer
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors: 
 - Dan Langevin
@@ -129,7 +129,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 4171646845594495161
+      hash: 3813093345563584248
       segments: 
       - 0
       version: "0"