gherkin 2.2.4-java → 2.2.5-java

data/History.txt

@@ -1,3 +1,8 @@
+== 2.2.5 (2010-10-1)
+
+=== New Features
+* Gherkin will scan all top comments for the language comment. (Aslak Hellesøy)
+
 == 2.2.4 (2010-09-22)
 
 === Bugfixes

data/VERSION

@@ -1 +1 @@
-2.2.4
+2.2.5

data/build_native_gems.sh

@@ -2,7 +2,7 @@
 rm -Rf release
 mkdir release
 GEM_PLATFORM=java gem build gherkin.gemspec
-GEM_PLATFORM=i386-mswin32 gem build gherkin.gemspec
-GEM_PLATFORM=i386-mingw32 gem build gherkin.gemspec
+GEM_PLATFORM=x86-mswin32 gem build gherkin.gemspec
+GEM_PLATFORM=x86-mingw32 gem build gherkin.gemspec
 GEM_PLATFORM=universal-dotnet gem build gherkin.gemspec
 mv *.gem release

data/gherkin.gemspec

@@ -32,7 +32,6 @@ Gem::Specification.new do |s|
   
   if ENV['GEM_PLATFORM']
     puts "GEM_PLATFORM:#{ENV['GEM_PLATFORM']}"
-    puts "PLATFORM:#{PLATFORM}"
   end
   s.platform = ENV['GEM_PLATFORM'] if ENV['GEM_PLATFORM'] 
   case s.platform.to_s

data/lib/gherkin/json_parser.rb

@@ -11,7 +11,7 @@ module Gherkin
     end
 
     # Parse a gherkin object +o+, which can either be a JSON String,
-    # or a Hash (from a parser JSON String).
+    # or a Hash (from a parsed JSON String).
     def parse(o, feature_uri='unknown.json', line_offset=0)
       o = JSON.parse(o) if String === o
       @formatter.uri(feature_uri)

data/lib/gherkin/lexer/i18n_lexer.rb

@@ -10,6 +10,7 @@ module Gherkin
     class I18nLexer
       native_impl('gherkin')
 
+      COMMENT_OR_EMPTY_LINE_PATTERN = /^\s*#|^\s*$/
       LANGUAGE_PATTERN = /^\s*#\s*language\s*:\s*([a-zA-Z\-]+)/ #:nodoc:
       attr_reader :i18n_language
 
@@ -30,9 +31,15 @@ module Gherkin
       end
 
       def lang(source)
-        line_one = source.split(/\n/)[0]
-        match = LANGUAGE_PATTERN.match(line_one)
-        I18n.get(match ? match[1] : 'en')
+        key = 'en'
+        source.split(/\n/).each do |line|
+          break unless COMMENT_OR_EMPTY_LINE_PATTERN =~ line
+          if LANGUAGE_PATTERN =~ line
+            key = $1
+            break
+          end
+        end
+        I18n.get(key)
       end
 
     end

data/spec/gherkin/lexer/i18n_lexer_spec.rb

@@ -20,6 +20,16 @@ module Gherkin
         @lexer.i18n_language.iso_code.should == "da"
       end
 
+      it "should detect language when the language comment is not the first line" do
+        @lexer.scan("# hello\n# language: no\n")
+        @lexer.i18n_language.iso_code.should == "no"
+      end
+
+      it "should detect language when the language is on the third line, and there are empty lines above" do
+        @lexer.scan("# hello\n\n# language: no\n")
+        @lexer.i18n_language.iso_code.should == "no"
+      end
+
       it "should use English i18n by default" do
         @lexer.scan("Feature: foo\n")
         @lexer.i18n_language.iso_code.should == "en"

data/tasks/compile.rake

@@ -78,7 +78,7 @@ EOF
     Rake::ExtensionTask.new("gherkin_lexer_#{i18n.underscored_iso_code}") do |ext|
       if ENV['RUBY_CC_VERSION']
         ext.cross_compile = true
-        ext.cross_platform = 'i386-mingw32'
+        ext.cross_platform = 'x86-mingw32'
       end
     end
 

data/tasks/cucumber.rake

@@ -1,4 +1,3 @@
-begin
 require 'cucumber/rake/task'
 
 Cucumber::Rake::Task.new(:cucumber) do |t|
@@ -17,9 +16,3 @@ namespace :cucumber do
   end
   task :native_lexer => [:clean, :compile]
 end
-
-rescue LoadError
-  task :cucumber do
-    raise "Cucumber not installed"
-  end
-end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: gherkin
 version: !ruby/object:Gem::Version 
-  hash: 15
   prerelease: false
   segments: 
   - 2
   - 2
-  - 4
-  version: 2.2.4
+  - 5
+  version: 2.2.5
 platform: java
 authors: 
 - Mike Sassak
@@ -17,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-22 00:00:00 +02:00
+date: 2010-10-01 00:00:00 +02:00
 default_executable: gherkin
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,7 +27,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 83
         segments: 
         - 1
         - 16
@@ -44,7 +42,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
         segments: 
         - 1
         - 4
@@ -60,7 +57,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 29
         segments: 
         - 1
         - 0
@@ -76,7 +72,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 49
         segments: 
         - 0
         - 8
@@ -92,7 +87,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 21
         segments: 
         - 0
         - 2
@@ -108,7 +102,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 62196431
         segments: 
         - 2
         - 0
@@ -126,7 +119,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 59
         segments: 
         - 0
         - 9
@@ -291,7 +283,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -300,7 +291,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -310,7 +300,7 @@ rubyforge_project:
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: gherkin-2.2.4
+summary: gherkin-2.2.5
 test_files: 
 - features/escaped_pipes.feature
 - features/feature_parser.feature