saharspec 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 627f1f82b546e7a3e096497b74f25cab346d0fa2
-  data.tar.gz: d7efe0bcc330cdd47d426fb502b5114fbffa85e6
+SHA256:
+  metadata.gz: 9467b45b9c26592854a9ce9ef7b9e5a549229a357602a3bf03241d5398f9cfcb
+  data.tar.gz: 0b981cb23146042faa5e584400bd941012a9ab57f8d5f68a080add82d443e23c
 SHA512:
-  metadata.gz: e2249769358166c5b72bee55ca94b9b0ed698715afc71e439e7687fba8f745b63641312e4cb7d52340c3e4f6a805458c0f7e0b7be9b23e4eeccb90487d6699a2
-  data.tar.gz: 945e11582fd5c21b7cb7fd8b0d7f1021611d546bb957446df2f8b1c7b2d5c1b060e19dfd80956b5dec8a0d6a4949cda0981e216d1093d9084d44e005cf25dd49
+  metadata.gz: fef4a6f67cf9db940fcd906f6c3b3edf924c26577d2d504202776b1bcbaad35027f9071bd2658afae22d081800ae8997fe70ae73ca3b165726a7d2b630484975
+  data.tar.gz: b55ed52e2842a7cf4b00ce01c8c2bf8c8fd91b53833dbf86498ead0febf55ed5cd86ab42b8c130e3a538ae5e0300df25c5beb114a778ae808cecf225d9198777

data/CHANGELOG.md

@@ -1,10 +1,23 @@
 # Saharspec history
 
+## 0.0.6 -- 2019-10-05
+
+* Fix `dont.send_message` combination behavior (and generally, behavior of `dont.` with matchers
+  defining custom `does_not_matches?`);
+* Better `ret` matcher failure message when there is a complicated matcher on the right side (use
+  its `failure_message` instead of `description`);
+* Update `send_message` matcher description to be more readable;
+* Drop Ruby 2.2 support.
+
+## 0.0.5 -- 2018-03-03
+
+* `be_json` matcher;
+* make `ret` diffable.
+
 ## 0.0.4 -- 2017-11-07
 
 * Update `its_call` description generation, looks better with `rspec --format doc`
 
-
 ## 0.0.3 -- 2017-11-06
 
 * Introduce new `its`-family addition: `its_call(*args)`

data/README.md

@@ -43,9 +43,9 @@ require 'saharspec/matchers/send_message'
 it {
   expect { fetcher }.to send_message(Net::HTTP, :get).with('http://google.com').returning('not this time')
 }
-# after + its_call
+# after + its_block
 subject { fetcher }
-its_call { is_expected.to send_message(Net::HTTP, :get).with('http://google.com').returning('not this time') }
+its_block { is_expected.to send_message(Net::HTTP, :get).with('http://google.com').returning('not this time') }
 ```
 
 Note: there is [reasons](https://github.com/rspec/rspec-expectations/issues/934) why it is not in rspec-mocks, though, not very persuative for

data/lib/saharspec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Umbrella module for all Saharspec RSpec DRY-ing features.
 #
 # See {file:README.md} or {Its} and {Matchers} separately.

data/lib/saharspec/its.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Saharspec
   # Wrapper module for all `its_*` RSpec additions.
   #

data/lib/saharspec/its/block.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Saharspec
   module Its
     module Block
@@ -53,4 +55,4 @@ RSpec.configure do |rspec|
   rspec.backtrace_exclusion_patterns << %r{/lib/saharspec/its/block}
 end
 
-RSpec::SharedContext.send(:include, Saharspec::Its::Block)
+RSpec::SharedContext.include Saharspec::Its::Block

data/lib/saharspec/its/call.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Saharspec
   module Its
     module Call
@@ -27,7 +29,6 @@ module Saharspec
         # rubocop:disable Lint/NestedMethodDefinition
         describe("(#{args.map(&:inspect).join(', ')})") do
           let(:__call_subject) do
-            warn 'No need to use its_call without arguments, just it {} will work' if args.empty?
             -> { subject.call(*args) }
           end
 
@@ -48,4 +49,4 @@ RSpec.configure do |rspec|
   rspec.backtrace_exclusion_patterns << %r{/lib/saharspec/its/call}
 end
 
-RSpec::SharedContext.send(:include, Saharspec::Its::Call)
+RSpec::SharedContext.include Saharspec::Its::Call

data/lib/saharspec/its/map.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Saharspec
   module Its
     module Map
@@ -72,4 +74,4 @@ RSpec.configure do |rspec|
   rspec.backtrace_exclusion_patterns << %r{/lib/saharspec/its/map}
 end
 
-RSpec::SharedContext.send(:include, Saharspec::Its::Map)
+RSpec::SharedContext.include Saharspec::Its::Map

data/lib/saharspec/matchers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Saharspec
   # All Saharspec matchers, when required, included into `RSpec::Matchers` namespace.
   #

data/lib/saharspec/matchers/be_json.rb

@@ -1,27 +1,33 @@
+# frozen_string_literal: true
+
 require 'json'
 
 module Saharspec
   module Matchers
     # @private
     class BeJson
-      NONE = Object.new.freeze
       include RSpec::Matchers::Composable
       include RSpec::Matchers # to have #match
 
+      ANY = Object.new.freeze
+
       attr_reader :actual, :expected
 
       def initialize(expected, **parse_opts)
         @expected_matcher = @expected = expected
+
         # wrap to make be_json('foo' => matcher) work, too
-        @expected_matcher = match(expected) unless expected == NONE || expected.respond_to?(:matches?)
+        unless expected == ANY || expected.respond_to?(:matches?)
+          @expected_matcher = match(expected)
+        end
         @parse_opts = parse_opts
       end
 
       def matches?(json)
         @actual = JSON.parse(json, **@parse_opts)
-        @expected_matcher == NONE || @expected_matcher === @actual
-      rescue JSON::ParserError => parse_error
-        @parser_error = parse_error
+        @expected_matcher == ANY || @expected_matcher === @actual
+      rescue JSON::ParserError => e
+        @parser_error = e
         false
       end
 
@@ -34,7 +40,7 @@ module Saharspec
       end
 
       def description
-        if @expected == NONE
+        if @expected == ANY
           'be a valid JSON string'
         else
           expected = @expected.respond_to?(:description) ? @expected.description : @expected
@@ -47,7 +53,7 @@ module Saharspec
           case
           when @parser_error
             "failed: #{@parser_error}"
-          when @expected != NONE
+          when @expected != ANY
             "was #{@actual}"
           end
         "expected value to #{description} but #{failed}"
@@ -81,7 +87,7 @@ module RSpec
     #
     # @param expected Value or matcher to check JSON against. It should implement `#===` method,
     #   so all standard and custom RSpec matchers work.
-    def be_json(expected = Saharspec::Matchers::BeJson::NONE)
+    def be_json(expected = Saharspec::Matchers::BeJson::ANY)
       Saharspec::Matchers::BeJson.new(expected)
     end
 
@@ -92,7 +98,7 @@ module RSpec
     #
     # @param expected Value or matcher to check JSON against. It should implement `#===` method,
     #   so all standard and custom RSpec matchers work.
-    def be_json_sym(expected = Saharspec::Matchers::BeJson::NONE)
+    def be_json_sym(expected = Saharspec::Matchers::BeJson::ANY)
       Saharspec::Matchers::BeJson.new(expected, symbolize_names: true)
     end
   end

data/lib/saharspec/matchers/dont.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Saharspec
   module Matchers
     # @private
@@ -11,16 +13,25 @@ module Saharspec
       end
 
       def match(_expected, actual)
-        @matcher or
-          fail(ArgumentError, '`dont` matcher used without any matcher to negate. Usage: dont.other_matcher(args)')
-        !@matcher.matches?(actual)
+        @matcher or fail ArgumentError, '`dont` matcher used without any matcher to negate. '\
+                                        'Usage: dont.other_matcher(args)'
+
+        # https://www.rubydoc.info/github/rspec/rspec-expectations/RSpec%2FMatchers%2FMatcherProtocol:does_not_match%3F
+        # In a negative expectation such as `expect(x).not_to foo`, RSpec will call
+        # `foo.does_not_match?(x)` if this method is defined. If it's not defined it
+        # will fall back to using `!foo.matches?(x)`.
+        if @matcher.respond_to?(:does_not_match?)
+          @matcher.does_not_match?(actual)
+        else
+          !@matcher.matches?(actual)
+        end
       end
 
       def supports_block_expectations?
         @matcher.supports_block_expectations?
       end
 
-      def method_missing(m, *a, &b) # rubocop:disable Style/MethodMissing
+      def method_missing(m, *a, &b) # rubocop:disable Style/MethodMissingSuper
         if @matcher
           @matcher.send(m, *a, &b)
         else

data/lib/saharspec/matchers/eq_multiline.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../util'
 
 module Saharspec

data/lib/saharspec/matchers/ret.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Saharspec
   module Matchers
     # @private
@@ -13,6 +15,7 @@ module Saharspec
       def matches?(subject)
         @subject = subject
         return false unless subject.respond_to?(:call)
+
         @actual = subject.call
         @expected === @actual
       end
@@ -30,12 +33,23 @@ module Saharspec
       end
 
       def failure_message
-        "expected to #{description}, " +
-          (@subject.respond_to?(:call) ? "but returned #{@actual.inspect}" : 'but was not callable')
+        case
+        when !@subject.respond_to?(:call)
+          "expected to #{description}, but was not callable"
+        when @expected.respond_to?(:failure_message)
+          "return value mismatch: #{@expected.failure_message}"
+        else
+          "expected to #{description}, but returned #{@actual.inspect}"
+        end
       end
 
       def failure_message_when_negated
-        "expected not to #{description}, but returned it"
+        case
+        when @expected.respond_to?(:failure_message_when_negated)
+          "return value mismatch: #{@expected.failure_message_when_negated}"
+        else
+          "expected not to #{description}, but returned it"
+        end
       end
     end
   end

data/lib/saharspec/matchers/send_message.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Saharspec
   module Matchers
     # @private
@@ -33,6 +35,7 @@ module Saharspec
 
       def times
         fail NoMethodError unless @times
+
         self
       end
 
@@ -68,7 +71,7 @@ module Saharspec
       end
 
       def description
-        format('to send %p.%s', @target, @method)
+        format('send %p.%s', @target, @method)
       end
 
       def failure_message

data/lib/saharspec/util.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Saharspec
   module Util
     def multiline(string)

data/lib/saharspec/version.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 module Saharspec
   MAJOR = 0
   MINOR = 0
-  PATCH = 5
+  PATCH = 6
   VERSION = [MAJOR, MINOR, PATCH].join('.')
 end

data/saharspec.gemspec

@@ -23,10 +23,10 @@ Gem::Specification.new do |s|
   end
   s.require_paths = ["lib"]
 
-  s.required_ruby_version = '>= 2.1.0'
+  s.required_ruby_version = '>= 2.3.0'
 
-  s.add_development_dependency 'rubocop', '>= 0.40'
-  s.add_development_dependency 'rspec'
+  s.add_development_dependency 'rubocop', '~> 0.75'
+  s.add_development_dependency 'rspec', '~> 3.7.0'
   s.add_development_dependency 'rspec-its'
   s.add_development_dependency 'simplecov', '~> 0.9'
   s.add_development_dependency 'rake'

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: saharspec
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Victor Shepelev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-02 00:00:00.000000000 Z
+date: 2019-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.40'
+        version: '0.75'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.40'
+        version: '0.75'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.7.0
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
@@ -146,15 +146,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Several additions for DRYer RSpec code