gherkin 2.11.5-java → 2.11.6-java

data/lib/gherkin/rubify.rb

@@ -5,14 +5,21 @@ module Gherkin
       # This is especially important to convert java.util.List coming
       # from Java and back to a Ruby Array.
       def rubify(o)
-        case(o)
-        when Java.java.util.Collection, Array
-          o.map{|e| rubify(e)}
-        when Java.gherkin.formatter.model.DocString
-          require 'gherkin/formatter/model'
-          Formatter::Model::DocString.new(o.content_type, o.value, o.line)
-        else
-          o
+        case (o)
+          when Java.java.util.Collection, Array
+            rubified_array = o.map{ |e| rubify(e) }
+            if o.respond_to?(:line)
+              class << rubified_array
+                attr_accessor :line
+              end
+              rubified_array.line = o.line
+            end
+            rubified_array
+          when Java.gherkin.formatter.model.DocString
+            require 'gherkin/formatter/model'
+            Formatter::Model::DocString.new(o.content_type, o.value, o.line)
+          else
+            o
         end
       end
     else

data/ragel/lexer.js.rl.erb

@@ -132,8 +132,8 @@
 var Lexer = function(listener) {
   // Check that listener has the required functions
   var events = ['comment', 'tag', 'feature', 'background', 'scenario', 'scenario_outline', 'examples', 'step', 'doc_string', 'row', 'eof'];
-  for(e in events) {
-    var event = events[e];
+  for(var i=0, len=events.length; i<len; i++) {
+    var event = events[i];
     if(typeof listener[event] != 'function') {
       throw "Error. No " + event + " function exists on " + JSON.stringify(listener);
     }

data/spec/gherkin/fixtures/with_bom_and_language_spec.feature

@@ -0,0 +1,4 @@
+# language: nl
+Functionaliteit: Feature Text
+  Scenario: Reading a Scenario
+    Gegeven there is a step

data/spec/gherkin/i18n_spec.rb

@@ -53,7 +53,7 @@ module Gherkin
           [:step, "当", "我按相加按钮", 7],
           [:step, "那么", "我应该在屏幕上看到的结果是13", 8],
           [:eof]
-        ] 
+        ]
       end
 
       it "should parse languages with spaces after some keywords but not others" do
@@ -162,7 +162,7 @@ module Gherkin
         end
 
         it "should report keyword regexp" do
-          Gherkin::I18n.keyword_regexp(:step).should =~ /\|Quando \|Quand \|Quan \|Pryd \|Pokud \|/
+          Gherkin::I18n.keyword_regexp(:step).should =~ /\|Quando \|Quand \|Quan \|Pryd \|/
         end
 
         it "should print available languages" do
@@ -188,6 +188,7 @@ module Gherkin
       | fi        | Finnish             | suomi             |
       | fr        | French              | français          |
       | he        | Hebrew              | עברית             |
+      | hi        | Hindi               | हिंदी             |
       | hr        | Croatian            | hrvatski          |
       | hu        | Hungarian           | magyar            |
       | id        | Indonesian          | Bahasa Indonesia  |
@@ -208,7 +209,9 @@ module Gherkin
       | sr-Cyrl   | Serbian             | Српски            |
       | sr-Latn   | Serbian (Latin)     | Srpski (Latinica) |
       | sv        | Swedish             | Svenska           |
+      | tl        | Telugu              | తెలుగు            |
       | tr        | Turkish             | Türkçe            |
+      | tt        | Tatar               | Татарча           |
       | uk        | Ukrainian           | Українська        |
       | uz        | Uzbek               | Узбекча           |
       | vi        | Vietnamese          | Tiếng Việt        |

data/spec/gherkin/rubify_spec.rb

@@ -0,0 +1,23 @@
+#encoding: utf-8
+if defined?(JRUBY_VERSION)
+  require 'spec_helper'
+  include Gherkin::Rubify
+
+  module Gherkin
+    module Rubify
+      describe "rubify" do
+        before do
+          @java_collection = [mock("Java.java.util.ArrayList")]
+          @java_collection.stub(:===).and_return(Java.java.util.Collection)
+          @java_collection.stub(:line).and_return(15)
+          @rubified_array = rubify(@java_collection)
+        end
+
+        it "should keep the line number attribute from Java object" do
+          @rubified_array.should respond_to(:line)
+          @rubified_array.line.should == 15
+        end
+      end
+    end
+  end
+end

data/spec/gherkin/shared/encoding_group.rb

@@ -15,6 +15,20 @@ module Gherkin
           ]
         end
 
+        describe "and language specification" do
+          it "should work just fine" do
+            @lexer = Gherkin::Lexer::I18nLexer.new(@listener)
+            scan_file("with_bom_and_language_spec.feature")
+            @listener.to_sexp.should == [
+              [:comment, "# language: nl", 1], 
+              [:feature, "Functionaliteit", "Feature Text", "", 2],
+              [:scenario, "Scenario", "Reading a Scenario", "", 3],
+              [:step, "Gegeven ", "there is a step", 4],
+              [:eof]
+            ]
+          end
+        end
+
         describe "with ISO-8859-1 encoding" do
           it "should work just fine" do
             @lexer = Gherkin::Lexer::I18nLexer.new(@listener)

data/tasks/cucumber.rake

@@ -4,6 +4,7 @@ require 'cucumber/rake/task'
 
 Cucumber::Rake::Task.new(:cucumber) do |t|
   profile = ENV['TRAVIS'] ? 'travis' : 'default'
+  profile = 'javascript' if ENV['GHERKIN_JS_NATIVE']
   t.cucumber_opts = "--profile #{profile}"
 end
 

data/tasks/gems.rake

@@ -1,11 +1,11 @@
 namespace :gems do
   task :win do
     unless File.directory?(File.expand_path('~/.rake-compiler'))
-      STDERR.puts "[ERROR] You must install MinGW rubies to build gherkin gems for Windows. See README.rdoc"
+      STDERR.puts "[ERROR] You must install MinGW rubies to build gherkin gems for Windows. See README.md"
       exit(1)
     end
     # rvm and mingw ruby versions have to match to avoid errors
-    sh "rvm 1.8.7-p352@cucumber do rake cross compile RUBY_CC_VERSION=1.8.7"
+    sh "rvm 1.8.7-p371@cucumber do rake cross compile RUBY_CC_VERSION=1.8.7"
     sh "bundle exec rake cross compile RUBY_CC_VERSION=1.9.3"
     # This will copy the .so files to the proper place
     sh "bundle exec rake -t cross compile RUBY_CC_VERSION=1.8.7:1.9.3"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gherkin
 version: !ruby/object:Gem::Version
-  version: 2.11.5
+  version: 2.11.6
   prerelease: 
 platform: java
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-14 00:00:00.000000000 Z
+date: 2013-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -20,7 +20,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.4.6
+        version: 1.7.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -28,7 +28,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.4.6
+        version: 1.7.6
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -52,7 +52,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 10.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -60,7 +60,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 10.0.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -68,7 +68,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.2.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -76,7 +76,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.2.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -84,7 +84,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: 2.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -92,7 +92,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: 2.12.0
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -116,7 +116,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.10.2
+        version: 0.11.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -124,7 +124,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.10.2
+        version: 0.11.2
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -132,7 +132,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.8.2.1
+        version: 0.8.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -140,7 +140,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.8.2.1
+        version: 0.8.3
 - !ruby/object:Gem::Dependency
   name: rdiscount
   requirement: !ruby/object:Gem::Requirement
@@ -180,7 +180,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.1.3
+        version: 3.1.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -188,7 +188,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.1.3
+        version: 3.1.4
 description: A fast Gherkin lexer/parser based on the Ragel State Machine Compiler.
 email: cukes@googlegroups.com
 executables: []
@@ -250,6 +250,8 @@ files:
 - lib/gherkin/json_parser.rb
 - lib/gherkin/lexer/encoding.rb
 - lib/gherkin/lexer/i18n_lexer.rb
+- lib/gherkin/lexer/tl.rb
+- lib/gherkin/lexer/tt.rb
 - lib/gherkin/listener/event.rb
 - lib/gherkin/listener/formatter_listener.rb
 - lib/gherkin/native.rb
@@ -292,6 +294,7 @@ files:
 - spec/gherkin/fixtures/simple_with_comments.feature
 - spec/gherkin/fixtures/simple_with_tags.feature
 - spec/gherkin/fixtures/with_bom.feature
+- spec/gherkin/fixtures/with_bom_and_language_spec.feature
 - spec/gherkin/formatter/ansi_escapes_spec.rb
 - spec/gherkin/formatter/filter_formatter_spec.rb
 - spec/gherkin/formatter/json_formatter_spec.rb
@@ -308,6 +311,7 @@ files:
 - spec/gherkin/native_lexer_spec.rb
 - spec/gherkin/output_stream_string_io.rb
 - spec/gherkin/parser/parser_spec.rb
+- spec/gherkin/rubify_spec.rb
 - spec/gherkin/sexp_recorder.rb
 - spec/gherkin/shared/doc_string_group.rb
 - spec/gherkin/shared/encoding_group.rb
@@ -359,7 +363,7 @@ rubyforge_project:
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: gherkin-2.11.5
+summary: gherkin-2.11.6
 test_files:
 - features/escaped_pipes.feature
 - features/feature_parser.feature
@@ -400,6 +404,7 @@ test_files:
 - spec/gherkin/fixtures/simple_with_comments.feature
 - spec/gherkin/fixtures/simple_with_tags.feature
 - spec/gherkin/fixtures/with_bom.feature
+- spec/gherkin/fixtures/with_bom_and_language_spec.feature
 - spec/gherkin/formatter/ansi_escapes_spec.rb
 - spec/gherkin/formatter/filter_formatter_spec.rb
 - spec/gherkin/formatter/json_formatter_spec.rb
@@ -416,6 +421,7 @@ test_files:
 - spec/gherkin/native_lexer_spec.rb
 - spec/gherkin/output_stream_string_io.rb
 - spec/gherkin/parser/parser_spec.rb
+- spec/gherkin/rubify_spec.rb
 - spec/gherkin/sexp_recorder.rb
 - spec/gherkin/shared/doc_string_group.rb
 - spec/gherkin/shared/encoding_group.rb