rspec-json_api 1.2.2 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7bb2dd6447fbb645e88da6ca6650a19bc60c53ac6279e24bbd440fe291eceff3
-  data.tar.gz: 9c42396046bcd95029c1744cb37322246e74696b353a2e58404de15bf90e9d72
+  metadata.gz: 7b4b978bb71054b9d75d61a47c0213eb26888876c72a132bd77da8e2a8aea15b
+  data.tar.gz: 69896916d64f74eb3c63708f6a84e412c9a0b8e5d2b9283fad40133f7f80a143
 SHA512:
-  metadata.gz: 923b1ee38754ea86b17c1aca69348ae1122de82b759cb0231a41ac02887a34bb14b8e445965409e21f133ed74054ac7754bba14cba6cbca4e9bc31b26a83cbbf
-  data.tar.gz: 77311bfdc2ff60e1c978ca1f49a68c328f98aec2e762f167087a7c2204b4d372d10ac2412d595cbbe25c22966fd478435c644b8f095a10b44965559ad14efe9e
+  metadata.gz: e69138827c7e5241305a32bac25ba0247e60bc7836bd31a22dd5fa3160a8c8247872359e716ded38e2876a299343cc516d643d2d0c8263a85928a11e4dc69b6d
+  data.tar.gz: a3ab6e463a51bb29c9a12fae052fff6f0f9a8e3732642b5a1a4a195078761e8a216235a655987a767c5b2f737ccb5a9dcb303d6ef66ff032a8ff811c113ba00c

data/Gemfile

@@ -7,6 +7,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 gemspec
 
 gem "activesupport", "~> 6.1", ">= 6.1.4.1"
+gem "diffy"
 gem "rake", "~> 13.0", ">= 13.0.6"
 gem "rspec-rails", "~> 5.0", ">= 5.0.2"
 gem "rubocop"

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    rspec-json_api (1.2.2)
+    rspec-json_api (1.3.1)
       activesupport (>= 6.1.4.1)
+      diffy (>= 3.4.2)
       rails (>= 6.1.4.1)
       rspec-rails (>= 5.0.2)
 
@@ -75,6 +76,7 @@ GEM
     crass (1.0.6)
     date (3.3.4)
     diff-lcs (1.5.0)
+    diffy (3.4.2)
     erubi (1.10.0)
     globalid (1.2.1)
       activesupport (>= 6.1)
@@ -201,6 +203,7 @@ PLATFORMS
 
 DEPENDENCIES
   activesupport (~> 6.1, >= 6.1.4.1)
+  diffy
   rake (~> 13.0, >= 13.0.6)
   rspec-json_api!
   rspec-rails (~> 5.0, >= 5.0.2)

data/lib/rspec/json_api/matchers/have_no_content.rb

@@ -3,17 +3,37 @@
 module RSpec
   module JsonApi
     module Matchers
+      # The HaveNoContent class is designed to verify that a given string is empty.
+      #
+      # This matcher is primarily used within RSpec tests to assert that a given
+      # string lacks content, effectively ensuring that expected content is absent,
+      # which can be particularly useful in testing API responses or other outputs
+      # where the absence of content signifies a specific state or outcome.
       class HaveNoContent
+        # Determines whether the actual string is empty, signifying no content.
+        #
+        # @param actual [String] The string to be evaluated.
+        # @return [Boolean] Returns true if the string is empty, indicating no content; false otherwise.
         def matches?(actual)
           actual == ""
         end
 
+        # Provides a failure message for when the actual string contains content,
+        # contrary to the expectation of being empty.
+        #
+        # @return [String] A descriptive message indicating the expectation was for
+        #   the string to have no content, yet content was found.
         def failure_message
-          self
+          "expected the string to be empty but it contained content"
         end
 
+        # Provides a failure message for when the expectation is negated (i.e.,
+        # expecting content) and the actual string is unexpectedly empty.
+        #
+        # @return [String] A descriptive message indicating that content was expected
+        #   in the string, but it was found to be empty.
         def failure_message_when_negated
-          self
+          "expected the string not to be empty, yet it was devoid of content"
         end
       end
     end

data/lib/rspec/json_api/matchers/match_json_schema.rb

@@ -3,36 +3,57 @@
 module RSpec
   module JsonApi
     module Matchers
+      # MatchJsonSchema class is designed to match a given JSON against a predefined JSON schema.
+      #
+      # This matcher is useful for validating JSON structures in API responses or other JSON data
+      # against a schema defined either as a Hash, an Array, or another JSON structure.
       class MatchJsonSchema
+        # @return [Object] the expected JSON schema to match against
         attr_reader :expected
+        # @return [Object] the actual JSON data being tested
+        attr_reader :actual
 
+        # Initializes the matcher with the expected JSON schema.
+        # @param expected [Object] The expected JSON schema as a Hash, Array, or other JSON-compatible structure.
         def initialize(expected)
           @expected = expected
         end
 
+        # Matches the actual JSON data against the expected schema.
+        # @param actual [String] The JSON string to test against the expected schema.
+        # @return [Boolean] true if the actual JSON matches the expected schema, false otherwise.
         def matches?(actual)
-          # Parse JSON to ruby object
-          actual = JSON.parse(actual, symbolize_names: true)
+          @actual = JSON.parse(actual, symbolize_names: true)
+          @diff = Diffy::Diff.new(expected, @actual, context: 5)
 
-          # Compare types
-          return false unless actual.instance_of?(expected.class)
+          return false unless @actual.instance_of?(expected.class)
 
           if expected.instance_of?(Array)
-            RSpec::JsonApi::CompareArray.compare(actual, expected)
+            RSpec::JsonApi::CompareArray.compare(@actual, expected)
           else
-            # Compare actual and expected schema
-            return false unless actual.deep_keys.deep_sort == expected.deep_keys.deep_sort
+            return false unless @actual.deep_keys.deep_sort == expected.deep_keys.deep_sort
 
-            RSpec::JsonApi::CompareHash.compare(actual, expected)
+            RSpec::JsonApi::CompareHash.compare(@actual, expected)
           end
         end
 
+        # Provides a failure message for when the JSON data does not match the expected schema.
+        # @return [String] A descriptive message detailing the mismatch between expected and actual JSON.
         def failure_message
-          self
+          <<~MSG
+            expected: #{expected}
+                 got: #{actual}
+
+            Diff:
+            #{@diff}
+          MSG
         end
 
+        # Provides a failure message for when the JSON data matches the expected schema, but it was expected not to.
+        # This is used in negative matchers.
+        # @return [self] Returns itself, but typically this method should be implemented to return a descriptive message
         def failure_message_when_negated
-          self
+          "expected the JSON data not to match the provided schema, but it did."
         end
       end
     end

data/lib/rspec/json_api/version.rb

@@ -2,6 +2,6 @@
 
 module RSpec
   module JsonApi
-    VERSION = "1.2.2"
+    VERSION = "1.3.1"
   end
 end

data/lib/rspec/json_api.rb

@@ -2,6 +2,7 @@
 
 # Load 3th party libraries
 require "json"
+require "diffy"
 require "active_support/core_ext/object/blank"
 
 # Load the json_api parts

data/rspec-json_api.gemspec

@@ -28,6 +28,7 @@ Gem::Specification.new do |spec|
 
   # Uncomment to register a new dependency of your gem
   spec.add_dependency "activesupport", ">= 6.1.4.1"
+  spec.add_dependency "diffy", ">= 3.4.2"
   spec.add_dependency "rails", ">= 6.1.4.1"
   spec.add_dependency "rspec-rails", ">= 5.0.2"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-json_api
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.1
 platform: ruby
 authors:
 - Michal Gajowiak
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-02-23 00:00:00.000000000 Z
+date: 2024-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 6.1.4.1
+- !ruby/object:Gem::Dependency
+  name: diffy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.4.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.4.2
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement