gherkin 1.0.3-i386-mswin32 → 1.0.4-i386-mswin32

data/spec/gherkin/parser/tag_expression_spec.rb

@@ -0,0 +1,120 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require 'gherkin/parser/tag_expression'
+
+module Gherkin
+  module Parser
+    describe TagExpression do
+      context "no tags" do
+        before(:each) do
+          @e = 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 = 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
+      end
+
+      context "!@foo" do
+        before(:each) do
+          @e = 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 = 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 = 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 = TagExpression.new('@foo:3,~@bar','@zap:5')
+        end
+
+        it "should count tags for positive tags" do
+          @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 = TagExpression.new(' @foo:3 , ~@bar ', ' @zap:5 ')
+        end
+
+        it "should split and trim" do
+          @e.__send__(:ruby_expression).should == "(!vars['@bar']||vars['@foo'])&&(vars['@zap'])"
+        end
+
+        it "should have limits" do
+          @e.limits.should == {"@zap"=>5, "@foo"=>3}
+        end
+      end
+
+      context "Parsing ''" do
+        before(:each) do
+          @e = TagExpression.new('')
+        end
+
+        it "should ignore empty tags" do
+          @e.eval("@foo").should == true
+        end
+      end
+    end
+  end
+end

data/spec/gherkin/rb_lexer_spec.rb

@@ -1,6 +1,5 @@
 #encoding: utf-8
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-require 'gherkin/rb_lexer'
 require 'gherkin/rb_lexer/en'
 
 module Gherkin

data/spec/gherkin/sexp_recorder.rb

@@ -4,9 +4,9 @@ module Gherkin
       @sexps = []
     end
 
-    def method_missing(m, *args)
-      args[0] = args[0].map{|cell| cell} if m == :row
-      @sexps << [m] + args
+    def method_missing(event, *args)
+      args[0] = args[0].to_a if event == :row # Special JRuby handling
+      @sexps << [event] + args
     end
 
     def to_sexp

data/spec/gherkin/shared/lexer_spec.rb

@@ -56,7 +56,7 @@ module Gherkin
           @listener.to_sexp.should == [
             [:feature, "Feature", "hi", 1],
             [:scenario, "Scenario", "test", 2],
-            [:tag, "hello", 4],
+            [:tag, "@hello", 4],
             [:scenario, "Scenario", "another", 5],
             [:eof]
           ]
@@ -404,16 +404,16 @@ Given I am a step
           scan_file("simple_with_tags.feature")
           @listener.to_sexp.should == [
             [:comment, "# FC", 1],
-            [:tag, "ft",2],
+            [:tag, "@ft",2],
             [:feature, "Feature", "hi", 3],
-            [:tag, "st1", 5],
-            [:tag, "st2", 5],
+            [:tag, "@st1", 5],
+            [:tag, "@st2", 5],
             [:scenario, "Scenario", "First", 6],
             [:step, "Given ", "Pepper", 7],
-            [:tag, "st3", 9],
-            [:tag, "st4", 10],
-            [:tag, "ST5", 10],
-            [:tag, "#^%&ST6**!", 10],
+            [:tag, "@st3", 9],
+            [:tag, "@st4", 10],
+            [:tag, "@ST5", 10],
+            [:tag, "@#^%&ST6**!", 10],
             [:scenario, "Scenario", "Second", 11],
             [:eof]
           ]
@@ -427,7 +427,7 @@ Given I am a step
             [:feature, "Feature", "Logging in\nSo that I can be myself", 1],
             [:comment, "# Comment", 3],
             [:scenario, "Scenario", "Anonymous user can get a login form.\nScenery here", 4],
-            [:tag, "tag", 7],
+            [:tag, "@tag", 7],
             [:scenario, "Scenario", "Another one", 8],
             [:eof]
           ]
@@ -440,20 +440,20 @@ Given I am a step
           @listener.to_sexp.should == [
             [:comment, "#Comment on line 1", 1],
             [:comment, "#Comment on line 2", 2],
-            [:tag, "tag1", 3],
-            [:tag, "tag2", 3],
+            [:tag, "@tag1", 3],
+            [:tag, "@tag2", 3],
             [:feature, "Feature", "Feature Text\nIn order to test multiline forms\nAs a ragel writer\nI need to check for complex combinations", 4],
             [:comment, "#Comment on line 9", 9],
             [:comment, "#Comment on line 11", 11],
             [:background, "Background", "", 13],
             [:step, "Given ", "this is a background step", 14],
             [:step, "And ", "this is another one", 15],
-            [:tag, "tag3", 17],
-            [:tag, "tag4", 17],
+            [:tag, "@tag3", 17],
+            [:tag, "@tag4", 17],
             [:scenario, "Scenario", "Reading a Scenario", 18],
             [:step, "Given ", "there is a step", 19],
             [:step, "But ", "not another step", 20],
-            [:tag, "tag3", 22],
+            [:tag, "@tag3", 22],
             [:scenario, "Scenario", "Reading a second scenario\nWith two lines of text", 23],
             [:comment, "#Comment on line 24", 25],
             [:step, "Given ", "a third step with a table", 26],
@@ -484,20 +484,20 @@ Given I am a step
             @listener.to_sexp.should == [
               [:comment, "#Comment on line 1", 1],
               [:comment, "#Comment on line 2", 2],
-              [:tag, "tag1", 3],
-              [:tag, "tag2", 3],
+              [:tag, "@tag1", 3],
+              [:tag, "@tag2", 3],
               [:feature, "Feature", "Feature Text\r\nIn order to test multiline forms\r\nAs a ragel writer\r\nI need to check for complex combinations", 4],
               [:comment, "#Comment on line 9", 9],
               [:comment, "#Comment on line 11", 11],
               [:background, "Background", "", 13],
               [:step, "Given ", "this is a background step", 14],
               [:step, "And ", "this is another one", 15],
-              [:tag, "tag3", 17],
-              [:tag, "tag4", 17],
+              [:tag, "@tag3", 17],
+              [:tag, "@tag4", 17],
               [:scenario, "Scenario", "Reading a Scenario", 18],
               [:step, "Given ", "there is a step", 19],
               [:step, "But ", "not another step", 20],
-              [:tag, "tag3", 22],
+              [:tag, "@tag3", 22],
               [:scenario, "Scenario", "Reading a second scenario\r\nWith two lines of text", 23],
               [:comment, "#Comment on line 24", 25],
               [:step, "Given ", "a third step with a table", 26],

data/spec/gherkin/shared/tags_spec.rb

@@ -5,7 +5,7 @@ module Gherkin
   module Lexer
     shared_examples_for "a Gherkin lexer lexing tags" do
       it "should lex a single tag" do
-        @listener.should_receive(:tag).with("dog", 1)
+        @listener.should_receive(:tag).with("@dog", 1)
         @lexer.scan("@dog\n")
       end
   
@@ -15,13 +15,13 @@ module Gherkin
       end
   
       it "should lex UTF-8 tags" do
-        @listener.should_receive(:tag).with("シナリオテンプレート", 1)
+        @listener.should_receive(:tag).with("@シナリオテンプレート", 1)
         @lexer.scan("@シナリオテンプレート\n")
       end
         
       it "should lex mixed tags" do
-        @listener.should_receive(:tag).with("wip", 1).ordered
-        @listener.should_receive(:tag).with("Значения", 1).ordered
+        @listener.should_receive(:tag).with("@wip", 1).ordered
+        @listener.should_receive(:tag).with("@Значения", 1).ordered
         @lexer.scan("@wip @Значения\n")
       end
   

data/tasks/bench.rake

@@ -106,11 +106,11 @@ class Benchmarker
 
   def run_rb_gherkin    
     require 'gherkin'
-    require 'gherkin/rb_lexer'
+    require 'gherkin/rb_lexer/en'
     require 'null_listener'
     @features.each do |feature|
       parser = Gherkin::Parser.new(NullListener.new, true, "root")
-      lexer = Gherkin::RbLexer['en'].new(parser)
+      lexer = Gherkin::RbLexer::En.new(parser)
       lexer.scan(File.read(feature))
     end
   end

data/tasks/compile.rake

@@ -16,7 +16,7 @@ CLEAN.include [
 
 desc "Compile the Java extensions"
 task :jar do
-  sh("ant -f java/build.xml")
+  sh("mvn -f java/pom.xml package")
 end
 
 namespace :dotnet do

data/tasks/ragel_task.rb

@@ -28,7 +28,7 @@ class RagelTask
   def target
     {
       'c'    => "ext/gherkin_lexer_#{@i18n.sanitized_key}/gherkin_lexer_#{@i18n.sanitized_key}.c",
-      'java' => "java/src/gherkin/lexer/#{@i18n.sanitized_key.capitalize}.java",
+      'java' => "java/src/main/java/gherkin/lexer/#{@i18n.sanitized_key.capitalize}.java",
       'rb'   => "lib/gherkin/rb_lexer/#{@i18n.sanitized_key}.rb",
       'csharp'   => "tmp/#{@i18n.sanitized_key}.cs"
     }[@lang]

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 3
-  version: 1.0.3
+  - 4
+  version: 1.0.4
 platform: i386-mswin32
 authors: 
 - Mike Sassak
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-30 00:00:00 +02:00
+date: 2010-04-07 00:00:00 +02:00
 default_executable: gherkin
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -114,53 +114,38 @@ files:
 - features/parser_with_native_lexer.feature
 - features/pretty_printer.feature
 - features/step_definitions/gherkin_steps.rb
-- features/step_definitions/pretty_printer_steps.rb
+- features/step_definitions/pretty_listener_step.rb
 - features/steps_parser.feature
 - features/support/env.rb
 - gherkin.gemspec
 - java/.gitignore
 - java/Gherkin.iml
-- java/build.xml
-- java/src/gherkin/FixJava.java
-- java/src/gherkin/I18nLexer.java
-- java/src/gherkin/Lexer.java
-- java/src/gherkin/LexingError.java
-- java/src/gherkin/Listener.java
-- java/src/gherkin/Main.java
-- java/src/gherkin/ParseError.java
-- java/src/gherkin/Parser.java
-- java/src/gherkin/formatter/Argument.java
-- java/src/gherkin/formatter/ArgumentFormat.java
-- java/src/gherkin/formatter/Colors.java
-- java/src/gherkin/formatter/Formatter.java
-- java/src/gherkin/formatter/PrettyFormatter.java
-- java/src/gherkin/lexer/.gitignore
-- java/src/gherkin/parser/StateMachineReader.java
-- java/test/gherkin/formatter/ArgumentTest.java
+- java/src/main/java/gherkin/lexer/.gitignore
 - lib/.gitignore
 - lib/gherkin.rb
 - lib/gherkin/c_lexer.rb
 - lib/gherkin/cli/main.rb
 - lib/gherkin/core_ext/array.rb
 - lib/gherkin/csharp_lexer.rb
-- lib/gherkin/format/argument.rb
-- lib/gherkin/format/monochrome_format.rb
+- lib/gherkin/formatter/argument.rb
+- lib/gherkin/formatter/colors.rb
+- lib/gherkin/formatter/monochrome_format.rb
+- lib/gherkin/formatter/pretty_listener.rb
 - lib/gherkin/i18n.rb
 - lib/gherkin/i18n.yml
 - lib/gherkin/i18n_lexer.rb
-- lib/gherkin/lexer.rb
-- lib/gherkin/parser.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
 - lib/gherkin/rb_lexer/.gitignore
 - lib/gherkin/rb_lexer/README.rdoc
-- lib/gherkin/rb_parser.rb
 - lib/gherkin/tools.rb
-- lib/gherkin/tools/colors.rb
 - lib/gherkin/tools/files.rb
-- lib/gherkin/tools/pretty_listener.rb
 - lib/gherkin/tools/reformat.rb
 - lib/gherkin/tools/stats.rb
 - lib/gherkin/tools/stats_listener.rb
@@ -183,19 +168,21 @@ files:
 - spec/gherkin/fixtures/simple.feature
 - spec/gherkin/fixtures/simple_with_comments.feature
 - spec/gherkin/fixtures/simple_with_tags.feature
-- spec/gherkin/format/argument_spec.rb
+- spec/gherkin/formatter/argument_spec.rb
+- spec/gherkin/formatter/colors_spec.rb
+- spec/gherkin/formatter/pretty_listener_spec.rb
 - spec/gherkin/i18n_lexer_spec.rb
 - spec/gherkin/i18n_spec.rb
 - spec/gherkin/java_lexer_spec.rb
-- spec/gherkin/parser_spec.rb
+- spec/gherkin/parser/filter_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_spec.rb
 - spec/gherkin/shared/py_string_spec.rb
 - spec/gherkin/shared/row_spec.rb
 - spec/gherkin/shared/tags_spec.rb
-- spec/gherkin/tools/colors_spec.rb
-- spec/gherkin/tools/pretty_listener_spec.rb
 - spec/spec_helper.rb
 - tasks/bench.rake
 - tasks/bench/feature_builder.rb
@@ -239,17 +226,19 @@ summary: Fast Gherkin lexer/parser
 test_files: 
 - spec/gherkin/c_lexer_spec.rb
 - spec/gherkin/csharp_lexer_spec.rb
-- spec/gherkin/format/argument_spec.rb
+- spec/gherkin/formatter/argument_spec.rb
+- spec/gherkin/formatter/colors_spec.rb
+- spec/gherkin/formatter/pretty_listener_spec.rb
 - spec/gherkin/i18n_lexer_spec.rb
 - spec/gherkin/i18n_spec.rb
 - spec/gherkin/java_lexer_spec.rb
-- spec/gherkin/parser_spec.rb
+- spec/gherkin/parser/filter_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_spec.rb
 - spec/gherkin/shared/py_string_spec.rb
 - spec/gherkin/shared/row_spec.rb
 - spec/gherkin/shared/tags_spec.rb
-- spec/gherkin/tools/colors_spec.rb
-- spec/gherkin/tools/pretty_listener_spec.rb
 - spec/spec_helper.rb

data/java/build.xml

@@ -1,16 +0,0 @@
-<project name="Gherkin" default="jar" basedir=".">
-  <target name="compile" description="Compile">
-    <mkdir dir="${basedir}/target/classes"/>
-    <javac srcdir="src" destdir="target/classes" debug="on"/>
-  </target>
-
-  <target name="jar" description="Jar" depends="compile">
-    <jar destfile="${basedir}/../lib/gherkin.jar">
-      <fileset dir="${basedir}/target/classes" />
-      <fileset dir="${basedir}/../lib" includes="gherkin/parser/*.txt" />
-      <manifest>
-        <attribute name="Main-Class" value="gherkin.Main" />
-      </manifest>
-    </jar>
-  </target>
-</project>

data/java/src/gherkin/FixJava.java

@@ -1,37 +0,0 @@
-package gherkin;
-
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.util.List;
-
-public class FixJava {
-    public static String join(List<String> strings, String separator) {
-        StringBuilder sb = new StringBuilder();
-        int i = 0;
-        for (String s : strings) {
-            if (i != 0) sb.append(separator);
-            sb.append(s);
-            i++;
-        }
-        return sb.toString();
-    }
-
-    public static String readResource(String filePath) throws IOException {
-        Reader reader = new InputStreamReader(FixJava.class.getResourceAsStream(filePath));
-        return readReader(reader);
-    }
-
-    public static String readReader(Reader reader) throws IOException {
-        final char[] buffer = new char[0x10000];
-        StringBuilder sb = new StringBuilder();
-        int read;
-        do {
-            read = reader.read(buffer, 0, buffer.length);
-            if (read > 0) {
-                sb.append(buffer, 0, read);
-            }
-        } while (read >= 0);
-        return sb.toString();
-    }
-}