gherkin 2.11.1-x86-mswin32 → 2.11.2-x86-mswin32

data/lib/gherkin/i18n.rb

@@ -1,4 +1,4 @@
-require 'yaml'
+require 'json'
 require 'gherkin/rubify'
 require 'gherkin/native'
 
@@ -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            = YAML.load_file(File.dirname(__FILE__) + '/i18n.yml')
+    LANGUAGES            = JSON.parse(IO.read(File.dirname(__FILE__) + '/i18n.json'))
 
     class << self
       include Rubify
@@ -105,7 +105,7 @@ module Gherkin
         end
       end
     rescue LoadError => e
-      raise LexerNotFound, "No lexer was found for #{iso_code} (#{e.message}). Supported languages are listed in gherkin/i18n.yml."
+      raise LexerNotFound, "No lexer was found for #{iso_code} (#{e.message}). Supported languages are listed in gherkin/i18n.json."
     end
 
     def c(listener)
@@ -114,13 +114,8 @@ module Gherkin
     end
 
     def rb(listener)
-      require 'gherkin/rb_lexer'
-      RbLexer[underscored_iso_code].new(listener)
-    end
-
-    def js(listener)
-      require 'gherkin/js_lexer'
-      JsLexer[underscored_iso_code].new(listener)
+      require "gherkin/lexer/#{underscored_iso_code}"
+      Lexer.const_get(underscored_iso_code.capitalize).new(listener)
     end
 
     def underscored_iso_code

data/lib/gherkin/native/therubyracer.rb

@@ -5,7 +5,8 @@ class Class
     class << self
       def new(*args)
         js = {
-          'Gherkin::Formatter::JSONFormatter' => 'js/lib/gherkin/formatter/json_formatter.js'
+          'Gherkin::Formatter::JSONFormatter' => 'js/lib/gherkin/formatter/json_formatter.js',
+          'Gherkin::Lexer::En' => 'js/lib/gherkin/lexer/en.js'
         }[self.name]
         if(js)
           Proxy.new(js, *args)
@@ -24,7 +25,7 @@ class Class
       # Mimic Node.js / Firebug console.log
       cxt['console'] = STDOUT
       def STDOUT.log(*a)
-        puts sprintf(*a)
+        puts sprintf(*a.map(&:to_s))
       end
 
       cxt.load(js)

data/lib/gherkin/parser/parser.rb

@@ -21,14 +21,18 @@ module Gherkin
         @raise_on_error = raise_on_error
         @machine_name = machine_name
         @machines = []
-        push_machine(@machine_name)
         @lexer = Gherkin::Lexer::I18nLexer.new(self, force_ruby)
       end
 
       def parse(gherkin, feature_uri, line_offset)
         @formatter.uri(feature_uri)
         @line_offset = line_offset
-        @lexer.scan(gherkin)
+        push_machine(@machine_name)
+        begin
+          @lexer.scan(gherkin)
+        ensure
+          pop_machine
+        end
       end
 
       def i18n_language
@@ -39,17 +43,14 @@ module Gherkin
         @lexer.errors
       end
 
-      # Doesn't yet fall back to super
-      def method_missing(method, *args)
-        # TODO: Catch exception and call super
-        event(method.to_s, args[-1])
-        @listener.__send__(method, *args)
-        if method == :eof
-          pop_machine
-          push_machine(@machine_name)
+      [:comment, :tag, :feature, :background, :scenario, :scenario_outline, :examples, :step, :doc_string, :row, :eof].each do |m|
+        define_method(m) do |*args|
+          if(event(m.to_s, args[-1]))
+            @listener.__send__(m, *args)
+          end
         end
       end
-
+      
       def event(ev, line)
         l = line ? @line_offset+line : nil
         machine.event(ev, l) do |state, legal_events|

data/ragel/lexer.java.rl.erb

@@ -1,4 +1,4 @@
-package gherkin.lexer.i18n;
+package gherkin.lexer;
 
 import java.io.UnsupportedEncodingException;
 import java.util.List;
@@ -8,7 +8,7 @@ import gherkin.lexer.Lexer;
 import gherkin.lexer.Listener;
 import gherkin.lexer.LexingError;
 
-public class <%= @i18n.underscored_iso_code.upcase %> implements Lexer {
+public class <%= @i18n.underscored_iso_code.capitalize %> implements Lexer {
   %%{
     machine lexer;
     alphtype byte;
@@ -151,7 +151,7 @@ public class <%= @i18n.underscored_iso_code.upcase %> implements Lexer {
 
   private final Listener listener;
 
-  public <%= @i18n.underscored_iso_code.upcase %>(Listener listener) {
+  public <%= @i18n.underscored_iso_code.capitalize %>(Listener listener) {
     this.listener = listener;
   }
 

data/ragel/lexer.js.rl.erb

@@ -135,10 +135,10 @@ var Lexer = function(listener) {
   for(e in events) {
     var event = events[e];
     if(typeof listener[event] != 'function') {
-      "Error. No " + event + " function exists on " + JSON.stringify(listener);
+      throw "Error. No " + event + " function exists on " + JSON.stringify(listener);
     }
   }
-  this.listener = listener;  
+  this.listener = listener;
 };
 
 Lexer.prototype.scan = function(data) {
@@ -208,8 +208,8 @@ Lexer.prototype.current_line_content = function(data, p) {
 };
 
 // Node.js export
-if(typeof exports !== 'undefined') {
-  exports.Lexer = Lexer;
+if(typeof module !== 'undefined') {
+  module.exports = Lexer;
 }
 // Require.js export
 if (typeof define !== 'undefined') {
@@ -224,4 +224,4 @@ if (typeof define !== 'undefined') {
   }
 }
 
-})();
+})();

data/ragel/lexer.rb.rl.erb

@@ -1,8 +1,10 @@
-require 'gherkin/lexer/i18n_lexer'
+require 'gherkin/native'
 
 module Gherkin
-  module RbLexer
+  module Lexer
     class <%= @i18n.underscored_iso_code.capitalize %> #:nodoc:
+      native_impl('gherkin')
+
       %%{
         machine lexer;
         

data/spec/gherkin/native_lexer_spec.rb

@@ -0,0 +1,29 @@
+#encoding: utf-8
+require 'spec_helper'
+
+module Gherkin
+  module Lexer
+    begin
+      require 'gherkin/lexer/en'
+    rescue LoadError
+      # For Java/JRuby we might not have the generated ruby lexer, which
+      # won't be used anyway. Just define a stub.
+      class En
+        native_impl('gherkin')
+      end 
+    end
+
+    describe "Native Lexer" do
+      before do
+        @listener = Gherkin::SexpRecorder.new
+        @lexer = Gherkin::Lexer::En.new(@listener)
+      end
+
+      it_should_behave_like "a Gherkin lexer"
+      it_should_behave_like "a Gherkin lexer lexing tags"
+      it_should_behave_like "a Gherkin lexer lexing doc_strings"
+      it_should_behave_like "a Gherkin lexer lexing rows"
+      it_should_behave_like "parsing windows files" unless ENV['GHERKIN_JS_NATIVE']
+    end
+  end
+end

data/tasks/compile.rake

@@ -6,13 +6,8 @@ CLEAN.include [
   'pkg', 'tmp',
   '**/*.{o,bundle,jar,so,obj,pdb,lib,def,exp,log,rbc}', 'ext',
   'java/target',
-  'ragel/i18n/*.rl',
-  'lib/gherkin/rb_lexer/*.rb',
   'lib/*.dll',
   'ext/**/*.c',
-  'java/src/main/java/gherkin/lexer/i18n/*.java',
-  'java/src/main/resources/gherkin/*.properties',
-  'js/lib/gherkin/lexer/*.js',
   'doc'
 ]
 
@@ -23,50 +18,18 @@ file 'lib/gherkin.jar' => Dir['java/src/main/java/**/*.java'] do
   sh("mvn -f java/pom.xml package")
 end
 
-desc "Build Javascript lexers"
+desc "Build JavaScript lexers"
 task :js
 
 rl_langs = ENV['RL_LANGS'] ? ENV['RL_LANGS'].split(',') : []
 langs = Gherkin::I18n.all.select { |lang| rl_langs.empty? || rl_langs.include?(lang.iso_code) }
 
-# http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6457127
-file 'lib/gherkin.jar' => "java/src/main/resources/gherkin/I18nKeywords_in.properties"
-file "java/src/main/resources/gherkin/I18nKeywords_in.properties" => "java/src/main/resources/gherkin/I18nKeywords_id.properties" do
-  cp "java/src/main/resources/gherkin/I18nKeywords_id.properties", "java/src/main/resources/gherkin/I18nKeywords_in.properties"
-end
-
-# http://forums.sun.com/thread.jspa?threadID=5335461
-file 'lib/gherkin.jar' => "java/src/main/resources/gherkin/I18nKeywords_iw.properties"
-file "java/src/main/resources/gherkin/I18nKeywords_iw.properties" => "java/src/main/resources/gherkin/I18nKeywords_he.properties" do
-  cp "java/src/main/resources/gherkin/I18nKeywords_he.properties", "java/src/main/resources/gherkin/I18nKeywords_iw.properties"
-end
-
-java_i18n_properties = "java/src/main/resources/gherkin/I18n.properties"
-file java_i18n_properties => 'lib/gherkin/i18n.yml' do
-  File.open(java_i18n_properties, 'wb') do |io|
-    io.puts("# Generated file. Do not edit.")
-    io.puts("i18n.isoCodes=#{langs.map{|i18n| i18n.iso_code}.join(',')}")
-  end
-end
-
 langs.each do |i18n|
   java = RagelTask.new('java', i18n)
   rb   = RagelTask.new('rb', i18n)
   js   = RagelTask.new('js', i18n)
 
-  lang_country = i18n.iso_code.split(/-/)
-  suffix = lang_country.length == 1 ? lang_country[0] : "#{lang_country[0]}_#{lang_country[1].upcase}"
-  java_properties = "java/src/main/resources/gherkin/I18nKeywords_#{suffix}.properties"
-  file java_properties => 'lib/gherkin/i18n.yml' do
-    File.open(java_properties, 'wb') do |io|
-      io.puts("# Generated file. Do not edit.")
-      (Gherkin::I18n::KEYWORD_KEYS + %w{name native}).each do |key|
-        value = Gherkin::I18n.unicode_escape(i18n.keywords(key).join("|"))
-        io.puts("#{key}:#{value}")
-      end
-    end
-  end
-  file 'lib/gherkin.jar' => [java.target, rb.target, java_properties, java_i18n_properties]
+  file 'lib/gherkin.jar' => [java.target]
 
   begin
   if !defined?(JRUBY_VERSION)

data/tasks/ragel_task.rb

@@ -23,6 +23,7 @@ class RagelTask
     deps = [lang_ragel, common_ragel]
     deps.unshift(UGLIFYJS) if(@lang == 'js')
 
+    min_target = target.gsub(/\.js$/, '.min.js')
     file target => deps do
       mkdir_p(File.dirname(target)) unless File.directory?(File.dirname(target))
       sh "ragel #{flags} #{lang_ragel} -o #{target}"
@@ -32,10 +33,17 @@ class RagelTask
         sh %{#{sed} 's/ESCAPED_TRIPLE_QUOTE/\\\\\\\\\\\\"\\\\\\\\\\\\"\\\\\\\\\\\\"/' #{target}}
         
         # Minify
-        sh %{node #{UGLIFYJS} #{target} > #{target.gsub(/\.js$/, '.min.js')}}
+        sh %{node #{UGLIFYJS} #{target} > #{min_target}}
       end
     end
 
+    if(@lang != 'java')
+      CLEAN.include(target)
+    end
+    if(@lang == 'js')
+      CLEAN.include(min_target)
+    end
+
     file UGLIFYJS do
       unless File.exist?(UGLIFYJS)
         Dir.chdir('js') do
@@ -47,17 +55,21 @@ class RagelTask
     file lang_ragel => lang_erb do
       write(ERB.new(IO.read(lang_erb)).result(binding), lang_ragel)
     end
+    
+    CLEAN.include(lang_ragel)
 
     file common_ragel => common_erb  do
       write(ERB.new(IO.read(common_erb)).result(binding), common_ragel)
     end
+    
+    CLEAN.include(common_ragel)
   end
 
   def target
     {
       'c'    => "ext/gherkin_lexer_#{@i18n.underscored_iso_code}/gherkin_lexer_#{@i18n.underscored_iso_code}.c",
-      'java' => "java/src/main/java/gherkin/lexer/i18n/#{@i18n.underscored_iso_code.upcase}.java",
-      'rb'   => "lib/gherkin/rb_lexer/#{@i18n.underscored_iso_code}.rb",
+      'java' => "java/src/main/java/gherkin/lexer/#{@i18n.underscored_iso_code.capitalize}.java",
+      'rb'   => "lib/gherkin/lexer/#{@i18n.underscored_iso_code}.rb",
       'js'   => "js/lib/gherkin/lexer/#{@i18n.underscored_iso_code}.js"
     }[@lang]
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gherkin
 version: !ruby/object:Gem::Version
-  version: 2.11.1
+  version: 2.11.2
   prerelease: 
 platform: x86-mswin32
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-23 00:00:00.000000000 Z
+date: 2012-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -68,7 +68,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.1.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -76,7 +76,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.1.5
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -84,7 +84,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: 2.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -92,7 +92,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: 2.11.0
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -100,7 +100,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.9.8
+        version: 0.9.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -108,7 +108,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.9.8
+        version: 0.9.9
 - !ruby/object:Gem::Dependency
   name: therubyracer
   requirement: !ruby/object:Gem::Requirement
@@ -116,7 +116,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.10.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -124,7 +124,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.10.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.0
+        version: 0.8.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -140,7 +140,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.8.2.1
 - !ruby/object:Gem::Dependency
   name: rdiscount
   requirement: !ruby/object:Gem::Requirement
@@ -164,7 +164,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.6
+        version: 1.0.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -172,7 +172,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.6
+        version: 1.0.7
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
@@ -230,6 +230,7 @@ files:
 - js/.npmignore
 - js/lib/gherkin/lexer/.npmignore
 - lib/gherkin.rb
+- lib/gherkin/README.md
 - lib/gherkin/c_lexer.rb
 - lib/gherkin/formatter/ansi_escapes.rb
 - lib/gherkin/formatter/argument.rb
@@ -244,9 +245,8 @@ files:
 - lib/gherkin/formatter/step_printer.rb
 - lib/gherkin/formatter/tag_count_formatter.rb
 - lib/gherkin/formatter/tag_filter.rb
+- lib/gherkin/i18n.json
 - lib/gherkin/i18n.rb
-- lib/gherkin/i18n.yml
-- lib/gherkin/js_lexer.rb
 - lib/gherkin/json_parser.rb
 - lib/gherkin/lexer/i18n_lexer.rb
 - lib/gherkin/listener/event.rb
@@ -259,8 +259,6 @@ files:
 - lib/gherkin/parser/parser.rb
 - lib/gherkin/parser/root.txt
 - lib/gherkin/parser/steps.txt
-- lib/gherkin/rb_lexer.rb
-- lib/gherkin/rb_lexer/README.rdoc
 - lib/gherkin/rubify.rb
 - lib/gherkin/tag_expression.rb
 - ragel/lexer.c.rl.erb
@@ -303,12 +301,11 @@ files:
 - spec/gherkin/formatter/tag_count_formatter_spec.rb
 - spec/gherkin/i18n_spec.rb
 - spec/gherkin/java_lexer_spec.rb
-- spec/gherkin/js_lexer_spec.rb
 - spec/gherkin/json_parser_spec.rb
 - spec/gherkin/lexer/i18n_lexer_spec.rb
+- spec/gherkin/native_lexer_spec.rb
 - spec/gherkin/output_stream_string_io.rb
 - spec/gherkin/parser/parser_spec.rb
-- spec/gherkin/rb_lexer_spec.rb
 - spec/gherkin/sexp_recorder.rb
 - spec/gherkin/shared/bom_group.rb
 - spec/gherkin/shared/doc_string_group.rb
@@ -451,7 +448,7 @@ rubyforge_project:
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: gherkin-2.11.1
+summary: gherkin-2.11.2
 test_files:
 - features/escaped_pipes.feature
 - features/feature_parser.feature
@@ -502,12 +499,11 @@ test_files:
 - spec/gherkin/formatter/tag_count_formatter_spec.rb
 - spec/gherkin/i18n_spec.rb
 - spec/gherkin/java_lexer_spec.rb
-- spec/gherkin/js_lexer_spec.rb
 - spec/gherkin/json_parser_spec.rb
 - spec/gherkin/lexer/i18n_lexer_spec.rb
+- spec/gherkin/native_lexer_spec.rb
 - spec/gherkin/output_stream_string_io.rb
 - spec/gherkin/parser/parser_spec.rb
-- spec/gherkin/rb_lexer_spec.rb
 - spec/gherkin/sexp_recorder.rb
 - spec/gherkin/shared/bom_group.rb
 - spec/gherkin/shared/doc_string_group.rb