rspec-paramz 2.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad92978ad2f245bcae60978474d7ec8b6de9e20adb2090bc1572f0974cc8c5d8
-  data.tar.gz: cad5699ce3a8290b5d7076abea8d5e3f70745b9606f54d909da777bee7155268
+  metadata.gz: b6ab7748da440263de4f4a668e3a9cb50546c78e59faf7f6c13b7b903d898887
+  data.tar.gz: 41f9aa35260d87b107ffc28a43e88d3a3078204d1d06e3d936be23e5db39586d
 SHA512:
-  metadata.gz: 1741436d436b3b23bb739c3d95a794f0d2de2304505bbe3d6cc679c9346fdf21b4c847426d79eb9cdaf10fac9793da4b6a03459223f383a020f16b80134c2eb8
-  data.tar.gz: a974dd00c973303da0f7bd7bed9e49b121190aa257da8381e530554e05d37dce45cd2ef76194d1a131e6ef0e961452275d4448d49035010ebc5d92365e3cdcfb
+  metadata.gz: 41f02f22fff92a028bfba776420243a20dc033564f4354e19eff49c216084b6e9fca15004758aef69b8d42fc2a1868defcbf7b962e4ec66dc37b60904df8616b
+  data.tar.gz: 8d175884a4d5d17f0c2e07b9f4c03561083e189e75f4478e1680168ed6e3cfb6d2840f5083b6a3ad24d1746ed83014ca6ce5cf619a8f0b9dff88c34c93e49dc9

data/.github/workflows/test.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['3.1', '3.2', '3.3', '3.4', 'head']
+        ruby-version: ['3.3', '3.4', 'head']
 
     steps:
     - uses: actions/checkout@v4

data/.gitignore

@@ -9,3 +9,5 @@
 
 # rspec failure tracking
 .rspec_status
+
+mise.toml

data/.rubocop.yml

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

data/Gemfile.lock

@@ -1,47 +1,49 @@
 PATH
   remote: .
   specs:
-    rspec-paramz (1.2.0)
+    rspec-paramz (3.0.1)
+      prism
       rspec
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.2)
+    ast (2.4.3)
     coderay (1.1.3)
-    diff-lcs (1.6.0)
-    json (2.10.1)
-    language_server-protocol (3.17.0.4)
+    diff-lcs (1.6.2)
+    json (2.13.2)
+    language_server-protocol (3.17.0.5)
     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.26.3)
-    parser (3.3.7.1)
+    parallel (1.27.0)
+    parser (3.3.9.0)
       ast (~> 2.4.1)
       racc
+    prism (1.4.0)
     pry (0.15.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
     racc (1.8.1)
     rainbow (3.1.1)
-    rake (13.2.1)
-    regexp_parser (2.10.0)
-    rspec (3.13.0)
+    rake (13.3.0)
+    regexp_parser (2.11.0)
+    rspec (3.13.1)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.3)
+    rspec-core (3.13.5)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.3)
+    rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.2)
+    rspec-mocks (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-support (3.13.2)
-    rubocop (1.72.2)
+    rspec-support (3.13.4)
+    rubocop (1.79.2)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -49,12 +51,13 @@ GEM
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.38.0, < 2.0)
+      rubocop-ast (>= 1.46.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.38.0)
-      parser (>= 3.3.1.0)
-    rubocop-rspec (3.5.0)
+    rubocop-ast (1.46.0)
+      parser (>= 3.3.7.2)
+      prism (~> 1.4)
+    rubocop-rspec (3.6.0)
       lint_roller (~> 1.1)
       rubocop (~> 1.72, >= 1.72.1)
     ruby-progressbar (1.13.0)
@@ -73,4 +76,4 @@ DEPENDENCIES
   rspec-paramz!
 
 BUNDLED WITH
-   2.3.15
+   2.7.1

data/README.md

@@ -6,7 +6,7 @@ Inspired by [tomykaira/rspec-parameterized](https://github.com/tomykaira/rspec-p
 
 ## Requirements
 
-- Ruby 3.1 or later
+- Ruby 3.3 or later
 
 ## Installation
 
@@ -30,236 +30,37 @@ See [paramz_spec.rb](https://github.com/fukayatsu/rspec-paramz/blob/master/spec/
 
 ```ruby
 RSpec.describe RSpec::Paramz do
-  describe '#paramz' do
-    context 'format 1' do
+  describe "#paramz" do
+    describe "additions" do
+      let(:one) { 1 }
+      let(:two) { 2 }
+      let(:three) { 3 }
       paramz(
-        [:a, :b, :answer],
-        1,   2,  3,
-        3,   8,  11,
-        5,   -8, -3,
+        -> { [:a,  :b,   :answer] },
+        -> { [one, two,  three  ] },
+        -> { [3,   8,    11     ] },
+        -> { [5,   -8,   -3     ] },
       ) do
-        it 'should do additions' do
+        it "do additions" do
           expect(a + b).to eq answer
         end
       end
-
-      #=>
-      # [a = 1 | b = 2 | answer = 3]
-      #   should do additions
-      # [a = 3 | b = 8 | answer = 11]
-      #   should do additions
-      # [a = 5 | b = -8 | answer = -3]
-      #   should do additions
-    end
-
-    context 'format 2' do
-      paramz(
-        [:a, :b, subject: -> { a + b }],
-        1,   2,  3,
-        3,   8,  11,
-        5,   -8, -3,
-      )
-
-      #=>
-      # [a = 1 | b = 2 | subject { a + b } = 3]
-      #   should == 3
-      # [a = 3 | b = 8 | subject { a + b } = 11]
-      #   should == 11
-      # [a = 5 | b = -8 | subject { a + b } = -3]
-      #   should == -3
-    end
-
-    context 'format 2-a' do
-      paramz(
-        [:a, :b, subject: -> { a + b }],
-        1,   2,  3,
-        3,   8,  11,
-        5,   -8, -3,
-      ) do
-        it 'should do additions' do
-          expect(subject).to eq(a + b)
-        end
-      end
-
-      #=>
-      # [a = 1 | b = 2 | subject { a + b } = 3]
-      #   should do additions
-      # [a = 3 | b = 8 | subject { a + b } = 11]
-      #   should do additions
-      # [a = 5 | b = -8 | subject { a + b } = -3]
-      #   should do additions
-    end
-
-    context 'format 3' do
-      paramz(
-        [:a, :b, subject: { answer: -> { a + b } }],
-        1,   2,  3,
-        3,   8,  11,
-        5,   -8, -3,
-      )
-
-      #=>
-      # [a = 1 | b = 2 | subject(:answer) { a + b } = 3]
-      #   should == 3
-      # [a = 3 | b = 8 | subject(:answer) { a + b } = 11]
-      #   should == 11
-      # [a = 5 | b = -8 | subject(:answer) { a + b } = -3]
-      #   should == -3
-    end
-
-    context 'format 3-b' do
-      paramz(
-        [:a, :b, subject: { answer: -> { a + b } }],
-        1,   2,  3,
-        3,   8,  11,
-        5,   -8, -3,
-      ) do
-        it 'should do additions' do
-          expect(subject).to eq(a + b)
-        end
-
-        it 'should do additions' do
-          expect(answer).to eq(a + b)
-        end
-      end
-
-      #=>
-      # [a = 1 | b = 2 | subject(:answer) { a + b } = 3]
-      #   should do additions
-      #   should do additions
-      # [a = 3 | b = 8 | subject(:answer) { a + b } = 11]
-      #   should do additions
-      #   should do additions
-      # [a = 5 | b = -8 | subject(:answer) { a + b } = -3]
-      #   should do additions
-      #   should do additions
-    end
-
-    context 'format 4' do
-      subject { a + b }
-
-      paramz(
-        [:a, :b, :subject],
-        1,   2,   3,
-        0,   0,   0,
-        -1,  -2,  -3,
-      )
-
-      #=>
-      # [a = 1 | b = 2 | subject = 3]
-      #   should == 3
-      # [a = 0 | b = 0 | subject = 0]
-      #   should == 0
-      # [a = -1 | b = -2 | subject = -3]
-      #   should == -3
-    end
-
-    context 'rspec-let' do
-      let(:one)   { 1 }
-      let(:two)   { one * 2 }
-      let(:three) { one * 3 }
-
-      context 'default' do
-        paramz(
-          [:a,       :b,          :answer],
-          -> { one }, 0,          1,
-          -> { one }, -> { one }, -> { 2 },
-          -> { one }, -> { two }, -> { three },
-        ) do
-          it 'should do additions' do
-            expect(a + b).to eq answer
-          end
-        end
-
-        #=>
-        # [a = { one } | b = 0 | answer = 1]
-        #   should do additions
-        # [a = { one } | b = { one } | answer = { 2 }]
-        #   should do additions
-        # [a = { one } | b = { two } | answer = { three }]
-        #   should do additions
-      end
-
-      context 'default 2' do
-        subject { a + b }
-        paramz(
-          [:a,       :b,          :subject],
-          -> { one }, 0,          1,
-          -> { one }, -> { one }, -> { 2 },
-          -> { one }, -> { two }, -> { three },
-        )
-
-        #=>
-        # [a = { one } | b = 0 | subject = 1]
-        #   should == 1
-        # [a = { one } | b = { one } | subject = { 2 }]
-        #   should == 2
-        # [a = { one } | b = { two } | subject = { three }]
-        #   should == 3
-      end
-
-      context 'default 3' do
-        paramz(
-          [:a,       :b,          subject: -> { a + b }],
-          -> { one }, 0,          1,
-          -> { one }, -> { one }, -> { 2 },
-          -> { one }, -> { two }, -> { three },
-        )
-
-        #=>
-        # [a = { one } | b = 0 | subject { a + b } = 1]
-        #   should == 1
-        # [a = { one } | b = { one } | subject { a + b } = { 2 }]
-        #   should == 2
-        # [a = { one } | b = { two } | subject { a + b } = { three }]
-        #   should == 3
-      end
-
-      context 'using RSpec::Paramz::Syntax' do
-        using RSpec::Paramz::Syntax
-        paramz(
-          [:a,    :b,     :answer],
-          :one.&, 0,      1,
-          :one.&, :one.&, -> { 2 },
-          :one.&, :two.&, :three.&,
-        ) do
-          it 'should do additions' do
-            expect(a + b).to eq answer
-          end
-        end
-
-        #=>
-        # [a = { one } | b = 0 | answer = 1]
-        #   should do additions
-        # [a = { one } | b = { one } | answer = { 2 }]
-        #   should do additions
-        # [a = { one } | b = { two } | answer = { three }]
-        #   should do additions
-      end
-    end
-
-    context 'nil or empty' do
-      paramz(
-        [:a,   :b,  :answer],
-        "foo", nil,   "foo",
-        "",    nil,   "",
-        nil,   "bar", nil
-      ) do
-        it 'should do additions' do
-          expect(a&.to_s).to eq answer
-        end
-      end
-
-      #=>
-      # [a = "foo" | b = nil | answer = "foo"]
-      #   should do additions
-      # [a = "" | b = nil | answer = ""]
-      #   should do additions
-      # [a = nil | b = "bar" | answer = nil]
-      #   should do additions
     end
   end
 end
+
+# =>
+# RSpec::Paramz
+#   #paramz
+#     additions
+#       [a = one | b = two | answer = three]
+#         do additions
+#       [a = 3 | b = 8 | answer = 11]
+#         do additions
+#       [a = 5 | b = -8 | answer = -3]
+#         do additions
+#       [a = "a" | b = "b" | answer = "ab"]
+#         do additions
 ```
 
 ## Development

data/lib/rspec/paramz/version.rb

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

data/lib/rspec/paramz.rb

@@ -1,53 +1,65 @@
 require "rspec/paramz/version"
-require "rspec/paramz/syntax"
-require "rspec/paramz/named_proc"
-require "rspec/paramz/pretty_print"
+require "prism"
 
 module RSpec
   module Paramz
     module ExampleGroupMethods
       def paramz(*args, &block)
-        labels = args.first
-
-        if !block_given? && labels.none? {|label| subject_label?(label) }
-          raise ArgumentError, "No block or subject given to paramz."
+        unless block_given?
+          raise ArgumentError, "No block given to paramz."
         end
 
-        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 context_name do
-            pairs.each do |label, val|
-              if subject_label?(label)
-                if label == :subject
-                  module_exec { val.is_a?(Proc) ? let(:_paramz_subject, &val) : let(:_paramz_subject) { val } }
-                  it { should == _paramz_subject }
-                  next
-                end
-
-                _subject, _subject_name = parse_subject(label)
-
-                module_exec { _subject.is_a?(Proc) ? subject(_subject_name, &_subject) : subject(_subject_name) { _subject } }
+        labels = args.first
+        labels = labels.call if labels.respond_to?(:call)
+        args[1..].each do |arg|
+          location = arg.source_location
+          source = spec_file_content(location.first).each_line.to_a[location[1] - 1].strip.delete_suffix(",")
+          result = Prism.parse(source)
+          lambda_node = result.value.compact_child_nodes.first.compact_child_nodes.first
+          array_nodes = lambda_node.body.compact_child_nodes.first
+          nodes = array_nodes.elements
+
+          texts = nodes.map do |node|
+            range = node.location.start_offset...node.location.end_offset
+            source.byteslice(range)
+          end
 
-                unless block_given?
-                  module_exec { val.is_a?(Proc) ? let(:_paramz_subject, &val) : let(:_paramz_subject) { val } }
-                  it { should == _paramz_subject }
+          context_name =
+            "[#{[labels, texts].transpose.map {|label, text| "#{label} = #{text}" }.join(" | ")}]"
+
+          context(context_name) do
+            nodes.each.with_index do |node, index|
+              let(labels[index]) do
+                if node.type == :true_node
+                  true
+                elsif node.type == :false_node
+                  false
+                elsif node.type == :nil_node
+                  nil
+                elsif node.type == :symbol_node
+                  node.value.to_sym
+                elsif node.type == :string_node
+                  node.unescaped
+                elsif node.type == :array_node
+                  range = node.opening_loc.start_offset...node.closing_loc.end_offset
+                  eval(source.byteslice(range)) # rubocop:disable Security/Eval
+                elsif node.respond_to?(:value)
+                  node.value
+                elsif node.respond_to?(:content)
+                  node.content
+                else
+                  loc = node.location
+                  eval(source[loc.start_character_offset...loc.end_code_units_offset]) # rubocop:disable Security/Eval
                 end
-              else
-                module_exec { val.is_a?(Proc) ? let(label, &val) : let(label) { val } }
               end
             end
 
-            module_eval(&block) if block_given?
+            module_exec(&block)
 
             after(:each) do |example|
               if example.exception
-                index_info = arg.map {|v| RSpec::Paramz::PrettyPrint.inspect(v, false) }.join(", ")
-                example.exception.backtrace.push("failed paramz index is:#{index + 1}:[#{index_info}]")
+                location = arg.source_location
+                example.exception.backtrace.push("failed paramz: #{location.first}:#{location.last}")
               end
             end
           end
@@ -56,22 +68,9 @@ 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]
-
-          _subject_name = nil
-          if _subject.is_a?(Hash)
-            _subject_name = _subject.keys.first
-            _subject      = _subject.values.first
-          end
-
-          [_subject, _subject_name]
+        def spec_file_content(path)
+          @spec_file_content ||= {}
+          @spec_file_content[path] ||= File.read(path)
         end
     end
   end

data/rspec-paramz.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["fukayatsu"]
   spec.email         = ["fukayatsu@gmail.com"]
 
-  spec.required_ruby_version = ">= 3.1.0"
+  spec.required_ruby_version = ">= 3.3.0"
 
   spec.summary       = "Simple Parameterized Test for RSpec."
   spec.description   = "Simple Parameterized Test for RSpec"
@@ -28,6 +28,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) {|f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.add_runtime_dependency "prism"
   spec.add_runtime_dependency "rspec"
 
   spec.add_development_dependency "bundler"

metadata

@@ -1,14 +1,28 @@
 --- !ruby/object:Gem::Specification
 name: rspec-paramz
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - fukayatsu
 bindir: exe
 cert_chain: []
-date: 2025-02-19 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: prism
+  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: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -100,9 +114,6 @@ files:
 - bin/console
 - bin/setup
 - lib/rspec/paramz.rb
-- lib/rspec/paramz/named_proc.rb
-- lib/rspec/paramz/pretty_print.rb
-- lib/rspec/paramz/syntax.rb
 - lib/rspec/paramz/version.rb
 - rspec-paramz.gemspec
 homepage: https://github.com/fukayatsu/rspec-paramz
@@ -119,14 +130,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.1.0
+      version: 3.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Simple Parameterized Test for RSpec.
 test_files: []

data/lib/rspec/paramz/named_proc.rb

@@ -1,16 +0,0 @@
-module RSpec
-  module Paramz
-    class NamedProc < Proc
-      def initialize(name, &block)
-        @name = name
-        super(&block)
-      end
-
-      def to_s
-        "{ #{@name} }"
-      end
-
-      alias_method :inspect, :to_s
-    end
-  end
-end

data/lib/rspec/paramz/pretty_print.rb

@@ -1,62 +0,0 @@
-module RSpec
-  module Paramz
-    module PrettyPrint
-      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
-
-        def 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
-
-            case subject_value
-            when Proc
-              "subject(:#{subject_name}) #{to_source(subject_value)}"
-            else
-              "subject { #{subject_value} }"
-            end
-          else
-            value
-          end
-        end
-
-        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)
-
-          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
-
-          def fetch_code_location(value)
-            iseq = RubyVM::InstructionSequence.of(value)
-            iseq.to_a[4][:code_location]
-          end
-      end
-    end
-  end
-end

data/lib/rspec/paramz/syntax.rb

@@ -1,12 +0,0 @@
-module RSpec
-  module Paramz
-    module Syntax
-      refine Symbol do
-        def &
-          _self = self
-          NamedProc.new(self) { __send__(_self) }
-        end
-      end
-    end
-  end
-end