cuke-patterns 0.1.5 → 0.1.6

data/Rakefile

@@ -14,7 +14,7 @@ begin
     gem.summary = %Q{Makes cucumber step definitions more focused, understandable, searchable and awesomeable.}
     gem.description = %Q{Makes cucumber step definitions more focused, understandable, searchable and awesomeable.}
     gem.email = "brendan@usergenic.com"
-    gem.homepage = "http://github.com/brendan/cuke-patterns"
+    gem.homepage = "http://github.com/cloudcrowd/cuke-patterns"
     gem.authors = ["Brendan Baldwin"]
     # gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.1.6

data/cuke-patterns.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cuke-patterns}
-  s.version = "0.1.5"
+  s.version = "0.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brendan Baldwin"]
-  s.date = %q{2010-08-18}
+  s.date = %q{2010-12-14}
   s.description = %q{Makes cucumber step definitions more focused, understandable, searchable and awesomeable.}
   s.email = %q{brendan@usergenic.com}
   s.extra_rdoc_files = [
@@ -25,8 +25,10 @@ Gem::Specification.new do |s|
      "cuke-patterns.gemspec",
      "features/apply_pattern.feature",
      "features/apply_pattern_steps.rb",
+     "features/multi_capture_patterns.feature",
      "features/pattern_generator.feature",
      "features/simple_patterns.feature",
+     "features/step_definitions/multi_capture_steps.rb",
      "features/step_definitions/pattern_generator_steps.rb",
      "features/step_definitions/simple_pattern_steps.rb",
      "features/support/env.rb",
@@ -36,17 +38,17 @@ Gem::Specification.new do |s|
      "lib/cuke-patterns/rb_world_ext.rb",
      "lib/cuke-patterns/step_mother_ext.rb"
   ]
-  s.homepage = %q{http://github.com/brendan/cuke-patterns}
+  s.homepage = %q{http://github.com/cloudcrowd/cuke-patterns}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Makes cucumber step definitions more focused, understandable, searchable and awesomeable.}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
     else
     end
   else

data/features/multi_capture_patterns.feature

@@ -0,0 +1,19 @@
+Feature: Multi-capture Patterns
+Here are some examples of patterns that yield more than one
+capture from the Regexp into the transform closure.
+
+Scenario: :quoted
+When I assign @x to "hello"
+Then @x should be equal to 'hello'
+And @x should be a String
+
+Scenario: multiple transform patterns
+When I assign @x to a set of 3 "things"
+Then @x should be equal to ['things','things','things']
+And @x should be an Array
+
+Scenario: multiple multi-capture transform patterns
+When I assign @x to "word1" + "word2"
+Then @x should be equal to 'word1word2'
+And @x should be a String
+

data/features/simple_patterns.feature

@@ -1,6 +1,11 @@
 Feature: Simple Patterns
 These are some examples of very simple but useful patterns.
 
+Scenario: :array
+When I assign @x to [1,2,3]
+Then @x should be equal to [1,2,3]
+And @x should be an Array
+
 Scenario: :fixnum
 When I assign @x to 1
 Then @x should be equal to 1
@@ -25,16 +30,3 @@ Scenario: :hash
 When I assign @x to {'a'=>'b','c'=>'d'}
 Then @x should be equal to {'a'=>'b','c'=>'d'}
 And @x should be a Hash
-
-Scenario: :array
-When I assign @x to [1,2,3]
-Then @x should be equal to [1,2,3]
-And @x should be an Array
-
-Scenario: :string
-When I assign @x to "aww yeah"
-Then @x should be equal to "aww yeah"
-And @x should be a String
-
-
-

data/features/step_definitions/multi_capture_steps.rb

@@ -0,0 +1,17 @@
+Pattern :quoted, /"([^"]*)"|'([^']*)'/ do |double, single|
+  double.to_s + single.to_s
+end
+
+When "I assign :ivar_name to :quoted" do |ivar, quoted|
+  instance_variable_set(ivar, quoted)
+end
+
+When "I assign :ivar_name to :quoted + :quoted" do |ivar, q1, q2|
+  instance_variable_set(ivar, q1+q2)
+end
+
+When "I assign :ivar_name to a set of :fixnum :quoted" do |ivar, count, quoted|
+  set = []
+  1.upto(count) { set.push(quoted) }
+  instance_variable_set(ivar, set)
+end

data/features/step_definitions/simple_pattern_steps.rb

@@ -1,4 +1,16 @@
-When "I assign :ivar_name to :value" do |ivar, value|
+When "I assign :ivar_name to :array" do |ivar, value|
+  instance_variable_set(ivar, value)
+end
+
+When "I assign :ivar_name to :fixnum" do |ivar, value|
+  instance_variable_set(ivar, value)
+end
+
+When "I assign :ivar_name to :float" do |ivar, value|
+  instance_variable_set(ivar, value)
+end
+
+When "I assign :ivar_name to :hash" do |ivar, value|
   instance_variable_set(ivar, value)
 end
 
@@ -13,12 +25,28 @@ end
 Pattern /a|an/
 Pattern /is|are/
 
+Pattern :array, /(\[.*\])/ do |array|
+  eval(array)
+end
+
 Pattern :class, /([A-Z]\w*(?:::[A-Z]\w*)*)/ do |class_name|
   class_name.split(/::/).inject(Object) do |klass, subname|
     klass.const_get(subname)
   end
 end
 
+Pattern :fixnum, /(-?\d+)/ do |fixnum|
+  fixnum.to_i
+end
+
+Pattern :float, /(-?\d+\.\d+)/ do |float|
+  float.to_f
+end
+
+Pattern :hash, /(\{.*\})/ do |hash|
+  eval(hash)
+end
+
 Pattern :ivar, /(@\w+)/ do |ivar_name|
   instance_variable_get(ivar_name)
 end

data/lib/cuke-patterns/rb_language_ext.rb

@@ -110,11 +110,12 @@ module CukePatterns
       regexp.to_s.gsub(/\\\\|\\\(|\(\?/,'').scan(/\(/).length
     end
 
+    # Given a Step Definition's string aka 'matcher' and its Proc, generate a Regexp and
+    # new Proc by replacing all the Patterns in the String matcher with their Regexps etc.
     def convert_cuke_patterns_and_proc(matcher, proc)
 
       matcher_regexp = "^"
 
-      pattern_counter = 0
       capture_counter = 0
 
       # Split the string by non-alphanumeric, underscore or leading-colon characters
@@ -131,12 +132,11 @@ module CukePatterns
 
         proc = convert_cuke_pattern_proc_arguments(
           proc, conversion_proc,
-          pattern_counter, pattern_capture_count) if conversion_proc
+          capture_counter, pattern_capture_count) if conversion_proc
 
-        pattern_counter += 1 unless pattern_capture_count == 0
         capture_counter += pattern_capture_count
 
-        matcher_regexp << "(?:#{regexp})"
+        matcher_regexp << regexp.to_s
 
       end
 
@@ -149,6 +149,9 @@ module CukePatterns
     # the arguments yielded to the original_block (arg_count) at the offset.
     def convert_cuke_pattern_proc_arguments(original_proc, conversion_proc, offset, arg_count)
 
+      # The number of arguments of the new Proc should be the number of arguments of the
+      # old Proc with the change that an argument in the old Proc will potentialy now be
+      # converted into a multiple-capture.
       arity = original_proc.arity + arg_count - 1
       arg_list = (1..arity).map{|n| "arg#{n}"}.join(",")
 
@@ -157,6 +160,7 @@ module CukePatterns
 
       new_proc = instance_eval(<<-ruby, file, line)
         Proc.new do |#{arg_list}|
+
           args = [#{arg_list}]
           arg_range = offset..(offset + arg_count - 1)
           converted_args = instance_exec(*args[arg_range], &conversion_proc)

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cuke-patterns
 version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Brendan Baldwin
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-18 00:00:00 -07:00
+date: 2010-12-14 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -36,8 +37,10 @@ files:
 - cuke-patterns.gemspec
 - features/apply_pattern.feature
 - features/apply_pattern_steps.rb
+- features/multi_capture_patterns.feature
 - features/pattern_generator.feature
 - features/simple_patterns.feature
+- features/step_definitions/multi_capture_steps.rb
 - features/step_definitions/pattern_generator_steps.rb
 - features/step_definitions/simple_pattern_steps.rb
 - features/support/env.rb
@@ -47,7 +50,7 @@ files:
 - lib/cuke-patterns/rb_world_ext.rb
 - lib/cuke-patterns/step_mother_ext.rb
 has_rdoc: true
-homepage: http://github.com/brendan/cuke-patterns
+homepage: http://github.com/cloudcrowd/cuke-patterns
 licenses: []
 
 post_install_message: 
@@ -56,23 +59,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Makes cucumber step definitions more focused, understandable, searchable and awesomeable.