gherkin 2.11.6-x86-mingw32 → 2.11.7-x86-mingw32

data/features/support/env.rb

@@ -13,7 +13,6 @@ Bundler.setup
 end
 require 'gherkin'
 require 'gherkin/sexp_recorder'
-require 'gherkin/output_stream_string_io'
 
 module TransformHelpers
   def tr_line_number(step_arg)
@@ -31,12 +30,12 @@ end
 
 class GherkinWorld
   include TransformHelpers
-  
+
   def initialize
     @formatter = Gherkin::SexpRecorder.new
   end
 end
 
-World do 
+World do
   GherkinWorld.new
 end

data/gherkin.gemspec

@@ -1,4 +1,6 @@
 # -*- encoding: utf-8 -*-
+$LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
+require 'gherkin/platform'
 
 Gem::Specification.new do |s|
   s.name        = "gherkin"
@@ -12,10 +14,10 @@ Gem::Specification.new do |s|
   #
   # Repeat these step for cucumber (swap `cucumber` with `gherkin`).
   #
-  # When both are building OK, do a `bundle exec rake install` in both cucumber and gherkin projects, revert the changes in the first 2 steps 
+  # When both are building OK, do a `bundle exec rake install` in both cucumber and gherkin projects, revert the changes in the first 2 steps
   # and release both projects. Do this for both ruby 1.8.7, ruby 1.9.3 and jruby.
   #
-  s.version     = "2.11.6"
+  s.version     = Gherkin::VERSION
   s.authors     = ["Mike Sassak", "Gregory Hnatiuk", "Aslak Hellesøy"]
   s.description = "A fast Gherkin lexer/parser based on the Ragel State Machine Compiler."
   s.summary     = "#{s.name}-#{s.version}"
@@ -36,11 +38,11 @@ Gem::Specification.new do |s|
   s.files -= Dir['lib/**/*.dll']
   s.files -= Dir['lib/**/*.bundle']
   s.files -= Dir['lib/**/*.so']
-  
+
   if ENV['GEM_PLATFORM']
     puts "GEM_PLATFORM:#{ENV['GEM_PLATFORM']}"
   end
-  s.platform = ENV['GEM_PLATFORM'] if ENV['GEM_PLATFORM'] 
+  s.platform = ENV['GEM_PLATFORM'] if ENV['GEM_PLATFORM']
   case s.platform.to_s
   when /java/
     s.files += Dir['lib/*.jar']
@@ -56,7 +58,7 @@ Gem::Specification.new do |s|
   end
   s.files -= Dir['**/.gitignore']
 
-  s.add_runtime_dependency('json', '>= 1.7.6')
+  s.add_runtime_dependency('multi_json', '~> 1.3')
 
   s.add_development_dependency('cucumber', '>= 1.2.1')
   s.add_development_dependency('rake', '>= 10.0.3')
@@ -64,7 +66,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency('rspec', '~> 2.12.0')
   s.add_development_dependency('rubyzip', '>= 0.9.9')
 
-  unless ENV['RUBY_CC_VERSION'] || defined?(JRUBY_VERSION)
+  unless ENV['RUBY_CC_VERSION'] || Gherkin::JRUBY
     s.add_development_dependency('therubyracer', '>= 0.11.2') if ENV['GHERKIN_JS']
     # For Documentation:
     s.add_development_dependency('yard', '>= 0.8.3')

data/lib/gherkin/formatter/json_formatter.rb

@@ -1,4 +1,4 @@
-require 'json'
+require 'multi_json'
 require 'gherkin/formatter/model'
 require 'gherkin/native'
 require 'base64'
@@ -9,9 +9,9 @@ module Gherkin
     # be turned into JSON.
     class JSONFormatter
       native_impl('gherkin')
-      
+
       include Base64
-      
+
       def initialize(io)
         raise "Must be writeable" unless io.respond_to?(:write)
         @io = io
@@ -20,7 +20,7 @@ module Gherkin
       end
 
       def done
-        @io.write(@feature_hashes.to_json)
+        @io.write(MultiJson.dump(@feature_hashes, :pretty => true))
       end
 
       def uri(uri)
@@ -61,7 +61,7 @@ module Gherkin
       def result(result)
         @current_step_or_hook['result'] = result.to_hash
       end
-      
+
       def append_duration(timestamp)
       	#check to make sure result exists (scenario outlines do not have results yet)
       	if !@current_step_or_hook['result'].nil?

data/lib/gherkin/formatter/tag_filter.rb

@@ -8,7 +8,7 @@ module Gherkin
       end
 
       def eval(tags, names, ranges)
-        @tag_expression.eval(tags.uniq)
+        @tag_expression.evaluate(tags.uniq)
       end
 
       def filter_table_body_rows(rows)
@@ -16,4 +16,4 @@ module Gherkin
       end
     end
   end
-end
+end

data/lib/gherkin/i18n.json

@@ -125,6 +125,20 @@
 	  "and": "*|Und",
 	  "but": "*|Aber"
 	},
+    "el": {
+        "name": "Greek",
+        "native": "Ελληνικά",
+        "feature": "Δυνατότητα|Λειτουργία",
+        "background": "Υπόβαθρο",
+        "scenario": "Σενάριο",
+        "scenario_outline": "Περιγραφή Σεναρίου",
+        "examples": "Παραδείγματα|Σενάρια",
+        "given": "*|Δεδομένου|Δεδομένου ότι",
+        "when": "*|Όταν",
+        "then": "*|Τότε",
+        "and": "*|Και",
+        "but": "*|Αλλά"
+    },
 	"en-au": {
 	  "name": "Australian",
 	  "native": "Australian",
@@ -153,6 +167,20 @@
 	  "and": "*|AN",
 	  "but": "*|BUT"
 	},
+	"en-old": {
+	  "name": "Old English",
+	  "native": "Englisc",
+	  "feature": "Hwaet|Hwæt",
+	  "background": "Aer|Ær",
+	  "scenario": "Swa",
+	  "scenario_outline": "Swa hwaer swa|Swa hwær swa",
+	  "examples": "Se the|Se þe|Se ðe",
+	  "given": "*|Thurh|Þurh|Ðurh",
+	  "when": "*|Tha|Þa|Ða",
+	  "then": "*|Tha|Þa|Ða|Tha the|Þa þe|Ða ðe",
+	  "and": "*|Ond|7",
+	  "but": "*|Ac"
+	},
 	"en-pirate": {
 	  "name": "Pirate",
 	  "native": "Pirate",

data/lib/gherkin/i18n.rb

@@ -1,6 +1,6 @@
-require 'json'
 require 'gherkin/rubify'
 require 'gherkin/native'
+require 'multi_json'
 
 module Gherkin
   class I18n
@@ -11,7 +11,7 @@ module Gherkin
     FEATURE_ELEMENT_KEYS = %w{feature background scenario scenario_outline examples}
     STEP_KEYWORD_KEYS    = %w{given when then and but}
     KEYWORD_KEYS         = FEATURE_ELEMENT_KEYS + STEP_KEYWORD_KEYS
-    LANGUAGES            = JSON.parse(File.open(File.dirname(__FILE__) + '/i18n.json', 'r:utf-8').read)
+    LANGUAGES            = MultiJson.load(File.open(File.dirname(__FILE__) + '/i18n.json', 'r:utf-8').read)
 
     class << self
       include Rubify
@@ -30,7 +30,7 @@ module Gherkin
       # there is typically a code generation tool to generate regular expressions for recognising the
       # various I18n translations of Gherkin's keywords.
       #
-      # The +keywords+ arguments can be one of <tt>:feature</tt>, <tt>:background</tt>, <tt>:scenario</tt>, 
+      # The +keywords+ arguments can be one of <tt>:feature</tt>, <tt>:background</tt>, <tt>:scenario</tt>,
       # <tt>:scenario_outline</tt>, <tt>:examples</tt>, <tt>:step</tt>.
       def keyword_regexp(*keywords)
         unique_keywords = all.map do |i18n|
@@ -42,7 +42,7 @@ module Gherkin
             end
           end
         end
-        
+
         unique_keywords.flatten.compact.map{|kw| kw.to_s}.sort.reverse.uniq.join('|').gsub(/\*/, '\*')
       end
 
@@ -150,14 +150,14 @@ module Gherkin
       gherkin_keyword_table = KEYWORD_KEYS.map do |key|
         Formatter::Model::Row.new([], [key, keywords(key).map{|keyword| %{"#{keyword}"}}.join(', ')], nil)
       end
-      
+
       code_keyword_table = STEP_KEYWORD_KEYS.map do |key|
         code_keywords = keywords(key).reject{|keyword| keyword == '* '}.map do |keyword|
           %{"#{self.class.code_keyword_for(keyword)}"}
         end.join(', ')
         Formatter::Model::Row.new([], ["#{key} (code)", code_keywords], nil)
       end
-      
+
       pf.table(gherkin_keyword_table + code_keyword_table)
       io.string
     end

data/lib/gherkin/json_parser.rb

@@ -1,8 +1,8 @@
-require 'json'
-require 'gherkin/formatter/model'
+require 'base64'
 require 'gherkin/formatter/argument'
+require 'gherkin/formatter/model'
 require 'gherkin/native'
-require 'base64'
+require 'multi_json'
 
 module Gherkin
   class JSONParser
@@ -17,7 +17,7 @@ module Gherkin
     # Parse a gherkin object +o+, which can either be a JSON String,
     # or a Hash (from a parsed JSON String).
     def parse(o)
-      o = JSON.parse(o) if String === o
+      o = MultiJson.load(o) if String === o
 
       o.each do |f|
         @formatter.uri(f['uri'])