json_spec 1.0.3 → 1.1.0

data/.travis.yml

@@ -3,4 +3,3 @@ branches: master
 rvm:
   - 1.9.2
   - 1.9.3
-  - ruby-head

data/README.md

@@ -1,4 +1,4 @@
-json_spec [![Build Status](https://secure.travis-ci.org/collectiveidea/json_spec.png)](http://travis-ci.org/collectiveidea/json_spec) [![Dependency Status](https://gemnasium.com/collectiveidea/json_spec.png)](https://gemnasium.com/collectiveidea/json_spec)
+json_spec [![Build Status](https://secure.travis-ci.org/collectiveidea/json_spec.png)](http://travis-ci.org/collectiveidea/json_spec) [![Dependency Status](https://gemnasium.com/collectiveidea/json_spec.png)](https://gemnasium.com/collectiveidea/json_spec) [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/collectiveidea/json_spec)
 =========
 
 Easily handle JSON in RSpec and Cucumber
@@ -313,7 +313,7 @@ Then the JSON response at "0/first_name" should be %{FIRST_NAME}
 ### More
 
 Check out the [specs](https://github.com/collectiveidea/json_spec/blob/master/spec)
-and [features](https://github.com/collectiveidea/json_spec/blob/master/features) too see all the
+and [features](https://github.com/collectiveidea/json_spec/blob/master/features) to see all the
 various ways you can use json_spec.
 
 Contributing

data/json_spec.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name    = "json_spec"
-  gem.version = "1.0.3"
+  gem.version = "1.1.0"
 
   gem.authors     = ["Steve Richert"]
   gem.email       = ["steve.richert@gmail.com"]

data/lib/json_spec/helpers.rb

@@ -34,18 +34,19 @@ module JsonSpec
       def value_at_json_path(ruby, path)
         return ruby unless path
 
-        json_path_to_keys(path).inject(ruby) do |value, key|
+        path.split("/").inject(ruby) do |value, key|
           case value
-          when Hash, Array then value.fetch(key){ missing_json_path!(path) }
-          else missing_json_path!(path)
+          when Hash
+            value.fetch(key){ missing_json_path!(path) }
+          when Array
+            missing_json_path!(path) unless key =~ /^\d+$/
+            value.fetch(key.to_i){ missing_json_path!(path) }
+          else
+            missing_json_path!(path)
           end
         end
       end
 
-      def json_path_to_keys(path)
-        path.split("/").map{|k| k =~ /^\d+$/ ? k.to_i : k }
-      end
-
       def missing_json_path!(path)
         raise JsonSpec::MissingPath.new(path)
       end

data/lib/json_spec/matchers/include_json.rb

@@ -17,6 +17,7 @@ module JsonSpec
         case actual
         when Hash then actual.values.map{|v| exclude_keys(v) }.include?(expected)
         when Array then actual.map{|e| exclude_keys(e) }.include?(expected)
+        when String then actual.include?(expected)
         else false
         end
       end

data/spec/json_spec/helpers_spec.rb

@@ -28,6 +28,11 @@ describe JsonSpec::Helpers do
         expect{ parse_json(json, path) }.to raise_error(JsonSpec::MissingPath)
       end
     end
+
+    it "parses at a numeric string path" do
+      json = %({"1":"two"})
+      parse_json(%({"1":"two"}), "1").should == "two"
+    end
   end
 
   context "normalize_json" do

data/spec/json_spec/matchers/be_json_eql_spec.rb

@@ -86,13 +86,13 @@ describe JsonSpec::Matchers::BeJsonEql do
     %({"id":1,"json":"spec"}).should_not be_json_eql(%({"id":2,"json":"different"})).including(:id, :json)
   end
 
-  it "provide a description message" do
+  it "provides a description message" do
     matcher = be_json_eql(%({"id":2,"json":"spec"}))
     matcher.matches?(%({"id":1,"json":"spec"}))
     matcher.description.should == "equal JSON"
   end
 
-  it "provide a description message with path" do
+  it "provides a description message with path" do
     matcher = be_json_eql(%({"id":1,"json":["spec"]})).at_path("json/0")
     matcher.matches?(%({"id":1,"json":["spec"]}))
     matcher.description.should == %(equal JSON at path "json/0")

data/spec/json_spec/matchers/have_json_path_spec.rb

@@ -21,7 +21,7 @@ describe JsonSpec::Matchers::HaveJsonPath do
     %({"one":[1,2,{"three":4}]}).should have_json_path("one/2/three")
   end
 
-  it "provide a description message" do
+  it "provides a description message" do
     matcher = have_json_path("json")
     matcher.matches?(%({"id":1,"json":"spec"}))
     matcher.description.should == %(have JSON path "json")

data/spec/json_spec/matchers/have_json_size_spec.rb

@@ -33,13 +33,13 @@ describe JsonSpec::Matchers::HaveJsonSize do
     matcher.failure_message_for_should_not.should == "Expected JSON value size to not be 3, got 3"
   end
 
-  it "provide a description message" do
+  it "provides a description message" do
     matcher = have_json_size(1)
     matcher.matches?(%({"id":1,"json":["spec"]}))
     matcher.description.should == %(have JSON size "1")
   end
 
-  it "provide a description message with path" do
+  it "provides a description message with path" do
     matcher = have_json_size(1).at_path("json")
     matcher.matches?(%({"id":1,"json":["spec"]}))
     matcher.description.should == %(have JSON size "1" at path "json")

data/spec/json_spec/matchers/have_json_type_spec.rb

@@ -58,13 +58,13 @@ describe JsonSpec::Matchers::HaveJsonType do
     matcher.failure_message_for_should_not.should == "Expected JSON value type to not be Numeric, got Fixnum"
   end
 
-  it "provide a description message" do
+  it "provides a description message" do
     matcher = have_json_type(String)
     matcher.matches?(%({"id":1,"json":"spec"}))
     matcher.description.should == %(have JSON type "String")
   end
 
-  it "provide a description message with path" do
+  it "provides a description message with path" do
     matcher = have_json_type(String).at_path("json")
     matcher.matches?(%({"id":1,"json":"spec"}))
     matcher.description.should == %(have JSON type "String" at path "json")

data/spec/json_spec/matchers/include_json_spec.rb

@@ -23,7 +23,7 @@ describe JsonSpec::Matchers::IncludeJson do
     json.should include_json(%({"two":2}))
   end
 
-  it "matches include hash values" do
+  it "matches included hash values" do
     json = %({"string":"one","integer":1,"float":1.0,"true":true,"false":false,"null":null})
     json.should include_json(%("one"))
     json.should include_json(%(1))
@@ -45,6 +45,12 @@ describe JsonSpec::Matchers::IncludeJson do
     json.should include_json(%([5,6]))
   end
 
+  it "matches a substring" do
+    json = %("json")
+    json.should include_json(%("js"))
+    json.should include_json(%("json"))
+  end
+
   it "matches at a path" do
     %({"one":{"two":[3,4]}}).should include_json(%([3,4])).at_path("one")
   end
@@ -53,13 +59,13 @@ describe JsonSpec::Matchers::IncludeJson do
     %([{"id":1,"two":3}]).should include_json(%({"two":3}))
   end
 
-  it "provide a description message" do
+  it "provides a description message" do
     matcher = include_json(%({"json":"spec"}))
     matcher.matches?(%({"id":1,"json":"spec"}))
     matcher.description.should == "include JSON"
   end
 
-  it "provide a description message with path" do
+  it "provides a description message with path" do
     matcher = include_json(%("spec")).at_path("json/0")
     matcher.matches?(%({"id":1,"json":["spec"]}))
     matcher.description.should == %(include JSON at path "json/0")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json_spec
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-30 00:00:00.000000000 Z
+date: 2012-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -154,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Easily handle JSON in RSpec and Cucumber