gherkin 2.0.2-java → 2.1.0-java

data/spec/gherkin/shared/py_string_group.rb

@@ -52,7 +52,6 @@ EOS
       it "should parse content separated by two newlines" do
         scan ps("A\n\nB")
         @listener.to_sexp.should == [
-          [:location, 'test.feature', 0],
           [:py_string, "A\n\nB", 1],
           [:eof]
         ]

data/spec/gherkin/shared/row_group.rb

@@ -5,7 +5,7 @@ module Gherkin
   module Lexer
     shared_examples_for "a Gherkin lexer lexing rows" do
       def scan(gherkin)
-        @lexer.scan(gherkin, "test.feature", 0)
+        @lexer.scan(gherkin)
       end
 
       rows = {
@@ -43,7 +43,6 @@ module Gherkin
       it "should allow utf-8" do
         scan(" | ůﻚ | 2 | \n")
         @listener.to_sexp.should == [
-          [:location, 'test.feature', 0],
           [:row, ["ůﻚ", "2"], 1],
           [:eof]
         ]

data/spec/gherkin/tag_expression_spec.rb

@@ -0,0 +1,137 @@
+require 'spec_helper'
+require 'gherkin/tag_expression'
+
+module Gherkin
+  describe TagExpression do
+    context "no tags" do
+      before(:each) do
+        @e = Gherkin::TagExpression.new([])
+      end
+
+      it "should match @foo" do
+        @e.eval(['@foo']).should == true
+      end
+
+      it "should match empty tags" do
+        @e.eval([]).should == true
+      end
+    end
+
+    context "@foo" do
+      before(:each) do
+        @e = Gherkin::TagExpression.new(['@foo'])
+      end
+
+      it "should match @foo" do
+        @e.eval(['@foo']).should == true
+      end
+
+      it "should not match @bar" do
+        @e.eval(['@bar']).should == false
+      end
+
+      it "should not match no tags" do
+        @e.eval([]).should == false
+      end
+    end
+
+    context "!@foo" do
+      before(:each) do
+        @e = Gherkin::TagExpression.new(['~@foo'])
+      end
+
+      it "should match @bar" do
+        @e.eval(['@bar']).should == true
+      end
+
+      it "should not match @foo" do
+        @e.eval(['@foo']).should == false
+      end
+    end
+
+    context "@foo || @bar" do
+      before(:each) do
+        @e = Gherkin::TagExpression.new(['@foo,@bar'])
+      end
+
+      it "should match @foo" do
+        @e.eval(['@foo']).should == true
+      end
+
+      it "should match @bar" do
+        @e.eval(['@bar']).should == true
+      end
+
+      it "should not match @zap" do
+        @e.eval(['@zap']).should == false
+      end
+    end
+
+    context "(@foo || @bar) && !@zap" do
+      before(:each) do
+        @e = Gherkin::TagExpression.new(['@foo,@bar', '~@zap'])
+      end
+
+      it "should match @foo" do
+        @e.eval(['@foo']).should == true
+      end
+
+      it "should not match @foo @zap" do
+        @e.eval(['@foo', '@zap']).should == false
+      end
+    end
+
+    context "(@foo:3 || !@bar:4) && @zap:5" do
+      before(:each) do
+        @e = Gherkin::TagExpression.new(['@foo:3,~@bar','@zap:5'])
+      end
+
+      it "should count tags for positive tags" do
+        rubify_hash(@e.limits).should == {'@foo' => 3, '@zap' => 5}
+      end
+
+      it "should match @foo @zap" do
+        @e.eval(['@foo', '@zap']).should == true
+      end
+    end
+
+    context "Parsing '@foo:3,~@bar', '@zap:5'" do
+      before(:each) do
+        @e = Gherkin::TagExpression.new([' @foo:3 , ~@bar ', ' @zap:5 '])
+      end
+
+      unless defined?(JRUBY_VERSION)
+        it "should split and trim (ruby implementation detail)" do
+          @e.__send__(:ruby_expression).should == "(!vars['@bar']||vars['@foo'])&&(vars['@zap'])"
+        end
+      end
+
+      it "should have limits" do
+        rubify_hash(@e.limits).should == {"@zap"=>5, "@foo"=>3}
+      end
+    end
+
+    context "Tag limits" do
+      it "should be counted for negative tags" do
+        @e = Gherkin::TagExpression.new(['~@todo:3'])
+        rubify_hash(@e.limits).should == {"@todo"=>3}
+      end
+
+      it "should be counted for positive tags" do
+        @e = Gherkin::TagExpression.new(['@todo:3'])
+        rubify_hash(@e.limits).should == {"@todo"=>3}
+      end
+
+      it "should raise an error for inconsistent limits" do
+        lambda do
+          @e = Gherkin::TagExpression.new(['@todo:3', '~@todo:4'])
+        end.should raise_error(/Inconsistent tag limits for @todo: 3 and 4/)
+      end
+
+      it "should allow duplicate consistent limits" do
+        @e = Gherkin::TagExpression.new(['@todo:3', '~@todo:3'])
+        rubify_hash(@e.limits).should == {"@todo"=>3}
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -11,7 +11,11 @@ require 'gherkin/shared/row_group'
 
 module GherkinSpecHelper
   def scan_file(file)
-    @lexer.scan(File.new(File.dirname(__FILE__) + "/gherkin/fixtures/" + file).read, file, 0)
+    @lexer.scan(fixture(file))
+  end
+
+  def fixture(file)
+    File.new(File.dirname(__FILE__) + "/gherkin/fixtures/" + file).read
   end
 
   def rubify_hash(hash)

data/tasks/bench.rake

@@ -106,23 +106,19 @@ class Benchmarker
 
   def run_rb_gherkin    
     require 'gherkin'
-    require 'gherkin/i18n_lexer'
-    require 'null_listener'
-    parser = Gherkin::Parser::Parser.new(NullListener.new, true, "root")
-    lexer = Gherkin::I18nLexer.new(parser, true)
+    require 'null_formatter'
+    parser = Gherkin::Parser::Parser.new(NullFormatter.new, true, "root", true)
     @features.each do |feature|
-      lexer.scan(File.read(feature), feature, 0)
+      parser.parse(File.read(feature), feature, 0)
     end
   end
 
   def run_native_gherkin
     require 'gherkin'
-    require 'gherkin/i18n_lexer'
     require 'null_listener'
-    parser = Gherkin::Parser::Parser.new(NullListener.new, true, "root")
-    lexer = Gherkin::I18nLexer.new(parser, false)
+    parser = Gherkin::Parser::Parser.new(NullFormatter.new, true, "root", false)
     @features.each do |feature|
-      lexer.scan(File.read(feature), feature, 0)
+      parser.parse(File.read(feature), feature, 0)
     end
   end
 

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
     - 2
+    - 1
     - 0
-    - 2
-  version: 2.0.2
+  version: 2.1.0
 platform: java
 authors: 
   - Mike Sassak
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-16 00:00:00 +02:00
+date: 2010-07-12 00:00:00 +02:00
 default_executable: gherkin
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -45,8 +45,8 @@ dependencies:
               - 0
               - 0
               - beta
-              - 11
-            version: 2.0.0.beta.11
+              - 15
+            version: 2.0.0.beta.15
     type: :development
     version_requirements: *id002
   - !ruby/object:Gem::Dependency 
@@ -59,8 +59,8 @@ dependencies:
             segments: 
               - 0
               - 8
-              - 1
-            version: 0.8.1
+              - 4
+            version: 0.8.4
     type: :development
     version_requirements: *id003
 description: A fast Gherkin lexer/parser based on the Ragel State Machine Compiler.
@@ -103,37 +103,39 @@ files:
   - java/src/main/java/gherkin/lexer/.gitignore
   - java/src/main/resources/gherkin/.gitignore
   - lib/.gitignore
-  - lib/gherkin.jar
   - lib/gherkin.rb
   - lib/gherkin/c_lexer.rb
   - lib/gherkin/cli/main.rb
   - lib/gherkin/formatter/argument.rb
   - lib/gherkin/formatter/colors.rb
   - lib/gherkin/formatter/escaping.rb
+  - lib/gherkin/formatter/filter_formatter.rb
   - lib/gherkin/formatter/json_formatter.rb
+  - lib/gherkin/formatter/line_filter.rb
+  - lib/gherkin/formatter/model.rb
   - lib/gherkin/formatter/monochrome_format.rb
   - lib/gherkin/formatter/pretty_formatter.rb
+  - lib/gherkin/formatter/regexp_filter.rb
+  - lib/gherkin/formatter/tag_count_formatter.rb
   - lib/gherkin/i18n.rb
   - lib/gherkin/i18n.yml
   - lib/gherkin/i18n_lexer.rb
-  - lib/gherkin/json_lexer.rb
+  - lib/gherkin/json_parser.rb
+  - lib/gherkin/listener/event.rb
+  - lib/gherkin/listener/formatter_listener.rb
   - lib/gherkin/native.rb
   - lib/gherkin/native/ikvm.rb
   - lib/gherkin/native/java.rb
   - lib/gherkin/native/null.rb
-  - lib/gherkin/parser/event.rb
-  - lib/gherkin/parser/filter_listener.rb
-  - lib/gherkin/parser/formatter_listener.rb
   - lib/gherkin/parser/meta.txt
   - lib/gherkin/parser/parser.rb
   - lib/gherkin/parser/root.txt
-  - lib/gherkin/parser/row.rb
   - lib/gherkin/parser/steps.txt
-  - lib/gherkin/parser/tag_expression.rb
   - lib/gherkin/rb_lexer.rb
   - lib/gherkin/rb_lexer/.gitignore
   - lib/gherkin/rb_lexer/README.rdoc
   - lib/gherkin/rubify.rb
+  - lib/gherkin/tag_expression.rb
   - lib/gherkin/tools.rb
   - lib/gherkin/tools/files.rb
   - lib/gherkin/tools/reformat.rb
@@ -149,7 +151,10 @@ files:
   - spec/gherkin/fixtures/comments_in_table.feature
   - spec/gherkin/fixtures/complex.feature
   - spec/gherkin/fixtures/complex.json
+  - spec/gherkin/fixtures/complex_for_filtering.feature
+  - spec/gherkin/fixtures/complex_with_tags.feature
   - spec/gherkin/fixtures/dos_line_endings.feature
+  - spec/gherkin/fixtures/hantu_pisang.feature
   - spec/gherkin/fixtures/i18n_fr.feature
   - spec/gherkin/fixtures/i18n_no.feature
   - spec/gherkin/fixtures/i18n_zh-CN.feature
@@ -158,24 +163,24 @@ files:
   - spec/gherkin/fixtures/with_bom.feature
   - spec/gherkin/formatter/argument_spec.rb
   - spec/gherkin/formatter/colors_spec.rb
+  - spec/gherkin/formatter/filter_formatter_spec.rb
+  - spec/gherkin/formatter/model_spec.rb
   - spec/gherkin/formatter/pretty_formatter_spec.rb
   - spec/gherkin/formatter/spaces.feature
   - spec/gherkin/formatter/tabs.feature
+  - spec/gherkin/formatter/tag_count_formatter_spec.rb
   - spec/gherkin/i18n_lexer_spec.rb
   - spec/gherkin/i18n_spec.rb
   - spec/gherkin/java_lexer_spec.rb
-  - spec/gherkin/json_lexer_spec.rb
+  - spec/gherkin/json_parser_spec.rb
   - spec/gherkin/output_stream_string_io.rb
-  - spec/gherkin/parser/filter_listener_spec.rb
-  - spec/gherkin/parser/formatter_listener_spec.rb
-  - spec/gherkin/parser/parser_spec.rb
-  - spec/gherkin/parser/tag_expression_spec.rb
   - spec/gherkin/rb_lexer_spec.rb
   - spec/gherkin/sexp_recorder.rb
   - spec/gherkin/shared/lexer_group.rb
   - spec/gherkin/shared/py_string_group.rb
   - spec/gherkin/shared/row_group.rb
   - spec/gherkin/shared/tags_group.rb
+  - spec/gherkin/tag_expression_spec.rb
   - spec/spec_helper.rb
   - tasks/bench.rake
   - tasks/bench/feature_builder.rb
@@ -225,17 +230,17 @@ test_files:
   - spec/gherkin/i18n_lexer_spec.rb
   - spec/gherkin/i18n_spec.rb
   - spec/gherkin/java_lexer_spec.rb
-  - spec/gherkin/json_lexer_spec.rb
+  - spec/gherkin/json_parser_spec.rb
   - spec/gherkin/output_stream_string_io.rb
   - spec/gherkin/rb_lexer_spec.rb
   - spec/gherkin/sexp_recorder.rb
+  - spec/gherkin/tag_expression_spec.rb
   - spec/gherkin/formatter/argument_spec.rb
   - spec/gherkin/formatter/colors_spec.rb
+  - spec/gherkin/formatter/filter_formatter_spec.rb
+  - spec/gherkin/formatter/model_spec.rb
   - spec/gherkin/formatter/pretty_formatter_spec.rb
-  - spec/gherkin/parser/filter_listener_spec.rb
-  - spec/gherkin/parser/formatter_listener_spec.rb
-  - spec/gherkin/parser/parser_spec.rb
-  - spec/gherkin/parser/tag_expression_spec.rb
+  - spec/gherkin/formatter/tag_count_formatter_spec.rb
   - spec/gherkin/shared/lexer_group.rb
   - spec/gherkin/shared/py_string_group.rb
   - spec/gherkin/shared/row_group.rb

data/lib/gherkin/parser/filter_listener.rb

@@ -1,203 +0,0 @@
-require 'gherkin/parser/event'
-require 'gherkin/parser/tag_expression'
-require 'gherkin/native'
-
-module Gherkin
-  module Parser
-    # This class filters events based on filter criteria.
-    class FilterListener
-      native_impl('gherkin')
-    
-      # Creates a new instance that replays events to +listener+, filtered by +filters+,
-      # an Array that can contain one of the following:
-      #
-      # * Line numbers (Fixnum) to filter on.
-      # * Name regexen (Regexp) to filter on. Matches against :feature, :background, :scenario, :scenario_outline and :examples
-      # * Tag expressions (String) to filter on.
-      #
-      def initialize(listener, filters)
-        @listener = listener
-        @filter_method = detect_filter(filters)
-        
-        @meta_buffer = []
-        @feature_buffer = []
-        @scenario_buffer = []
-        @examples_buffer = []
-        @examples_rows_buffer = []
-
-        @feature_tags = []
-        @scenario_tags = []
-        @example_tags = []
-
-        @table_state = :step
-      end
-
-      def location(uri, offset)
-        @listener.location(uri, offset)
-      end
-
-      private
-
-      def method_missing(*event_args)
-        event = Event.new(event_args)
-
-        return event.replay(@listener) if no_filters?
-
-        case(event.event)
-        when :tag
-          @meta_buffer << event
-        when :comment
-          @meta_buffer << event
-        when :feature
-          @feature_buffer = @meta_buffer
-          @feature_buffer << event
-          @feature_tags = extract_tags
-          @meta_buffer = []
-          @feature_ok = true if filter_match?(event)
-        when :background
-          @feature_buffer += @meta_buffer
-          @feature_buffer << event
-          @meta_buffer = []
-          @table_state = :background
-          @background_ok = true if filter_match?(event)
-        when :scenario
-          replay_examples_rows_buffer
-          @scenario_buffer = @meta_buffer
-          @scenario_buffer << event
-          @scenario_tags = extract_tags
-          @example_tags = []
-          @meta_buffer = []
-          @scenario_ok = filter_match?(*@scenario_buffer) || tag_match?
-          @examples_ok = false
-          @background_ok = false
-          @table_state = :step
-        when :scenario_outline
-          replay_examples_rows_buffer
-          @scenario_buffer = @meta_buffer
-          @scenario_buffer << event
-          @scenario_tags = extract_tags
-          @example_tags = []
-          @meta_buffer = []
-          @scenario_ok = filter_match?(*@scenario_buffer)
-          @examples_ok = false
-          @background_ok = false
-          @table_state = :step
-        when :examples
-          replay_examples_rows_buffer
-          @examples_buffer = @meta_buffer
-          @examples_buffer << event
-          @example_tags = extract_tags
-          @meta_buffer = []
-          @examples_rows_buffer = []
-          @examples_ok = filter_match?(*@examples_buffer) || tag_match?
-          @table_state = :examples
-        when :step
-          case(@table_state)
-          when :background
-            @feature_buffer += @meta_buffer
-            @feature_buffer << event
-            @meta_buffer = []
-            @background_ok = true if filter_match?(event)
-          else
-            @scenario_buffer << event
-            @scenario_ok ||= filter_match?(*@scenario_buffer)
-            @table_state = :step
-          end
-        when :row
-          case(@table_state)
-          when :examples
-            unless header_row_already_buffered?
-              @examples_buffer << event
-              @examples_ok = true if filter_match?(*@examples_buffer)
-            else
-              @examples_rows_buffer << event if @scenario_ok || @examples_ok || @feature_ok || filter_match?(event)
-            end
-          when :step
-            @scenario_buffer << event
-            @scenario_ok ||= filter_match?(*@scenario_buffer)
-          when :background
-            @feature_buffer += @meta_buffer
-            @feature_buffer << event
-            @meta_buffer = []
-          else
-            raise "Bad table_state:#{@table_state.inspect}"
-          end
-        when :py_string
-          if @table_state == :background
-            @feature_buffer << event
-            @feature_ok ||= filter_match?(*@feature_buffer)
-          else
-            @scenario_buffer << event
-            @scenario_ok ||= filter_match?(*@scenario_buffer)
-          end
-        when :eof
-          replay_examples_rows_buffer
-          event.replay(@listener)
-          return
-        else
-          super
-        end
-
-        if @scenario_ok || @examples_ok || @feature_ok || @background_ok
-          replay_buffers
-        end
-      end
-
-      def detect_filter(filters)
-        @filters = filters
-        raise "Bad filter: #{filters.inspect}" if filters.map{|filter| filter.class}.uniq.length > 1
-        @filter_method = case(filters[0])
-        when Fixnum 
-          :line_match?
-        when Regexp 
-          :name_match?
-        when String 
-          TagExpression.new(filters)
-        end
-      end
-
-      def no_filters?
-        @filters.empty?
-      end
-
-      def header_row_already_buffered?
-        return @examples_buffer.any? && @examples_buffer[-1].event == :row
-      end
-      
-      def filter_match?(*events)
-        return false unless[:name_match?, :line_match?].include?(@filter_method)
-        events.detect{|event| event.__send__(@filter_method, @filters)}
-      end
-
-      def tag_match?
-        return TagExpression === @filter_method && @filter_method.eval(current_tags)
-      end
-
-      def replay_buffers
-        (@feature_buffer + @scenario_buffer).each do |event| 
-          event.replay(@listener)
-        end
-        @feature_buffer = []
-        @scenario_buffer = [] 
-      end
-
-      def replay_examples_rows_buffer
-        if @examples_rows_buffer.any?
-          replay_buffers
-          (@examples_buffer + @examples_rows_buffer).each do |event|
-            event.replay(@listener)
-          end
-          @examples_rows_buffer = []
-        end
-      end
-      
-      def current_tags
-        @feature_tags + @scenario_tags + @example_tags
-      end
-
-      def extract_tags
-        @meta_buffer.select { |event| event.event == :tag }.map { |event| event.keyword }
-      end
-    end
-  end
-end