srl_ruby 0.4.5 → 0.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 09e2d0e45cb7094a048508eaf8af5e3d081a279b
-  data.tar.gz: 50017e8623af0c0f034746541f430f21f4df7660
+SHA256:
+  metadata.gz: 53f0b4c07147644a3298d66dd4db0b7108fc1cc630debc1be7dc5721bca244bf
+  data.tar.gz: 410029ea6b5ddc36c6161d50701500af1cb406e8b39bbfa2b6d6d60839db41eb
 SHA512:
-  metadata.gz: 911f5c56ba1fcd7fcefa97b23ca8d3f76c228f84d21eeb742c40415fa81763a2ba0d296b045f38e727be94ea2bc0517141cf7e593493596e98c4f8a4e55a2e95
-  data.tar.gz: e0b9b5e7a2a9a87520fe632f37e5ed89484be85d16f02519628ac44c0716dad669352cd86e465a46b225cc009d8e9eddc06328348e98243ad470c007cd0f2a8f
+  metadata.gz: 0e6124858fe023541f5fc291790251c2c87a2c36cbf28f9285d4b4ed6b87c3705ce381da3536c5e70627101f17c3b203673ea175fbb3fe58f7d193219ef959c0
+  data.tar.gz: a74fb973b4d74fe3546e10e9466654998f0f675ebaf9253932d8fb04b516feea767ab511c86fd11522df58084049a2b0f6455e1fd54ecde7920fd8f32550fc0b

data/.rubocop.yml

@@ -1,10 +1,21 @@
 AllCops:
   Exclude:
     - 'exp/**/*'
+    - 'demo/**/*'
+
+Gemspec/DateAssignment:
+  Enabled: true
+
+Layout/ArgumentAlignment:
+  Enabled: false
+
+Layout/ArrayAlignment:
+  Enabled: true
+  EnforcedStyle: with_fixed_indentation
 
 Layout/CaseIndentation:
   Enabled: false
-  
+
 Layout/ClosingHeredocIndentation:
   Enabled: false
 
@@ -16,7 +27,7 @@ Layout/ElseAlignment:
 
 Layout/EmptyLines:
   Enabled: false
-  
+
 Layout/EndAlignment:
   Enabled: false
 
@@ -24,39 +35,127 @@ Layout/EndOfLine:
   Enabled: true
   EnforcedStyle: lf
 
+Layout/FirstArgumentIndentation:
+  Enabled: false
+
+Layout/HashAlignment:
+  Enabled: false
+
 Layout/IndentationWidth:
   Enabled: false
 
 Layout/IndentationConsistency:
   Enabled: true
-  
-Layout/IndentHeredoc:
+
+Layout/HeredocIndentation:
   Enabled: false
-  
+
+Layout/LineEndStringConcatenationIndentation:
+  Enabled: true
+
 Layout/MultilineHashBraceLayout:
   Enabled: true
 
+Layout/MultilineMethodCallBraceLayout:
+  Enabled: true
+  EnforcedStyle: same_line
+
 Layout/SpaceAroundOperators:
   Enabled: true
 
+Layout/SpaceBeforeBrackets:
+  Enabled: true
+
 Layout/SpaceInsideParens:
   Enabled: true
-  
-Layout/Tab:
+
+Layout/IndentationStyle:
+  Enabled: true
+
+Layout/SpaceAroundMethodCallOperator:
   Enabled: true
-  
-Layout/TrailingBlankLines:
+
+Layout/TrailingEmptyLines:
   Enabled: true
 
 Layout/TrailingWhitespace:
   Enabled: true
 
+Lint/AmbiguousAssignment:
+  Enabled: true
+
+Lint/AmbiguousOperatorPrecedence: # new in 1.21
+  Enabled: true
+
+Lint/AmbiguousRange:
+  Enabled: true
+
+Lint/DeprecatedConstants:
+  Enabled: true
+
+Lint/DuplicateBranch:
+  Enabled: true
+
+Lint/DuplicateRegexpCharacterClassElement:
+  Enabled: true
+
+Lint/EmptyBlock:
+  Enabled: true
+
+Lint/EmptyClass:
+  Enabled: false
+
+Lint/EmptyInPattern:
+  Enabled: true
+
+Lint/IncompatibleIoSelectWithFiberScheduler: # new in 1.21
+  Enabled: true
+
+Lint/LambdaWithoutLiteralBlock:
+  Enabled: true
+
 Lint/Loop:
   Enabled: true
 
+Lint/NoReturnInBeginEndBlocks:
+  Enabled: true
+
+Lint/NumberedParameterAssignment:
+  Enabled: true
+
+Lint/OrAssignmentToConstant:
+  Enabled: true
+
+Lint/RaiseException:
+  Enabled: true
+
+Lint/RedundantDirGlobSort:
+  Enabled: true
+
+Lint/RequireRelativeSelfPath: # new in 1.22
+  Enabled: true
+
 Lint/RescueException:
   Enabled: true
 
+Lint/StructNewOverride:
+  Enabled: true
+
+Lint/SymbolConversion:
+  Enabled: true
+
+Lint/ToEnumArguments:
+  Enabled: true
+
+Lint/TripleQuotes:
+  Enabled: true
+
+Lint/UnexpectedBlockArity:
+  Enabled: true
+
+Lint/UnmodifiedReduceAccumulator:
+  Enabled: true
+
 Lint/UnusedMethodArgument:
   Enabled: true
 
@@ -76,20 +175,24 @@ Metrics/BlockLength:
   Enabled: true
   Max: 350
 
+Metrics/BlockNesting:
+  Enabled: true
+  Max: 5
+
 Metrics/ClassLength:
   Enabled: true
-  Max: 350
+  Max: 450
 
 Metrics/CyclomaticComplexity:
   Enabled: false
 
-Metrics/LineLength:
+Layout/LineLength:
   Enabled: false
   Max: 90
 
 Metrics/MethodLength:
   Enabled: true
-  Max: 40
+  Max: 60
 
 Metrics/ModuleLength:
   Enabled: true
@@ -103,21 +206,30 @@ Naming/ConstantName:
 
 Naming/ClassAndModuleCamelCase:
   Enabled: false
-  
-Naming/UncommunicativeBlockParamName:
+
+Naming/BlockParameterName:
   Enabled: true
-  
-Naming/UncommunicativeMethodParamName:
+
+Naming/InclusiveLanguage:
+  Enabled: true
+
+Naming/MethodParameterName:
+  Enabled: false
+
+Naming/MethodName:
   Enabled: false
 
 Naming/VariableName:
   Enabled: false
 
+Security/IoMethods: # new in 1.22
+  Enabled: true
+
 Style/Alias:
   Enabled: true
 
-Layout/AlignHash:
-  Enabled: false
+Style/ArgumentsForwarding:
+  Enabled: true
 
 Style/AsciiComments:
   Enabled: false
@@ -137,6 +249,9 @@ Style/ClassCheck:
 Style/ClassVars:
   Enabled: false
 
+Style/CollectionCompact:
+  Enabled: true
+
 Style/ColonMethodCall:
   Enabled: false
 
@@ -155,44 +270,204 @@ Style/DefWithParentheses:
 Style/Documentation:
   Enabled: false
 
+Style/DocumentDynamicEvalDefinition:
+  Enabled: true
+
 Style/ExpandPathArguments:
   Enabled: false
 
+Style/ExponentialNotation:
+  Enabled: true
+
 Style/GuardClause:
   Enabled: false
 
+Style/HashEachMethods:
+  Enabled: true
+
+Style/HashExcept:
+  Enabled: true
+
+Style/HashTransformKeys:
+  Enabled: true
+
+Style/HashTransformValues:
+  Enabled: true
+
 Style/IfUnlessModifier:
   Enabled: false
 
+Style/InPatternThen:
+  Enabled: true
+
 Style/InverseMethods:
+  Enabled: false
+
+Style/MissingRespondToMissing:
+  Enabled: false
+
+Style/MultilineInPatternThen:
+  Enabled: true
+
+Style/NegatedIfElseCondition:
   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/QuotedSymbols:
+  Enabled: true
+
 Style/RaiseArgs:
   Enabled: true
 
+Style/RedundantArgument:
+  Enabled: true
+
 Style/RedundantReturn:
   Enabled: false
-  
+
 Style/RedundantSelf:
   Enabled: true
 
+Style/RedundantSelfAssignmentBranch:
+  Enabled: true
+
 Style/RegexpLiteral:
   Enabled: false
 
 Style/PercentLiteralDelimiters:
   Enabled: false
-  
+
+Style/SelectByRegexp: # new in 1.22
+  Enabled: true
+
 Style/StderrPuts:
-  Enabled: false  
+  Enabled: false
 
 Style/StringLiterals:
   Enabled: true
 
+Style/SwapValues:
+  Enabled: true
+
 Style/TernaryParentheses:
   Enabled: false
-  
+
 Style/UnlessElse:
-  Enabled: false
+  Enabled: false
+
+# Rubocop complains when it doesn't find an explicit setting for the following cops:
+Layout/EmptyLinesAroundAttributeAccessor:
+  Enabled: true
+
+Lint/BinaryOperatorWithIdenticalOperands:
+  Enabled: true
+
+Lint/DeprecatedOpenSSLConstant:
+  Enabled: true
+
+Lint/DuplicateElsifCondition:
+  Enabled: true
+
+Lint/DuplicateRescueException:
+  Enabled: true
+
+Lint/EmptyConditionalBody:
+  Enabled: true
+
+Lint/FloatComparison:
+  Enabled: true
+
+Lint/MissingSuper:
+  Enabled: true
+
+Lint/MixedRegexpCaptureTypes:
+  Enabled: true
+
+Lint/OutOfRangeRegexpRef:
+  Enabled: true
+
+Lint/SelfAssignment:
+  Enabled: true
+
+Lint/TopLevelReturnWithArgument:
+  Enabled: true
+
+Lint/UnreachableLoop:
+  Enabled: true
+
+Style/AccessorGrouping:
+  Enabled: true
+
+Style/ArrayCoercion:
+  Enabled: true
+
+Style/BisectedAttrAccessor:
+  Enabled: true
+
+Style/CaseLikeIf:
+  Enabled: true
+
+Style/EndlessMethod:
+  Enabled: true
+
+Style/ExplicitBlockArgument:
+  Enabled: true
+
+Style/GlobalStdStream:
+  Enabled: true
+
+Style/HashAsLastArrayItem:
+  Enabled: true
+
+Style/HashConversion:
+  Enabled: true
+
+Style/HashLikeCase:
+  Enabled: true
+
+Style/IfWithBooleanLiteralBranches:
+  Enabled: true
+
+Style/OptionalBooleanParameter:
+  Enabled: true
+
+Style/RedundantAssignment:
+  Enabled: true
+
+Style/RedundantFetchBlock:
+  Enabled: true
+
+Style/RedundantFileExtensionInRequire:
+  Enabled: true
+
+Style/RedundantRegexpCharacterClass:
+  Enabled: true
+
+Style/RedundantRegexpEscape:
+  Enabled: true
+
+Style/SingleArgumentDig:
+  Enabled: true
+
+Style/SlicingWithRange:
+  Enabled: true
+
+Style/StringChars:
+  Enabled: true
+
+Style/StringConcatenation:
+  Enabled: true

data/CHANGELOG.md

@@ -1,3 +1,44 @@
+## [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.
+
+### Changed
+- File `srl_ruby.gemspec` Updated the dependencies
+- File `grammar.rb` Grammar refactored (use  ? * + modifiers in production rules)
+- class `ASTBuilder` updated `reduce_` to reflect new refactored production rules.
+
+## [0.4.7] - 2021-08-24
+- Updated dependencies (Ruby >= 2.5), (Rley >= 0.8.02)
+- Code restyling to please rubocop 1.19.1. 
+### Changed
+- File `srl_ruby.gemspec` Updated the dependencies
+- File `.rubocop.yml` Added configuration for newest cops
+
+## [0.4.6] - 2019-08-17
+- Code refactoring to use string frozen magic comments (as a consequence, skeem runs only on Rubies 2.3 or newer).  
+- Code restyling to please rubocop 0.7.40. 
+### Changed
+- File `README.md` updated note on compatibility with Rubies
+
+
+## [0.4.5] - 2019-01-13
+- Removed Ruby versions older than 2.3 in CI testing because of breaking changes by Bundler 2.0  
+
+### Changed
+* Files `.travis.yml`, `appveyor.yml` updated.
+
 ## [0.4.5] - 2019-01-02
 ### Changed
 - Minor code re-styling to please Rubocop 0.62.0.

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }

data/LICENSE.txt

@@ -5,7 +5,7 @@ the 'srl_test' directory, which is subject to its own license.
 
 The MIT License (MIT)
 
-Copyright (c) 2018-2019 Dimitri Geshef
+Copyright (c) 2018-2021 Dimitri Geshef
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -15,7 +15,7 @@ With **srl_ruby** you can easily design your patterns in SRL and let *srl_ruby*
 - Ruby API for integrating a SRL parser or compiler with your code.
 - 100% pure Ruby with clean design (_not a port from some other language_)
 - Minimal runtime dependency ([Rley](https://rubygems.org/gems/rley) gem). Won't drag a bunch of gems...
-- Compatibility: works with 2.x+ MRI, JRuby
+- Compatibility: works with Ruby 2.3+ MRI, JRuby
 - Portability: tested on both Linux and Windows,...
 
 ## Installation

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task' # Rspec as testing tool
 require 'cucumber/rake/task' # Cucumber as testing tool
@@ -8,6 +10,7 @@ RSpec::Core::RakeTask.new do |spec|
 end
 
 Cucumber::Rake::Task.new do |_|
+  # Comment
 end
 
 # Combine RSpec and Cucumber tests

data/appveyor.yml

@@ -1,26 +1,28 @@
 version: '{build}'
-max_jobs: 3
+max_jobs: 5
 environment:
   matrix:
+  - Ruby_version: 26-x64
   - Ruby_version: 25-x64
-  - Ruby_version: 24-x64  
+  - Ruby_version: 24-x64
   - Ruby_version: 23-x64
-  - Ruby_version: 22-x64 
-  - Ruby_version: 21-x64
-  - Ruby_version: 25  
-  - Ruby_version: 24  
-  - Ruby_version: 23  
-  - Ruby_version: 22
-  - Ruby_version: 21  
-# These are failing 
-#  - Ruby_version: 26  
-#  - Ruby_version: 26-x64  
+  - Ruby_version: 26
+  - Ruby_version: 25
+  - Ruby_version: 24
+  - Ruby_version: 23
 
 install:
   - set PATH=C:\Ruby%Ruby_version%\bin;%PATH%
+  - gem update --system
+  - gem install bundler
   - bundle install --retry=3 --clean --force
 
 build: off
 
+before_test:
+  - ruby -v
+  - gem -v
+  - bundle -v
+
 test_script:
   - bundle exec rake

data/bin/srl2ruby

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 require 'erb'
 require 'rubygems'
 require 'pathname'
@@ -7,10 +9,14 @@ require_relative '../lib/srl_ruby'
 require_relative 'srl2ruby_cli_parser'
 
 class Srl2RubyProg
-  DefaultSRLExtension = 'srl'.freeze
-  DefDirname = '/templates'.freeze
-  DefTemplate = 'base.erb'.freeze
+  DefaultSRLExtension = 'srl'
+  DefDirname = '/templates'
+  DefTemplate = 'base.erb'
+
+  # @return [Hash]
   attr_reader(:cli_options)
+
+  # @return [ERB]
   attr_reader(:template)
 
   def initialize(prog_name, args)
@@ -47,18 +53,16 @@ class Srl2RubyProg
       fname = cli_options[:template]
       exists = File.exist?(fname)
       if exists
-        t_filepath = Dir.getwd + '/' + fname
+        t_filepath = "#{Dir.getwd}/#{fname}"
       else
-        t_filepath = def_template_dir + '/' + fname
+        t_filepath = "#{def_template_dir}/#{fname}"
         exit(1) unless file_exist?(t_filepath)
       end
     else
-      t_filepath = def_template_dir + '/' + DefTemplate
+      t_filepath = "#{def_template_dir}/#{DefTemplate}"
     end
     path = Pathname.new(t_filepath)
-    erb_template = ERB.new(path.read, nil, '<>')
-
-    erb_template
+    ERB.new(path.read, nil, '<>')
   end
 
   def validate_filename(raw_fname)

data/bin/srl2ruby_cli_parser.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'optparse' # Use standard OptionParser class for command-line parsing
 
 # A command-line option parser for the srl2ruby compiler.
@@ -35,7 +37,7 @@ class Srl2RubyCLIParser < OptionParser
   end
 
   def description
-    descr = <<-DESCR
+    <<-DESCR
 Description:
   Parses a SRL file and compiles it into a Ruby Regexp literal.
   Simple Regex Language (SRL) website: https://simple-regex.com
@@ -45,8 +47,6 @@ Examples:
   #{program_name} -p 'begin with literally "Hello world!"'
   #{program_name} example.srl -o example_re.rb -t srl_and_ruby.erb
 DESCR
-
-    descr
   end
 
   def heading

data/features/lib/step_definitions/srl_testing_steps.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 When('I define the following SRL expression:') do |srl_source|
   @regex = SrlRuby::parse(srl_source)
 end

data/features/lib/support/env..rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rspec'
 require 'cucumber'
 require 'srl_ruby'

data/lib/regex/abstract_method.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # File: abstract_method.rb
 
 # Mix-in module. Provides the method 'abstract_method' that raises an exception

data/lib/regex/alternation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # File: alternation.rb
 
 require_relative 'polyadic_expression' # Access the superclass
@@ -17,9 +19,7 @@ module Regex # This module is used as a namespace
     # Purpose: Return the String representation of the concatented expressions.
     def text_repr
       result_children = children.map(&:to_str)
-      result = '(?:' + result_children.join('|') + ')'
-
-      return result
+      "(?:#{result_children.join('|')})"
     end
   end # class
 end # module