regexp_parser 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e084510a97816730f68028cba8be7b9ee576e886347952d8400cd26293f3361
-  data.tar.gz: f98f2bbb3558c6a50d3415c830ba6dae1f09b2aca944f411b88c1cd65d527f60
+  metadata.gz: d7b93dde993f6fe427ff43755738bf7de50f8613cf6e8097c9d791646d803e4c
+  data.tar.gz: 993a88720a4ee1d8a34f4c95e167089adc6455289bfeb356de8c028a9bbee63d
 SHA512:
-  metadata.gz: 972c429ea4b47e2d2fefbc087cb23362f3e385cbbdbbead8013537d9bfe12b07237dcb1dcfaab6e1793037347d310702fa7fc035ab874dc24722b041493cc3f2
-  data.tar.gz: 6ace6c2390101f9d95bcc9325ba70c4d4d9d90d5796ab015ffcef1f58b907eb3a2649ee07f3f77e6f2682a2f4803e6f94e634855e39a97480a1fb17f00b97c23
+  metadata.gz: 0bf5c142591b2d5a65023c53f76a64a13106074050042d24614963cc14dabda197ea9140fccd93f26ad06885293369b076bb5e9198967a6e3762654df8033455
+  data.tar.gz: 1311b3dfa90633ef456edc12abf6ace2d7311c7be8450f3768a436f9c8491c3a87987f3d6ac24c6966b6f4de5363e0f6f874bfe9e1b038a6cf5d9c043553b58e

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 ## [Unreleased]
 
+### [1.7.0] - 2020-02-23 - [Janosch Müller](mailto:janosch84@gmail.com)
+
+### Added
+
+- `Expression#each_expression` and `1.#traverse` can now be called without a block
+  * this returns an `Enumerator` and allows chaining, e.g. `each_expression.select`
+  * thanks to [Masataka Kuwabara](https://github.com/pocke)
+
+### Fixed
+
+- `MatchLength#each` no longer ignores the given `limit:` when called without a block
+
 ### [1.6.0] - 2019-06-16 - [Janosch Müller](mailto:janosch84@gmail.com)
 
 ### Added

data/Gemfile

@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 gemspec
 
 group :development, :test do
-  gem 'rake', '~> 12.2'
+  gem 'rake', '~> 13.0'
   gem 'regexp_property_values', '~> 1.0'
   gem 'rspec', '~> 3.8'
 end

data/lib/regexp_parser/expression/methods/match_length.rb

@@ -22,7 +22,7 @@ class Regexp::MatchLength
   end
 
   def each(opts = {})
-    return enum_for(__method__) unless block_given?
+    return enum_for(__method__, opts) unless block_given?
     limit = opts[:limit] || 1000
     yielded = 0
     (min..max).each do |num|

data/lib/regexp_parser/expression/methods/traverse.rb

@@ -14,7 +14,7 @@ module Regexp::Expression
     #
     # Returns self.
     def traverse(include_self = false, &block)
-      raise 'traverse requires a block' unless block_given?
+      return enum_for(__method__, include_self) unless block_given?
 
       block.call(:enter, self, 0) if include_self
 
@@ -37,6 +37,8 @@ module Regexp::Expression
     # Iterates over the expressions of this expression as an array, passing
     # the expression and its index within its parent to the given block.
     def each_expression(include_self = false, &block)
+      return enum_for(__method__, include_self) unless block_given?
+
       traverse(include_self) do |event, exp, index|
         yield(exp, index) unless event == :exit
       end

data/lib/regexp_parser/version.rb

@@ -1,5 +1,5 @@
 class Regexp
   class Parser
-    VERSION = '1.6.0'
+    VERSION = '1.7.0'
   end
 end

data/spec/expression/methods/match_length_spec.rb

@@ -120,6 +120,13 @@ RSpec.describe(Regexp::MatchLength) do
       expect { result.next }.to raise_error(StopIteration)
     end
 
+    it 'is aware of limit option even if called without a block' do
+      result = ML.of(/a?/).each(limit: 1)
+      expect(result).to be_a(Enumerator)
+      expect(result.next).to eq 0
+      expect { result.next }.to raise_error(StopIteration)
+    end
+
     it 'is limited to 1000 iterations in case there are infinite match lengths' do
       expect(ML.of(/a*/).first(3000).size).to eq 1000
     end

data/spec/expression/methods/traverse_spec.rb

@@ -39,6 +39,17 @@ RSpec.describe('Subexpression#traverse') do
     expect(visits).to eq 9
   end
 
+  specify('Subexpression#traverse without a block') do
+    root = RP.parse(/abc/)
+    enum = root.traverse
+
+    expect(enum).to be_a(Enumerator)
+    event, expr, idx = enum.next
+    expect(event).to eq(:visit)
+    expect(expr).to be_a(Regexp::Expression::Literal)
+    expect(idx).to eq(0)
+  end
+
   specify('Subexpression#walk alias') do
     root = RP.parse(/abc/)
 
@@ -81,6 +92,16 @@ RSpec.describe('Subexpression#traverse') do
     expect(indices).to eq [0, 0, 1, 0, 2]
   end
 
+  specify('Subexpression#each_expression without a block') do
+    root = RP.parse(/abc/)
+    enum = root.each_expression
+
+    expect(enum).to be_a(Enumerator)
+    expr, idx = enum.next
+    expect(expr).to be_a(Regexp::Expression::Literal)
+    expect(idx).to eq(0)
+  end
+
   specify('Subexpression#flat_map without block') do
     root = RP.parse(/a(b([c-e]+))?/)
 

data/spec/expression/options_spec.rb

@@ -85,44 +85,44 @@ RSpec.describe('Expression#options') do
       .and change { exp.unicode_classes? }.from(false).to(true)
   end
 
-  RSpec.shared_examples '#options' do |regexp, klass, at: []|
+  RSpec.shared_examples '#options' do |regexp, path, klass|
     it "works for expression class #{klass}" do
-      exp = RP.parse(/#{regexp.source}/i).dig(*at)
+      exp = RP.parse(/#{regexp.source}/i).dig(*path)
       expect(exp).to be_a(klass)
       expect(exp).to be_i
       expect(exp).not_to be_x
     end
   end
 
-  include_examples '#options', //, Root
-  include_examples '#options', /a/, Literal, at: [0]
-  include_examples '#options', /\A/, Anchor::Base, at: [0]
-  include_examples '#options', /\d/, CharacterType::Base, at: [0]
-  include_examples '#options', /\n/, EscapeSequence::Base, at: [0]
-  include_examples '#options', /\K/, Keep::Mark, at: [0]
-  include_examples '#options', /./, CharacterType::Any, at: [0]
-  include_examples '#options', /(a)/, Group::Base, at: [0]
-  include_examples '#options', /(a)/, Literal, at: [0, 0]
-  include_examples '#options', /(?=a)/, Assertion::Base, at: [0]
-  include_examples '#options', /(?=a)/, Literal, at: [0, 0]
-  include_examples '#options', /(a|b)/, Group::Base, at: [0]
-  include_examples '#options', /(a|b)/, Alternation, at: [0, 0]
-  include_examples '#options', /(a|b)/, Alternative, at: [0, 0, 0]
-  include_examples '#options', /(a|b)/, Literal, at: [0, 0, 0, 0]
-  include_examples '#options', /(a)\1/, Backreference::Base, at: [1]
-  include_examples '#options', /(a)\k<1>/, Backreference::Number, at: [1]
-  include_examples '#options', /(a)\g<1>/, Backreference::NumberCall, at: [1]
-  include_examples '#options', /[a]/, CharacterSet, at: [0]
-  include_examples '#options', /[a]/, Literal, at: [0, 0]
-  include_examples '#options', /[a-z]/, CharacterSet::Range, at: [0, 0]
-  include_examples '#options', /[a-z]/, Literal, at: [0, 0, 0]
-  include_examples '#options', /[a&&z]/, CharacterSet::Intersection, at: [0, 0]
-  include_examples '#options', /[a&&z]/, CharacterSet::IntersectedSequence, at: [0, 0, 0]
-  include_examples '#options', /[a&&z]/, Literal, at: [0, 0, 0, 0]
-  include_examples '#options', /[[:ascii:]]/, PosixClass, at: [0, 0]
-  include_examples '#options', /\p{word}/, UnicodeProperty::Base, at: [0]
-  include_examples '#options', /(a)(?(1)b|c)/, Conditional::Expression, at: [1]
-  include_examples '#options', /(a)(?(1)b|c)/, Conditional::Condition, at: [1, 0]
-  include_examples '#options', /(a)(?(1)b|c)/, Conditional::Branch, at: [1, 1]
-  include_examples '#options', /(a)(?(1)b|c)/, Literal, at: [1, 1, 0]
+  include_examples '#options', //, [], Root
+  include_examples '#options', /a/, [0], Literal
+  include_examples '#options', /\A/, [0], Anchor::Base
+  include_examples '#options', /\d/, [0], CharacterType::Base
+  include_examples '#options', /\n/, [0], EscapeSequence::Base
+  include_examples '#options', /\K/, [0], Keep::Mark
+  include_examples '#options', /./, [0], CharacterType::Any
+  include_examples '#options', /(a)/, [0], Group::Base
+  include_examples '#options', /(a)/, [0, 0], Literal
+  include_examples '#options', /(?=a)/, [0], Assertion::Base
+  include_examples '#options', /(?=a)/, [0, 0], Literal
+  include_examples '#options', /(a|b)/, [0], Group::Base
+  include_examples '#options', /(a|b)/, [0, 0], Alternation
+  include_examples '#options', /(a|b)/, [0, 0, 0], Alternative
+  include_examples '#options', /(a|b)/, [0, 0, 0, 0], Literal
+  include_examples '#options', /(a)\1/, [1], Backreference::Base
+  include_examples '#options', /(a)\k<1>/, [1], Backreference::Number
+  include_examples '#options', /(a)\g<1>/, [1], Backreference::NumberCall
+  include_examples '#options', /[a]/, [0], CharacterSet
+  include_examples '#options', /[a]/, [0, 0], Literal
+  include_examples '#options', /[a-z]/, [0, 0], CharacterSet::Range
+  include_examples '#options', /[a-z]/, [0, 0, 0], Literal
+  include_examples '#options', /[a&&z]/, [0, 0], CharacterSet::Intersection
+  include_examples '#options', /[a&&z]/, [0, 0, 0], CharacterSet::IntersectedSequence
+  include_examples '#options', /[a&&z]/, [0, 0, 0, 0], Literal
+  include_examples '#options', /[[:ascii:]]/, [0, 0], PosixClass
+  include_examples '#options', /\p{word}/, [0], UnicodeProperty::Base
+  include_examples '#options', /(a)(?(1)b|c)/, [1], Conditional::Expression
+  include_examples '#options', /(a)(?(1)b|c)/, [1, 0], Conditional::Condition
+  include_examples '#options', /(a)(?(1)b|c)/, [1, 1], Conditional::Branch
+  include_examples '#options', /(a)(?(1)b|c)/, [1, 1, 0], Literal
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: regexp_parser
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Ammar Ali
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-16 00:00:00.000000000 Z
+date: 2020-02-23 00:00:00.000000000 Z
 dependencies: []
 description: A library for tokenizing, lexing, and parsing Ruby regular expressions.
 email:
@@ -181,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Scanner, lexer, parser for ruby's regular expressions