regexp-examples 1.4.2 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 4c992534d7187881c9471d5145917b6887be2289e7908d66963bef9cfb2b1b23
-  data.tar.gz: f4a147e388dca108bf32b54edf24a2c3c51937cd2cb0158dfc84f7f8c30e3de5
+SHA1:
+  metadata.gz: 9ee8a454e1238f6a09e9d5df9b3e462fa497bea2
+  data.tar.gz: 30c836039ede81f568c55f2552c42eec951505ef
 SHA512:
-  metadata.gz: b78764bd1222e9f4a416ce4b09a1f82315eced10daada19ebab746750126aa879536308ed1fbecfa7b4103242b188346d805ff2290640192578dec9f74795852
-  data.tar.gz: 1b3b7a7022c7ed2d8cbae0a47305fb1007786ec9417f94c2bd71dc991354255f40795cdf24cfe0438b23901d22b6d662cf26790c619847726b0cc3668f3c7779
+  metadata.gz: dbef5b7698904308ab77ce262ab00d806936cde7fe00f567733cb4aba8bf71a75e714f9e2c525d00b5dca4e5ab11b2d9b1713e2b58dabfbc0210c9ef21e80e76
+  data.tar.gz: be725e51de4a04371d78fe99844d3778c104a6a0951059655d99f2bfa98c1b269b412f4d688b852a85e86466323e48e0d7dcdac53d40e4781cfab10f7681028b

data/.travis.yml

@@ -2,9 +2,10 @@ language: ruby
 rvm:
   - 2.0.0
   - 2.1.10
-  - 2.2.8
-  - 2.3.5
-  - 2.4.2
+  - 2.2.9
+  - 2.3.6
+  - 2.4.3
+  - 2.5.0
   - ruby-head
 matrix:
   allow_failures:

data/README.md

@@ -57,6 +57,7 @@ Obviously, you will get different (random) results if you try these yourself!
 * MRI 2.2.x
 * MRI 2.3.x
 * MRI 2.4.x
+* MRI 2.5.x
 
 MRI ≤ 1.9.3 are not supported. This is primarily because MRI 2.0.0 introduced a new
 regexp engine (`Oniguruma` was replaced by `Onigmo`). Whilst *most* of this gem could
@@ -110,6 +111,9 @@ Long answer:
   * ...and even if nested or optional, e.g. `/(even(this(works?))) \1 \2 \3/`, `/what about (this)? \1/`
   * Non-capture groups, e.g. `/(?:foo)/`
   * Comment groups, e.g. `/foo(?#comment)bar/`
+  * [Absent operator groups, e.g. `/(?~exp)/`](https://medium.com/rubyinside/the-new-absent-operator-in-ruby-s-regular-expressions-7c3ef6cd0b99)
+    This feature is available in ruby version `>= 2.4.1`.
+    However, support in this gem is [limited](https://github.com/tom-lord/regexp-examples/issues/22).
 * Control characters, e.g. `/\ca/`, `/\cZ/`, `/\C-9/`
 * Escape sequences, e.g. `/\x42/`, `/\x5word/`, `/#{"\x80".force_encoding("ASCII-8BIT")}/`
 * Unicode characters, e.g. `/\u0123/`, `/\uabcd/`, `/\u{789}/`
@@ -200,15 +204,10 @@ All forms of configuration mentioned above **are thread safe**.
 
 ## Bugs and TODOs
 
-There are no known major bugs with this library. However, there are a few obscure issues that you *may* encounter:
+There are no known major bugs with this library. However, there are a few obscure issues that you *may* encounter.
 
-* Conditional capture groups, e.g. `/(group1)? (?(1)yes|no)/.examples` are not yet supported. (This example *should* return: `["group1 yes", " no"]`)
-* Nested repeat operators are incorrectly parsed, e.g. `/b{2}{3}/` - which *should* be interpreted like `/b{6}/`. (However, there is probably no reason
- to ever write regexes like this!)
-* A new ["absent operator" (`/(?~exp)/`)](https://medium.com/rubyinside/the-new-absent-operator-in-ruby-s-regular-expressions-7c3ef6cd0b99)
- was added to Ruby version `2.4.1`. This gem does not yet support it (or gracefully fail when used).
-* Ideally, `regexp#examples` should always return up to `max_results_limit`. Currenty, it usually "aborts" before this limit is reached.
- (I.e. the exact number of examples generated can be hard to predict, for complex patterns.)
+All known bugs/missing features are [documented in GitHub](https://github.com/tom-lord/regexp-examples/issues).
+Please discuss known issues there, or raise a new issue if required. Pull requests are welcome!
 
 Some of the most obscure regexp features are not even mentioned in [the ruby docs](http://ruby-doc.org/core/Regexp.html).
 However, full documentation on all the intricate obscurities in the ruby (version 2.x) regexp parser can be found

data/lib/regexp-examples/groups.rb

@@ -125,7 +125,7 @@ module RegexpExamples
     # Generates the result of each contained group
     # and adds the filled group of each result to itself
     def result
-      strings = @groups.map { |repeater| repeater.public_send(__method__) }
+      strings = @groups.map { |repeater| repeater.public_send(__callee__) }
       RegexpExamples.permutations_of_strings(strings).map do |result|
         GroupResult.new(result, group_id)
       end

data/lib/regexp-examples/parser_helpers/parse_multi_group_helper.rb

@@ -18,6 +18,7 @@ module RegexpExamples
               |!              # Neglookahead
               |=              # Lookahead
               |\#             # Comment group
+              |~              # Absent operator (ruby 2.4.1+)
               |<              # Lookbehind or named capture
               (
                 !             # Neglookbehind
@@ -31,10 +32,27 @@ module RegexpExamples
           if match[1].nil? # e.g. /(normal)/
             group_id = @num_groups.to_s
           elsif match[2] == ':' # e.g. /(?:nocapture)/
+            @num_groups -= 1
             @current_position += 2
           elsif match[2] == '#' # e.g. /(?#comment)/
-            comment_group = rest_of_string.match(/.*?[^\\](?:\\{2})*\)/)[0]
+            @num_groups -= 1
+            comment_group = rest_of_string.match(/.*?[^\\](?:\\{2})*(?=\))/)[0]
             @current_position += comment_group.length
+            return PlaceHolderGroup.new
+          elsif match[2] == '~' # e.g. /(?~absent operator)/
+            # The "best" way to replicate this is with a negative lookbehind:
+            # e.g. (?~abc) --> (?:.(?<!abc))*
+            # But since look-behinds are irregular, this library cannot support
+            # that! A possible workaround would be to replace the group with a
+            # repetition of the first letter negated, e.g.
+            # (?~abc) --> (?:[^a]*)
+            # However (!!) this generalisation is not always possible:
+            # (?~\wa|\Wb) --> ???
+            # Therefore, the only 100% reliable option is just to match "nothing"
+            @num_groups -= 1 # "Absence groups" are not counted as backrefs
+            absence_group = rest_of_string.match(/.*?[^\\](?:\\{2})*(?=\))/)[0]
+            @current_position += absence_group.length
+            return PlaceHolderGroup.new
           elsif match[2] =~ /\A(?=[mix-]+)([mix]*)-?([mix]*)/ # e.g. /(?i-mx)/
             regexp_options_toggle(Regexp.last_match(1), Regexp.last_match(2))
             @num_groups -= 1 # Toggle "groups" should not increase backref group count

data/lib/regexp-examples/version.rb

@@ -1,4 +1,4 @@
 # Gem version
 module RegexpExamples
-  VERSION = '1.4.2'.freeze
+  VERSION = '1.4.3'.freeze
 end

data/spec/regexp-examples_spec.rb

@@ -1,3 +1,8 @@
+# Load from a separate file to avoid unrescuable SyntaxError
+if RUBY_VERSION >= '2.4.1'
+  require_relative 'regexp-examples_spec_2.4.1'
+end
+
 RSpec.describe Regexp, '#examples' do
   def self.examples_exist_and_match(*regexps)
     regexps.each do |regexp|
@@ -69,7 +74,7 @@ RSpec.describe Regexp, '#examples' do
         /[abc-e]/,
         /[^a-zA-Z]/,
         /[\w]/,
-        /[]]/, # TODO: How to suppress annoying warnings on this test?
+        /[]]/,
         /[\]]/,
         /[\\]/,
         /[\\\]]/,
@@ -92,6 +97,7 @@ RSpec.describe Regexp, '#examples' do
       examples_exist_and_match(
         /(normal)/,
         /(?:nocapture)/,
+        /(?:nocapture)(normal) \1/, # Ensure the group counter is correct
         /(?<name>namedgroup)/,
         /(?<name>namedgroup) \k<name>/,
         /(?<name>namedgroup) \k'name'/
@@ -268,6 +274,7 @@ RSpec.describe Regexp, '#examples' do
     context 'for comment groups' do
       examples_exist_and_match(
         /a(?#comment)b/,
+        /(?#comment)(group1)\1/, # Ensure the group counter is correct
         /a(?#ugly backslashy\ comment\\\))b/
       )
     end

data/spec/regexp-examples_spec_2.4.1.rb

@@ -0,0 +1,7 @@
+RSpec.describe Regexp, '#examples' do
+  context 'absent operator' do
+    it 'treats the group as an empty match' do
+      expect(/abc(?~def)ghi/.examples).to eq(['abcghi'])
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: regexp-examples
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
 platform: ruby
 authors:
 - Tom Lord
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-25 00:00:00.000000000 Z
+date: 2018-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -81,6 +81,7 @@ files:
 - spec/config_spec.rb
 - spec/helpers.rb
 - spec/regexp-examples_spec.rb
+- spec/regexp-examples_spec_2.4.1.rb
 - spec/regexp-random_example_spec.rb
 - spec/spec_helper.rb
 homepage: http://rubygems.org/gems/regexp-examples
@@ -103,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: Extends the Regexp class with '#examples' and '#random_example'
@@ -111,5 +112,6 @@ test_files:
 - spec/config_spec.rb
 - spec/helpers.rb
 - spec/regexp-examples_spec.rb
+- spec/regexp-examples_spec_2.4.1.rb
 - spec/regexp-random_example_spec.rb
 - spec/spec_helper.rb