srl_ruby 0.4.8 → 0.4.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4142454106f1b3b0a0e1e9b7c382ba6c5088f34a7b4d2e4c9437164537bb766a
-  data.tar.gz: 2ded972212dc2db8b037aba56aec6f79917a90a945f56c8f9f72b1bd88cd8b69
+  metadata.gz: 3a2509164bd980bf2145d41c15281608694674f633b2a6f2b482b6298db7d36a
+  data.tar.gz: 3112162a2a27268dd4d0c1e8cf4b0af25b98a158152e7ceca9e9d5f34c347c96
 SHA512:
-  metadata.gz: d7da9074cd772c28dc7eeaa8072d39fb5a91a08dba1665982fbf08303582c84742cf72ca6785ed18f1944cb11fcfd25fb011a37f93055c552011543235799669
-  data.tar.gz: '070724971995e366a27232732d5accf62c3e2141807ae80a7548d0ae98a28004bf811c50119001e581648c3e262cba7295ee6117bab5f1bddea3110e692d9c94'
+  metadata.gz: 51099a1c625930c9e139079f73647524caf6db7ed23ccdcdee475a720dcdb238d4e48ad0632f6ec7b0cee8e57785a25ce7b5f4232c605811f382a95d11b31afa
+  data.tar.gz: a4a7383ce66944d5b5c834200a8e5b2367660912a93daaca13dc27eb95fd56f0b655317c575a4013dd5e69b22af804a4dcbfb5ce5a5804249bf78d7495d5a4e9

data/.rubocop.yml

@@ -1,9 +1,13 @@
 AllCops:
   Exclude:
     - 'exp/**/*'
+    - 'demo/**/*'
 
 Gemspec/DateAssignment:
   Enabled: true
+  
+Gemspec/RequireMFA: # new in 1.23
+  Enabled: false  
 
 Layout/ArgumentAlignment:
   Enabled: false
@@ -83,6 +87,9 @@ Layout/TrailingWhitespace:
 Lint/AmbiguousAssignment:
   Enabled: true
 
+Lint/AmbiguousOperatorPrecedence: # new in 1.21
+  Enabled: true
+
 Lint/AmbiguousRange:
   Enabled: true
 
@@ -104,6 +111,9 @@ Lint/EmptyClass:
 Lint/EmptyInPattern:
   Enabled: true
 
+Lint/IncompatibleIoSelectWithFiberScheduler: # new in 1.21
+  Enabled: true
+
 Lint/LambdaWithoutLiteralBlock:
   Enabled: true
 
@@ -124,6 +134,12 @@ Lint/RaiseException:
 
 Lint/RedundantDirGlobSort:
   Enabled: true
+  
+Lint/RefinementImportMethods: # new in 1.27
+  Enabled: true  
+
+Lint/RequireRelativeSelfPath: # new in 1.22
+  Enabled: true
 
 Lint/RescueException:
   Enabled: true
@@ -151,6 +167,9 @@ Lint/UnusedMethodArgument:
 
 Lint/UselessAccessModifier:
   Enabled: true
+  
+Lint/UselessRuby2Keywords: # new in 1.23
+  Enabled: true  
 
 Lint/Void:
   Enabled: false
@@ -196,6 +215,9 @@ Naming/ConstantName:
 
 Naming/ClassAndModuleCamelCase:
   Enabled: false
+  
+Naming/BlockForwarding: # new in 1.24
+  Enabled: true  
 
 Naming/BlockParameterName:
   Enabled: true
@@ -212,6 +234,9 @@ Naming/MethodName:
 Naming/VariableName:
   Enabled: false
 
+Security/IoMethods: # new in 1.22
+  Enabled: true
+
 Style/Alias:
   Enabled: true
 
@@ -258,13 +283,19 @@ Style/Documentation:
   Enabled: false
 
 Style/DocumentDynamicEvalDefinition:
-  Enabled: false
+  Enabled: true
 
 Style/ExpandPathArguments:
   Enabled: false
 
 Style/ExponentialNotation:
   Enabled: true
+  
+Style/FileRead: # new in 1.24
+  Enabled: true  
+
+Style/FileWrite: # new in 1.24
+  Enabled: true
 
 Style/GuardClause:
   Enabled: false
@@ -289,6 +320,9 @@ Style/InPatternThen:
 
 Style/InverseMethods:
   Enabled: false
+  
+Style/MapToHash: # new in 1.24
+  Enabled: true  
 
 Style/MissingRespondToMissing:
   Enabled: false
@@ -299,14 +333,26 @@ Style/MultilineInPatternThen:
 Style/NegatedIfElseCondition:
   Enabled: true
 
+Style/NestedFileDirname: # new in 1.26
+  Enabled: true
+
 Style/Next:
   Enabled: false
 
 Style/NilLambda:
   Enabled: true
 
+Style/NumberedParameters: # new in 1.22
+  Enabled: true
+
+Style/NumberedParametersLimit: # new in 1.22
+  Enabled: true
+
 Style/NumericLiterals:
   Enabled: false
+  
+Style/OpenStructUse: # new in 1.23
+  Enabled: true  
 
 Style/QuotedSymbols:
   Enabled: true
@@ -316,6 +362,9 @@ Style/RaiseArgs:
 
 Style/RedundantArgument:
   Enabled: true
+  
+Style/RedundantInitialize: # new in 1.27
+  Enabled: true  
 
 Style/RedundantReturn:
   Enabled: false
@@ -332,6 +381,9 @@ Style/RegexpLiteral:
 Style/PercentLiteralDelimiters:
   Enabled: false
 
+Style/SelectByRegexp: # new in 1.22
+  Enabled: true
+
 Style/StderrPuts:
   Enabled: false
 
@@ -448,4 +500,4 @@ Style/StringChars:
   Enabled: true
 
 Style/StringConcatenation:
-  Enabled: true
+  Enabled: true

data/CHANGELOG.md

@@ -1,3 +1,24 @@
+## [0.4.11] - 2022-04-17
+- Fixed code breaking change in Ruby 3.1+: prime library is no longer part of stdlib.
+
+### Fixed
+- File `srl-ruby.gemspec` has a dependency to `Rley 0.8.11`. Necessary to fix change in CRuby 3.1:  `prime` library is no more part of stdlib.
+
+### Changed
+- Minor style refactoring to please Runocop 1.27
+
+## [0.4.9] - 2021-11-01
+- Code update to align with `Rley` v. 0.8.08
+
+### Changed
+- File `ast_builder.rb` Updated some `reduce_...` methods to cope with ? quantifier change
+- File `srl_ruby.gemspec` Updated the dependency towards Rley
+- File `.rubocop.yml` Added newest cops from 1.21 and 1.22
+
+### Fixed
+- File `grammar.rb` is now calling `Rley::grammar_builder` factory method.
+- File `rule_file_grammar.rb` is now calling `Rley::grammar_builder` factory method.
+
 ## [0.4.8] - 2021-08-27
 - Updated dependencies (Bundler >~ 2.2), (Rley >~ 0.8.03)
 - Grammar refactoring to take profit of new Rley rule syntax.

data/Rakefile

@@ -2,20 +2,20 @@
 
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task' # Rspec as testing tool
-require 'cucumber/rake/task' # Cucumber as testing tool
+# require 'cucumber/rake/task' # Cucumber as testing tool
 
-desc 'Run RSpec'
-RSpec::Core::RakeTask.new do |spec|
-  spec.pattern = 'spec/**/*_spec.rb'
-end
+# desc 'Run RSpec'
+RSpec::Core::RakeTask.new(:spec)
 
-Cucumber::Rake::Task.new do |_|
-  # Comment
-end
+# Cucumber::Rake::Task.new do |_|
+  # # Comment
+# end
 
 # Combine RSpec and Cucumber tests
 desc 'Run tests, with RSpec and Cucumber'
-task test: %i[spec cucumber]
+task test: :spec
+# task test: %i[spec cucumber]
+
 
 # Default rake task
 task default: :test

data/lib/regex/expression.rb

@@ -13,9 +13,6 @@ module Regex # This module is used as a namespace
     # @return [NilClass, Anchor]
     attr_accessor :end_anchor
 
-    # Constructor
-    def initialize(); end
-
     # Abstract method. Return true iff the expression is atomic
     # (= doesn't not have any child).
     # @return [Boolean]

data/lib/srl_ruby/ast_builder.rb

@@ -120,7 +120,7 @@ module SrlRuby
 
     # rule('expression' => 'pattern (flags)?').tag 'flagged_expr'
     def reduce_flagged_expr(_production, aRange, theTokens, theChildren)
-      @options = theChildren[1] if theChildren[1]
+      @options = theChildren[1].first if theChildren[1]
       return_first_child(aRange, theTokens, theChildren)
     end
 
@@ -163,7 +163,7 @@ module SrlRuby
 
     # rule('quantifiable' => 'begin_anchor? anchorable end_anchor?')
     def reduce_quantifiable(_production, _range, _tokens, theChildren)
-      Regex::Concatenation.new(*theChildren.compact)
+      Regex::Concatenation.new(*theChildren.flatten.compact)
     end
 
     # rule 'begin_anchor' => %w[STARTS WITH]
@@ -195,7 +195,7 @@ module SrlRuby
 
     # rule('assertable' => 'term quantifier?').tag 'assertable'
     def reduce_assertable(_production, _range, _tokens, theChildren)
-      (term, quantifier) = theChildren
+      (term, quantifier) = theChildren.flatten
       quantifier ? repetition(term, quantifier) : term
     end
 

data/lib/srl_ruby/grammar.rb

@@ -5,7 +5,7 @@ require 'rley' # Load the gem
 module SrlRuby
   ########################################
   # SRL grammar
-  builder = Rley::Notation::GrammarBuilder.new do
+  builder = Rley::grammar_builder do
     # Separators...
     add_terminals('LPAREN', 'RPAREN', 'COMMA')
 

data/lib/srl_ruby/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SrlRuby
-  VERSION = '0.4.8'
+  VERSION = '0.4.11'
 end

data/spec/acceptance/support/rule_file_ast_builder.rb

@@ -32,7 +32,7 @@ module Acceptance
       Terminal2NodeClass
     end
 
-    # rule('rule_file' => %w[srl_heading srl_tests]).as 'start_rule'
+    # rule('rule_file' => 'srl_heading tests').as 'start_rule'
     def reduce_start_rule(_production, _range, _tokens, theChildren)
       rule_file = RuleFileTests.new(theChildren[0])
       tests = theChildren.last.flatten
@@ -54,16 +54,6 @@ module Acceptance
       theChildren.last
     end
 
-    # rule('srl_tests' => %w[srl_tests single_test]).as 'test_list'
-    def reduce_test_list(_production, _range, _tokens, theChildren)
-      theChildren[0] << theChildren[1]
-    end
-
-    # rule('srl_tests' => 'single_test').as 'one_test'
-    def reduce_one_test(_production, _range, _tokens, theChildren)
-      [theChildren.last]
-    end
-
     # rule('match_test' => %w[MATCH: STRING_LIT]).as 'match_string'
     def reduce_match_string(_production, _range, _tokens, theChildren)
       MatchTest.new(theChildren.last)
@@ -85,17 +75,6 @@ module Acceptance
       theChildren[2]
     end
 
-    # rule('capture_expectations' => %w[capture_expectations
-    #   single_expectation]).as 'assertion_list'
-    def reduce_assertion_list(_production, _range, _tokens, theChildren)
-      theChildren[0] << theChildren[1]
-    end
-
-    # rule('capture_expectations' => 'single_expectation').as 'one_expectation'
-    def reduce_one_expectation(_production, _range, _tokens, theChildren)
-      [theChildren.last]
-    end
-
     # rule('single_expectation' => %w[DASH INTEGER COLON capture_variable
     #   COLON STRING_LIT]).as 'capture_expectation'
     def reduce_capture_expectation(_production, _range, _tokens, theChildren)

data/spec/acceptance/support/rule_file_grammar.rb

@@ -6,8 +6,7 @@ require 'rley' # Load the Rley gem
 # Grammar for Test-Rule files
 # [File format](https://github.com/SimpleRegex/Test-Rules/blob/master/README.md)
 ########################################
-# Define a grammar for basic arithmetical expressions
-builder = Rley::Notation::GrammarBuilder.new do
+builder = Rley::grammar_builder do
   # Punctuation
   add_terminals('COLON', 'DASH')
 
@@ -19,24 +18,20 @@ builder = Rley::Notation::GrammarBuilder.new do
   add_terminals('INTEGER', 'STRING_LIT')
   add_terminals('IDENTIFIER', 'SRL_SOURCE')
 
-  rule('rule_file' => 'srl_heading srl_tests').as 'start_rule'
-  rule('srl_heading' => 'SRL SRL_SOURCE').as 'srl_source'
-  rule('srl_tests' => 'srl_tests single_test').as 'test_list'
-  rule('srl_tests' => 'single_test').as 'one_test'
-  rule('single_test' => 'atomic_test').as 'single_atomic_test'
-  rule('single_test' => 'compound_test').as 'single_compound_test'
-  rule('atomic_test' => 'match_test').as 'atomic_match'
-  rule('atomic_test' => 'no_match_test').as 'atomic_no_match'
-  rule('compound_test' => 'capture_test').as 'compound_capture'
-  rule('match_test' => 'MATCH STRING_LIT').as 'match_string'
-  rule('no_match_test' => 'NO MATCH STRING_LIT').as 'no_match_string'
-  rule('capture_test' => 'capture_heading capture_expectations').as 'capture_test'
-  rule('capture_heading' => 'CAPTURE FOR STRING_LIT COLON').as 'capture_string'
-  rule('capture_expectations' => 'capture_expectations single_expectation').as 'assertion_list'
-  rule('capture_expectations' => 'single_expectation').as 'one_expectation'
-  rule('single_expectation' => 'DASH INTEGER COLON capture_variable COLON STRING_LIT').as 'capture_expectation'
-  rule('capture_variable' => 'INTEGER').as 'var_integer'
-  rule('capture_variable' => 'IDENTIFIER').as 'var_identifier'
+  rule('rule_file' => 'srl_heading srl_test+').tag 'start_rule'
+  rule('srl_heading' => 'SRL SRL_SOURCE').tag 'srl_source'
+  rule('srl_test' => 'atomic_test').tag 'single_atomic_test'
+  rule('srl_test' => 'compound_test').tag 'single_compound_test'
+  rule('atomic_test' => 'match_test').tag 'atomic_match'
+  rule('atomic_test' => 'no_match_test').tag 'atomic_no_match'
+  rule('compound_test' => 'capture_test').tag 'compound_capture'
+  rule('match_test' => 'MATCH STRING_LIT').tag 'match_string'
+  rule('no_match_test' => 'NO MATCH STRING_LIT').tag 'no_match_string'
+  rule('capture_test' => 'capture_heading capture_expectation+').tag 'capture_test'
+  rule('capture_heading' => 'CAPTURE FOR STRING_LIT COLON').tag 'capture_string'
+  rule('capture_expectation' => 'DASH INTEGER COLON capture_variable COLON STRING_LIT').tag 'capture_expectation'
+  rule('capture_variable' => 'INTEGER').tag 'var_integer'
+  rule('capture_variable' => 'IDENTIFIER').tag 'var_identifier'
 end
 
 # And now build the grammar...

data/spec/regex/character_spec.rb

@@ -53,6 +53,7 @@ module Regex # Open this namespace, to get rid of scope qualifiers
       end
     end # context
 
+    # rubocop: disable Style/DocumentDynamicEvalDefinition
     context 'Provided services' do
       it 'Should know its lexeme if created from a string' do
         # Lexeme is defined when the character was initialised from a text
@@ -89,6 +90,7 @@ module Regex # Open this namespace, to get rid of scope qualifiers
 
         # Try with our escape sequence samples
         (SampleDigrams + SampleNumEscs).each do |escape_seq|
+          # Build a string from escape sequence literal
           expectation = String.class_eval(%Q|"#{escape_seq}"|, __FILE__, __LINE__)
           new_ch = Character.new(escape_seq).to_str
           new_ch == expectation
@@ -113,6 +115,7 @@ module Regex # Open this namespace, to get rid of scope qualifiers
 
         # Try with our escape sequence samples
         (SampleDigrams + SampleNumEscs).each do |escape_seq|
+          # Get ordinal value of given escape sequence
           expectation = String.class_eval(%Q|"#{escape_seq}".ord()|, __FILE__, __LINE__)
           expect(Character.new(escape_seq).codepoint).to eq(expectation)
         end
@@ -147,7 +150,7 @@ module Regex # Open this namespace, to get rid of scope qualifiers
         # Case 5: test fails with multiple character strings
         expect(newOne).not_to eq('03a3')
 
-        # Case 6: equality testing with arbitray object
+        # Case 6: equality testing with arbitrary object
         expect(newOne).not_to eq(nil)
         expect(newOne).not_to eq(Object.new)
 
@@ -169,6 +172,7 @@ module Regex # Open this namespace, to get rid of scope qualifiers
         expect(ch2.explain).to eq("the character '\u03a3'")
       end
     end # context
+    # rubocop: enable Style/DocumentDynamicEvalDefinition
     # rubocop: enable Lint/ConstantDefinitionInBlock
   end # describe
 end # module

data/srl_ruby.gemspec

@@ -68,11 +68,11 @@ SUMMARY
   spec.required_ruby_version = '>= 2.5.0'
 
   # Runtime dependencies
-  spec.add_dependency 'rley', '~> 0.8.02'
+  spec.add_dependency 'rley', '~> 0.8.11'
 
   # Development dependencies
-  spec.add_development_dependency 'bundler', '~> 2.2.0'
-  spec.add_development_dependency 'cucumber', '>= 2.2.0'
-  spec.add_development_dependency 'rake', '~> 12.0'
+  spec.add_development_dependency 'bundler', '>= 2.2.0'
+  spec.add_development_dependency 'cucumber', '>= 3.1.2'
+  spec.add_development_dependency 'rake', '>= 12.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: srl_ruby
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.4.11
 platform: ruby
 authors:
 - Dimitri Geshef
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-27 00:00:00.000000000 Z
+date: 2022-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rley
@@ -16,26 +16,26 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.02
+        version: 0.8.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.02
+        version: 0.8.11
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.0
 - !ruby/object:Gem::Dependency
@@ -44,26 +44,26 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 3.1.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 3.1.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '12.0'
 - !ruby/object:Gem::Dependency
@@ -206,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: A parser for the [Simple Regex Language](https://simple-regex.com/). It translates