gherkin 1.0.22-java → 1.0.23-java

data/History.txt

@@ -1,3 +1,8 @@
+== 1.0.23 (2010-05-02)
+
+=== Changed Features
+* Java API now uses camelCased method names instead of underscored (more Java-like) (Aslak Hellesøy)
+
 == 1.0.22 (2010-04-28)
 
 === Bugfixes
@@ -8,12 +13,12 @@
 === Bugfixes
 * Fix compile warning on ruby 1.9.2dev (2009-07-18 trunk 24186) (#53 Aslak Hellesøy)
 
-== 1.0.20
+== 1.0.20 (2010-04-20)
 
 === Bugfixes
 * The gherkin CLI is working again (Gregory Hnatiuk)
 
-== 1.0.19
+== 1.0.19 (2010-04-20)
 
 === New Features
 * Works with JRuby 1.5.0.RC1 (Aslak Hellesøy)
@@ -21,7 +26,7 @@
 === Changed Features
 * I18n.code_keywords now return And and But as well, making Cucumber StepDefs a little more flexible (Aslak Hellesøy)
 
-== 1.0.18 (2010-04-21)
+== 1.0.18 (2010-04-20)
 
 === Bugfixes
 * Explicitly use UTF-8 encoding when scanning source with Java lexer. (Aslak Hellesøy)

data/Rakefile

@@ -20,7 +20,7 @@ begin
     gem.executables = ["gherkin"]
     gem.add_dependency "trollop", ">= 1.15"
     gem.add_development_dependency "rspec", ">= 1.3.0"
-    gem.add_development_dependency "cucumber", ">= 0.7.0.beta.1"
+    gem.add_development_dependency "cucumber", ">= 0.7.0.beta.8"
     gem.add_development_dependency "rake-compiler", ">= 0.7.0" unless defined?(JRUBY_VERSION)
 
     gem.files -= FileList['ikvm/**/*']

data/VERSION.yml

@@ -2,4 +2,4 @@
 :major: 1
 :minor: 0
 :build: 
-:patch: 22
+:patch: 23

data/lib/gherkin/formatter/pretty_formatter.rb

@@ -53,7 +53,7 @@ module Gherkin
         @io.puts "\n#{grab_comments!('    ')}#{grab_tags!('    ')}    #{keyword}: #{indent(name, '    ')}"
       end
 
-      def step(keyword, name, line, status=nil, arguments=nil, location=nil)
+      def step(keyword, name, line, status=nil, exception=nil, arguments=nil, location=nil)
         flush_table
         status_param = "#{status}_param" if status
         name = Gherkin::Formatter::Argument.format(name, @format, (arguments || [])) 

data/lib/gherkin/parser/{sexp.rb → event.rb}

@@ -1,6 +1,6 @@
 module Gherkin
   module Parser
-    class Sexp < Array
+    class Event < Array
       def initialize(*args)
         super
         self[1] = self[1].to_a if event == :row # Special JRuby handling

data/lib/gherkin/parser/filter_listener.rb

@@ -1,4 +1,4 @@
-require 'gherkin/parser/sexp'
+require 'gherkin/parser/event'
 require 'gherkin/parser/tag_expression'
 
 module Gherkin
@@ -34,32 +34,32 @@ module Gherkin
       
       private
 
-      def method_missing(*sexp_args)
-        sexp = Sexp.new(sexp_args)
+      def method_missing(*event_args)
+        event = Event.new(event_args)
 
-        return sexp.replay(@listener) if no_filters?
+        return event.replay(@listener) if no_filters?
 
-        case(sexp.event)
+        case(event.event)
         when :tag
-          @meta_buffer << sexp
+          @meta_buffer << event
         when :comment
-          @meta_buffer << sexp
+          @meta_buffer << event
         when :feature
           @feature_buffer = @meta_buffer
-          @feature_buffer << sexp
+          @feature_buffer << event
           @feature_tags = extract_tags
           @meta_buffer = []
-          @feature_ok = true if filter_match?(sexp)
+          @feature_ok = true if filter_match?(event)
         when :background
           @feature_buffer += @meta_buffer
-          @feature_buffer << sexp
+          @feature_buffer << event
           @meta_buffer = []
           @table_state = :background
-          @background_ok = true if filter_match?(sexp)
+          @background_ok = true if filter_match?(event)
         when :scenario
           replay_examples_rows_buffer
           @scenario_buffer = @meta_buffer
-          @scenario_buffer << sexp
+          @scenario_buffer << event
           @scenario_tags = extract_tags
           @example_tags = []
           @meta_buffer = []
@@ -70,7 +70,7 @@ module Gherkin
         when :scenario_outline
           replay_examples_rows_buffer
           @scenario_buffer = @meta_buffer
-          @scenario_buffer << sexp
+          @scenario_buffer << event
           @scenario_tags = extract_tags
           @example_tags = []
           @meta_buffer = []
@@ -81,7 +81,7 @@ module Gherkin
         when :examples
           replay_examples_rows_buffer
           @examples_buffer = @meta_buffer
-          @examples_buffer << sexp
+          @examples_buffer << event
           @example_tags = extract_tags
           @meta_buffer = []
           @examples_rows_buffer = []
@@ -91,11 +91,11 @@ module Gherkin
           case(@table_state)
           when :background
             @feature_buffer += @meta_buffer
-            @feature_buffer << sexp
+            @feature_buffer << event
             @meta_buffer = []
-            @background_ok = true if filter_match?(sexp)
+            @background_ok = true if filter_match?(event)
           else
-            @scenario_buffer << sexp
+            @scenario_buffer << event
             @scenario_ok ||= filter_match?(*@scenario_buffer)
             @table_state = :step
           end
@@ -103,32 +103,32 @@ module Gherkin
           case(@table_state)
           when :examples
             unless header_row_already_buffered?
-              @examples_buffer << sexp
+              @examples_buffer << event
               @examples_ok = true if filter_match?(*@examples_buffer)
             else
-              @examples_rows_buffer << sexp if @scenario_ok || @examples_ok || @feature_ok || filter_match?(sexp)
+              @examples_rows_buffer << event if @scenario_ok || @examples_ok || @feature_ok || filter_match?(event)
             end
           when :step
-            @scenario_buffer << sexp
+            @scenario_buffer << event
             @scenario_ok ||= filter_match?(*@scenario_buffer)
           when :background
             @feature_buffer += @meta_buffer
-            @feature_buffer << sexp
+            @feature_buffer << event
             @meta_buffer = []
           else
             raise "Bad table_state:#{@table_state.inspect}"
           end
         when :py_string
           if @table_state == :background
-            @feature_buffer << sexp
+            @feature_buffer << event
             @feature_ok ||= filter_match?(*@feature_buffer)
           else
-            @scenario_buffer << sexp
+            @scenario_buffer << event
             @scenario_ok ||= filter_match?(*@scenario_buffer)
           end
         when :eof
           replay_examples_rows_buffer
-          sexp.replay(@listener)
+          event.replay(@listener)
           return
         else
           super
@@ -160,9 +160,9 @@ module Gherkin
         return @examples_buffer.any? && @examples_buffer[-1].event == :row
       end
       
-      def filter_match?(*sexps)
+      def filter_match?(*events)
         return false unless[:name_match?, :line_match?].include?(@filter_method)
-        sexps.detect{|sexp| sexp.__send__(@filter_method, @filters)}
+        events.detect{|event| event.__send__(@filter_method, @filters)}
       end
 
       def tag_match?
@@ -170,8 +170,8 @@ module Gherkin
       end
 
       def replay_buffers
-        (@feature_buffer + @scenario_buffer).each do |sexp| 
-          sexp.replay(@listener)
+        (@feature_buffer + @scenario_buffer).each do |event| 
+          event.replay(@listener)
         end
         @feature_buffer = []
         @scenario_buffer = [] 
@@ -180,8 +180,8 @@ module Gherkin
       def replay_examples_rows_buffer
         if @examples_rows_buffer.any?
           replay_buffers
-          (@examples_buffer + @examples_rows_buffer).each do |sexp|
-            sexp.replay(@listener)
+          (@examples_buffer + @examples_rows_buffer).each do |event|
+            event.replay(@listener)
           end
           @examples_rows_buffer = []
         end
@@ -192,7 +192,7 @@ module Gherkin
       end
 
       def extract_tags
-        @meta_buffer.select { |sexp| sexp.event == :tag }.map { |sexp| sexp.keyword }
+        @meta_buffer.select { |event| event.event == :tag }.map { |event| event.keyword }
       end
     end
   end

data/ragel/lexer.java.rl.erb

@@ -30,7 +30,7 @@ public class <%= @i18n.underscored_iso_code.upcase %> implements Lexer {
 
     action store_pystring_content {
       String con = unindent(startCol, substring(data, contentStart, nextKeywordStart-1).replaceFirst("(\\r?\\n)?( )*\\Z", "").replaceAll("\\\\\"\\\\\"\\\\\"", "\"\"\""));
-      listener.py_string(con, currentLine);
+      listener.pyString(con, currentLine);
     }
 
     action store_feature_content {
@@ -56,7 +56,7 @@ public class <%= @i18n.underscored_iso_code.upcase %> implements Lexer {
 
     action store_scenario_outline_content {
       String con = multilineStrip(keywordContent(data, p, eof, nextKeywordStart, contentStart));
-      listener.scenario_outline(keyword, con, currentLine);
+      listener.scenarioOutline(keyword, con, currentLine);
       if(nextKeywordStart != -1) p = nextKeywordStart - 1;
       nextKeywordStart = -1;
     }

data/spec/gherkin/formatter/pretty_formatter_spec.rb

@@ -36,8 +36,8 @@ module Gherkin
           ['When ', 'foo']
         ])
         @l.scenario("Scenario", "The scenario", 4, "features/foo.feature:4")
-        @l.step("Given ", "some stuff", 5, nil, nil, "features/step_definitions/bar.rb:56")
-        @l.step("When ", "foo", 6, nil, nil, "features/step_definitions/bar.rb:96")
+        @l.step("Given ", "some stuff", 5, nil, nil, nil, "features/step_definitions/bar.rb:56")
+        @l.step("When ", "foo", 6, nil, nil, nil, "features/step_definitions/bar.rb:96")
 
         assert_io(%{Feature: Hello
   World
@@ -54,7 +54,7 @@ module Gherkin
           ['Given ', 'some stuff that is longer']
         ])
         @l.scenario("Scenario", "The scenario", 4, "features/foo.feature:4")
-        @l.step("Given ", "some stuff that is longer", 5, nil, nil, "features/step_definitions/bar.rb:56")
+        @l.step("Given ", "some stuff that is longer", 5, nil, nil, nil, "features/step_definitions/bar.rb:56")
 
         assert_io(%{Feature: Hello
   World
@@ -70,7 +70,7 @@ module Gherkin
           ['Given ', 'some stuff that is longer']
         ])
         @l.scenario("Scenario", "The scenario", 4, "features/foo.feature:4")
-        @l.step("Given ", "some stuff that is longer", 5, nil, nil, "features/step_definitions/bar.rb:56")
+        @l.step("Given ", "some stuff that is longer", 5, nil, nil, nil, "features/step_definitions/bar.rb:56")
 
         assert_io(%{Feature: Hello
   World
@@ -95,7 +95,7 @@ module Gherkin
 
       it "should highlight arguments for regular steps" do
         passed = defined?(JRUBY_VERSION) ? 'passed' : :passed
-        @l.step("Given ", "I have 999 cukes in my belly", 3, passed, [Gherkin::Formatter::Argument.new(7, '999')], nil)
+        @l.step("Given ", "I have 999 cukes in my belly", 3, passed, nil, [Gherkin::Formatter::Argument.new(7, '999')], nil)
         assert_io("    Given I have 999 cukes in my belly\n")
       end
 

data/spec/gherkin/sexp_recorder.rb

@@ -5,6 +5,9 @@ module Gherkin
     end
 
     def method_missing(event, *args)
+      event = :scenario_outline if event == :scenarioOutline # Special Java Lexer handling
+      event = :py_string if event == :pyString # Special Java Lexer handling
+      event = :syntax_error if event == :syntaxError # Special Java Lexer handling
       args[0] = args[0].to_a if event == :row # Special JRuby handling
       @sexps << [event] + args
     end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
     - 1
     - 0
-    - 22
-  version: 1.0.22
+    - 23
+  version: 1.0.23
 platform: java
 authors: 
   - Mike Sassak
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-28 00:00:00 -05:00
+date: 2010-05-02 00:00:00 +02:00
 default_executable: gherkin
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -58,8 +58,8 @@ dependencies:
               - 7
               - 0
               - beta
-              - 1
-            version: 0.7.0.beta.1
+              - 8
+            version: 0.7.0.beta.8
     type: :development
     version_requirements: *id003
 description: A fast Gherkin lexer/parser based on the Ragel State Machine Compiler.
@@ -109,11 +109,11 @@ files:
   - lib/gherkin/i18n.yml
   - lib/gherkin/i18n_lexer.rb
   - lib/gherkin/java_impl.rb
+  - lib/gherkin/parser/event.rb
   - lib/gherkin/parser/filter_listener.rb
   - lib/gherkin/parser/meta.txt
   - lib/gherkin/parser/parser.rb
   - lib/gherkin/parser/root.txt
-  - lib/gherkin/parser/sexp.rb
   - lib/gherkin/parser/steps.txt
   - lib/gherkin/parser/tag_expression.rb
   - lib/gherkin/rb_lexer.rb