gherkin 1.0.9-java → 1.0.10-java

data/History.txt

@@ -1,3 +1,12 @@
+== 1.0.10 (2010-04-16)
+
+=== New Features
+* Added Esperanto and added a Russian synonym for Feature. (Antono Vasiljev)
+* Pure Java implementation of FilterListener and TagExpression (Mike Gaffney, Aslak Hellesøy)
+
+=== Changed Features
+* TagExpression takes array args instead of varargs. (Aslak Hellesøy)
+
 == 1.0.9 (2010-04-12)
 
 === Bugfixes

data/README.rdoc

@@ -30,7 +30,7 @@ E.g. in Bash, export RL_LANG="en,fr,no". This can be quite helpful when modifyin
 
 * Bump version in the VERSION.yml file and:
 ** java/pom.xml
-** ikvm/Gherkin/Gherkin,csproj
+** ikvm/Gherkin/Gherkin.csproj
 * rake release:ALL
 * Announce on Cucumber list, IRC and Twitter.
 

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 0
-:patch: 9
+:patch: 10
 :major: 1

data/lib/gherkin/i18n.rb

@@ -35,6 +35,14 @@ module Gherkin
         
         unique_keywords.flatten.compact.sort.reverse.uniq.join('|').gsub(/\*/, '\*')
       end
+
+      def code_keywords
+        all.map{|i18n| i18n.code_keywords}.flatten.uniq.sort
+      end
+
+      def code_keyword_for(gherkin_keyword)
+        gherkin_keyword.gsub(/[\s',]/, '').strip
+      end
     end
 
     attr_reader :key
@@ -120,7 +128,7 @@ module Gherkin
 
     # Keywords that can be used in code
     def code_keywords
-      result = gwt_keywords.map{|keyword| keyword.gsub(/[\s',]/, '').strip}
+      result = gwt_keywords.map{|keyword| self.class.code_keyword_for(keyword)}
       result.delete('*')
       result
     end

data/lib/gherkin/i18n.yml

@@ -74,7 +74,7 @@
   scenario: Scenario
   scenario_outline: Scenario Amlinellol
   examples: Enghreifftiau
-  given: "*|anrhegedig a"
+  given: "*|Anrhegedig a"
   when: "*|Pryd"
   then: "*|Yna"
   and: "*|A"
@@ -170,6 +170,19 @@
   then: "*|Then y'all"
   and: "*|And y'all"
   but: "*|But y'all"
+"eo":
+  name: Esperanto
+  native: Esperanto
+  feature: Trajto
+  background: Fono
+  scenario: Scenaro
+  scenario_outline: Konturo de la scenaro
+  examples: Ekzemploj
+  given: "*|Donitaĵo"
+  when: "*|Se"
+  then: "*|Do"
+  and: "*|Kaj"
+  but: "*|Sed"
 "es":
   name: Spanish
   native: español
@@ -420,7 +433,7 @@
 "ru":
   name: Russian
   native: русский
-  feature: Функционал
+  feature: Функционал|Фича
   background: Предыстория
   scenario: Сценарий
   scenario_outline: Структура сценария

data/lib/gherkin/java_impl.rb

@@ -7,13 +7,35 @@ class Class
     if defined?(JRUBY_VERSION)
       require jar
       class << self
-        define_method(:new) do |*args|
+        def javaify(arg)
+          if Array === arg
+            arg.map{|a| javaify(a)}
+          else
+            case(arg)
+            when Regexp
+              java.util.regex.Pattern.compile(arg.source)
+            else
+              arg
+            end
+          end
+        end
+
+        def new(*args)
+          java_class.new(*javaify(args))
+        end
+
+        def ===(object)
+          super || object.java_kind_of?(java_class)
+        end
+
+        def java_class
           names = self.name.split('::')
           package = Java
           names[0..-2].each do |module_name|
             package = package.__send__(module_name.downcase)
           end
-          package.__send__(names[-1]).new(*args)
+
+          package.__send__(names[-1])
         end
       end
     end

data/lib/gherkin/parser/filter_listener.rb

@@ -5,6 +5,9 @@ module Gherkin
   module Parser
     # This class filters events based on filter criteria.
     class FilterListener
+      require 'gherkin/java_impl'
+      java_impl('gherkin.jar')
+    
       # Creates a new instance that replays events to +listener+, filtered by +filters+,
       # a Hash that can contain:
       #
@@ -138,7 +141,7 @@ module Gherkin
         when Regexp 
           :name_match?
         when String 
-          TagExpression.new(*filters)
+          TagExpression.new(filters)
         end
       end
 
@@ -147,8 +150,7 @@ module Gherkin
       end
 
       def header_row_already_buffered?
-        return false unless @examples_buffer.any?
-        @examples_buffer[-1].event == :row
+        return @examples_buffer.any? && @examples_buffer[-1].event == :row
       end
       
       def filter_match?(*sexps)
@@ -157,8 +159,7 @@ module Gherkin
       end
 
       def tag_match?
-        return false unless TagExpression === @filter_method
-        @filter_method.eval(*current_tags)
+        return TagExpression === @filter_method && @filter_method.eval(current_tags)
       end
 
       def replay_buffers

data/lib/gherkin/parser/tag_expression.rb

@@ -1,9 +1,12 @@
 module Gherkin
   module Parser
     class TagExpression
+      require 'gherkin/java_impl'
+      java_impl('gherkin.jar')
+
       attr_reader :limits
 
-      def initialize(*tag_expressions)
+      def initialize(tag_expressions)
         @ands = []
         @limits = {}
         tag_expressions.each do |expr|
@@ -15,7 +18,7 @@ module Gherkin
         @ands.empty?
       end
 
-      def eval(*tags)
+      def eval(tags)
         return true if @ands.flatten.empty?
         vars = Hash[*tags.map{|tag| [tag, true]}.flatten]
         !!Kernel.eval(ruby_expression)

data/spec/gherkin/i18n_lexer_spec.rb

@@ -18,5 +18,9 @@ module Gherkin
       @lexer.scan("Feature: foo\n")
       @lexer.i18n_language.key.should == "en"
     end
+
+    it "should === its ruby class, even when the impl is Java" do
+      I18nLexer.should === I18nLexer.new(SexpRecorder.new, true)
+    end
   end
 end

data/spec/gherkin/i18n_spec.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 module Gherkin
   module Lexer
-    describe "i18n parsing" do
+    describe I18n do
       before do
         @listener = Gherkin::SexpRecorder.new
       end
@@ -60,6 +60,14 @@ module Gherkin
           [:eof]
         ]
       end
+
+      describe 'keywords' do
+        it "should have code keywords without space, comma or apostrophe" do
+          ['Akkor', 'Etantdonné', 'Lorsque', '假設'].each do |code_keyword|
+            I18n.code_keywords.should include(code_keyword)
+          end
+        end
+      end
     end
   end
 end

data/spec/gherkin/parser/filter_listener_spec.rb

@@ -31,8 +31,6 @@ module Gherkin
       end
 
       def scan(listener, filters)
-        tag_expressions = filters.delete(:tag_expressions)
-        filters[:tag_expression] = TagExpression.new(*tag_expressions) if tag_expressions
         filter_listener = FilterListener.new(listener, filters)
         parser = Gherkin::Parser::Parser.new(filter_listener, true, "root")
         lexer  = Gherkin::I18nLexer.new(parser, true)

data/spec/gherkin/parser/parser_spec.rb

@@ -35,7 +35,7 @@ module Gherkin
         it "should be reusable for several feature files (native lexer: #{native})" do
           listener = mock('listener', :null_object => true)
           parser = Parser.new(listener, true)
-          lexer = I18nLexer.new(parser, native)
+          lexer = Gherkin::I18nLexer.new(parser, native)
           feature = <<-EOF
 Feature: foo
   Scenario: bar

data/spec/gherkin/parser/tag_expression_spec.rb

@@ -6,113 +6,109 @@ module Gherkin
     describe TagExpression do
       context "no tags" do
         before(:each) do
-          @e = TagExpression.new
+          @e = TagExpression.new([])
         end
 
         it "should match @foo" do
-          @e.eval('@foo').should == true
+          @e.eval(['@foo']).should == true
         end
 
         it "should match empty tags" do
-          @e.eval().should == true
+          @e.eval([]).should == true
         end
       end
 
       context "@foo" do
         before(:each) do
-          @e = TagExpression.new('@foo')
+          @e = TagExpression.new(['@foo'])
         end
 
         it "should match @foo" do
-          @e.eval('@foo').should == true
+          @e.eval(['@foo']).should == true
         end
 
         it "should not match @bar" do
-          @e.eval('@bar').should == false
+          @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 = TagExpression.new('~@foo')
+          @e = TagExpression.new(['~@foo'])
         end
 
         it "should match @bar" do
-          @e.eval('@bar').should == true
+          @e.eval(['@bar']).should == true
         end
 
         it "should not match @foo" do
-          @e.eval('@foo').should == false
+          @e.eval(['@foo']).should == false
         end
       end
 
       context "@foo || @bar" do
         before(:each) do
-          @e = TagExpression.new('@foo,@bar')
+          @e = TagExpression.new(['@foo,@bar'])
         end
 
         it "should match @foo" do
-          @e.eval('@foo').should == true
+          @e.eval(['@foo']).should == true
         end
 
         it "should match @bar" do
-          @e.eval('@bar').should == true
+          @e.eval(['@bar']).should == true
         end
 
         it "should not match @zap" do
-          @e.eval('@zap').should == false
+          @e.eval(['@zap']).should == false
         end
       end
 
       context "(@foo || @bar) && !@zap" do
         before(:each) do
-          @e = TagExpression.new('@foo,@bar', '~@zap')
+          @e = TagExpression.new(['@foo,@bar', '~@zap'])
         end
 
         it "should match @foo" do
-          @e.eval('@foo').should == true
+          @e.eval(['@foo']).should == true
         end
 
         it "should not match @foo @zap" do
-          @e.eval('@foo', '@zap').should == false
+          @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')
+          @e = TagExpression.new(['@foo:3,~@bar','@zap:5'])
         end
 
         it "should count tags for positive tags" do
-          @e.limits.should == {'@foo' => 3, '@zap' => 5}
+          rubify_hash(@e.limits).should == {'@foo' => 3, '@zap' => 5}
         end
 
         it "should match @foo @zap" do
-          @e.eval('@foo', '@zap').should == true
+          @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 ')
+          @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'])"
+        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
-          @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
+          rubify_hash(@e.limits).should == {"@zap"=>5, "@foo"=>3}
         end
       end
     end

data/spec/spec_helper.rb

@@ -39,6 +39,16 @@ module GherkinSpecHelper
   def scan_file(file)
     @lexer.scan(File.new(File.dirname(__FILE__) + "/gherkin/fixtures/" + file).read)
   end
+
+  def rubify_hash(hash)
+    if defined?(JRUBY_VERSION)
+      h = {}
+      hash.keySet.each{|key| h[key] = hash[key]}
+      h
+    else
+      hash
+    end
+  end
 end
 
 Spec::Runner.configure do |c|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gherkin
 version: !ruby/object:Gem::Version 
-  version: 1.0.9
+  version: 1.0.10
 platform: java
 authors: 
   - Mike Sassak
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-12 00:00:00 +02:00
+date: 2010-04-16 00:00:00 +02:00
 default_executable: gherkin
 dependencies: 
   - !ruby/object:Gem::Dependency