regexp-examples 0.2.1 → 0.2.2

data/lib/regexp-examples/backreferences.rb

@@ -1,49 +1,18 @@
 module RegexpExamples
-  class CaptureGroupResult < String
-    attr_reader :group_id, :subgroups
-    def initialize(group_id, subgroups, values)
-      @group_id = group_id
-      @subgroups = subgroups
-      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
-  end
-
   class BackReferenceReplacer
     def substitute_backreferences(full_examples)
-      full_examples.map! do |full_example|
-        if full_example.is_a? String
-          [full_example]
-        else
-          full_example.map! do |partial_example|
-            partial_example.gsub(/__(\w+)__/) do |match|
-              find_backref_for(full_example, $1)
-            end
-          end
+      full_examples.map do |full_example|
+        while full_example.match(/__(\w+?)__/)
+          full_example.sub!(/__(\w+?)__/, find_backref_for(full_example, $1))
         end
+        full_example
       end
-      full_examples
     end
 
     private
     def find_backref_for(full_example, group_id)
-      full_example.each do |partial_example|
-        next unless partial_example.respond_to?(:group_id)
-          partial_example.all_subgroups.each do |subgroup|
-            return subgroup if subgroup.group_id == group_id
-          end
+      full_example.all_subgroups.detect do |subgroup|
+        subgroup.group_id == group_id
       end
     end
 

data/lib/regexp-examples/exceptions.rb

@@ -0,0 +1,5 @@
+module RegexpExamples
+  class Error < StandardError; end
+  class UnsupportedSyntaxError < Error; end
+  class IllegalSyntaxError < Error; end
+end

data/lib/regexp-examples/groups.rb

@@ -1,10 +1,35 @@
 module RegexpExamples
+  # All Group#result methods return an array of GroupResult objects
+  # The key objective here is to keep track of all capture groups, in order
+  # to fill in backreferences
+  class GroupResult < String
+    attr_reader :group_id, :subgroups
+    def initialize(result, group_id = nil, subgroups = [])
+      @group_id = group_id
+      @subgroups = subgroups
+      if result.respond_to?(:group_id)
+        @subgroups = result.all_subgroups
+      end
+      super(result)
+    end
+
+    def all_subgroups
+      [self, subgroups].flatten.reject { |subgroup| subgroup.group_id.nil? }
+    end
+
+    # Overridden in order to preserve the @group_id and @subgroups
+    # Used by BaseGroup (which, in turn, is used by all Group objects)
+    def *(int)
+      self.class.new(super.to_s, group_id, subgroups)
+    end
+  end
+
   class SingleCharGroup
     def initialize(char)
       @char = char
     end
     def result
-      [@char]
+      [GroupResult.new(@char)]
     end
   end
 
@@ -52,17 +77,17 @@ module RegexpExamples
     end
 
     def result
-      if @negative
-        CharSets::Any - @chars
-      else
-        @chars
+      (@negative ? (CharSets::Any - @chars) : @chars).map do |result|
+        GroupResult.new(result)
       end
     end
   end
 
   class DotGroup
     def result
-      CharSets::Any
+      CharSets::Any.map do |result|
+        GroupResult.new(result)
+      end
     end
   end
 
@@ -79,8 +104,7 @@ module RegexpExamples
     def result
       strings = @groups.map {|repeater| repeater.result}
       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
+        GroupResult.new(result, group_id)
       end
     end
   end
@@ -101,7 +125,9 @@ module RegexpExamples
       right_result = @right_repeaters.map do |repeater|
         RegexpExamples::permutations_of_strings([repeater.result])
       end
-      left_result.concat(right_result).flatten.uniq
+      left_result.concat(right_result).flatten.uniq.map do |result|
+        GroupResult.new(result)
+      end
     end
   end
 
@@ -112,7 +138,7 @@ module RegexpExamples
     end
 
     def result
-      ["__#{@id}__"]
+      [ GroupResult.new("__#{@id}__") ]
     end
   end
 

data/lib/regexp-examples/helpers.rb

@@ -11,26 +11,16 @@ 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|
-      if options[:no_join]
-        result.flatten
-      else
-        join_preserving_capture_groups(result)
-      end
+      join_preserving_capture_groups(result)
     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
+    GroupResult.new(result.join, nil, subgroups)
   end
 end
 

data/lib/regexp-examples/parser.rb

@@ -92,9 +92,9 @@ module RegexpExamples
           @current_position += 2
           group_id = nil
         when %w(! =).include?(match[2]) # e.g. /(?=lookahead)/, /(?!neglookahead)/
-          # TODO: Raise exception
+          raise IllegalSyntaxError, "Lookaheads are not regular; cannot generate examples"
         when %w(! =).include?(match[3]) # e.g. /(?<=lookbehind)/, /(?<!neglookbehind)/
-          # TODO: Raise exception
+          raise IllegalSyntaxError, "Lookbehinds are not regular; cannot generate examples"
         else # e.g. /(?<name>namedgroup)/
           @current_position += (match[3].length + 3)
           group_id = match[3]

data/lib/regexp-examples/regexp_extensions.rb

@@ -3,12 +3,10 @@ class Regexp
     def examples
       partial_examples =
         RegexpExamples::Parser.new(source)
-      .parse
-      .map {|repeater| repeater.result}
-      full_examples = RegexpExamples::permutations_of_strings(partial_examples.dup, no_join: true)
-      full_examples_with_backrefs = \
-        RegexpExamples::BackReferenceReplacer.new.substitute_backreferences(full_examples)
-      full_examples_with_backrefs.map(&:join)
+          .parse
+          .map {|repeater| repeater.result}
+      full_examples = RegexpExamples::permutations_of_strings(partial_examples)
+      RegexpExamples::BackReferenceReplacer.new.substitute_backreferences(full_examples)
     end
   end
   include Examples

data/lib/regexp-examples/version.rb

@@ -1,3 +1,3 @@
 module RegexpExamples
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

data/regexp-examples.gemspec

@@ -18,4 +18,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency "bundler", "~> 1.7"
   s.add_development_dependency "rake", "~> 10.0"
   s.license          = 'MIT'
+  s.required_ruby_version = '>= 1.9.2'
 end

data/spec/regexp-examples_spec.rb

@@ -13,6 +13,14 @@ RSpec.describe Regexp, "#examples" do
     end
   end
 
+  def self.examples_raise_illegal_syntax_error(*regexps)
+    regexps.each do |regexp|
+      it do
+        expect{regexp.examples}.to raise_error RegexpExamples::IllegalSyntaxError
+      end
+    end
+  end
+
   context 'returns matching strings' do
     context "for basic repeaters" do
       examples_exist_and_match(
@@ -59,12 +67,6 @@ RSpec.describe Regexp, "#examples" do
         /(?<name>namedgroup)/,
         /(?<name>namedgroup) \k<name>/
       )
-      # TODO: These are not yet implemented
-      # (expect to raise exception)
-#        /(?=lookahead)/,
-#        /(?!neglookahead)/,
-#        /(?<=lookbehind)/,
-#        /(?<!neglookbehind)/,
     end
 
     context "for escaped characters" do
@@ -109,5 +111,14 @@ RSpec.describe Regexp, "#examples" do
         /a+|b*|c?/
       )
     end
+
+    context "for illegal syntax" do
+      examples_raise_illegal_syntax_error(
+        /(?=lookahead)/,
+        /(?!neglookahead)/,
+        /(?<=lookbehind)/,
+        /(?<!neglookbehind)/
+      )
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: regexp-examples
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Tom Lord
@@ -82,6 +82,7 @@ files:
 - lib/regexp-examples.rb
 - lib/regexp-examples/backreferences.rb
 - lib/regexp-examples/constants.rb
+- lib/regexp-examples/exceptions.rb
 - lib/regexp-examples/groups.rb
 - lib/regexp-examples/helpers.rb
 - lib/regexp-examples/parser.rb
@@ -103,7 +104,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -111,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Extends the Regexp class with '#examples'