rspec-paramz 1.2.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13b0814bc75385484cc98d0e177265f3946afc2f85ebfa9cc7b074396723cb36
-  data.tar.gz: ca7a49c75162ca57d76296a7de15d8d222d92a66451637fa41f5032f3c08c602
+  metadata.gz: ad92978ad2f245bcae60978474d7ec8b6de9e20adb2090bc1572f0974cc8c5d8
+  data.tar.gz: cad5699ce3a8290b5d7076abea8d5e3f70745b9606f54d909da777bee7155268
 SHA512:
-  metadata.gz: efc72c44e493d2010d21468eec25971a04931966f94a50e4fc61c20045d25a85d9cfb189b71716833e909b2b38e8be4816df8b40e669b8b4cbb7c6c1d76d00cb
-  data.tar.gz: d3e7ddc26c2649fe090e9e36a7924a090fdc6178af4252a6207de64e01321ac1683f02526dcb2048510df3f2ddf986b8b5af8a0e796d8b26a979decec1b5308b
+  metadata.gz: 1741436d436b3b23bb739c3d95a794f0d2de2304505bbe3d6cc679c9346fdf21b4c847426d79eb9cdaf10fac9793da4b6a03459223f383a020f16b80134c2eb8
+  data.tar.gz: a974dd00c973303da0f7bd7bed9e49b121190aa257da8381e530554e05d37dce45cd2ef76194d1a131e6ef0e961452275d4448d49035010ebc5d92365e3cdcfb

data/.github/workflows/test.yml

@@ -0,0 +1,26 @@
+name: Test
+
+on:
+  push:
+  pull_request:
+
+permissions:
+  contents: read
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['3.1', '3.2', '3.3', '3.4', 'head']
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: Run tests
+      run: bundle exec rake

data/.rubocop.yml

@@ -4,4 +4,4 @@ inherit_gem:
     - "config/rspec.yml"
 
 AllCops:
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 3.1

data/Gemfile.lock

@@ -2,65 +2,74 @@ PATH
   remote: .
   specs:
     rspec-paramz (1.2.0)
-      rspec (~> 3.0)
+      rspec
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.2)
     coderay (1.1.3)
-    diff-lcs (1.5.0)
-    method_source (1.0.0)
+    diff-lcs (1.6.0)
+    json (2.10.1)
+    language_server-protocol (3.17.0.4)
+    lint_roller (1.1.0)
+    method_source (1.1.0)
     onkcop (1.0.0.0)
       rubocop (>= 0.80.0)
       rubocop-rspec (>= 1.34.0)
-    parallel (1.22.1)
-    parser (3.1.2.0)
+    parallel (1.26.3)
+    parser (3.3.7.1)
       ast (~> 2.4.1)
-    pry (0.14.1)
+      racc
+    pry (0.15.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
+    racc (1.8.1)
     rainbow (3.1.1)
-    rake (13.0.6)
-    regexp_parser (2.5.0)
-    rexml (3.2.5)
-    rspec (3.11.0)
-      rspec-core (~> 3.11.0)
-      rspec-expectations (~> 3.11.0)
-      rspec-mocks (~> 3.11.0)
-    rspec-core (3.11.0)
-      rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.0)
+    rake (13.2.1)
+    regexp_parser (2.10.0)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.3)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.1)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.0)
-    rubocop (1.30.1)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.2)
+    rubocop (1.72.2)
+      json (~> 2.3)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
       parallel (~> 1.10)
-      parser (>= 3.1.0.0)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.18.0, < 2.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.38.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.18.0)
-      parser (>= 3.1.1.0)
-    rubocop-rspec (2.11.1)
-      rubocop (~> 1.19)
-    ruby-progressbar (1.11.0)
-    unicode-display_width (2.1.0)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.38.0)
+      parser (>= 3.3.1.0)
+    rubocop-rspec (3.5.0)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
+    ruby-progressbar (1.13.0)
+    unicode-display_width (3.1.4)
+      unicode-emoji (~> 4.0, >= 4.0.4)
+    unicode-emoji (4.0.4)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 2.0)
+  bundler
   onkcop
   pry
-  rake (~> 13.0)
+  rake
   rspec-paramz!
 
 BUNDLED WITH

data/README.md

@@ -6,8 +6,7 @@ Inspired by [tomykaira/rspec-parameterized](https://github.com/tomykaira/rspec-p
 
 ## Requirements
 
-- Ruby 2.6 or later
-  - This gem uses `RubyVM::AbstractSyntaxTree`
+- Ruby 3.1 or later
 
 ## Installation
 

data/lib/rspec/paramz/pretty_print.rb

@@ -1,51 +1,61 @@
 module RSpec
   module Paramz
     module PrettyPrint
-      def self.inspect(value, raw_value = true)
-        case value
-        when Hash
-          subject(value)
-        when Proc
-          to_source(value)
-        else
-          raw_value ? value : value.inspect
+      class << self
+        def inspect(value, raw_value = true)
+          case value
+          when Hash
+            subject(value)
+          when Proc
+            to_source(value)
+          else
+            raw_value ? value : value.inspect
+          end
         end
-      end
-
-      def self.subject(value)
-        return value if value.keys != [:subject]
 
-        _subject = value.values.first
-        case _subject
-        when Proc
-          "subject #{to_source(_subject)}"
-        when Hash
-          subject_name  = _subject.keys.first
-          subject_value = _subject.values.first
+        def subject(value)
+          return value if value.keys != [:subject]
 
-          case subject_value
+          _subject = value.values.first
+          case _subject
           when Proc
-            "subject(:#{subject_name}) #{to_source(subject_value)}"
+            "subject #{to_source(_subject)}"
+          when Hash
+            subject_name  = _subject.keys.first
+            subject_value = _subject.values.first
+
+            case subject_value
+            when Proc
+              "subject(:#{subject_name}) #{to_source(subject_value)}"
+            else
+              "subject { #{subject_value} }"
+            end
           else
-            "subject { #{subject_value} }"
+            value
           end
-        else
-          value
         end
-      end
 
-      def self.to_source(value)
-        return value if value.is_a?(NamedProc) || !value.is_a?(Proc)
+        def to_source(value)
+          return value if value.is_a?(NamedProc) || !value.is_a?(Proc)
+
+          code_location = fetch_code_location(value)
+          return value if code_location.nil?
+
+          path = value.source_location.first
+          lines = File.readlines(path)
 
-        node = RubyVM::AbstractSyntaxTree.of(value)
-        return value if node.nil?
+          source_lines = lines[(code_location[0] - 1)..(code_location[2] - 1)]
+          source_lines[-1] = source_lines[-1][0..(code_location[3] - 1)]
+          source_lines[0]  = source_lines[0][code_location[1]..]
+          source_lines.map(&:strip).join("\n")
+        end
+
+        private
 
-        path = value.source_location.first
-        lines = File.readlines(path)
-        source_lines = lines[(node.first_lineno - 1)..(node.last_lineno - 1)]
-        source_lines[-1] = source_lines[-1][0..(node.last_column - 1)]
-        source_lines[0]  = source_lines[0][node.first_column..]
-        source_lines.map(&:strip).join("\n")
+          def fetch_code_location(value)
+            iseq = RubyVM::InstructionSequence.of(value)
+            iseq.to_a[4][:code_location]
+          end
       end
     end
   end

data/lib/rspec/paramz/version.rb

@@ -1,5 +1,5 @@
 module RSpec
   module Paramz
-    VERSION = "1.2.0"
+    VERSION = "2.0.0".freeze
   end
 end

data/lib/rspec/paramz.rb

@@ -9,14 +9,16 @@ module RSpec
       def paramz(*args, &block)
         labels = args.first
 
-        if !block_given? && !labels.any? { |label| subject_label?(label) }
+        if !block_given? && labels.none? {|label| subject_label?(label) }
           raise ArgumentError, "No block or subject given to paramz."
         end
 
-        args[1..-1].each_slice(labels.length).with_index do |arg, index|
+        args[1..].each_slice(labels.length).with_index do |arg, index|
           pairs = [labels, arg].transpose.to_h
 
-          context_name = '[' + pairs.map { |k, v| "#{RSpec::Paramz::PrettyPrint.inspect(k)} = #{RSpec::Paramz::PrettyPrint.inspect(v, false)}" }.join(' | ') + ']'
+          context_name = "[" + pairs.map {|k, v|
+            "#{RSpec::Paramz::PrettyPrint.inspect(k)} = #{RSpec::Paramz::PrettyPrint.inspect(v, false)}"
+          }.join(" | ") + "]"
 
           context context_name do
             pairs.each do |label, val|
@@ -29,7 +31,7 @@ module RSpec
 
                 _subject, _subject_name = parse_subject(label)
 
-                module_exec { _subject.is_a?(Proc) ? subject(_subject_name, &_subject) : subject(_subject_name) { _subject }  }
+                module_exec { _subject.is_a?(Proc) ? subject(_subject_name, &_subject) : subject(_subject_name) { _subject } }
 
                 unless block_given?
                   module_exec { val.is_a?(Proc) ? let(:_paramz_subject, &val) : let(:_paramz_subject) { val } }
@@ -44,7 +46,7 @@ module RSpec
 
             after(:each) do |example|
               if example.exception
-                index_info = arg.map { |v| RSpec::Paramz::PrettyPrint.inspect(v, false) }.join(', ')
+                index_info = arg.map {|v| RSpec::Paramz::PrettyPrint.inspect(v, false) }.join(", ")
                 example.exception.backtrace.push("failed paramz index is:#{index + 1}:[#{index_info}]")
               end
             end
@@ -54,22 +56,23 @@ module RSpec
 
       private
 
-      def subject_label?(label)
-        return true if label == :subject
-        label.is_a?(Hash) && label.keys == [:subject]
-      end
-
-      def parse_subject(label)
-        _subject = label[:subject]
+        def subject_label?(label)
+          return true if label == :subject
 
-        _subject_name = nil
-        if _subject.is_a?(Hash)
-          _subject_name = _subject.keys.first
-          _subject      = _subject.values.first
+          label.is_a?(Hash) && label.keys == [:subject]
         end
 
-        [_subject, _subject_name]
-      end
+        def parse_subject(label)
+          _subject = label[:subject]
+
+          _subject_name = nil
+          if _subject.is_a?(Hash)
+            _subject_name = _subject.keys.first
+            _subject      = _subject.values.first
+          end
+
+          [_subject, _subject_name]
+        end
     end
   end
 

data/rspec-paramz.gemspec

@@ -8,8 +8,10 @@ Gem::Specification.new do |spec|
   spec.authors       = ["fukayatsu"]
   spec.email         = ["fukayatsu@gmail.com"]
 
-  spec.summary       = %q{Simple Parameterized Test for RSpec.}
-  spec.description   = %q{Simple Parameterized Test for RSpec}
+  spec.required_ruby_version = ">= 3.1.0"
+
+  spec.summary       = "Simple Parameterized Test for RSpec."
+  spec.description   = "Simple Parameterized Test for RSpec"
   spec.homepage      = "https://github.com/fukayatsu/rspec-paramz"
   spec.license       = "MIT"
 
@@ -19,17 +21,17 @@ Gem::Specification.new do |spec|
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.files = Dir.chdir(File.expand_path(__dir__)) do
+    `git ls-files -z`.split("\x0").reject {|f| f.match(%r{^(test|spec|features)/}) }
   end
   spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.executables   = spec.files.grep(%r{^exe/}) {|f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "rspec", "~> 3.0"
+  spec.add_runtime_dependency "rspec"
 
-  spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "rake", "~> 13.0"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "onkcop"
   spec.add_development_dependency "pry"
+  spec.add_development_dependency "rake"
 end

metadata

@@ -1,59 +1,58 @@
 --- !ruby/object:Gem::Specification
 name: rspec-paramz
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 2.0.0
 platform: ruby
 authors:
 - fukayatsu
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-15 00:00:00.000000000 Z
+date: 2025-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   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: '2.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: onkcop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: onkcop
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +66,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -87,10 +86,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock
@@ -113,7 +112,6 @@ metadata:
   homepage_uri: https://github.com/fukayatsu/rspec-paramz
   source_code_uri: https://github.com/fukayatsu/rspec-paramz
   changelog_uri: https://github.com/fukayatsu/rspec-paramz/releases
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -121,15 +119,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Simple Parameterized Test for RSpec.
 test_files: []

data/.travis.yml

@@ -1,7 +0,0 @@
----
-sudo: false
-language: ruby
-cache: bundler
-rvm:
-  - 2.6.3
-before_install: gem install bundler -v 2.0.2