regexp-examples 0.1.0 → 0.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmEzZDkwZTIyMTM0MzM1MTQ3YThmY2NhNGJmNGQzZDZmYTdlOTgzZQ==
+    OWJkMDYzMDJhNjQ2ZWE1YmZjZjM4NWViMThmYWVmMjA0ODBkZmZhNg==
   data.tar.gz: !binary |-
-    ZTdlYjhjOTg2MTc1MWU5M2NjYTk1ODU2OGNiNWMxYTIxYzlhMjdlMg==
+    Yjk3YTM5ZjNiMTdkODEwNmVjZGM2YTMzMTMzODA3OTE5YWFiMjE5Zg==
 SHA512:
   metadata.gz: !binary |-
-    NTUyY2Q2MzUwNjczMmYwOWQ1YTJkZTk5N2I2YWIzM2Q4NzUxODM0NDg4ZWQ3
-    ZDJiYTVkM2RhYzE1NTAzODdjMzY4ZDI4NTM3NjM0ZjJiZWQ1N2U4ZmVmMzIz
-    M2YyMDQ1MTAyZDg5NjAwOTY5Y2FlMDIyNzkwZjdhMDJiOTZhNDU=
+    MDc5YTA3MTdkMWQ0MmQ4OTk5Mzg4MjRlMWNhOTUxMTA0NWZjZDY3MmY1ZDc5
+    YjE2MWM3YTgxODgwZmFkYmEwMDY4MzdjZDg3OTQ1NWE5ZDFjNWE4NTIzYjhh
+    OWY1OTk4ZWU3ODE2YWIxMTg2Mzg0ZmQxYjNkNzgzNjNmNzU1ZDU=
   data.tar.gz: !binary |-
-    ZmQ1NWY5NjRiYzViNjdlNjNhODQ1ODkyZTZmMzk5MTIzZDgxZDFjNDIxODEz
-    ODY5ZDcxYzEwODAxYjhmNDE5MGM1ZDk5YzkxYjk5ZTUxYzRkYjY5ZTM2MWNk
-    NTNkZmRjYmMzN2ZkNjg4MDQ1MzdlNWNhZjYzOTJlODVkZjQwMTE=
+    MTJiMjA3NjY5ZDk0ODJjNDVmYjk5ZjczNjU5MDk4OGQ1N2NjZWNhODFiNDVj
+    Y2IxZGFmYzZhMzgzYTZhOTdiNDYwYWM4YzA0NDg3NmM1YzIwOWE5ZTc2ODNl
+    ZGMzMTdlZjhiYTY2NDI4NGIwNTVlOWViYjhjYzNmMmNlMGUxNGQ=

data/README.md

@@ -29,9 +29,12 @@ or a huge number of possible matches, such as `/.\w/`, then only a subset of the
 * Boolean "Or" groups, e.g. `/a|b|c/`
 * Character sets (inluding ranges and negation!), e.g. `/[abc]/`, `/[A-Z0-9]/`, `/[^a-z]/`
 * Escaped characters, e.g. `/\n/`, `/\w/`, `/\D/` (and so on...)
-* Capture groups, including named groups and backreferences(!!), e.g. `/(this|that) \1/` `/(?<name>foo) \k<name>/`
 * Non-capture groups, e.g. `/(?:foo)/`
-* '''Arbitrarily complex combinations of all the above!'''
+* Capture groups, e.g. `/(group)/`
+  * Including named groups, e.g. `/?(<name>group)/`
+  * ...And backreferences(!!!), e.g. `/(this|that) \1/` `/(?<name>foo) \k<name>/`
+  * Groups work fine, even if nested! e.g. `/(even(this(works?))) \1 \2 \3/`
+* **Arbitrarily complex combinations of all the above!**
 
 ## Not-Yet-Supported syntax
 

data/lib/regexp-examples/backreferences.rb

@@ -7,10 +7,15 @@ module RegexpExamples
       super(values)
     end
 
+    def all_subgroups
+      [self, subgroups].flatten
+    end
+
     # Overridden in order to preserve the @group_id and @subgroups
     def *(int)
       self.class.new(group_id, subgroups, super)
     end
+    # Overridden in order to preserve the @group_id and @subgroups
     def gsub(regex)
       self.class.new(group_id, subgroups, super)
     end
@@ -36,16 +41,10 @@ module RegexpExamples
     def find_backref_for(full_example, group_id)
       full_example.each do |partial_example|
         next unless partial_example.respond_to?(:group_id)
-        case
-        when partial_example.group_id == group_id
-          return partial_example
-        when sub_partial_example = find_backref_for(partial_example.subgroups, group_id)
-          # TODO: This line does NOT work for all nested backreference groups
-          # Need to revisit this logic and find a better solution, if possible
-          return sub_partial_example.result.detect{|sub_partial_result| partial_example.include? sub_partial_result}
-        end
+          partial_example.all_subgroups.each do |subgroup|
+            return subgroup if subgroup.group_id == group_id
+          end
       end
-      nil
     end
 
   end

data/lib/regexp-examples/groups.rb

@@ -78,8 +78,8 @@ module RegexpExamples
     # itself
     def result
       strings = @groups.map {|repeater| repeater.result}
-      subgroups = @groups.select{ |repeater| repeater.group.respond_to? :group_id}.map{|repeater| repeater.group}
       RegexpExamples::permutations_of_strings(strings).map do |result|
+        subgroups = result.respond_to?(:group_id) ? result.all_subgroups : []
         group_id ? CaptureGroupResult.new(group_id, subgroups, result) : result
       end
     end

data/lib/regexp-examples/helpers.rb

@@ -11,7 +11,25 @@ module RegexpExamples
     first = arrays_of_strings.shift
     return first if arrays_of_strings.empty?
     first.product( permutations_of_strings(arrays_of_strings, options) ).map do |result|
-      options[:no_join] ? result.flatten : result.flatten.join
+      if options[:no_join]
+        result.flatten
+      else
+        join_preserving_capture_groups(result)
+      end
+    end
+  end
+
+  def self.join_preserving_capture_groups(result)
+    result.flatten!
+    subgroups = result
+      .select { |partial| partial.respond_to? :group_id }
+      .map(&:all_subgroups)
+      .flatten
+
+    if subgroups.empty?
+      result.join
+    else
+      CaptureGroupResult.new(nil, subgroups, result.join)
     end
   end
 

data/lib/regexp-examples/version.rb

@@ -1,3 +1,3 @@
 module RegexpExamples
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

data/spec/regexp-examples_spec.rb

@@ -86,7 +86,9 @@ describe Regexp, "#examples" do
         /(repeat) \1/,
         /(ref1) (ref2) \1 \2/,
         /((ref2)ref1) \1 \2/,
-        /((ref1and2)) \1 \2/
+        /((ref1and2)) \1 \2/,
+        /(one)(two)(three)(four)(five)(six)(seven)(eight)(nine)(ten) \10\9\8\7\6\5\4\3\2\1/,
+        /(a?(b?(c?(d?(e?)))))/
       )
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: regexp-examples
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Tom Lord