rspec-resembles_json_matchers 0.9.0 → 0.9.1

data/lib/rspec/resembles_json_matchers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "rspec/resembles_json_matchers/version"
 require "rspec/resembles_json_matchers/string_indent"
 
@@ -32,7 +34,7 @@ module RSpec
 
     def self.resembles_matcher_candidates
       # Order matters
-      @candidates ||= [
+      @resembles_matcher_candidates ||= [
         JsonMatcher,
         ResemblesAnyOfMatcher,
         ResemblesRouteMatcher,
@@ -45,9 +47,8 @@ module RSpec
       ].freeze
     end
 
-    def self.resembles_matcher_for(expected, **a)
+    def self.resembles_matcher_for(expected, **_a)
       resembles_matcher_candidates.detect { |candidate| candidate.can_match?(expected) } || RSpec::Matchers::BuiltIn::Eq
     end
-
   end
 end

data/lib/rspec/resembles_json_matchers/attribute_differ.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_support/inflector"
 
 module RSpec::ResemblesJsonMatchers
@@ -47,40 +49,34 @@ module RSpec::ResemblesJsonMatchers
         @buffer.print NORMAL_COLOR
         @buffer.print prefix + "  " + "#{matcher.attribute_name.to_json}: "
         render(matcher.value_matcher, prefix: prefix + "  ")
-        @buffer.print(",") unless last
-        @buffer.puts
+      elsif nested_matcher?(matcher.value_matcher)
+        @buffer.print NORMAL_COLOR
+        @buffer.print prefix + "  " + "#{matcher.attribute_name.to_json}: "
+        render(matcher.value_matcher, prefix: prefix + "  ")
       else
-        if nested_matcher?(matcher.value_matcher)
-          @buffer.print NORMAL_COLOR
-          @buffer.print prefix + "  " + "#{matcher.attribute_name.to_json}: "
-          render(matcher.value_matcher, prefix: prefix + "  ")
-          @buffer.print(",") unless last
-          @buffer.puts
+        @buffer.print REMOVED_COLOR
+        @buffer.print prefix
+        if prefix.include? "-"
+          @buffer.print "  "
         else
-          @buffer.print REMOVED_COLOR
-          @buffer.print prefix
-          if prefix.include? "-"
-            @buffer.print "  "
-          else
-            @buffer.print "- "
-          end
-          @buffer.print "#{matcher.attribute_name.to_json}: "
-          render(matcher.value_matcher, prefix: prefix + "  ")
-          @buffer.print NORMAL_COLOR
-          @buffer.print(",") unless last
-          @buffer.puts
-          @buffer.print ADDED_COLOR
-          @buffer.print prefix + "+ #{matcher.attribute_name.to_json}: "
-          render(matcher.actual_value, prefix: prefix + "  ")
-          @buffer.print NORMAL_COLOR
-          @buffer.print(",") unless last
-          @buffer.puts
+          @buffer.print "- "
         end
+        @buffer.print "#{matcher.attribute_name.to_json}: "
+        render(matcher.value_matcher, prefix: prefix + "  ")
+        @buffer.print NORMAL_COLOR
+        @buffer.print(",") unless last
+        @buffer.puts
+        @buffer.print ADDED_COLOR
+        @buffer.print prefix + "+ #{matcher.attribute_name.to_json}: "
+        render(matcher.actual_value, prefix: prefix + "  ")
+        @buffer.print NORMAL_COLOR
       end
+      @buffer.print(",") unless last
+      @buffer.puts
     end
 
     def render_MissingAttributeMatcher(matcher, prefix: "", last: false)
-      prefix = prefix + (prefix.include?("-") ? "  " : "- ")
+      prefix += (prefix.include?("-") ? "  " : "- ")
       @buffer.print REMOVED_COLOR
       @buffer.print prefix + "#{matcher.attribute_name.to_json}: "
       render(matcher.value_matcher, prefix: prefix)
@@ -89,7 +85,7 @@ module RSpec::ResemblesJsonMatchers
     end
 
     def render_ExtraAttributeMatcher(matcher, prefix: "", last: false)
-      prefix = prefix + "+ "
+      prefix += "+ "
       @buffer.print ADDED_COLOR
       @buffer.print prefix + matcher.attribute_name.to_json + ": "
       render(matcher.actual_value, prefix: prefix)
@@ -97,7 +93,7 @@ module RSpec::ResemblesJsonMatchers
       @buffer.puts
     end
 
-    def render_ResemblesAnyOfMatcher(matcher, prefix: "", **opts)
+    def render_ResemblesAnyOfMatcher(matcher, prefix: "", **_opts)
       @buffer.puts "["
       if matcher.matched?
         matcher.original_expected.each do |item|
@@ -124,44 +120,45 @@ module RSpec::ResemblesJsonMatchers
       @buffer.print prefix + "]"
     end
 
-    def render_ResemblesBooleanMatcher(matcher, **opts)
+    def render_ResemblesBooleanMatcher(matcher, **_opts)
       @buffer.print matcher.expected.to_json
     end
 
-    def render_ResemblesStringMatcher(matcher, **opts)
+    def render_ResemblesStringMatcher(matcher, **_opts)
       @buffer.print matcher.expected.to_json
     end
 
-    def render_ResemblesDateMatcher(matcher, **opts)
+    def render_ResemblesDateMatcher(matcher, **_opts)
       @buffer.print matcher.expected.to_json
     end
 
-    def render_ResemblesNumericMatcher(matcher, **opts)
+    def render_ResemblesNumericMatcher(matcher, **_opts)
       @buffer.print matcher.expected.to_json
     end
 
-    def render_ResemblesClassMatcher(matcher, **opts)
+    def render_ResemblesClassMatcher(matcher, **_opts)
       @buffer.print matcher.expected.inspect
     end
 
-    def render_ResemblesNilMatcher(matcher, **opts)
+    def render_ResemblesNilMatcher(_matcher, **_opts)
       @buffer.print "null"
     end
 
-    def render_ResemblesRouteMatcher(matcher, **opts)
+    def render_ResemblesRouteMatcher(matcher, **_opts)
       @buffer.print matcher.expected.inspect
     end
 
     def method_missing(method_name, *args, &block)
       if method_name.to_s.start_with?("render_")
         raise NoMethodError, method_name if method_name.to_s.end_with?("Matcher")
+
         @buffer.print RSpec::Support::ObjectFormatter.format(args.first)
       else
         super
       end
     end
 
-    def respond_to_missing?(method_name, include_private = false)
+    def respond_to_missing?(method_name, _include_private = false)
       method_name.to_s.start_with?("render_")
     end
 
@@ -169,11 +166,9 @@ module RSpec::ResemblesJsonMatchers
       matcher.is_a?(JsonMatcher) || matcher.is_a?(ResemblesAnyOfMatcher)
     end
 
-    NORMAL_COLOR  = "\e[0m".freeze
-    REMOVED_COLOR = "\e[31m".freeze # Red
-    ADDED_COLOR   = "\e[32m".freeze # Green
-    NEUTRAL_COLOR = "\e[34m".freeze # Blue
-
+    NORMAL_COLOR  = "\e[0m"
+    REMOVED_COLOR = "\e[31m" # Red
+    ADDED_COLOR   = "\e[32m" # Green
+    NEUTRAL_COLOR = "\e[34m" # Blue
   end
 end
-

data/lib/rspec/resembles_json_matchers/attribute_matcher.rb

@@ -1,8 +1,9 @@
+# frozen_string_literal: true
+
 require "active_support/core_ext/hash/indifferent_access"
 require "active_support/core_ext/object/try"
 
 module RSpec::ResemblesJsonMatchers
-
   class AttributeMatcher
     include RSpec::ResemblesJsonMatchers::Helpers
     Undefined = Object.new # TODO use Dry::Core::Constants::Undefined
@@ -61,7 +62,6 @@ module RSpec::ResemblesJsonMatchers
         true
       end
     end
-
   end
 
   class MissingAttributeMatcher < AttributeMatcher
@@ -80,7 +80,6 @@ module RSpec::ResemblesJsonMatchers
   end
 
   class ExtraAttributeMatcher < AttributeMatcher
-
     def matches?(document)
       @document = document.try(:with_indifferent_access)
       false
@@ -93,7 +92,5 @@ module RSpec::ResemblesJsonMatchers
     def description
       "not be present"
     end
-
   end
-
 end

data/lib/rspec/resembles_json_matchers/helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "json"
 
 module RSpec::ResemblesJsonMatchers
@@ -14,16 +16,15 @@ module RSpec::ResemblesJsonMatchers
     end
 
     def matcherize(expected)
-      if is_matcher? expected
+      if matcher?(expected)
         expected
       else
         RSpec::ResemblesJsonMatchers.resembles_matcher_for(expected).new(expected)
       end
     end
 
-    def is_matcher?(obj)
+    def matcher?(obj)
       obj.respond_to?(:matches?) && obj.respond_to?(:description)
     end
-
   end
 end

data/lib/rspec/resembles_json_matchers/json_matcher.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_support/core_ext/hash/keys" # stringify_keys
 require "json"
 
@@ -13,7 +15,7 @@ module RSpec::ResemblesJsonMatchers
       hash.is_a? Hash
     end
 
-    attr_reader :expected, :actual
+    attr_reader :expected
 
     def initialize(expected_json)
       @expected = expected_json.try(:deep_stringify_keys)
@@ -23,7 +25,7 @@ module RSpec::ResemblesJsonMatchers
       @actual = actual_json.try(:deep_stringify_keys)
       # Can't use #all? because it stops on the first false
       all_passed = true
-      expected_matchers.each do |key, matcher|
+      expected_matchers.each do |_key, matcher|
         result = matcher.matches?(actual)
         all_passed &&= result
       end
@@ -39,7 +41,7 @@ module RSpec::ResemblesJsonMatchers
       AttributeDiffer.new(self).to_s
     end
 
-    def to_json
+    def to_json(*_args)
       failure_message
     end
 
@@ -58,8 +60,8 @@ module RSpec::ResemblesJsonMatchers
     end
 
     def expected_formatted
-      out = "{\n"
-      out << expected_matchers.map do |k,v|
+      out = +"{\n"
+      out << expected_matchers.map do |k, v|
         %{"#{k}": #{RSpec::Support::ObjectFormatter.format(v.expected_value)}}.indent(2)
       end.join(",\n")
       out << "\n}"
@@ -68,6 +70,5 @@ module RSpec::ResemblesJsonMatchers
     def actual
       @actual ||= {}
     end
-
   end
 end

data/lib/rspec/resembles_json_matchers/matcherizer.rb

@@ -1,5 +1,6 @@
-module RSpec::ResemblesJsonMatchers
+# frozen_string_literal: true
 
+module RSpec::ResemblesJsonMatchers
   module Matcherizer
     def matcherize(expected)
       if matcher? expected
@@ -20,6 +21,4 @@ module RSpec::ResemblesJsonMatchers
       obj.respond_to?(:matches?) && obj.respond_to?(:description)
     end
   end
-
 end
-

data/lib/rspec/resembles_json_matchers/resembles_any_of_matcher.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_support/core_ext/array/wrap"
 
 module RSpec::ResemblesJsonMatchers
@@ -34,9 +36,7 @@ module RSpec::ResemblesJsonMatchers
       end
     end
 
-    def failure_message
-
-    end
+    def failure_message; end
 
     def expected_matchers
       @expected
@@ -47,16 +47,12 @@ module RSpec::ResemblesJsonMatchers
     end
 
     def expected_formatted
-      "".tap do |out|
-        out << expected_matchers.map do |v|
-          case v
-          when RSpec::Matchers::BuiltIn::Eq
-            "should #{v.description}".indent(2)
-          else
-            "should #{v.description}".indent(2)
-          end
-        end.join("\n")
-      end << "\n"
+      out = +""
+      out << expected_matchers.map do |v|
+        "should #{v.description}".indent(2)
+      end.join("\n")
+      out << "\n"
+      out
     end
   end
 end

data/lib/rspec/resembles_json_matchers/resembles_array_matcher.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 module RSpec::ResemblesJsonMatchers
   class ResemblesArrayMatcher
@@ -27,9 +28,6 @@ module RSpec::ResemblesJsonMatchers
       @expected.map { |e| matcherize(e) }
     end
 
-    def failure_message
-    end
+    def failure_message; end
   end
-
-
 end

data/lib/rspec/resembles_json_matchers/resembles_boolean_matcher.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 module RSpec::ResemblesJsonMatchers
   class ResemblesBooleanMatcher

data/lib/rspec/resembles_json_matchers/resembles_class_matcher.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 module RSpec::ResemblesJsonMatchers
   class ResemblesClassMatcher
@@ -17,7 +18,7 @@ module RSpec::ResemblesJsonMatchers
 
     def matches?(actual)
       @actual = actual
-      actual.kind_of? @expected
+      actual.is_a? @expected
     end
 
     def expected_formatted

data/lib/rspec/resembles_json_matchers/resembles_date_matcher.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "time"
 
 module RSpec::ResemblesJsonMatchers

data/lib/rspec/resembles_json_matchers/resembles_hash_matcher.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RSpec::ResemblesJsonMatchers
   class ResemblesHashMatcher
     include Helpers
@@ -30,11 +32,11 @@ module RSpec::ResemblesJsonMatchers
         end
       end
 
-      actual.keys.each { |k| unmatched_matchers.delete(k) }
+      actual.each_key { |k| unmatched_matchers.delete(k) }
 
-      !failed_matches.any? and
-        !unmatched_keys.any? and
-        !unmatched_matchers.any?
+      failed_matches.none? and
+        unmatched_keys.none? and
+        unmatched_matchers.none?
     end
 
     def description
@@ -59,9 +61,7 @@ module RSpec::ResemblesJsonMatchers
       end
     end
 
-    def failed_matches
-      @failed_matches
-    end
+    attr_reader :failed_matches
 
     def unmatched_keys
       @actual.keys - @matched_keys
@@ -73,15 +73,16 @@ module RSpec::ResemblesJsonMatchers
 
     def expected_formatted
       out = "{\n"
-      out << expected_matchers.map do |k,v|
+      out << expected_matchers.map do |k, v|
         %{  "%s": %s} % [k, v.expected_formatted]
       end.join(",\n")
       out << "\n}\n"
     end
 
     def pretty_failed_matches
-      failed_matches.map do |k,matcher|
+      failed_matches.map do |k, matcher|
         next unless @actual.key?(k) # Covered by the unmatched matchers messages
+
         matcher_failure_message =
           matcher.failure_message
                  .gsub("(compared using ==)", "") # From the equality matcher, ugly in this context
@@ -99,10 +100,9 @@ module RSpec::ResemblesJsonMatchers
     end
 
     def pretty_unmatched_matchers
-      unmatched_matchers.map do |key, matcher|
+      unmatched_matchers.map do |key, _matcher|
         "attribute #{key.to_s.inspect}:\n  has a matcher defined, but that attribute was not provided"
       end.join("\n") + "\n"
     end
-
   end
 end