gherkin 2.11.0-java → 2.11.1-java

data/History.md

@@ -1,3 +1,8 @@
+## [2.11.1](https://github.com/cucumber/gherkin/compare/v2.11.0...v2.11.1)
+
+* [JavaScript] Native implementation of JSONFormatter (Aslak Hellesøy)
+* [Core] Add more accurate polish translations. ([#181](https://github.com/cucumber/gherkin/pull/181) Adam Stankiewicz)
+
 ## [2.11.0](https://github.com/cucumber/gherkin/compare/v2.10.0...v2.11.0)
 
 * [Core] Alias Feature with Business Need and Ability. ([#167](https://github.com/cucumber/gherkin/issues/167) 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.0</version>
+        <version>2.11.1</version>
     </dependency>
 
 You can get it manually from [Maven Central](http://search.maven.org/#browse%7C-2073395818)
@@ -143,10 +143,19 @@ And you can try it out with node.js:
 
     node js/example/print.js spec/gherkin/fixtures/1.feature
 
+Or the json formatter:
+
+    node js/example/json_fomratter_example.js
+
 If you're hacking and just want to rebuild the English parser:
 
     rake js/lib/gherkin/lexer/en.js
 
+In order to test the native JavaScript implementation of JSONFormatter, you also need to define the `GHERKIN_JS_NATIVE` environment
+variable. It's recommended you don't do this permanently, as it will disable testing the Ruby implementation. Try this instead:
+
+    GHERKIN_JS_NATIVE=true GHERKIN_JS=true bundle exec rake
+
 TODO: Make all specs pass with js lexer - replace 'c(listener)' with 'js(listener)' in i18n.rb
 
 ### .NET dll
@@ -230,6 +239,10 @@ Make sure you have access to all the servers where packages are being uploaded:
   * Make sure you have a key [with no sub-key](https://docs.sonatype.org/display/Repository/How+To+Generate+PGP+Signatures+With+Maven)
 * nuget: See .NET section above
 
+Run tests once with GHERKIN_JS_NATIVE=true:
+
+    GHERKIN_JS_NATIVE=true GHERKIN_JS=true bundle exec rake
+
 Now we can release:
 
 * Make sure GHERKIN_JS is defined (see JavaScript section above)

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.0"
+  s.version     = "2.11.1"
   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/formatter/json_formatter.rb

@@ -84,7 +84,7 @@ module Gherkin
     private
 
       def add_hook(match, result, hook)
-        hooks = (feature_element[hook] ||= []);
+        hooks = feature_element[hook] ||= []
         hooks << {'match' => match.to_hash, 'result' => result.to_hash}
       end
 

data/lib/gherkin/i18n.yml

@@ -432,13 +432,13 @@
 "pl":
   name: Polish
   native: polski
-  feature: Właściwość
+  feature: Właściwość|Funkcja|Aspekt|Potrzeba biznesowa
   background: Założenia
   scenario: Scenariusz
   scenario_outline: Szablon scenariusza
   examples: Przykłady
   given: "*|Zakładając|Mając"
-  when: "*|Jeżeli|Jeśli"
+  when: "*|Jeżeli|Jeśli|Gdy|Kiedy"
   then: "*|Wtedy"
   and: "*|Oraz|I"
   but: "*|Ale"

data/lib/gherkin/js_lexer.rb

@@ -1,7 +1,7 @@
 require 'v8'
 
 module Gherkin
-  # Thin adapter for the Javascript lexer, primarily used for testing.
+  # Thin adapter for the JavaScript lexer, primarily used for testing.
   class JsLexer
     def self.[](i18n_underscored_iso_code)
       cxt = V8::Context.new
@@ -17,4 +17,4 @@ module Gherkin
       cxt['exports']['Lexer']
     end
   end
-end
+end

data/lib/gherkin/native.rb

@@ -1,7 +1,7 @@
-if defined?(RUBY_ENGINE) && RUBY_ENGINE == "ironruby"
-  require 'gherkin/native/ikvm'
-elsif defined?(JRUBY_VERSION)
+if defined?(JRUBY_VERSION)
   require 'gherkin/native/java'
+elsif ENV['GHERKIN_JS_NATIVE']
+  require 'gherkin/native/therubyracer'
 else
   require 'gherkin/native/null'
-end
+end

data/lib/gherkin/native/java.rb

@@ -17,10 +17,6 @@ class Class
     end
   end
 
-  def implements(java_class_name)
-    # no-op
-  end
-
   # Causes a Java class to be instantiated instead of the Ruby class when 
   # running on JRuby. This is used to test both pure Java and pure Ruby classes 
   # from the same Ruby based test suite. The Java Class must have a package name
@@ -29,6 +25,18 @@ class Class
     require "#{lib}.jar"
 
     class << self
+      def new(*args)
+        begin
+          java_class.new(*javaify(args))
+        rescue ArgumentError => e
+          e.message << "\n#{java_class.name}"
+          raise e
+        rescue NameError => e
+          e.message << "\n args: #{args.inspect}" 
+          raise e
+        end
+      end
+
       def javaify(arg)
         if Array === arg
           arg.map{|a| javaify(a)}
@@ -46,18 +54,6 @@ class Class
         end
       end
 
-      def new(*args)
-        begin
-          java_class.new(*javaify(args))
-        rescue ArgumentError => e
-          e.message << "\n#{java_class.name}"
-          raise e
-        rescue NameError => e
-          e.message << "\n args: #{args.inspect}" 
-          raise e
-        end
-      end
-
       def ===(object)
         super || object.java_kind_of?(java_class)
       end

data/lib/gherkin/native/null.rb

@@ -1,9 +1,5 @@
 class Class
-  def implements(java_class_name)
-    # no-op
-  end
-
   def native_impl(lib)
     # no-op
   end
-end
+end

data/lib/gherkin/native/therubyracer.rb

@@ -0,0 +1,39 @@
+require 'v8'
+
+class Class
+  def native_impl(lib)
+    class << self
+      def new(*args)
+        js = {
+          'Gherkin::Formatter::JSONFormatter' => 'js/lib/gherkin/formatter/json_formatter.js'
+        }[self.name]
+        if(js)
+          Proxy.new(js, *args)
+        else
+          super(*args)
+        end
+      end
+    end
+  end
+
+  class Proxy
+    def initialize(js, *args)
+      cxt = V8::Context.new
+      cxt['module'] = {}
+
+      # Mimic Node.js / Firebug console.log
+      cxt['console'] = STDOUT
+      def STDOUT.log(*a)
+        puts sprintf(*a)
+      end
+
+      cxt.load(js)
+      @js_obj = cxt['module']['exports'].new(*args)
+    end
+
+    def method_missing(name, *args)
+      a = args.map{|a| a.respond_to?(:to_hash) ? a.to_hash : a}
+      @js_obj.__send__(name, *a)
+    end
+  end
+end

data/spec/gherkin/c_lexer_spec.rb

@@ -1,5 +1,5 @@
 #encoding: utf-8
-unless defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && RUBY_ENGINE == "ironruby")
+unless defined?(JRUBY_VERSION)
 require 'spec_helper'
 require 'gherkin_lexer_en'
 

data/spec/gherkin/formatter/json_formatter_spec.rb

@@ -85,7 +85,6 @@ module Gherkin
             }
           ]
         }
-
         JSON.parse(expected).should == JSON.parse(io.string)
       end
     end

data/spec/gherkin/js_lexer_spec.rb

@@ -1,11 +1,11 @@
 #encoding: utf-8
-if !defined?(JRUBY_VERSION) && !(defined?(RUBY_ENGINE) && RUBY_ENGINE == "ironruby") && ENV['GHERKIN_JS']
+if !defined?(JRUBY_VERSION) && ENV['GHERKIN_JS']
 require 'spec_helper'
 require 'gherkin/js_lexer'
 
 module Gherkin
   module Lexer
-    describe "Javascript Lexer" do
+    describe "JavaScript Lexer" do
       before do
         @listener = Gherkin::SexpRecorder.new
         @lexer = Gherkin::JsLexer['en'].new(@listener)

data/tasks/ragel_task.rb

@@ -1,5 +1,6 @@
 require 'yaml'
 require 'erb'
+require 'rbconfig'
 
 class RagelTask
   begin
@@ -27,7 +28,8 @@ class RagelTask
       sh "ragel #{flags} #{lang_ragel} -o #{target}"
       if(@lang == 'js')
         # Ragel chokes if we put the escaped triple quotes in .rl, so we'll do the replace with sed after the fact. Lots of backslashes!!
-        sh %{sed -i '' 's/ESCAPED_TRIPLE_QUOTE/\\\\\\\\\\\\"\\\\\\\\\\\\"\\\\\\\\\\\\"/' #{target}}
+        sed = Config::CONFIG['host_os'] =~ /linux/i ? "sed -i" : "sed -i ''"
+        sh %{#{sed} 's/ESCAPED_TRIPLE_QUOTE/\\\\\\\\\\\\"\\\\\\\\\\\\"\\\\\\\\\\\\"/' #{target}}
         
         # Minify
         sh %{node #{UGLIFYJS} #{target} > #{target.gsub(/\.js$/, '.min.js')}}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gherkin
 version: !ruby/object:Gem::Version
-  version: 2.11.0
+  version: 2.11.1
   prerelease: 
 platform: java
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-08 00:00:00.000000000 Z
+date: 2012-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -252,9 +252,9 @@ files:
 - lib/gherkin/listener/event.rb
 - lib/gherkin/listener/formatter_listener.rb
 - lib/gherkin/native.rb
-- lib/gherkin/native/ikvm.rb
 - lib/gherkin/native/java.rb
 - lib/gherkin/native/null.rb
+- lib/gherkin/native/therubyracer.rb
 - lib/gherkin/parser/meta.txt
 - lib/gherkin/parser/parser.rb
 - lib/gherkin/parser/root.txt
@@ -360,7 +360,7 @@ rubyforge_project:
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: gherkin-2.11.0
+summary: gherkin-2.11.1
 test_files:
 - features/escaped_pipes.feature
 - features/feature_parser.feature

data/lib/gherkin/native/ikvm.rb

@@ -1,55 +0,0 @@
-class Class
-
-  def implements(java_class_name)
-    m = java_class_name.split('.').inject(Object) do |mod, name|
-      mod = mod.const_get(name)
-    end
-    include m
-  end
-
-  # Causes a .NET class to be instantiated instead of the Ruby class when 
-  # running on IronRuby. This is used to test both pure .NET and pure Ruby classes 
-  # from the same Ruby based test suite. The .NET Class must have a package name
-  # that corresponds with the Ruby class.
-  def native_impl(lib)
-    begin
-      load_assembly(lib)
-    rescue LoadError => e
-      e.message << "\nTry this: SET MONO_PATH=#{File.expand_path(File.dirname(__FILE__) + '/../..')} (or export MONO_PATH=...)"
-      raise e
-    end
-
-    class << self
-      def ikvmify(arg)
-        if Array === arg
-          arg.map{|a| ikvmify(a)}
-        else
-          case(arg)
-          when Regexp
-            Object.const_get('java').const_get('util').const_get('regex').const_get('Pattern').compile(arg.source)
-          else
-            arg
-          end
-        end
-      end
-
-      def new(*args)
-        ikvm_class.new(*ikvmify(args))
-      end
-
-      def ===(object)
-        super || object.java_kind_of?(java_class)
-      end
-
-      def ikvm_class
-        names = self.name.split('::')
-        namespace = Object
-        names[0..-2].each do |module_name|
-          namespace = namespace.const_get(module_name.downcase)
-        end
-
-        namespace.const_get(names[-1])
-      end
-    end
-  end
-end