regexgen 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e86e086268d6721f47706182ff5ea253c144a1c17a204ebe35ecb8c1f706cc89
-  data.tar.gz: a88cd0e49107c29290c840d66a859a67538977b18fc3294b5df97894b99897ae
+  metadata.gz: 7d4795aa7ce199e2818f541f0e1bbcb49c75c1767ada19faba309107f119afd9
+  data.tar.gz: 8c6f5e905c16356c643f0d0b9991081023055b74d801613cc6ecb53c2c63edfc
 SHA512:
-  metadata.gz: 9ea1ab6014151731615350e3eaeb5e975fb346e23b442c673077f424e806fae63c2a2db9058a041a8c32e523287c6417bdad0f54b6991c30c7f46e3ddc0fbcc1
-  data.tar.gz: ff525455e5a7ecbd1a2bbde4a618f1b192ebadfaf7c13c3d7f4bbdd750103b472c700bcbddda2a937466486c60310b28a5123d0030c97264903d9c11787cafd3
+  metadata.gz: 7d99428533020d7b8423d6cef3fbb1d5e6000a34d42266869473db0a921a7975b32f24c5f3c126c0ccb64c0c9d63b09d8a438fc5d0d8fbf42c1a4a1131d76053
+  data.tar.gz: d2639356091418e3e74bae4813c904a10100d0306ef255e6f90ac737b2f15609dd31a658610a3525cd445b0414cb24f3f01cd92fa1a5ee33fc1794ceb820d280

data/.github/workflows/main.yml

@@ -1,25 +1,21 @@
-name: CI
+name: Ruby
 
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
+on: [push,pull_request]
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
-
     steps:
     - uses: actions/checkout@v2
-    - name: Setup Ruby, JRuby and TruffleRuby
-      uses: ruby/setup-ruby@v1.40.0
-    - name: Install dependencies
-      run: bundle install
-    - name: Run tests
-      run: bundle exec rake test
-    - name: Lint
-      run: bundle exec rubocop
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: 2.7.4
+    - name: Install
+      run: |
+        gem install bundler -v 2.2.29
+        bundle install
     - name: Type check
       run: bundle exec solargraph typecheck --level typed
+    - name: Unit tests
+      run: bundle exec rake

data/.rubocop.yml

@@ -8,77 +8,7 @@ Naming/MethodParameterName:
     - 'lib/regexgen/regex.rb'
     - 'lib/regexgen/ast.rb'
 
-Layout/EmptyLinesAroundAttributeAccessor:
-  Enabled: true
-Layout/SpaceAroundMethodCallOperator:
-  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/RaiseException:
-  Enabled: true
-Lint/SelfAssignment:
-  Enabled: true
-Lint/StructNewOverride:
-  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/ExplicitBlockArgument:
-  Enabled: true
-Style/ExponentialNotation:
-  Enabled: true
-Style/GlobalStdStream:
-  Enabled: true
-Style/HashAsLastArrayItem:
-  Enabled: true
-Style/HashEachMethods:
-  Enabled: true
-Style/HashLikeCase:
-  Enabled: true
-Style/HashTransformKeys:
-  Enabled: true
-Style/HashTransformValues:
-  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/StringConcatenation:
-  Enabled: true
+AllCops:
+  TargetRubyVersion: 2.5
+  NewCops: enable
+  SuggestExtensions: false

data/.ruby-version

@@ -1 +1 @@
-2.6.5
+2.7.4

data/CHANGELOG.md

@@ -0,0 +1,27 @@
+## [Unreleased]
+
+## [0.3.1] - 2021-10-14
+
+- Fix missing `require 'set'`
+
+## [0.3.0] - 2020-08-18
+
+- Improve performance
+
+## [0.2.1] - 2020-08-11
+
+- Bug fix
+- Correct link in readme
+
+## [0.2.0] - 2020-08-11
+
+- Bug fix
+- Now includes `bin/regexgen` executable
+
+## [0.1.1] - 2020-08-11
+
+- Correct gem metadata
+
+## [0.1.0] - 2020-08-10
+
+- Initial release

data/Gemfile.lock

@@ -1,72 +1,79 @@
 PATH
   remote: .
   specs:
-    regexgen (0.3.0)
+    regexgen (0.3.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.1)
-    backport (1.1.2)
-    benchmark (0.1.0)
+    ast (2.4.2)
+    backport (1.2.0)
+    benchmark (0.1.1)
     byebug (11.1.3)
+    diff-lcs (1.4.4)
     e2mmap (0.1.0)
     jaro_winkler (1.5.4)
-    maruku (0.7.3)
-    mini_portile2 (2.4.0)
-    minitest (5.14.1)
-    nokogiri (1.10.10)
-      mini_portile2 (~> 2.4.0)
-    parallel (1.19.2)
-    parser (2.7.1.4)
+    kramdown (2.3.1)
+      rexml
+    kramdown-parser-gfm (1.1.0)
+      kramdown (~> 2.0)
+    mini_portile2 (2.6.1)
+    minitest (5.14.4)
+    nokogiri (1.12.5)
+      mini_portile2 (~> 2.6.1)
+      racc (~> 1.4)
+    parallel (1.21.0)
+    parser (3.0.2.0)
       ast (~> 2.4.1)
+    racc (1.5.2)
     rainbow (3.0.0)
     rake (12.3.3)
-    regexp_parser (1.7.1)
+    regexp_parser (2.1.1)
     reverse_markdown (2.0.0)
       nokogiri
-    rexml (3.2.4)
-    rubocop (0.89.1)
+    rexml (3.2.5)
+    rubocop (1.22.1)
       parallel (~> 1.10)
-      parser (>= 2.7.1.1)
+      parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.7)
+      regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 0.3.0, < 1.0)
+      rubocop-ast (>= 1.12.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.3.0)
-      parser (>= 2.7.1.4)
-    ruby-progressbar (1.10.1)
-    solargraph (0.39.14)
-      backport (~> 1.1)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.12.0)
+      parser (>= 3.0.1.1)
+    ruby-progressbar (1.11.0)
+    solargraph (0.44.0)
+      backport (~> 1.2)
       benchmark
       bundler (>= 1.17.2)
+      diff-lcs (~> 1.4)
       e2mmap
       jaro_winkler (~> 1.5)
-      maruku (~> 0.7, >= 0.7.3)
-      nokogiri (~> 1.9, >= 1.9.1)
-      parser (~> 2.3)
+      kramdown (~> 2.3)
+      kramdown-parser-gfm (~> 1.1)
+      parser (~> 3.0)
       reverse_markdown (>= 1.0.5, < 3)
-      rubocop (~> 0.52)
+      rubocop (>= 0.52)
       thor (~> 1.0)
       tilt (~> 2.0)
       yard (~> 0.9, >= 0.9.24)
-    thor (1.0.1)
+    thor (1.1.0)
     tilt (2.0.10)
-    unicode-display_width (1.7.0)
-    yard (0.9.25)
+    unicode-display_width (2.1.0)
+    yard (0.9.26)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  byebug (~> 11)
+  byebug
   minitest (~> 5.0)
   rake (~> 12.0)
   regexgen!
-  rubocop (~> 0.89)
-  solargraph (~> 0.39)
+  rubocop
+  solargraph
 
 BUNDLED WITH
-   2.1.4
+   2.2.29

data/Rakefile

@@ -9,4 +9,8 @@ Rake::TestTask.new(:test) do |t|
   t.test_files = FileList['test/**/*_test.rb']
 end
 
-task default: :test
+require 'rubocop/rake_task'
+
+RuboCop::RakeTask.new
+
+task default: %i[test rubocop]

data/lib/regexgen/ast.rb

@@ -178,21 +178,23 @@ module Regexgen
       end
 
       def remove_substring(side, len)
-        return Literal.new(@value[len..]) if side == :start
-        return Literal.new(@value[0...(@value.length - len)]) if side == :end
+        case side
+        when :start then Literal.new(@value[len...@value.length])
+        when :end then Literal.new(@value[0...(@value.length - len)])
+        else raise "Unknown side: #{side}"
+        end
       end
     end
 
-    class<<self
+    class << self
       def parens(exp, parent)
-        str = exp.to_s
-        if exp.precedence < parent.precedence
-          unless exp.respond_to?(:single_character?) && exp.single_character?
-            return "(?:#{str})" unless exp.respond_to?(:single_codepoint?) && exp.single_codepoint?
-          end
+        if exp.precedence < parent.precedence &&
+           !(exp.respond_to?(:single_character?) && exp.single_character?) &&
+           !(exp.respond_to?(:single_codepoint?) && exp.single_codepoint?)
+          "(?:#{exp})"
+        else
+          exp.to_s
         end
-
-        str
       end
     end
   end

data/lib/regexgen/minimize.rb

@@ -5,7 +5,7 @@ require 'regexgen/set'
 module Regexgen
   using SetUtil
 
-  class<<self
+  class << self
     # Hopcroft's DSA minimization algorithm
     # https://en.wikipedia.org/wiki/DFA_minimization#Hopcroft's_algorithm
     #
@@ -76,9 +76,9 @@ module Regexgen
             complement = y - x
             next if complement.empty?
 
-            p.replace(y, intersection, complement)
+            p.replace_item(y, intersection, complement)
             if w.include?(y)
-              w.replace(y, intersection, complement)
+              w.replace_item(y, intersection, complement)
             elsif intersection.size <= complement.size
               w.add(intersection)
             else

data/lib/regexgen/regex.rb

@@ -3,7 +3,7 @@
 require 'regexgen/ast'
 
 module Regexgen
-  class<<self
+  class << self
     # Brzozowski algebraic method
     # https://cs.stackexchange.com/a/2392
     #

data/lib/regexgen/set.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'set'
+
 module Regexgen
   module SetUtil
     refine Set do
@@ -9,8 +11,8 @@ module Regexgen
         item
       end
 
-      def replace(search, *replacements)
-        raise unless delete?(search)
+      def replace_item(search, *replacements)
+        raise("Failed to delete #{search}") unless delete?(search)
 
         merge(replacements)
       end

data/lib/regexgen/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Regexgen
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

data/lib/regexgen.rb

@@ -5,7 +5,7 @@ require 'regexgen/trie'
 
 # Generate regular expressions that match a set of strings
 module Regexgen
-  class <<self
+  class << self
     def generate(strings, flags = nil)
       Trie.new.tap { |t| strings.each(&t.method(:add)) }
           .to_regex(flags)

data/regexgen.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
   spec.summary       = 'Generate a minimal regex matching a set of strings'
   spec.homepage      = 'https://github.com/amake/regexgen-ruby'
   spec.license       = 'MIT'
-  spec.required_ruby_version = Gem::Requirement.new('>= 2.3.0')
+  spec.required_ruby_version = Gem::Requirement.new('>= 2.5.0')
 
   spec.metadata['homepage_uri'] = spec.homepage
   spec.metadata['source_code_uri'] = 'https://github.com/amake/regexgen-ruby.git'
@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'byebug', '~> 11'
-  spec.add_development_dependency 'rubocop', '~> 0.89'
-  spec.add_development_dependency 'solargraph', '~> 0.39'
+  spec.add_development_dependency 'byebug'
+  spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'solargraph'
 end

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: regexgen
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Aaron Madlon-Kay
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-18 00:00:00.000000000 Z
+date: 2021-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '11'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '11'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.89'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.89'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: solargraph
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.39'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.39'
+        version: '0'
 description: 
 email:
 - aaron@madlon-kay.com
@@ -67,6 +67,7 @@ files:
 - ".ruby-version"
 - ".solargraph.yml"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -98,14 +99,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Generate a minimal regex matching a set of strings