gherkin 2.11.4-java → 2.11.5-java

data/History.md

@@ -1,3 +1,8 @@
+## [2.11.5](https://github.com/cucumber/gherkin/compare/v2.11.4...v2.11.5)
+
+* [Core] Czech translation cleaned a little bit up. ([#202](https://github.com/cucumber/gherkin/pull/202) Jakub Linhart)
+* [JavaScript] No lexer modules in 2.11.4 NPM package ([#198](https://github.com/cucumber/gherkin/issues/198) Aslak Hellesøy)
+
 ## [2.11.4](https://github.com/cucumber/gherkin/compare/v2.11.3...v2.11.4)
 
 * [Core] Support for file encodings different from UTF-8 in feature files. ([#158](https://github.com/cucumber/gherkin/issues/158) Aslak Hellesøy)

data/README.md

@@ -54,7 +54,7 @@ The jar file is in the central Maven repo.
     <dependency>
         <groupId>info.cukes</groupId>
         <artifactId>gherkin</artifactId>
-        <version>2.11.4</version>
+        <version>2.11.5</version>
     </dependency>
 
 You can get it manually from [Maven Central](http://search.maven.org/#browse%7C-2073395818)

data/gherkin.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   # 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.4"
+  s.version     = "2.11.5"
   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}"

data/lib/gherkin/i18n.json

@@ -91,7 +91,7 @@
 	  "scenario": "Scénář",
 	  "scenario_outline": "Náčrt Scénáře|Osnova scénáře",
 	  "examples": "Příklady",
-	  "given": "*|Pokud",
+	  "given": "*|Pokud|Za předpokladu",
 	  "when": "*|Když",
 	  "then": "*|Pak",
 	  "and": "*|A také|A",

data/lib/gherkin/lexer/encoding.rb

@@ -5,13 +5,20 @@ module Gherkin
 
       COMMENT_OR_EMPTY_LINE_PATTERN = /^\s*#|^\s*$/
       ENCODING_PATTERN = /^\s*#\s*encoding\s*:\s*([0-9a-zA-Z\-]+)/i #:nodoc:
+      DEFAULT_ENCODING = 'UTF-8'
 
       def read_file(path)
         source = File.new(path).read
         enc = encoding(source)
-        if(enc != 'UTF-8')
+        if(enc != DEFAULT_ENCODING)
           # Read it again with different encoding
-          source = File.new(path, "r:#{enc}:UTF-8").read
+          source = File.new(path, "r:#{enc}:#{DEFAULT_ENCODING}").read
+          if source.respond_to?(:encode)
+            source = source.encode(DEFAULT_ENCODING)
+          else
+            require 'iconv'
+            source = Iconv.new(DEFAULT_ENCODING, enc).iconv(source)
+          end
         end
         source
       end
@@ -19,7 +26,7 @@ module Gherkin
     private
 
       def encoding(source)
-        encoding = 'UTF-8'
+        encoding = DEFAULT_ENCODING
         source.each_line do |line|
           break unless COMMENT_OR_EMPTY_LINE_PATTERN =~ line
           if ENCODING_PATTERN =~ line

data/tasks/release.rake

@@ -24,6 +24,9 @@ namespace :release do
   
   desc 'Push npm package to http://npmjs.org/'
   task :push_npm_package do
+    en_min_js = File.expand_path(File.dirname(__FILE__) + '/../js/lib/gherkin/lexer/en.min.js')
+    raise "No #{en_min_js}. Did you set GHERKIN_JS=true in your shell?" unless File.file?(en_min_js)
+
     Dir.chdir('js') do
       sh("npm publish")
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gherkin
 version: !ruby/object:Gem::Version
-  version: 2.11.4
+  version: 2.11.5
   prerelease: 
 platform: java
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-09 00:00:00.000000000 Z
+date: 2012-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -109,6 +109,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.9.9
+- !ruby/object:Gem::Dependency
+  name: therubyracer
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.10.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.10.2
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -343,7 +359,7 @@ rubyforge_project:
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: gherkin-2.11.4
+summary: gherkin-2.11.5
 test_files:
 - features/escaped_pipes.feature
 - features/feature_parser.feature