rspec-json_expectations 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 635c0cad90f8b318d89952ee50c859dc7bc4110b
-  data.tar.gz: 430f157ca89a149f6f0c99e655ae6ebe40180ae1
+  metadata.gz: 578ce36c168740a6cf33f28aa580b7eb9a3b2bda
+  data.tar.gz: b06d98b0d63db3bafa6aeca999c7716de7c92913
 SHA512:
-  metadata.gz: 07b925d6f73e3478dae9b094e7bcf8a624c3b814e9d22b6c2b877bc628c9676d05bc628e5a0a344b48d16746184f93a2f578c1555502c9a39be4d79dc39048e1
-  data.tar.gz: 20ea442c480d27d1af256ea657d206e86f527b38171709aafa3710135565ff0f664a87c8ac981b924ad64d95287f33d2d83c937f9d63ef5d1cf7772c1789dd8e
+  metadata.gz: 4531142c7ea3c080f9cb3df97550346f7e9ff5e8bf009b1f1ee29d3ab2d5eb023619b51f69281dec5c9fa093e6b397596bc80e14e105ed7d9a8c5bdf8244d22b
+  data.tar.gz: a9ec4e356c69bb1a5ef5c2d5898b21ba95df8d24eff9b41669ee6c2790b0a52b8d45afdf0a2941d9141d74280e427c1e927a4aa4d426b8b9b25f9e871989c76b

data/Gemfile

@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+
+gemspec

data/features/rspec/json_expectations/unordered_array_support.feature

@@ -152,6 +152,25 @@ Feature: Unordered array matching support for include_json matcher
           1 example, 0 failures
           """
 
+  Scenario: Expecting json string with array at root to fully include json with arrays using alternative syntax
+    Given a file "spec/nested_example_spec.rb" with:
+          """ruby
+          require "spec_helper"
+
+          RSpec.describe "A json response" do
+            subject { '%{JSON_WITH_ROOT_ARRAY}' }
+
+            it "has basic info about user" do
+              expect(subject).to include_unordered_json ["first flight", "day & night"]
+            end
+          end
+          """
+     When I run "rspec spec/nested_example_spec.rb"
+     Then I see:
+          """
+          1 example, 0 failures
+          """
+
   Scenario: Expecting json string with array at root to fully include json with arrays with different order
     Given a file "spec/nested_example_spec.rb" with:
           """ruby
@@ -173,6 +192,25 @@ Feature: Unordered array matching support for include_json matcher
           1 example, 0 failures
           """
 
+  Scenario: Expecting json string with array at root to fully include json with arrays with different order using alternative syntax
+    Given a file "spec/nested_example_spec.rb" with:
+          """ruby
+          require "spec_helper"
+
+          RSpec.describe "A json response" do
+            subject { '%{JSON_WITH_ROOT_ARRAY}' }
+
+            it "has basic info about user" do
+              expect(subject).to include_unordered_json ["day & night", "first flight"]
+            end
+          end
+          """
+     When I run "rspec spec/nested_example_spec.rb"
+     Then I see:
+          """
+          1 example, 0 failures
+          """
+
   Scenario: Expecting json string with array at root to fully include json with wrong values
     Given a file "spec/nested_example_spec.rb" with:
           """ruby
@@ -198,3 +236,27 @@ Feature: Unordered array matching support for include_json matcher
                              expected: "unknown"
                                   got: nil
           """
+
+  Scenario: Expecting json string with array at root to fully include json with wrong values using alternative syntax
+    Given a file "spec/nested_example_spec.rb" with:
+          """ruby
+          require "spec_helper"
+
+          RSpec.describe "A json response" do
+            subject { '%{JSON_WITH_ROOT_ARRAY}' }
+
+            it "has basic info about user" do
+              expect(subject).to include_unordered_json ["day & night", "unknown", "first flight"]
+            end
+          end
+          """
+     When I run "rspec spec/nested_example_spec.rb"
+     Then I see:
+          """
+                           json atom at path "1" is missing
+          """
+      And I see:
+          """
+                             expected: "unknown"
+                                  got: nil
+          """

data/lib/rspec/json_expectations.rb

@@ -1,4 +1,5 @@
 require "rspec/core"
+require "rspec/json_expectations/matcher_factory"
 require "rspec/json_expectations/version"
 require "rspec/json_expectations/json_traverser"
 require "rspec/json_expectations/failure_presenter"

data/lib/rspec/json_expectations/matcher_factory.rb

@@ -0,0 +1,50 @@
+module RSpec
+  module JsonExpectations
+    class MatcherFactory
+      def initialize(matcher_name)
+        @matcher_name = matcher_name
+      end
+
+      def define_matcher(&block)
+        RSpec::Matchers.define(@matcher_name) do |expected|
+          yield
+
+          # RSpec 2 vs 3
+          if respond_to?(:failure_message)
+            match do |actual|
+              traverse(expected, actual, false)
+            end
+
+            match_when_negated do |actual|
+              traverse(expected, actual, true)
+            end
+
+            failure_message do |actual|
+              RSpec::JsonExpectations::FailurePresenter.render(@include_json_errors)
+            end
+
+            failure_message_when_negated do |actual|
+              RSpec::JsonExpectations::FailurePresenter.render(@include_json_errors)
+            end
+          else
+            match_for_should do |actual|
+              traverse(expected, actual, false)
+            end
+
+            match_for_should_not do |actual|
+              traverse(expected, actual, true)
+            end
+
+            failure_message_for_should do |actual|
+              RSpec::JsonExpectations::FailurePresenter.render(@include_json_errors)
+            end
+
+            failure_message_for_should_not do |actual|
+              RSpec::JsonExpectations::FailurePresenter.render(@include_json_errors)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rspec/json_expectations/matchers.rb

@@ -1,40 +1,4 @@
-RSpec::Matchers.define :include_json do |expected|
-
-  # RSpec 2 vs 3
-  if respond_to?(:failure_message)
-    match do |actual|
-      traverse(expected, actual, false)
-    end
-
-    match_when_negated do |actual|
-      traverse(expected, actual, true)
-    end
-
-    failure_message do |actual|
-       RSpec::JsonExpectations::FailurePresenter.render(@include_json_errors)
-    end
-
-    failure_message_when_negated do |actual|
-       RSpec::JsonExpectations::FailurePresenter.render(@include_json_errors)
-    end
-  else
-    match_for_should do |actual|
-      traverse(expected, actual, false)
-    end
-
-    match_for_should_not do |actual|
-      traverse(expected, actual, true)
-    end
-
-    failure_message_for_should do |actual|
-      RSpec::JsonExpectations::FailurePresenter.render(@include_json_errors)
-    end
-
-    failure_message_for_should_not do |actual|
-      RSpec::JsonExpectations::FailurePresenter.render(@include_json_errors)
-    end
-  end
-
+RSpec::JsonExpectations::MatcherFactory.new(:include_json).define_matcher do
   def traverse(expected, actual, negate=false)
     unless expected.is_a?(Hash) ||
         expected.is_a?(Array) ||
@@ -55,6 +19,28 @@ RSpec::Matchers.define :include_json do |expected|
   end
 end
 
+RSpec::JsonExpectations::MatcherFactory.new(:include_unordered_json).define_matcher do
+  def traverse(expected, actual, negate=false)
+    unless expected.is_a?(Array)
+      raise ArgumentError,
+        "Expected value must be a array for include_unordered_json matcher"
+    end
+
+    actual_json = actual
+    actual_json = JSON.parse(actual) if String === actual
+
+    expected_wrapped_in_unordered_array = \
+      RSpec::JsonExpectations::Matchers::UnorderedArrayMatcher.new(expected)
+
+    RSpec::JsonExpectations::JsonTraverser.traverse(
+      @include_json_errors = { _negate: negate },
+      expected_wrapped_in_unordered_array,
+      actual_json,
+      negate
+    )
+  end
+end
+
 module RSpec
   module JsonExpectations
     module Matchers

data/lib/rspec/json_expectations/version.rb

@@ -1,5 +1,5 @@
 module RSpec
   module JsonExpectations
-    VERSION = "1.3.0"
+    VERSION = "1.4.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-json_expectations
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Oleksii Fedorov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-18 00:00:00.000000000 Z
+date: 2016-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -51,6 +51,7 @@ files:
 - ".gitignore"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
+- Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -72,6 +73,7 @@ files:
 - lib/rspec/json_expectations.rb
 - lib/rspec/json_expectations/failure_presenter.rb
 - lib/rspec/json_expectations/json_traverser.rb
+- lib/rspec/json_expectations/matcher_factory.rb
 - lib/rspec/json_expectations/matchers.rb
 - lib/rspec/json_expectations/version.rb
 - local_env.rb
@@ -112,4 +114,3 @@ test_files:
 - features/rspec/json_expectations/unordered_array_support.feature
 - features/step_definitions/steps.rb
 - features/support/env.rb
-has_rdoc: