cuke-patterns 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/cuke-patterns.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cuke-patterns}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brendan Baldwin"]

data/features/step_definitions/simple_pattern_steps.rb

@@ -14,9 +14,6 @@ Then /^@x should evaluate to (.*)$/ do |expression|
   @x.should == eval(expression)
 end
 
-Pattern 'a',  /a|an/
-Pattern 'an', /a|an/
-
 Pattern :class, /([A-Z][a-z]+)/ do |class_name|
   Object.const_get(class_name)
 end
@@ -28,3 +25,15 @@ end
 Pattern :list_of_integers, /(-?\d+(?: *(?:,|and) *-?\d+)*)/ do |list|
   list.split(/ *(?:,|and) */).map{|number| number.to_i}
 end
+
+PatternGenerator do |key|
+  %w[a an].include?(key) and /a|an/
+end
+
+## This PatternGenerator would enable automatic singularize/pluralize of ALL words
+## so you don't have to resort to regexp construction for steps just do deal with
+## pluralization related nonsense.
+#
+# PatternGenerator do |key|
+#   Regexp.new([Regexp.escape(key.singularize), Regexp.escape(key.pluralize)].join('|'))
+# end

data/lib/cuke-patterns.rb

@@ -6,6 +6,10 @@ module CukePatterns
       @rb_language.register_rb_cuke_pattern(name, regexp, &proc)
     end
 
+    def register_rb_cuke_pattern_generator(&proc)
+      @rb_language.register_rb_cuke_pattern_generator(&proc)
+    end
+
   end
 
   # For extending the Cucumber::RbSupport::RbLanguage class
@@ -33,7 +37,21 @@ module CukePatterns
     end
 
     def cuke_patterns
-      @cuke_patterns ||= {}
+      @cuke_patterns ||= Hash.new {|hash, key| default_cuke_pattern(key)}
+    end
+
+    # Hook this method to automatically generate regexp matches for words in step
+    # definition strings that *don't* match to registered patterns.
+    def default_cuke_pattern(key)
+      default_cuke_pattern_generators.each do |generator|
+        regexp, proc = generator[key]
+        return [regexp, proc] if regexp
+      end
+      return nil
+    end
+
+    def default_cuke_pattern_generators
+      @default_cuke_pattern_generators ||= []
     end
 
     def register_rb_cuke_pattern(name, regexp, &conversion_proc)
@@ -51,6 +69,10 @@ module CukePatterns
       return cuke_patterns[name] = [regexp, conversion_proc]
     end
 
+    def register_rb_cuke_pattern_generator(&proc)
+      default_cuke_pattern_generators << proc
+    end
+
     def register_rb_step_definition_with_cuke_patterns(matcher, proc)
       return register_rb_step_definition_without_cuke_patterns(matcher, proc) unless matcher.is_a?(String)
       cuke_pattern_delayed_step_definition_registrations << [matcher, proc]
@@ -73,13 +95,13 @@ module CukePatterns
       # Split the string by non-alphanumeric, underscore or leading-colon characters
       matcher.scan(/(:?\w+)|([^:\w]+|:)/) do |candidate, non_candidate|
 
-        if non_candidate or not cuke_patterns.include?(candidate)
+        regexp, conversion_proc = cuke_patterns[candidate] if candidate
+
+        if non_candidate or not regexp
           matcher_regexp << Regexp.escape(candidate || non_candidate)
           next
         end
 
-        regexp, conversion_proc = cuke_patterns[candidate]
-
         pattern_capture_count = capture_count_for(regexp)
 
         proc = convert_cuke_pattern_proc_arguments(
@@ -89,7 +111,7 @@ module CukePatterns
         pattern_counter += 1 unless pattern_capture_count == 0
         capture_counter += pattern_capture_count
 
-        matcher_regexp << regexp.to_s
+        matcher_regexp << "(?:#{regexp})"
 
       end
 
@@ -162,6 +184,11 @@ Cucumber::RbSupport::RbDsl.module_eval do
   def Pattern(name, regexp, &proc)
     Cucumber::RbSupport::RbDsl.register_rb_cuke_pattern(name, regexp, &proc)
   end
+
+  def PatternGenerator(&proc)
+    Cucumber::RbSupport::RbDsl.register_rb_cuke_pattern_generator(&proc)
+  end
+
 end
 
 Cucumber::RbSupport::RbLanguage.class_eval do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Brendan Baldwin