rspec-resembles_json_matchers 0.7.2 → 0.9.1

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
@@ -8,19 +10,24 @@ module RSpec::ResemblesJsonMatchers
       array.is_a? Array
     end
 
-    attr_reader :expected, :actual
+    attr_reader :expected, :actual, :original_expected
 
     def initialize(expected)
+      @original_expected = expected
       @expected = expected.map { |e| matcherize(e) }
     end
 
     def matches?(actual)
       @actual = Array.wrap(actual)
-      @actual.all? do |a|
+      @matched = @actual.all? do |a|
         expected_matchers.any? { |m| attempted_matchers << m; m.matches? a }
       end
     end
 
+    def matched?
+      @matched
+    end
+
     def description
       if @expected.size == 1
         "have every item #{expected_matchers.first.description}"
@@ -29,9 +36,7 @@ module RSpec::ResemblesJsonMatchers
       end
     end
 
-    def failure_message
-
-    end
+    def failure_message; end
 
     def expected_matchers
       @expected
@@ -42,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
@@ -5,6 +6,8 @@ module RSpec::ResemblesJsonMatchers
       bool.is_a?(TrueClass) || bool.is_a?(FalseClass)
     end
 
+    attr_reader :expected
+
     def initialize(expected)
       @expected = expected
     end
@@ -14,7 +17,7 @@ module RSpec::ResemblesJsonMatchers
     end
 
     def matches?(actual)
-      actual == @expected
+      actual.is_a?(TrueClass) || actual.is_a?(FalseClass)
     end
 
     def expected_formatted

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

data/lib/rspec/resembles_json_matchers/resembles_matcher.rb

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
+
 require "active_support/core_ext/array/wrap"
 
 module RSpec::ResemblesJsonMatchers
-
   def resembles(expected)
     ResemblesMatcher.new(expected)
   end
@@ -18,11 +19,9 @@ module RSpec::ResemblesJsonMatchers
                           candidates.detect { |candidate| candidate.can_match?(@expected) }
                         end
 
-      if candidate_class
-        @candidate = candidate_class.new(expected)
-      else
-        fail "Could not find an acceptable resembles matcher for #{@expected.inspect}"
-      end
+      fail "Could not find an acceptable resembles matcher for #{@expected.inspect}" unless candidate_class
+
+      @candidate = candidate_class.new(expected)
     end
 
     def description
@@ -31,29 +30,22 @@ module RSpec::ResemblesJsonMatchers
 
     def matches?(actual)
       @actual = actual
-      if @candidate
-        @candidate.matches?(actual)
-      end
+      @candidate&.matches?(actual)
     end
 
     def failure_message(negated: false)
-      "expected #{@actual.inspect} to #{negated ? "not " : ""}#{description}"
+      "expected #{@actual.inspect} to #{negated ? 'not ' : ''}#{description}"
     end
 
     def negative_failure_message
       failure_message(negated: true)
     end
 
-    def candidates
-    end
+    def candidates; end
   end
 
   class ResemblesAllOfMatcher
-
   end
 
-
-
   RSpec.configure { |c| c.include self }
 end
-

data/lib/rspec/resembles_json_matchers/resembles_nil_matcher.rb

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

data/lib/rspec/resembles_json_matchers/resembles_numeric_matcher.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 module RSpec::ResemblesJsonMatchers
   class ResemblesNumericMatcher
@@ -25,7 +26,7 @@ module RSpec::ResemblesJsonMatchers
       @expected
     end
 
-    def to_json
+    def to_json(*_args)
       @expected
     end
 

data/lib/rspec/resembles_json_matchers/resembles_route_matcher.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 module RSpec::ResemblesJsonMatchers
   class ResemblesRouteMatcher
@@ -9,16 +10,18 @@ module RSpec::ResemblesJsonMatchers
         route_string.include?(":")
     end
 
+    attr_reader :expected
+
     def initialize(expected_route)
-      @expected_route = expected_route
+      @expected = expected_route
     end
 
     def description
-      "resemble route #{@expected_route.inspect}"
+      "resemble route #{@expected.inspect}"
     end
 
     def matches?(actual)
-      path = ActionDispatch::Journey::Path::Pattern.from_string(@expected_route)
+      path = ActionDispatch::Journey::Path::Pattern.from_string(@expected)
       actual =~ path.to_regexp
     end
   end

data/lib/rspec/resembles_json_matchers/resembles_string_matcher.rb

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

data/lib/rspec/resembles_json_matchers/string_indent.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module RSpec
   module ResemblesJsonMatchers
     module StringIndent
       def indent!(amount, indent_string = nil, indent_empty_lines = false)
-        indent_string = indent_string || self[/^[ \t]/] || ' '
+        indent_string = indent_string || self[/^[ \t]/] || " "
         re = indent_empty_lines ? /^/ : /^(?!$)/
         gsub!(re, indent_string * amount)
       end
@@ -18,5 +20,5 @@ end
 begin
   require "active_support/core_ext/string/indent" # indent
 rescue LoadError
-  String.send(:include, RSpec::ResemblesJsonMatchers::StringIndent)
+  String.include RSpec::ResemblesJsonMatchers::StringIndent
 end

data/lib/rspec/resembles_json_matchers/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Rspec
   module ResemblesJsonMatchers
-    VERSION = "0.7.2"
+    VERSION = "0.9.1"
   end
 end

data/rspec-resembles_json_matchers.gemspec

@@ -1,7 +1,8 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'rspec/resembles_json_matchers/version'
+require "rspec/resembles_json_matchers/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "rspec-resembles_json_matchers"
@@ -9,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Paul Sadauskas"]
   spec.email         = ["psadauskas@gmail.com"]
 
-  spec.summary       = %q{Helpful matchers for comparing JSON documents.}
+  spec.summary       = "Helpful matchers for comparing JSON documents."
   spec.homepage      = "https://github.com/paul/rspec-resembles_json_matchers"
 
   # Prevent pushing this gem to RubyGems.org by setting 'allowed_push_host', or
@@ -25,18 +26,22 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.11"
+  spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", "~> 3.0"
+
   spec.add_development_dependency "appraisal"
+  spec.add_development_dependency "awesome_print"
   spec.add_development_dependency "guard"
   spec.add_development_dependency "guard-rspec"
   spec.add_development_dependency "pry-byebug"
   spec.add_development_dependency "pry-state"
-  spec.add_development_dependency "awesome_print"
+  spec.add_development_dependency "rubocop"
+  spec.add_development_dependency "rubocop-performance"
+  spec.add_development_dependency "rubocop-rspec"
 
-  spec.add_runtime_dependency "rspec", ">= 2.0", "< 4.0.0.a"
-  spec.add_runtime_dependency "rspec-expectations", ">= 2.0", "< 4.0.0.a"
-  spec.add_runtime_dependency "rspec-support", ">= 2.0", "< 4.0.0.a"
   spec.add_runtime_dependency "activesupport", ">= 3.0" # For core extensions
+  spec.add_runtime_dependency "rspec", ">= 3.0", "< 4.0.0.a"
+  spec.add_runtime_dependency "rspec-expectations", ">= 3.0", "< 4.0.0.a"
+  spec.add_runtime_dependency "rspec-support", ">= 3.0", "< 4.0.0.a"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-resembles_json_matchers
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.9.1
 platform: ruby
 authors:
 - Paul Sadauskas
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-12 00:00:00.000000000 Z
+date: 2020-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
@@ -123,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: awesome_print
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,32 +151,54 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
-    - - "<"
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0.a
-  type: :runtime
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
-    - - "<"
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0.a
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: rspec-expectations
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: 4.0.0.a
@@ -172,17 +208,17 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: 4.0.0.a
 - !ruby/object:Gem::Dependency
-  name: rspec-support
+  name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: 4.0.0.a
@@ -192,17 +228,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: 4.0.0.a
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: rspec-support
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 4.0.0.a
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -210,6 +249,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 4.0.0.a
 description: 
 email:
 - psadauskas@gmail.com
@@ -219,19 +261,22 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".travis.yml"
 - Appraisals
 - Changelog.md
 - Gemfile
 - Guardfile
+- LICENSE.txt
 - README.md
 - Rakefile
 - bin/rspec
 - examples/example_spec.rb
-- gemfiles/rails_42.gemfile
-- gemfiles/rails_42.gemfile.lock
+- gemfiles/.bundle/config
 - gemfiles/rails_5.gemfile
 - gemfiles/rails_5.gemfile.lock
+- gemfiles/rails_6.gemfile
+- gemfiles/rails_6.gemfile.lock
 - lib/rspec/resembles_json_matchers.rb
 - lib/rspec/resembles_json_matchers/attribute_differ.rb
 - lib/rspec/resembles_json_matchers/attribute_matcher.rb
@@ -270,8 +315,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Helpful matchers for comparing JSON documents.