rspec-parameterized-core 1.0.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9a8d43ccf0423ea5eeeee84ec63814c779d554b67c72e117328422f019f6589
-  data.tar.gz: 85648988761216691d64e09db8e7ca8e35e9b66d3ddcea55f3e693bbab8c938e
+  metadata.gz: 533287240763772bdb4bce2c18611e6ae33ea580ef36fc1344f77d7d25993650
+  data.tar.gz: 400d4aff05dcf41c042455a8df97e3dd3cc1391a6efa88056dc52f95b25b4aa4
 SHA512:
-  metadata.gz: c99e4fef851bd42987a161ff6cb75dc95480a2eb6364c7e8b57b6fe5008412ec6b688f90befcce3cba7479b9ed76077fa7a5e2d7bd445e44c5983ebd9fe9aed9
-  data.tar.gz: dc8ff9f56961a767b5cf999da41936ddd9fe2f91df1ff02559179d637472b396db80f6efd377b455b9d5c7b16a70f44832920c697ddc3b3d2d3f85cff7030d5c
+  metadata.gz: b3a09f8853bbb5b038510976cbca380a762bee57491eaa9722ca9cab31015c2426f277a7238d2cd0efba6493d69fc7d298ea17fc85da255fcdd324a3b7301aab
+  data.tar.gz: 92c79e269e753b5f2d971a7ece2f2878a8a0b7b86c4c8de6455ed63387a79162087186358c92c21b04515df1fb994d23de5b1a23f3385c096226662246b09fbf

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 ## [Unreleased]
-[Full Changelog](https://github.com/rspec-parameterized/rspec-parameterized-core/compare/v1.0.1...main)
+[Full Changelog](https://github.com/rspec-parameterized/rspec-parameterized-core/compare/v2.0.0...main)
+
+## [2.0.0](https://github.com/rspec-parameterized/rspec-parameterized-core/releases/tag/v2.0.0) - 2025-05-02
+[Full Changelog](https://github.com/rspec-parameterized/rspec-parameterized-core/compare/v1.0.1...v2.0.0)
+
+- Requires Ruby 2.7+
+  - https://github.com/rspec-parameterized/rspec-parameterized-core/pull/19
+- Use Prism gem instead of Parser gem when Ruby 3.4+
+  - https://github.com/rspec-parameterized/rspec-parameterized-core/issues/17
+  - https://github.com/rspec-parameterized/rspec-parameterized-core/pull/18
 
 ## [1.0.1] - 2024-05-04
 [Full Changelog](https://github.com/rspec-parameterized/rspec-parameterized-core/compare/v1.0.0...v1.0.1)

data/lib/rspec/parameterized/core/composite_parser.rb

@@ -0,0 +1,75 @@
+module RSpec
+  module Parameterized
+    module Core
+      # Proxy class for parser and prism
+      module CompositeParser
+        # @param obj [Object]
+        # @return [String]
+        # @raise [RSpec::Parameterized::Core::ParserSyntaxError]
+        def self.to_raw_source(obj)
+          return to_raw_source_with_prism(obj) if use_prism?
+
+          to_raw_source_with_parser(obj)
+        end
+
+        # Whether use parser or prism
+        #
+        # @return [true] Use prism
+        # @return [false] Use parser
+        def self.use_prism?
+          Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0")
+        end
+
+        # @param obj [Object]
+        # @return [String]
+        # @raise [RSpec::Parameterized::Core::ParserSyntaxError]
+        def self.to_raw_source_with_parser(obj)
+          obj.is_a?(Proc) ? obj.to_raw_source : obj.inspect
+        rescue Parser::SyntaxError => e
+          raise ParserSyntaxError
+        end
+        private_class_method :to_raw_source_with_parser
+
+        # @param obj [Object]
+        # @return [String]
+        def self.to_raw_source_with_prism(obj)
+          return obj.inspect unless obj.is_a?(Proc)
+
+          filename, linenum = obj.source_location
+          ast = parse_with_prism(filename, linenum)
+
+          return "" unless ast
+
+          ast.source.source.strip
+        end
+        private_class_method :to_raw_source_with_prism
+
+        # @param filename [String]
+        # @param linenum [Integer]
+        #
+        # @return [Prism::ParseResult,nil]
+        def self.parse_with_prism(filename, linenum)
+          buf = []
+          File.open(filename, "rb").each_with_index do |line, index|
+            next if index < linenum - 1
+            buf << line
+
+            ret = Prism.parse(buf.join)
+            return ret if ret.success?
+          end
+
+          nil
+        end
+        private_class_method :parse_with_prism
+      end
+    end
+  end
+end
+
+if RSpec::Parameterized::Core::CompositeParser.use_prism?
+  require 'prism'
+else
+  require 'parser'
+  require 'unparser'
+  require 'proc_to_ast'
+end

data/lib/rspec/parameterized/core/errors.rb

@@ -0,0 +1,9 @@
+module RSpec
+  module Parameterized
+    module Core
+      class Error < StandardError; end
+
+      class ParserSyntaxError < Error; end
+    end
+  end
+end

data/lib/rspec/parameterized/core/lazy_arg.rb

@@ -11,8 +11,8 @@ module RSpec
         end
 
         def inspect
-          "#{@block.to_raw_source}"
-        rescue Parser::SyntaxError
+          CompositeParser.to_raw_source(@block)
+        rescue ParserSyntaxError
           super.inspect
         end
       end

data/lib/rspec/parameterized/core/version.rb

@@ -3,7 +3,7 @@
 module Rspec
   module Parameterized
     module Core
-      VERSION = "1.0.1"
+      VERSION = "2.0.0"
     end
   end
 end

data/lib/rspec/parameterized/core.rb

@@ -1,9 +1,8 @@
 require "rspec/parameterized/core/version"
-require 'parser'
-require 'unparser'
-require 'proc_to_ast'
 require 'rspec/parameterized/core/helper_methods'
 require 'rspec/parameterized/core/example_helper_methods'
+require 'rspec/parameterized/core/errors'
+require 'rspec/parameterized/core/composite_parser'
 
 module RSpec
   module Parameterized
@@ -143,11 +142,9 @@ module RSpec
         end
 
         def params_inspect(obj)
-          begin
-            obj.is_a?(Proc) ? obj.to_raw_source : obj.inspect
-          rescue Parser::SyntaxError
-            return obj.inspect
-          end
+          RSpec::Parameterized::Core::CompositeParser.to_raw_source(obj)
+        rescue ParserSyntaxError
+          return obj.inspect
         end
 
         def set_verbose_parameters(&block)

data/rspec-parameterized-core.gemspec

@@ -14,7 +14,7 @@ I was inspired by [udzura's mock](https://gist.github.com/1881139).}
 
   spec.homepage = "https://github.com/rspec-parameterized/rspec-parameterized-core"
   spec.license = "MIT"
-  spec.required_ruby_version = ">= 2.6.0"
+  spec.required_ruby_version = ">= 2.7.0"
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = spec.homepage
@@ -32,12 +32,18 @@ I was inspired by [udzura's mock](https://gist.github.com/1881139).}
   spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "rspec", ">= 2.13", "< 4"
+
+  # parser dependencies
   spec.add_dependency "parser"
   spec.add_dependency "proc_to_ast", ">= 0.2.0"
-  spec.add_dependency "rspec", ">= 2.13", "< 4"
   spec.add_dependency "unparser"
 
+  # prism dependencies
+  spec.add_dependency "prism"
+
   spec.add_development_dependency "rake", ">= 12.0.0"
+  spec.add_development_dependency "rspec-its"
 
   # For more information and examples about making a new gem, check out our
   # guide at: https://bundler.io/guides/creating_gem.html

metadata

@@ -1,17 +1,36 @@
 --- !ruby/object:Gem::Specification
 name: rspec-parameterized-core
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 2.0.0
 platform: ruby
 authors:
 - sue445
 - tomykaira
 - joker1007
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-05-04 00:00:00.000000000 Z
+date: 2025-05-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.13'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.13'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: parser
   requirement: !ruby/object:Gem::Requirement
@@ -41,27 +60,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.2.0
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: unparser
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.13'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.13'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: unparser
+  name: prism
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -88,6 +101,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 12.0.0
+- !ruby/object:Gem::Dependency
+  name: rspec-its
+  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'
 description: RSpec::Parameterized supports simple parameterized test syntax in rspec.
 email:
 - sue445@sue445.net
@@ -105,6 +132,8 @@ files:
 - lib/rspec-parameterized-core.rb
 - lib/rspec/parameterized/core.rb
 - lib/rspec/parameterized/core/arg.rb
+- lib/rspec/parameterized/core/composite_parser.rb
+- lib/rspec/parameterized/core/errors.rb
 - lib/rspec/parameterized/core/example_helper_methods.rb
 - lib/rspec/parameterized/core/helper_methods.rb
 - lib/rspec/parameterized/core/lazy_arg.rb
@@ -120,7 +149,6 @@ metadata:
   source_code_uri: https://github.com/rspec-parameterized/rspec-parameterized-core
   changelog_uri: https://github.com/rspec-parameterized/rspec-parameterized-core/blob/main/CHANGELOG.md
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -128,15 +156,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: RSpec::Parameterized supports simple parameterized test syntax in rspec.
   I was inspired by [udzura's mock](https://gist.github.com/1881139).