json_spec 0.6.0 → 0.7.0

data/json_spec.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{|f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency "json", "~> 1.0"
+  s.add_dependency "multi_json", "~> 1.0.0"
   s.add_dependency "rspec", "~> 2.0"
 
   s.add_development_dependency "rake", "~> 0.9"

data/lib/json_spec/helpers.rb

@@ -1,12 +1,14 @@
+require 'multi_json'
+
 module JsonSpec
   module Helpers
     extend self
 
     def parse_json(json, path = nil)
-      ruby = JSON.parse(%([#{json}])).first
+      ruby = MultiJson.decode(%([#{json}])).first
       value_at_json_path(ruby, path)
-    rescue JSON::ParserError
-      JSON.parse(json)
+    rescue MultiJson::DecodeError
+      MultiJson.decode(json)
     end
 
     def normalize_json(json, path = nil)

data/lib/json_spec/matchers.rb

@@ -17,7 +17,7 @@ RSpec::Matchers.define :be_json_eql do |expected_json|
   end
 
   chain :excluding do |*keys|
-    excluded_keys.add(*keys.map{|k| k.to_s })
+    excluded_keys.merge(keys.map{|k| k.to_s })
   end
 
   chain :including do |*keys|
@@ -60,7 +60,7 @@ RSpec::Matchers.define :include_json do |expected_json|
   end
 
   chain :excluding do |*keys|
-    excluded_keys.add(*keys.map{|k| k.to_s })
+    excluded_keys.merge(*keys.map{|k| k.to_s })
   end
 
   chain :including do |*keys|
@@ -105,7 +105,8 @@ RSpec::Matchers.define :have_json_type do |klass|
   include JsonSpec::Helpers
 
   match do |json|
-    parse_json(json, @path).is_a?(klass)
+    @json = json
+    actual.is_a?(klass)
   end
 
   chain :at_path do |path|
@@ -113,24 +114,27 @@ RSpec::Matchers.define :have_json_type do |klass|
   end
 
   failure_message_for_should do
-    message = "Expected JSON value type to be #{klass}"
+    message = "Expected JSON value type to be #{klass}, got #{actual.class}"
     message << %( at path "#{@path}") if @path
     message
   end
 
   failure_message_for_should_not do
-    message = "Expected JSON value type to not be #{klass}"
+    message = "Expected JSON value type to not be #{klass}, got #{actual.class}"
     message << %( at path "#{@path}") if @path
     message
   end
+
+  def actual
+    parse_json(@json, @path)
+  end
 end
 
 RSpec::Matchers.define :have_json_size do |expected_size|
   include JsonSpec::Helpers
 
   match do |json|
-    ruby = parse_json(json, @path)
-    actual_size = ruby.is_a?(Enumerable) ? ruby.size : 1
+    @json = json
     actual_size == expected_size
   end
 
@@ -139,14 +143,19 @@ RSpec::Matchers.define :have_json_size do |expected_size|
   end
 
   failure_message_for_should do
-    message = "Expected JSON value size to be #{expected_size}"
+    message = "Expected JSON value size to be #{expected_size}, got #{actual_size}"
     message << %( at path "#{@path}") if @path
     message
   end
 
   failure_message_for_should_not do
-    message = "Expected JSON value size to not be #{expected_size}"
+    message = "Expected JSON value size to not be #{expected_size}, got #{actual_size}"
     message << %( at path "#{@path}") if @path
     message
   end
+
+  def actual_size
+    ruby = parse_json(@json, @path)
+    ruby.is_a?(Enumerable) ? ruby.size : 1
+  end
 end

data/lib/json_spec/version.rb

@@ -1,3 +1,3 @@
 module JsonSpec
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

data/spec/json_spec/helpers_spec.rb

@@ -13,7 +13,7 @@ describe JsonSpec::Helpers do
     end
 
     it "raises a parser error for invalid JSON" do
-      expect{ parse_json("json_spec") }.to raise_error(JSON::ParserError)
+      expect{ parse_json("json_spec") }.to raise_error(MultiJson::DecodeError)
     end
 
     it "parses at a path if given" do

data/spec/json_spec/matchers_spec.rb

@@ -67,6 +67,11 @@ describe "Matchers:" do
       %({"id":1,"json":"spec"}).should be_json_eql(%({"id":2,"json":"spec"})).excluding(:id)
     end
 
+    it "excludes multiple keys" do
+      JsonSpec.excluded_keys = []
+      %({"id":1,"json":"spec"}).should be_json_eql(%({"id":2,"json":"different"})).excluding(:id, :json)
+    end
+
     it "includes globally-excluded hash keys per matcher" do
       JsonSpec.excluded_keys = %w(id ignore)
       %({"id":1,"json":"spec","ignore":"please"}).should_not be_json_eql(%({"id":2,"json":"spec","ignore":"this"})).including("id")
@@ -76,6 +81,11 @@ describe "Matchers:" do
       JsonSpec.excluded_keys = %w(id)
       %({"id":1,"json":"spec"}).should_not be_json_eql(%({"id":2,"json":"spec"})).including(:id)
     end
+
+    it "includes multiple keys" do
+      JsonSpec.excluded_keys = %w(id json)
+      %({"id":1,"json":"spec"}).should_not be_json_eql(%({"id":2,"json":"different"})).including(:id, :json)
+    end
   end
 
   context "include_json" do
@@ -152,6 +162,18 @@ describe "Matchers:" do
     it "matches at a path" do
       %({"one":[1,2,3]}).should have_json_size(3).at_path("one")
     end
+
+    it "provides a failure message for should" do
+      matcher = have_json_size(3)
+      matcher.matches?(%([1,2]))
+      matcher.failure_message_for_should.should == "Expected JSON value size to be 3, got 2"
+    end
+
+    it "provides a failure message for should not" do
+      matcher = have_json_size(3)
+      matcher.matches?(%([1,2,3]))
+      matcher.failure_message_for_should_not.should == "Expected JSON value size to not be 3, got 3"
+    end
   end
 
   context "have_json_path" do
@@ -215,6 +237,18 @@ describe "Matchers:" do
       %(10.0).should have_json_type(Numeric)
     end
 
+    it "provides a failure message for should" do
+      matcher = have_json_type(Numeric)
+      matcher.matches?(%("foo"))
+      matcher.failure_message_for_should.should == "Expected JSON value type to be Numeric, got String"
+    end
+
+    it "provides a failure message for should not" do
+      matcher = have_json_type(Numeric)
+      matcher.matches?(%(10))
+      matcher.failure_message_for_should_not.should == "Expected JSON value type to not be Numeric, got Fixnum"
+    end
+
     context "somewhat uselessly" do
       it "matches true" do
         %(true).should have_json_type(TrueClass)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json_spec
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,23 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-20 00:00:00.000000000 -04:00
-default_executable: 
+date: 2011-08-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: json
-  requirement: &70202465651180 !ruby/object:Gem::Requirement
+  name: multi_json
+  requirement: &70258292680600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70202465651180
+  version_requirements: *70258292680600
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70202465650680 !ruby/object:Gem::Requirement
+  requirement: &70258292680100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +32,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70202465650680
+  version_requirements: *70258292680100
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70202465650220 !ruby/object:Gem::Requirement
+  requirement: &70258292710600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +43,10 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70202465650220
+  version_requirements: *70258292710600
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70202465649760 !ruby/object:Gem::Requirement
+  requirement: &70258292710140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,7 +54,7 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70202465649760
+  version_requirements: *70258292710140
 description: Easily handle JSON in RSpec and Cucumber
 email:
 - steve.richert@gmail.com
@@ -92,7 +91,6 @@ files:
 - spec/json_spec/matchers_spec.rb
 - spec/json_spec/memory_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: https://github.com/collectiveidea/json_spec
 licenses: []
 post_install_message: 
@@ -113,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: json_spec
-rubygems_version: 1.6.2
+rubygems_version: 1.8.8
 signing_key: 
 specification_version: 3
 summary: Easily handle JSON in RSpec and Cucumber