gherkin 1.0.18 → 1.0.19

data/History.txt

@@ -1,3 +1,11 @@
+== 1.0.19
+
+=== New Features
+* Works with JRuby 1.5.0.RC1 (Aslak Hellesøy)
+
+=== 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)
 
 === Bugfixes

data/VERSION.yml

@@ -2,4 +2,4 @@
 :major: 1
 :minor: 0
 :build: 
-:patch: 18
+:patch: 19

data/lib/gherkin/i18n.rb

@@ -11,7 +11,6 @@ module Gherkin
     ALL_KEYS = %w{name native feature background scenario scenario_outline examples given when then and but}
     KEYWORD_KEYS = ALL_KEYS - %w{name native}
     STEP_KEYWORD_KEYS = %w{given when then and but}
-    GWT_KEYWORD_KEYS = %w{given when then}
     LANGUAGES    = YAML.load_file(File.dirname(__FILE__) + '/i18n.yml')
 
     class << self
@@ -132,13 +131,9 @@ module Gherkin
       STEP_KEYWORD_KEYS.map{|iso_code| keywords(iso_code)}.flatten.uniq
     end
 
-    def gwt_keywords
-      GWT_KEYWORD_KEYS.map{|iso_code| keywords(iso_code)}.flatten.uniq
-    end
-
     # Keywords that can be used in code
     def code_keywords
-      result = gwt_keywords.map{|keyword| self.class.code_keyword_for(keyword)}
+      result = step_keywords.map{|keyword| self.class.code_keyword_for(keyword)}
       result.delete('*')
       result
     end
@@ -158,7 +153,7 @@ module Gherkin
       KEYWORD_KEYS.each do |key|
         pf.row([key, keywords(key).map{|keyword| %{"#{keyword}"}}.join(', ')], 0)
       end
-      GWT_KEYWORD_KEYS.each do |key|
+      STEP_KEYWORD_KEYS.each do |key|
         code_keywords = keywords(key).reject{|keyword| keyword == '* '}.map do |keyword|
           %{"#{self.class.code_keyword_for(keyword)}"}
         end.join(', ')

data/spec/gherkin/i18n_spec.rb

@@ -133,6 +133,8 @@ module Gherkin
       | given (code)     | "Soit", "Etantdonné"                   |
       | when (code)      | "Quand", "Lorsque", "Lorsqu"           |
       | then (code)      | "Alors"                                |
+      | and (code)       | "Et"                                   |
+      | but (code)       | "Mais"                                 |
 }
         end
       end

data/spec/spec_helper.rb

@@ -13,7 +13,7 @@ require 'shared/py_string_spec'
 require 'shared/row_spec'
 
 if defined?(JRUBY_VERSION)
-  class OutputStreamStringIO < java.io.ByteArrayOutputStream
+  class OutputStreamStringIO < Java.java.io.ByteArrayOutputStream
     def rewind
     end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 18
-  version: 1.0.18
+  - 19
+  version: 1.0.19
 platform: ruby
 authors: 
 - Mike Sassak
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-21 00:00:00 +02:00
+date: 2010-04-23 00:00:00 +02:00
 default_executable: gherkin
 dependencies: 
 - !ruby/object:Gem::Dependency