gherkin 1.0.13-i386-mingw32 → 1.0.14-i386-mingw32

data/History.txt

@@ -1,3 +1,6 @@
+== 1.0.14 (2010-04-18)
+(Something went wrong when releasing 1.0.13)
+
 == 1.0.13 (2010-04-18)
 
 === New Features

data/VERSION.yml

@@ -2,4 +2,4 @@
 :major: 1
 :minor: 0
 :build: 
-:patch: 13
+:patch: 14

data/lib/gherkin/i18n.rb

@@ -3,6 +3,8 @@ require 'yaml'
 module Gherkin
   class I18n
     KEYWORD_KEYS = %w{name native feature background scenario scenario_outline examples given when then and but}
+    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
@@ -122,21 +124,21 @@ module Gherkin
       keywords('examples')
     end
 
-    def but_keywords(space=true)
-      keywords('but', space)
+    def but_keywords
+      keywords('but')
     end
 
-    def and_keywords(space=true)
-      keywords('and', space)
+    def and_keywords
+      keywords('and')
     end
 
     # Keywords that can be used in Gherkin source
     def step_keywords
-      %w{given when then and but}.map{|key| keywords(key, true)}.flatten.uniq
+      STEP_KEYWORD_KEYS.map{|key| keywords(key)}.flatten.uniq
     end
 
     def gwt_keywords
-      %w{given when then}.map{|key| keywords(key, true)}.flatten.uniq
+      GWT_KEYWORD_KEYS.map{|key| keywords(key)}.flatten.uniq
     end
 
     # Keywords that can be used in code
@@ -154,15 +156,40 @@ module Gherkin
       @keywords['native']
     end
 
-    def keywords(key, space=false)
+    def keywords(key)
       raise "No #{key} in #{@keywords.inspect}" if @keywords[key].nil?
-      @keywords[key].split('|').map{|kw| space ? keyword_space(kw) : kw}
+      @keywords[key].split('|').map{|keyword| keyword_space(key, keyword)}
+    end
+
+    def keyword_table
+      require 'stringio'
+      require 'gherkin/formatter/pretty_formatter'
+      io = StringIO.new
+      pf = Gherkin::Formatter::PrettyFormatter.new(io, true)
+
+      (KEYWORD_KEYS - %w{name native}).each do |key|
+        pf.row([key, keywords(key).map{|keyword| %{"#{keyword}"}}.join(', ')], 0)
+      end
+      %w{given when then}.each do |key|
+        code_keywords = keywords(key).reject{|kw| kw == '* '}.map do |kw|
+          %{"#{self.class.code_keyword_for(kw)}"}
+        end.join(', ')
+        pf.row(["#{key} (code)", code_keywords], 0)
+      end
+      
+      pf.flush_table
+      io.rewind
+      io.read
     end
 
     private
 
-    def keyword_space(val)
-      (val + ' ').sub(/< $/,'')
+    def keyword_space(key, keyword)
+      if(STEP_KEYWORD_KEYS.index(key))
+        (keyword + ' ').sub(/< $/,'')
+      else
+        keyword
+      end
     end
   end
 end

data/spec/gherkin/i18n_spec.rb

@@ -113,6 +113,24 @@ module Gherkin
       | vi        | Vietnamese             | Tiếng Việt           |
       | zh-CN     | Chinese simplified     | 简体中文                 |
       | zh-TW     | Chinese traditional    | 繁體中文                 |
+}
+        end
+
+        it "should print keywords for a given language" do
+          ("\n" + I18n.get('fr').keyword_table).should == %{
+      | feature          | "Fonctionnalité"                       |
+      | background       | "Contexte"                             |
+      | scenario         | "Scénario"                             |
+      | scenario_outline | "Plan du scénario", "Plan du Scénario" |
+      | examples         | "Exemples"                             |
+      | given            | "* ", "Soit ", "Etant donné "          |
+      | when             | "* ", "Quand ", "Lorsque ", "Lorsqu'"  |
+      | then             | "* ", "Alors "                         |
+      | and              | "* ", "Et "                            |
+      | but              | "* ", "Mais "                          |
+      | given (code)     | "Soit", "Etantdonné"                   |
+      | when (code)      | "Quand", "Lorsque", "Lorsqu"           |
+      | then (code)      | "Alors"                                |
 }
         end
       end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 13
-  version: 1.0.13
+  - 14
+  version: 1.0.14
 platform: i386-mingw32
 authors: 
 - Mike Sassak