json_spec 1.1.1 → 1.1.2

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MDEyZjVhZTBmM2M5MTE2ZmRkY2IzMWIwNzRiNzY5ODNiNjE2YjNlZg==
-  data.tar.gz: !binary |-
-    YzAyNTgzMmE3N2Y4ZjUyZGIwZjM3NGY5ZDlmYTk2MjBlZGIzNTNlZA==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    YzA1MDUwZDlmM2Y4MjMzMDMyOGU4OTE2Yjk2Mzk1NjA2NGM5MzYwNmE1ZWE1
-    N2U4ZTNkZmVjZGZlZGVmNDYxYTczMDQ1NjdmMTZmODI1NjllMTc5ZjY1YjEx
-    MTZhNjA5YTU3MzdmN2NmNWNiMzA4ZTQxYjgwMmQwOGNlOTg3ZGM=
-  data.tar.gz: !binary |-
-    Y2U3OWY4OTYyNjNiMjU5MTZmNzBlMDNhZTU0ZGE0NGVmMGRhNWEwYWNiMzdj
-    YTk2MTVlM2JkNjcxOTliMmVmY2VjNDU1NjcwYmRiNmVhYTQ4YjhmYjY2MDk0
-    NTA1MzY1Yzk3ZTFmMGFkZTliOWFlN2RiMTcwMGI5NTk5ZTdmNjA=
+SHA1:
+  metadata.gz: cb0b1f7ab27245791f7d65778506309a14a43645
+  data.tar.gz: 3aa7d4931332e3ffe04d7d44da3d8256b7fa613f
+SHA512:
+  metadata.gz: ed9cb913d6d387841c2f7a725b4aaf192cf3a4aa72dad6e052f155574cdb563232ecb8f1d780d1a2636a324c6c8ea42cb7e9f4a15f0ffeb601ed294a6c19da7a
+  data.tar.gz: 3fba85ecb36f7d03cb4f04a661622f43b51764ec04ae9f3b6312c8f67bd54084cbbb9f6563c0121f1eb30a4ed85fedcf70d52140b64d6015498ee06b7c0bda84

data/.gitignore

@@ -1,6 +1,4 @@
-*.gem
 .bundle
-.rvmrc
 Gemfile.lock
 gemfiles/*.lock
-pkg/*
+pkg

data/.travis.yml

@@ -1,6 +1,15 @@
+branches:
+  only:
+    - master
+gemfile:
+  - gemfiles/rspec2.gemfile
+  - gemfiles/rspec3.gemfile
 language: ruby
-branches: master
+matrix:
+  allow_failures:
+    - rvm: ruby-head
 rvm:
-  - 1.9.2
   - 1.9.3
-  - 2.0.0
+  - "2.0"
+  - "2.1"
+  - ruby-head

data/Gemfile

@@ -3,6 +3,5 @@ source "https://rubygems.org"
 gemspec
 
 group :test do
-  gem "cucumber", "~> 1.1", ">= 1.1.1"
-  gem "rake", "~> 10.0"
+  gem "cucumber", "~> 1.3"
 end

data/README.md

@@ -1,10 +1,13 @@
-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)
-=========
+# json_spec
 
 Easily handle JSON in RSpec and Cucumber
 
-RSpec
---------------
+[![Gem Version](https://img.shields.io/gem/v/json_spec.svg?style=flat)](http://rubygems.org/gems/json_spec)
+[![Build Status](https://img.shields.io/travis/collectiveidea/json_spec/master.svg?style=flat)](https://travis-ci.org/collectiveidea/json_spec)
+[![Code Climate](https://img.shields.io/codeclimate/github/collectiveidea/json_spec.svg?style=flat)](https://codeclimate.com/github/collectiveidea/json_spec)
+[![Dependency Status](https://img.shields.io/gemnasium/collectiveidea/json_spec.svg?style=flat)](https://gemnasium.com/collectiveidea/json_spec)
+
+## RSpec
 
 json_spec defines five new RSpec matchers:
 
@@ -101,8 +104,7 @@ hash keys and array indexes. For instance, with the following JSON:
 
 We could access the first friend's first name with the path `"friends/0/first_name"`.
 
-Cucumber
---------
+## Cucumber
 
 json_spec provides Cucumber steps that utilize its RSpec matchers and that's where json_spec really
 shines. This is perfect for testing your app's JSON API.
@@ -316,8 +318,7 @@ Check out the [specs](https://github.com/collectiveidea/json_spec/blob/master/sp
 and [features](https://github.com/collectiveidea/json_spec/blob/master/features) to see all the
 various ways you can use json_spec.
 
-Contributing
-------------
+## Contributing
 
 If you come across any issues, please [tell us](https://github.com/collectiveidea/json_spec/issues).
 Pull requests (with tests) are appreciated. No pull request is too small. Please help with:
@@ -333,8 +334,7 @@ Pull requests (with tests) are appreciated. No pull request is too small. Please
 
 If you report a bug and don't include a fix, please include a failing test.
 
-Copyright
----------
+## Copyright
 
 Copyright © 2011 Steve Richert
 

data/Rakefile

@@ -3,13 +3,14 @@ require "rspec/core/rake_task"
 require "cucumber/rake/task"
 
 RSpec::Core::RakeTask.new(:spec)
-Cucumber::Rake::Task.new(:cucumber) do |t|
-  t.cucumber_opts = "--tags ~@fail"
+
+Cucumber::Rake::Task.new(:cucumber) do |task|
+  task.cucumber_opts = "--tags ~@fail"
 end
 
-Cucumber::Rake::Task.new(:negative_cucumber) do |t|
-  t.cucumber_opts = "--tags @fail --wip"
+Cucumber::Rake::Task.new(:negative_cucumber) do |task|
+  task.cucumber_opts = "--tags @fail --wip"
 end
 
-task :test => [:spec, :cucumber, :negative_cucumber]
-task :default => :test
+task test: [:spec, :cucumber, :negative_cucumber]
+task default: :test

data/gemfiles/rspec2.gemfile

@@ -0,0 +1,9 @@
+source "https://rubygems.org"
+
+gemspec path: ".."
+
+gem "rspec", "~> 2.0"
+
+group :test do
+  gem "cucumber", "~> 1.3"
+end

data/gemfiles/rspec3.gemfile

@@ -0,0 +1,9 @@
+source "https://rubygems.org"
+
+gemspec path: ".."
+
+gem "rspec", "~> 3.0"
+
+group :test do
+  gem "cucumber", "~> 1.3"
+end

data/json_spec.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name    = "json_spec"
-  gem.version = "1.1.1"
+  gem.version = "1.1.2"
 
   gem.authors     = ["Steve Richert"]
   gem.email       = ["steve.richert@gmail.com"]
@@ -12,11 +12,11 @@ Gem::Specification.new do |gem|
   gem.license     = "MIT"
 
   gem.add_dependency "multi_json", "~> 1.0"
-  gem.add_dependency "rspec", "~> 2.0"
+  gem.add_dependency "rspec", ">= 2.0", "< 4.0"
 
   gem.add_development_dependency "bundler", "~> 1.0"
+  gem.add_development_dependency "rake", "~> 10.0"
 
-  gem.files         = `git ls-files`.split($\)
-  gem.test_files    = gem.files.grep(/^(features|spec)/)
-  gem.require_paths = ["lib"]
+  gem.files      = `git ls-files`.split($\)
+  gem.test_files = gem.files.grep(/^(features|spec)/)
 end

data/lib/json_spec/configuration.rb

@@ -29,7 +29,7 @@ module JsonSpec
     end
 
     def reset
-      instance_variables.each{|ivar| remove_instance_variable(ivar) }
+      instance_variables.each { |ivar| remove_instance_variable(ivar) }
     end
   end
 end

data/lib/json_spec/matchers/be_json_eql.rb

@@ -42,13 +42,15 @@ module JsonSpec
         self
       end
 
-      def failure_message_for_should
+      def failure_message
         message_with_path("Expected equivalent JSON")
       end
+      alias :failure_message_for_should :failure_message
 
-      def failure_message_for_should_not
+      def failure_message_when_negated
         message_with_path("Expected inequivalent JSON")
       end
+      alias :failure_message_for_should_not :failure_message_when_negated
 
       def description
         message_with_path("equal JSON")

data/lib/json_spec/matchers/have_json_path.rb

@@ -14,13 +14,15 @@ module JsonSpec
         false
       end
 
-      def failure_message_for_should
+      def failure_message
         %(Expected JSON path "#{@path}")
       end
+      alias :failure_message_for_should :failure_message
 
-      def failure_message_for_should_not
+      def failure_message_when_negated
         %(Expected no JSON path "#{@path}")
       end
+      alias :failure_message_for_should_not :failure_message_when_negated
 
       def description
         %(have JSON path "#{@path}")

data/lib/json_spec/matchers/have_json_size.rb

@@ -19,13 +19,15 @@ module JsonSpec
         self
       end
 
-      def failure_message_for_should
+      def failure_message
         message_with_path("Expected JSON value size to be #{@expected}, got #{@actual}")
       end
+      alias :failure_message_for_should :failure_message
 
-      def failure_message_for_should_not
+      def failure_message_when_negated
         message_with_path("Expected JSON value size to not be #{@expected}, got #{@actual}")
       end
+      alias :failure_message_for_should_not :failure_message_when_negated
 
       def description
         message_with_path(%(have JSON size "#{@expected}"))

data/lib/json_spec/matchers/have_json_type.rb

@@ -10,7 +10,7 @@ module JsonSpec
 
       def matches?(json)
         @ruby = parse_json(json, @path)
-        @classes.any?{|c| c === @ruby }
+        @classes.any? { |c| c === @ruby }
       end
 
       def at_path(path)
@@ -18,13 +18,15 @@ module JsonSpec
         self
       end
 
-      def failure_message_for_should
+      def failure_message
         message_with_path("Expected JSON value type to be #{@classes.join(", ")}, got #{@ruby.class}")
       end
+      alias :failure_message_for_should :failure_message
 
-      def failure_message_for_should_not
+      def failure_message_when_negated
         message_with_path("Expected JSON value type to not be #{@classes.join(", ")}, got #{@ruby.class}")
       end
+      alias :failure_message_for_should_not :failure_message_when_negated
 
       def description
         message_with_path(%(have JSON type "#{@classes.join(", ")}"))
@@ -34,7 +36,7 @@ module JsonSpec
         def type_to_classes(type)
           case type
           when Class then [type]
-          when Array then type.map{|t| type_to_classes(t) }.flatten
+          when Array then type.map { |t| type_to_classes(t) }.flatten
           else
             case type.to_s.downcase
             when "boolean"     then [TrueClass, FalseClass]

data/lib/json_spec/matchers/include_json.rb

@@ -15,8 +15,8 @@ module JsonSpec
         actual = parse_json(actual_json, @path)
         expected = exclude_keys(parse_json(@expected_json))
         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 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
@@ -42,13 +42,15 @@ module JsonSpec
         self
       end
 
-      def failure_message_for_should
+      def failure_message
         message_with_path("Expected included JSON")
       end
+      alias :failure_message_for_should :failure_message
 
-      def failure_message_for_should_not
+      def failure_message_when_negated
         message_with_path("Expected excluded JSON")
       end
+      alias :failure_message_for_should_not :failure_message_when_negated
 
       def description
         message_with_path("include JSON")

data/spec/json_spec/configuration_spec.rb

@@ -16,12 +16,12 @@ describe JsonSpec::Configuration do
   end
 
   it "excludes custom keys via block" do
-    JsonSpec.configure{|c| c.exclude_keys("token") }
+    JsonSpec.configure { |c| c.exclude_keys("token") }
     JsonSpec.excluded_keys.should == ["token"]
   end
 
   it "excludes custom keys via block setter" do
-    JsonSpec.configure{|c| c.excluded_keys = ["token"] }
+    JsonSpec.configure { |c| c.excluded_keys = ["token"] }
     JsonSpec.excluded_keys.should == ["token"]
   end
 

data/spec/json_spec/matchers/be_json_eql_spec.rb

@@ -28,8 +28,8 @@ describe JsonSpec::Matchers::BeJsonEql do
   it "ignores excluded-by-default hash keys" do
     JsonSpec.excluded_keys.should_not be_empty
 
-    actual = expected = {"json" => "spec"}
-    JsonSpec.excluded_keys.each{|k| actual[k] = k }
+    actual = expected = { "json" => "spec" }
+    JsonSpec.excluded_keys.each { |k| actual[k] = k }
     actual.to_json.should be_json_eql(expected.to_json)
   end
 

data/spec/json_spec/matchers/have_json_size_spec.rb

@@ -21,16 +21,18 @@ describe JsonSpec::Matchers::HaveJsonSize do
     %({"one":[1,2,3]}).should have_json_size(3).at_path("one")
   end
 
-  it "provides a failure message for should" do
+  it "provides a failure message" 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"
+    matcher.failure_message.should            == "Expected JSON value size to be 3, got 2"
+    matcher.failure_message_for_should.should == "Expected JSON value size to be 3, got 2" # RSpec 2 interface
   end
 
-  it "provides a failure message for should not" do
+  it "provides a failure message for negation" 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"
+    matcher.failure_message_when_negated.should   == "Expected JSON value size to not be 3, got 3"
+    matcher.failure_message_for_should_not.should == "Expected JSON value size to not be 3, got 3" # RSpec 2 interface
   end
 
   it "provides a description message" do

data/spec/json_spec/matchers/have_json_type_spec.rb

@@ -46,16 +46,18 @@ describe JsonSpec::Matchers::HaveJsonType do
     %(10.0).should have_json_type(Numeric)
   end
 
-  it "provides a failure message for should" do
+  it "provides a failure message" do
     matcher = have_json_type(Numeric)
     matcher.matches?(%("foo"))
-    matcher.failure_message_for_should.should == "Expected JSON value type to be Numeric, got String"
+    matcher.failure_message.should            == "Expected JSON value type to be Numeric, got String"
+    matcher.failure_message_for_should.should == "Expected JSON value type to be Numeric, got String" # RSpec 2 interface
   end
 
-  it "provides a failure message for should not" do
+  it "provides a failure message for negation" 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"
+    matcher.failure_message_when_negated.should   == "Expected JSON value type to not be Numeric, got Fixnum"
+    matcher.failure_message_for_should_not.should == "Expected JSON value type to not be Numeric, got Fixnum" # RSpec 2 interface
   end
 
   it "provides a description message" do

data/spec/json_spec/memory_spec.rb

@@ -7,12 +7,12 @@ describe JsonSpec::Memory do
 
   it "memorizes strings" do
     JsonSpec.memorize(:key, "value")
-    JsonSpec.memory.should == {:key => "value"}
+    JsonSpec.memory.should == { key: "value" }
   end
 
   it "symbolizes keys" do
     JsonSpec.memorize("key", "value")
-    JsonSpec.memory.should == {:key => "value"}
+    JsonSpec.memory.should == { key: "value" }
   end
 
   it "regurgitates unremembered strings" do

data/spec/spec_helper.rb

@@ -4,6 +4,13 @@ RSpec.configure do |config|
   config.before do
     JsonSpec.reset
   end
+
+  config.expect_with :rspec do |c|
+    c.syntax = [:should, :expect]
+  end
+  config.mock_with :rspec do |c|
+    c.syntax = [:should, :expect]
+  end
 end
 
 def files_path

metadata

@@ -1,57 +1,77 @@
 --- !ruby/object:Gem::Specification
 name: json_spec
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Steve Richert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-19 00:00:00.000000000 Z
+date: 2014-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
 description: RSpec matchers and Cucumber steps for testing JSON content
 email:
 - steve.richert@gmail.com
@@ -59,10 +79,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
-- LICENSE
+- LICENSE.txt
 - README.md
 - Rakefile
 - features/equivalence.feature
@@ -74,6 +94,8 @@ files:
 - features/step_definitions/steps.rb
 - features/support/env.rb
 - features/types.feature
+- gemfiles/rspec2.gemfile
+- gemfiles/rspec3.gemfile
 - json_spec.gemspec
 - lib/json_spec.rb
 - lib/json_spec/configuration.rb
@@ -115,17 +137,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Easily handle JSON in RSpec and Cucumber