rspec-json_matcher 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe8679b010a21084b2b7fa60c0fa4f1f2081cbeb
-  data.tar.gz: 7cba23c67f6e4037726440ab4b5d08c28e1ffa32
+  metadata.gz: 2b5b194d82e6f879060a40c9cee4ecdd96cd38ab
+  data.tar.gz: d7e4b9e053a6a0312542f451a9d6be0183cf469f
 SHA512:
-  metadata.gz: 0b40b1025ec21c6f52441367a733d3651691cd1db90b2a3c96c81ad115f12b9db0cb13e709abc7850831978bfd9f5e15ec4a4d47bf06a13fdc17c7956eac4b4a
-  data.tar.gz: 644c8da6b47f9f96eef217a0a522ec08f06053f21b6ea1ba9e70cbbaf85905ca06e104b13f93d209696d2f874c70e6589b257011d88abedf839bae0bca52a43c
+  metadata.gz: 419d26029dab6cf9868443c61fe14ddfedbd35cc6a1403b2760b03c0a04771ab202ef868c237311a2edeee08030d78c60a7bc1e5d569f10ccf6ef10ec6f22f3a
+  data.tar.gz: 8434fa25f560b14afc212606c994969fefb18368695c9fc5844b96cc18f93faa91e12a547c8a97622ef059dc1f3e18b575ca6a0a54f94f46e0f2e3f33bff87f4

data/CHANGELOG.md

@@ -0,0 +1,14 @@
+## 0.0.5
+* More strict comparison to detect different Hash keys
+
+## 0.0.4
+* Change indent style on failure message
+
+## 0.0.3
+* Bundler friendliness
+
+## 0.0.2
+* Tiny refactoring
+
+## 0.0.1
+* The first release on 2013-4-25

data/lib/rspec/json_matcher/version.rb

@@ -1,5 +1,5 @@
 module RSpec
   module JsonMatcher
-    VERSION = "0.0.4"
+    VERSION = "0.0.5"
   end
 end

data/lib/rspec/json_matcher.rb

@@ -69,6 +69,14 @@ module RSpec
         new(*args).compare
       end
 
+      def self.extract_keys(array_or_hash)
+        if array_or_hash.is_a?(Array)
+          array_or_hash.each_index.to_a
+        else
+          array_or_hash.keys
+        end
+      end
+
       def initialize(actual, expected)
         @actual   = actual
         @expected = expected
@@ -84,8 +92,8 @@ module RSpec
         actual.class == expected.class
       end
 
-      def has_same_size?
-        actual.size == expected.size
+      def has_same_keys?
+        (self.class.extract_keys(actual) - self.class.extract_keys(expected)).size == 0
       end
 
       def has_same_value?
@@ -97,25 +105,16 @@ module RSpec
       end
 
       def has_same_collection?
-        collection? && has_same_class? && has_same_size? && has_same_key_values?
+        collection? && has_same_class? && has_same_keys? && has_same_values?
       end
 
-      def has_same_key_values?
-        keys.all? {|key| self.class.compare(actual[key], expected[key]) }
+      def has_same_values?
+        self.class.extract_keys(actual).all? {|key| self.class.compare(actual[key], expected[key]) }
       end
 
       def collection?
         actual.is_a?(Array) || actual.is_a?(Hash)
       end
-
-      def keys
-        case actual
-        when Array
-          actual.each_index
-        when Hash
-          actual.keys
-        end
-      end
     end
   end
 end

data/spec/rspec/json_matcher_spec.rb

@@ -2,11 +2,21 @@ require "spec_helper"
 
 describe RSpec::JsonMatcher do
   context "with invalid JSON" do
-    it "does match" do
+    it "does not match" do
       "".should_not be_json
     end
   end
 
+  context "with invalid keys JSON" do
+    it "does not match" do
+      {
+        "a" => nil
+      }.to_json.should_not be_json(
+        "b" => nil
+      )
+    end
+  end
+
   context "with valid JSON" do
     it "matches with handy patterns" do
       [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-json_matcher
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-14 00:00:00.000000000 Z
+date: 2013-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -88,6 +88,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -118,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: RSpec matcher for testing JSON string