saharspec 0.0.6 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9467b45b9c26592854a9ce9ef7b9e5a549229a357602a3bf03241d5398f9cfcb
-  data.tar.gz: 0b981cb23146042faa5e584400bd941012a9ab57f8d5f68a080add82d443e23c
+  metadata.gz: 8f36fea6becab89824a594297f3eb830f98277a412b304ba439f8c97cc2d84ff
+  data.tar.gz: c62d07b013183f8425a7775fb653f63958cb9a24c66ae5f84a34717df2c8e06d
 SHA512:
-  metadata.gz: fef4a6f67cf9db940fcd906f6c3b3edf924c26577d2d504202776b1bcbaad35027f9071bd2658afae22d081800ae8997fe70ae73ca3b165726a7d2b630484975
-  data.tar.gz: b55ed52e2842a7cf4b00ce01c8c2bf8c8fd91b53833dbf86498ead0febf55ed5cd86ab42b8c130e3a538ae5e0300df25c5beb114a778ae808cecf225d9198777
+  metadata.gz: 216ee5c533e3e54e05ea03cdb12da2d582d7fa5d5dda82ac5ea9cb83eba22acb2f5eccf3257f644f224f79baa1e4879b6191de4c64d4aafd6be1fc67d58d2372
+  data.tar.gz: 2495db0a5cb29fcde39b6057f2789c0bcb70d71c53254f677ab8e8308abed99a8c2cd3bd70f8051fba29fed3e253e8537704f028ad4edf431ceafb41c8253b8c

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Saharspec history
 
+## 0.0.9 -- 2022-05-17
+
+* Properly lint RSpec specs using `its_block`/`its_call`/`its_map` with `rubocop-rspec` >= 2.0 ([@ka8725](https://github.com/ka8725))
+* Fix `its_block` and `its_call` to support RSpec 3.11
+
+## 0.0.8 -- 2020-10-10
+
+* Better `dont` failure message (just use underlying matchers `failure_message_when_negated`)
+
+## 0.0.7 -- 2020-04-11
+
+* Allow `its_call` to work properly with keyword args on Ruby 2.7
+
 ## 0.0.6 -- 2019-10-05
 
 * Fix `dont.send_message` combination behavior (and generally, behavior of `dont.` with matchers

data/README.md

@@ -73,18 +73,18 @@ context 'when incompatible' do
 end
 
 # option 2. subject is block
-subject { -> {2 + x } }
-
-context 'when incompatible' do
-  let(:x) { '3' }
-  it { is_expected.to raise_error } # DRY
-end
+subject { -> { 2 + x } }
 
 context 'when numeric' do
   let(:x) { 3 }
   it { expect(subject.call).to eq 5 } # not DRY
 end
 
+context 'when incompatible' do
+  let(:x) { '3' }
+  it { is_expected.to raise_error } # DRY
+end
+
 # after
 require 'saharspec/matchers/ret'
 
@@ -157,7 +157,7 @@ require 'saharspec/matchers/eq_multiline'
 
 ### `dont`: matcher negation
 
-Another (exprimental) attempt to get rid of `define_negated_matcher`. `dont` is not 100% grammatically
+Allows to get rid of gazilliions of `define_negated_matcher`. `dont` is not 100% grammatically
 correct, yet short and readable enought. It just negates attached matcher.
 
 ```ruby
@@ -250,6 +250,16 @@ describe '#delete_at' do
 end
 ```
 
+### Linting with RuboCop RSpec
+
+`rubocop-rspec` fails to properly detect RSpec constructs that Saharspec defines (`its_call`, `its_block`, `its_map`).
+Make sure to use `rubocop-rspec` 2.0 or newer and add the following to your `.rubocop.yml`:
+
+```yaml
+inherit_gem:
+  saharspec: config/rubocop-rspec.yml
+```
+
 ## State & future
 
 I use all of the components of the library on daily basis. Probably, I will extend it with other

data/config/rubocop-rspec.yml

@@ -0,0 +1,13 @@
+RSpec:
+  Language:
+    Includes:
+      Examples:
+        - its_block
+        - its_call
+        - its_map
+        - fits_block
+        - fits_call
+        - fits_map
+        - xits_block
+        - xits_call
+        - xits_map

data/lib/saharspec/its/block.rb

@@ -3,7 +3,7 @@
 module Saharspec
   module Its
     module Block
-      # Creates nested example which converts current subject to a block-subject.
+      # Creates nested example that redefines implicit `is_expected` to use subject as a block.
       #
       # @example
       #
@@ -34,12 +34,13 @@ module Saharspec
       def its_block(*options, &block)
         # rubocop:disable Lint/NestedMethodDefinition
         describe('as block') do
+          # FIXME: Not necessary? (Previously, wrapped the subject in lambda, now just repeats it)
           let(:__call_subject) do
-            -> { subject }
+            subject
           end
 
           def is_expected
-            expect(__call_subject)
+            expect { __call_subject }
           end
 
           example(nil, *options, &block)

data/lib/saharspec/its/call.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'ruby2_keywords'
+
 module Saharspec
   module Its
     module Call
@@ -25,15 +27,15 @@ module Saharspec
       #      its_call(5) { is_expected.to change(array, :length).by(1) }
       #    end
       #
-      def its_call(*args, &block)
+      ruby2_keywords def its_call(*args, &block)
         # rubocop:disable Lint/NestedMethodDefinition
         describe("(#{args.map(&:inspect).join(', ')})") do
           let(:__call_subject) do
-            -> { subject.call(*args) }
+            subject.call(*args)
           end
 
           def is_expected
-            expect(__call_subject)
+            expect { __call_subject }
           end
 
           example(nil, &block)

data/lib/saharspec/its/map.rb

@@ -32,7 +32,7 @@ module Saharspec
       # @param block [Proc] The test itself. Inside it, `is_expected` (or `are_expected`) is related to result
       #  of `map`ping the subject.
       #
-      def its_map(attribute, *options, &block) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+      def its_map(attribute, *options, &block) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
         # rubocop:disable Lint/NestedMethodDefinition
         # TODO: better desciption for different cases
         describe("map(&:#{attribute})") do

data/lib/saharspec/matchers/dont.rb

@@ -4,7 +4,8 @@ module Saharspec
   module Matchers
     # @private
     class Not < RSpec::Matchers::BuiltIn::BaseMatcher
-      def initialize
+      def initialize(*)
+        super
         @delegator = Delegator.new
       end
 
@@ -27,11 +28,15 @@ module Saharspec
         end
       end
 
+      def failure_message
+        @matcher.failure_message_when_negated
+      end
+
       def supports_block_expectations?
         @matcher.supports_block_expectations?
       end
 
-      def method_missing(m, *a, &b) # rubocop:disable Style/MethodMissingSuper
+      def method_missing(m, *a, &b) # rubocop:disable Lint/MissingSuper
         if @matcher
           @matcher.send(m, *a, &b)
         else
@@ -41,7 +46,7 @@ module Saharspec
         self
       end
 
-      def respond_to_missing?(method, include_private = false)
+      def respond_to_missing?(method, include_private = false) # rubocop:disable Lint/MissingSuper
         if @matcher
           @matcher.respond_to?(method, include_private)
         else

data/lib/saharspec/version.rb

@@ -3,6 +3,6 @@
 module Saharspec
   MAJOR = 0
   MINOR = 0
-  PATCH = 6
+  PATCH = 9
   VERSION = [MAJOR, MINOR, PATCH].join('.')
 end

data/saharspec.gemspec

@@ -25,8 +25,12 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 2.3.0'
 
-  s.add_development_dependency 'rubocop', '~> 0.75'
-  s.add_development_dependency 'rspec', '~> 3.7.0'
+  s.add_runtime_dependency 'ruby2_keywords'
+
+  if RUBY_VERSION >= '2.4' # Newest Rubocop fails on 2.3
+    s.add_development_dependency 'rubocop', '~> 0.93'
+  end
+  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,41 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: saharspec
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.9
 platform: ruby
 authors:
 - Victor Shepelev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-05 00:00:00.000000000 Z
+date: 2022-05-17 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: ruby2_keywords
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.75'
+        version: '0.93'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.75'
+        version: '0.93'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.7.0
 - !ruby/object:Gem::Dependency
@@ -119,6 +133,7 @@ files:
 - CHANGELOG.md
 - LICENSE.txt
 - README.md
+- config/rubocop-rspec.yml
 - lib/saharspec.rb
 - lib/saharspec/its.rb
 - lib/saharspec/its/block.rb
@@ -153,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Several additions for DRYer RSpec code