gherkin 2.4.5-java → 2.4.6-java

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gherkin (2.4.5)
+    gherkin (2.4.6)
       json (>= 1.4.6)
 
 GEM
@@ -9,10 +9,10 @@ GEM
   specs:
     awesome_print (0.4.0)
     builder (3.0.0)
-    cucumber (1.0.0)
+    cucumber (1.0.2)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
-      gherkin (~> 2.4.1)
+      gherkin (~> 2.4.5)
       json (>= 1.4.6)
       term-ansicolor (>= 1.0.5)
     diff-lcs (1.1.2)
@@ -29,7 +29,7 @@ GEM
     rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
-    term-ansicolor (1.0.5)
+    term-ansicolor (1.0.6)
 
 PLATFORMS
   java
@@ -39,9 +39,9 @@ DEPENDENCIES
   awesome_print (>= 0.4.0)
   builder (>= 2.1.2)
   bundler (>= 1.0.15)
-  cucumber (>= 1.0.0)
+  cucumber (>= 1.0.2)
   gherkin!
   rake (>= 0.9.2)
   rake-compiler (>= 0.7.8)
   rspec (>= 2.6.0)
-  term-ansicolor (>= 1.0.5)
+  term-ansicolor (>= 1.0.6)

data/History.md

@@ -1,3 +1,9 @@
+## [2.4.6](https://github.com/cucumber/gherkin/compare/v2.4.5...v2.4.6)
+
+### Bugfixes
+* Added Icelandic translation (Ægir Örn Símonarson)
+* JavaScript: String prototype has no "trimRight" function. Fixes failure in Opera. (Julien Biezemans)
+
 ## [2.4.5](https://github.com/cucumber/gherkin/compare/v2.4.4...v2.4.5)
 
 No changes, releasing again since the 2.4.4 release failed halfway through.

data/gherkin.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = "gherkin"
-  s.version     = "2.4.5"
+  s.version     = "2.4.6"
   s.authors     = ["Mike Sassak", "Gregory Hnatiuk", "Aslak Hellesøy"]
   s.description = "A fast Gherkin lexer/parser for based on the Ragel State Machine Compiler."
   s.summary     = "#{s.name}-#{s.version}"
@@ -44,7 +44,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency('json', '>= 1.4.6')
 
-  s.add_development_dependency('cucumber', '>= 1.0.0')
+  s.add_development_dependency('cucumber', '>= 1.0.2')
   s.add_development_dependency('rake', '>= 0.9.2')
   s.add_development_dependency('bundler', '>= 1.0.15')
   s.add_development_dependency('rspec', '>= 2.6.0')
@@ -58,6 +58,6 @@ Gem::Specification.new do |s|
   end
 
   # Only needed by Cucumber. Remove when Cucumber no longer needs those.
-  s.add_development_dependency('term-ansicolor', '>= 1.0.5')
+  s.add_development_dependency('term-ansicolor', '>= 1.0.6')
   s.add_development_dependency('builder', '>= 2.1.2')
 end

data/lib/gherkin/c_lexer.rb

@@ -4,7 +4,7 @@ module Gherkin
   module CLexer
     def self.[](i18n_underscored_iso_code)
       begin
-        prefix = Config::CONFIG['arch'] =~ /mswin|mingw/ ? "#{Config::CONFIG['MAJOR']}.#{Config::CONFIG['MINOR']}/" : ''
+        prefix = RbConfig::CONFIG['arch'] =~ /mswin|mingw/ ? "#{RbConfig::CONFIG['MAJOR']}.#{RbConfig::CONFIG['MINOR']}/" : ''
         lib = "#{prefix}gherkin_lexer_#{i18n_underscored_iso_code}"
         require lib
         const_get(i18n_underscored_iso_code.capitalize)

data/lib/gherkin/formatter/model.rb

@@ -99,7 +99,7 @@ module Gherkin
 
         attr_accessor :rows
 
-        def initialize(comments, tags, keyword, name, description, line, rows=nil)
+        def initialize(comments, tags, keyword, name, description, line, rows)
           super(comments, tags, keyword, name, description, line)
           @rows = rows
         end

data/lib/gherkin/i18n.yml

@@ -300,6 +300,19 @@
   then: "*|Maka"
   and: "*|Dan"
   but: "*|Tapi"
+"is":
+  name: Icelandic
+  native: Íslenska
+  feature: Eiginleiki
+  background: Bakgrunnur
+  scenario: Atburðarás
+  scenario_outline: Lýsing Atburðarásar|Lýsing Dæma 
+  examples: Dæmi|Atburðarásir
+  given: "*|Ef"
+  when: "*|Þegar"
+  then: "*|Þá"
+  and: "*|Og"
+  but: "*|En"
 "it":
   name: Italian
   native: italiano

data/lib/gherkin/listener/formatter_listener.rb

@@ -44,7 +44,7 @@ module Gherkin
 
       def examples(keyword, name, description, line)
         replay_step_or_examples
-        @examples_statement = Formatter::Model::Examples.new(grab_comments!, grab_tags!, keyword, name, description, line)
+        @examples_statement = Formatter::Model::Examples.new(grab_comments!, grab_tags!, keyword, name, description, line, nil)
       end
 
       def step(keyword, name, line)

data/ragel/lexer.js.rl.erb

@@ -181,7 +181,7 @@ Lexer.prototype.unindent = function(startcol, text) {
 
 Lexer.prototype.store_keyword_content = function(event, data, p, eof) {
   var end_point = (!this.next_keyword_start || (p == eof)) ? p : this.next_keyword_start;
-  var content = this.unindent(this.start_col + 2, this.bytesToString(data.slice(this.content_start, end_point))).trimRight();
+  var content = this.unindent(this.start_col + 2, this.bytesToString(data.slice(this.content_start, end_point))).replace(/\s+$/,"");
   var content_lines = content.split("\n")
   var name = content_lines.shift() || "";
   name = name.trim();

data/spec/gherkin/i18n_spec.rb

@@ -101,6 +101,7 @@ module Gherkin
       | hr        | Croatian            | hrvatski          |
       | hu        | Hungarian           | magyar            |
       | id        | Indonesian          | Bahasa Indonesia  |
+      | is        | Icelandic           | Íslenska          |
       | it        | Italian             | italiano          |
       | ja        | Japanese            | 日本語               |
       | ko        | Korean              | 한국어               |

data/tasks/gems.rake

@@ -13,7 +13,7 @@ namespace :gems do
 
   desc 'Prepare JRuby binares'
   task :jruby => [:jar] do
-    sh "rvm jruby@cucumber exec rspec spec"
+    sh "rvm jruby exec rspec spec"
   end
 
   desc 'Prepare IronRuby binaries'

metadata

@@ -1,149 +1,146 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: gherkin
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 2.4.6
   prerelease: 
-  version: 2.4.5
 platform: java
-authors: 
+authors:
 - Mike Sassak
 - Gregory Hnatiuk
-- "Aslak Helles\xC3\xB8y"
+- Aslak Hellesøy
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-10 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-08-07 00:00:00.000000000 +01:00
+default_executable: 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: json
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2164846820 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.4.6
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: cucumber
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2164846820
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: &2160649980 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.0.0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.2
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2160649980
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &2160649520 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.9.2
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2160649520
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &2160649060 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.15
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *2160649060
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2160648600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.6.0
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: awesome_print
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *2160648600
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  requirement: &2160648140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.4.0
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: therubyracer
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *2160648140
+- !ruby/object:Gem::Dependency
+  name: therubyracer
+  requirement: &2160647600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.9.2
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: yard
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *2160647600
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: &2160647140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.7.2
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: rdiscount
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: *2160647140
+- !ruby/object:Gem::Dependency
+  name: rdiscount
+  requirement: &2160646680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.6.8
   type: :development
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: term-ansicolor
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: *2160646680
+- !ruby/object:Gem::Dependency
+  name: term-ansicolor
+  requirement: &2160646220 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.0.5
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.6
   type: :development
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: builder
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: *2160646220
+- !ruby/object:Gem::Dependency
+  name: builder
+  requirement: &2160645760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.1.2
   type: :development
-  version_requirements: *id011
+  prerelease: false
+  version_requirements: *2160645760
 description: A fast Gherkin lexer/parser for based on the Ragel State Machine Compiler.
 email: cukes@googlegroups.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitattributes
 - .gitignore
 - .gitmodules
@@ -289,34 +286,33 @@ files:
 - lib/base64-2.3.8.jar
 - lib/gherkin.jar
 - lib/json-simple-1.1.jar
+has_rdoc: true
 homepage: http://github.com/cucumber/gherkin
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: gherkin-2.4.5
-test_files: 
+summary: gherkin-2.4.6
+test_files:
 - features/escaped_pipes.feature
 - features/feature_parser.feature
 - features/json_formatter.feature