gherkin 2.2.9-x86-mswin32 → 2.3.0-x86-mswin32

data/Gemfile

@@ -1,5 +1,7 @@
 source "http://rubygems.org"
 gemspec
 
-@dependencies.reject!{|dep| dep.name == 'cucumber'}
-gem 'cucumber', :path => '../cucumber'
+unless ENV['TM_RUBY']
+  @dependencies.reject!{|dep| dep.name == 'cucumber'}
+  gem 'cucumber', :path => '../cucumber'
+end

data/History.txt

@@ -1,3 +1,12 @@
+== 2.3.0 (2010-11-12)
+
+=== New Features
+* New aliases for Scenario Outline in Swedish, Norwegian and English. (Peter Krantz, Aslak Hellesøy)
+* Improved build documentation for people who want to contribute. (Aslak Hellesøy)
+* Results can now be outputted/parsed in JSON. (Aslak Hellesøy)
+* JSON output now contains optional "match", "result" and "embeddings" elements underneath each step. (Aslak Hellesøy)
+* Added support for Base64 encoded embeddings in JSON representation. Useful for screenshots etc. (Aslak Hellesøy)
+
 == 2.2.9 (2010-10-15)
 
 === New Features

data/README.rdoc

@@ -5,26 +5,115 @@ Fast Gherkin lexer and parser based on Ragel. Gherkin is two things:
 * The language that has evolved out of the Cucumber project.
 * This library
 
-== Generating and building the code
+Supported platforms:
 
-You'll need MRI (any version) if you want to build for MRI. To build the Java implementation you'll need JRuby.
-You'll also need Ragel installed and on your PATH.
+* Ruby 1.8.6-1.9.2 (MRI, JRuby, REE, Rubinius)
+* Pure Java
+* .NET
+* IronRuby (experimental)
+* Javascript (coming soon)
 
-=== MRI
+== Installing the toolchain
 
-  rake clean compile
+Due to the cross-platform nature of this library, you have to install a lot of tools to build gherkin yourself.
+In order to make it easier for occasional contributors to get the development environment up and running, you don't
+have to install everything up front. The build scripts should tell you if you are missing something. For example,
+you shouldn't have to install MinGW to build windows binaries if you are a Linux user and just want to fix a bug in
+the C code.
 
-=== Java
+=== Common dependencies
 
-  rake clean jar
+These are the minimal tools you need to install, even if you are building non-Ruby packages.
+
+* Ragel (brew install ragel or apt-get install ragel)
+* Ruby (any version should do).
+* A clone of the cucumber git repo to a "cucumber" sibling folder of your gherkin folder. (Only needed to run cucumber tests)
+* RVM (you may not need this if you are only building for a single platform)
+
+With this minimal toolchain installed, install Ruby gems needed by the build:
+
+  gem install bundler
+  bundle install
 
-== Running RSpec and Cucumber tests
+Running RSpec and Cucumber tests
 
-rake clean spec cucumber
+  rake clean spec cucumber
 
 If the RL_LANG environment variable is set, only the parsers for the languages specified there will be built.
 E.g. in Bash, export RL_LANG="en,fr,no". This can be quite helpful when modifying the Ragel grammar.
 
+See subsections for building for a specific platform.
+
+=== MRI, REE or Rubinius
+
+You'll need GCC installed.
+
+Build the gem with:
+
+  rake build
+
+=== Pure Java and JRuby
+
+You must install JRuby to build the pure Java jar or the JRuby gem:
+
+  rvm install jruby
+  rvm use jruby
+  rvm gemset create cucumber
+  rvm use @cucumber
+  gem install bundler
+  bundle install
+
+Now you can build the jar with:
+
+  rake clean jar
+
+=== .NET and IronRuby
+
+You must install Mono and IKVM to build the pure .NET dll and the IronRuby gem:
+
+* Install Mono from http://www.mono-project.com/ and make sure it's on your $PATH
+* Download IKVM from http://www.ikvm.net/ and extract it to /usr/local/ikvm so that you have a /usr/local/ikvm/bin/ikvmc.exe
+
+Now you can build the .NET dll with:
+
+  rake ikvm
+
+=== MinGW Rubies (for Windows gems)
+
+You must install MinGW rubies to build gems fow Windows.
+First you need to download and install MinGW:
+
+OS X users can get it from http://crossgcc.rts-software.org/doku.php
+Once you have installed it, add this to your .bashrc:
+
+  export PATH=$PATH:/usr/local/i386-mingw32-4.3.0/bin
+
+Now, let's install some rubies.
+Make sure you have openssl installed first.
+
+  brew install openssl
+
+  # 1.8.6
+  # Don't worry about inconsistent patchlevels here. It works.
+  rvm install 1.8.6-p399
+  rvm use 1.8.6-p399
+  rvm gemset create cucumber
+  rvm use @cucumber
+  gem install bundler
+  bundle install
+  rake-compiler cross-ruby VERSION=1.8.6-p287
+
+  # 1.9.1
+  # Later 1.9.1 patch levels or 1.9.2 don't compile on mingw.
+  # The compiled binaries should still work on 1.9.2
+  rvm install 1.9.1-p243
+  rvm use 1.9.1-p243
+  rvm gemset create cucumber
+  rvm use @cucumber
+  gem install bundler
+  bundle install
+  rake-compiler cross-ruby VERSION=1.9.1-p243
+
 == Release process
 
 * Bump version in the VERSION file and:

data/Rakefile

@@ -3,6 +3,7 @@ require 'rubygems'
 require 'bundler'
 Bundler.setup
 Bundler::GemHelper.install_tasks
+ENV['RUBYOPT'] = nil # Necessary to prevent Bundler from *&^%$#ing up rake-compiler.
 
 require 'rake/clean'
 

data/VERSION

@@ -1 +1 @@
-2.2.9
+2.3.0

data/features/support/env.rb

@@ -10,7 +10,6 @@ require 'gherkin'
 require 'gherkin/sexp_recorder'
 require 'gherkin/output_stream_string_io'
 require 'gherkin/java_libs'
-require 'gherkin/json'
 
 module TransformHelpers
   def tr_line_number(step_arg)

data/gherkin.gemspec

@@ -53,6 +53,6 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency('rake', '~> 0.8.7')
   s.add_development_dependency('awesome_print', '~> 0.2.1')
-  s.add_development_dependency('rspec', '~> 2.0.0.beta.22')
-  s.add_development_dependency('cucumber', '~> 0.9.1')
+  s.add_development_dependency('rspec', '~> 2.0.1')
+  s.add_development_dependency('cucumber', '~> 0.9.4')
 end

data/lib/gherkin/formatter/argument.rb

@@ -1,8 +1,9 @@
 require 'gherkin/native'
+require 'gherkin/formatter/hashable'
 
 module Gherkin
   module Formatter
-    class Argument
+    class Argument < Hashable
       native_impl('gherkin')
       attr_reader :offset, :val
 

data/lib/gherkin/formatter/colors.rb

@@ -10,19 +10,21 @@ module Gherkin
     #
     # The colours that you can change are:
     #
-    # * <tt>undefined</tt>     - defaults to <tt>yellow</tt>
-    # * <tt>pending</tt>       - defaults to <tt>yellow</tt>
-    # * <tt>pending_param</tt> - defaults to <tt>yellow,bold</tt>
-    # * <tt>failed</tt>        - defaults to <tt>red</tt>
-    # * <tt>failed_param</tt>  - defaults to <tt>red,bold</tt>
-    # * <tt>passed</tt>        - defaults to <tt>green</tt>
-    # * <tt>passed_param</tt>  - defaults to <tt>green,bold</tt>
-    # * <tt>outline</tt>       - defaults to <tt>cyan</tt>
-    # * <tt>outline_param</tt> - defaults to <tt>cyan,bold</tt>
-    # * <tt>skipped</tt>       - defaults to <tt>cyan</tt>
-    # * <tt>skipped_param</tt> - defaults to <tt>cyan,bold</tt>
-    # * <tt>comment</tt>       - defaults to <tt>grey</tt>
-    # * <tt>tag</tt>           - defaults to <tt>cyan</tt>
+    # * <tt>undefined</tt>       - defaults to <tt>yellow</tt>
+    # * <tt>pending</tt>         - defaults to <tt>yellow</tt>
+    # * <tt>pending_param</tt>   - defaults to <tt>yellow,bold</tt>
+    # * <tt>executing</tt>       - defaults to <tt>magenta</tt>
+    # * <tt>executing_param</tt> - defaults to <tt>magenta,bold</tt>
+    # * <tt>failed</tt>          - defaults to <tt>red</tt>
+    # * <tt>failed_param</tt>    - defaults to <tt>red,bold</tt>
+    # * <tt>passed</tt>          - defaults to <tt>green</tt>
+    # * <tt>passed_param</tt>    - defaults to <tt>green,bold</tt>
+    # * <tt>outline</tt>         - defaults to <tt>cyan</tt>
+    # * <tt>outline_param</tt>   - defaults to <tt>cyan,bold</tt>
+    # * <tt>skipped</tt>         - defaults to <tt>cyan</tt>
+    # * <tt>skipped_param</tt>   - defaults to <tt>cyan,bold</tt>
+    # * <tt>comment</tt>         - defaults to <tt>grey</tt>
+    # * <tt>tag</tt>             - defaults to <tt>cyan</tt>
     #
     # For instance, if your shell has a black background and a green font (like the
     # "Homebrew" settings for OS X' Terminal.app), you may want to override passed
@@ -47,6 +49,7 @@ module Gherkin
       end.merge({
         'undefined' => 'yellow',
         'pending'   => 'yellow',
+        'executing' => 'magenta',
         'failed'    => 'red',
         'passed'    => 'green',
         'outline'   => 'cyan',

data/lib/gherkin/formatter/hashable.rb

@@ -0,0 +1,19 @@
+module Gherkin
+  module Formatter
+    class Hashable
+      def to_hash
+        instance_variables.inject({}) do |hash, ivar|
+          value = instance_variable_get(ivar)
+          value = value.to_hash if value.respond_to?(:to_hash)
+          if Array === value
+            value = value.map do |e|
+              e.respond_to?(:to_hash) ? e.to_hash : e
+            end
+          end
+          hash[ivar[1..-1]] = value unless [[], nil].index(value)
+          hash
+        end
+      end
+    end
+  end
+end

data/lib/gherkin/formatter/json_formatter.rb

@@ -1,12 +1,14 @@
 require 'json'
 require 'gherkin/formatter/model'
 require 'gherkin/native'
+require 'base64'
 
 module Gherkin
   module Formatter
     class JSONFormatter
       native_impl('gherkin')
       
+      include Base64
       attr_reader :gherkin_object
       
       # Creates a new instance that writes the resulting JSON to +io+.
@@ -45,6 +47,18 @@ module Gherkin
         steps << step.to_hash
       end
 
+      def match(match)
+        last_step['match'] = match.to_hash
+      end
+
+      def result(result)
+        last_step['result'] = result.to_hash
+      end
+
+      def embedding(mime_type, data)
+        embeddings << {'mime_type' => mime_type, 'data' => encode64s(data)}
+      end
+
       def eof
         @io.write(@gherkin_object.to_json) if @io
       end
@@ -66,6 +80,19 @@ module Gherkin
       def steps
         feature_element['steps'] ||= []
       end
+
+      def last_step
+        steps[-1]
+      end
+
+      def embeddings
+        last_step['embeddings'] ||= []
+      end
+
+      def encode64s(data)
+        # Strip newlines
+        encode64(data).gsub(/\n/, '')
+      end
     end
   end
 end

data/lib/gherkin/formatter/model.rb

@@ -1,24 +1,9 @@
 require 'gherkin/native'
+require 'gherkin/formatter/hashable'
 
 module Gherkin
   module Formatter
     module Model
-      class Hashable
-        def to_hash
-          instance_variables.inject({}) do |hash, ivar|
-            value = instance_variable_get(ivar)
-            value = value.to_hash if value.respond_to?(:to_hash)
-            if Array === value
-              value = value.map do |e|
-                e.respond_to?(:to_hash) ? e.to_hash : e
-              end
-            end
-            hash[ivar[1..-1]] = value unless [[], nil].index(value)
-            hash
-          end
-        end
-      end
-      
       class BasicStatement < Hashable
         attr_reader :comments, :keyword, :name, :line
         
@@ -127,13 +112,7 @@ module Gherkin
       class Step < BasicStatement
         native_impl('gherkin')
 
-        attr_accessor :multiline_arg, :result
-
-        def initialize(comments, keyword, name, line, multiline_arg=nil, result=nil)
-          super(comments, keyword, name, line)
-          @multiline_arg = multiline_arg
-          @result = result
-        end
+        attr_accessor :multiline_arg
 
         def line_range
           range = super
@@ -225,13 +204,31 @@ module Gherkin
         end
       end
 
-      class Result
+      class Match < Hashable
         native_impl('gherkin')
 
-        attr_reader :status, :error_message, :arguments, :stepdef_location
+        attr_reader :arguments, :location
         
-        def initialize(status, error_message, arguments, stepdef_location)
-          @status, @error_message, @arguments, @stepdef_location = status, error_message, arguments, stepdef_location
+        def initialize(arguments, location)
+          @arguments, @location = arguments, location
+        end
+
+        def replay(formatter)
+          formatter.match(self)
+        end
+      end
+
+      class Result < Hashable
+        native_impl('gherkin')
+
+        attr_reader :status, :error_message
+        
+        def initialize(status, error_message)
+          @status, @error_message = status, error_message
+        end
+
+        def replay(formatter)
+          formatter.result(self)
         end
       end
     end

data/lib/gherkin/formatter/pretty_formatter.rb

@@ -60,23 +60,32 @@ module Gherkin
       end
 
       def step(step)
-        print_step(step)
-        case step.multiline_arg
-        when Model::PyString
-          py_string(step.multiline_arg)
-        when Array
-          table(step.multiline_arg)
-        end
+        @step = step
+        match(Model::Match.new([], nil)) if @monochrome
       end
 
-      def print_step(step)
-        print_comments(step.comments, '    ')
-        @io.write('    ')
-        text_format(step).write_text(@io, step.keyword)
-        @step_printer.write_step(@io, text_format(step), arg_format(step), step.name, step.arguments)
-        print_indented_stepdef_location!(step.result.stepdef_location) if step.result
+      def match(match)
+        print_step(format('executing'), format('executing_param'), match.arguments, match.location)
+      end
+
+      def result(result)
         # TODO: Print error message
+      end
+
+      def print_step(text_format, arg_format, arguments, location)
+        print_comments(@step.comments, '    ')
+        @io.write('    ')
+        text_format.write_text(@io, @step.keyword)
+        @step_printer.write_step(@io, text_format, arg_format, @step.name, arguments)
+        print_indented_stepdef_location!(location) if location
+
         @io.puts
+        case @step.multiline_arg
+        when Model::PyString
+          py_string(@step.multiline_arg)
+        when Array
+          table(@step.multiline_arg)
+        end
       end
 
       class MonochromeFormat

data/lib/gherkin/i18n.yml

@@ -17,7 +17,7 @@
   feature: Feature
   background: Background
   scenario: Scenario
-  scenario_outline: Scenario Outline
+  scenario_outline: Scenario Outline|Scenario Template
   examples: Examples|Scenarios
   given: "*|Given"
   when: "*|When"
@@ -397,7 +397,7 @@
   feature: Egenskap
   background: Bakgrunn
   scenario: Scenario
-  scenario_outline: Abstrakt Scenario
+  scenario_outline: Scenariomal|Abstrakt Scenario
   examples: Eksempler
   given: "*|Gitt"
   when: "*|Når"
@@ -475,7 +475,7 @@
   feature: Egenskap
   background: Bakgrund
   scenario: Scenario
-  scenario_outline: Abstrakt Scenario
+  scenario_outline: Abstrakt Scenario|Scenariomall
   examples: Exempel
   given: "*|Givet"
   when: "*|När"

data/lib/gherkin/json_parser.rb

@@ -1,11 +1,15 @@
 require 'json'
 require 'gherkin/formatter/model'
+require 'gherkin/formatter/argument'
 require 'gherkin/native'
+require 'base64'
 
 module Gherkin
   class JSONParser
     native_impl('gherkin')
 
+    include Base64
+
     def initialize(formatter)
       @formatter = formatter
     end
@@ -21,6 +25,9 @@ module Gherkin
         feature_element(feature_element).replay(@formatter)
         (feature_element["steps"] || []).each do |step|
           step(step).replay(@formatter)
+          match(step)
+          result(step)
+          embeddings(step)
         end
         (feature_element["examples"] || []).each do |eo|
           Formatter::Model::Examples.new(comments(eo), tags(eo), keyword(eo), name(eo), description(eo), line(eo), rows(eo['rows'])).replay(@formatter)
@@ -30,6 +37,8 @@ module Gherkin
       @formatter.eof
     end
 
+  private
+
     def feature_element(o)
       case o['type']
       when 'background'
@@ -42,15 +51,35 @@ module Gherkin
     end
 
     def step(o)
-      multiline_arg = nil
+      step = Formatter::Model::Step.new(comments(o), keyword(o), name(o), line(o))
+
       if(ma = o['multiline_arg'])
         if(ma['type'] == 'table')
-          multiline_arg = rows(ma['value'])
+          step.multiline_arg = rows(ma['value'])
         else
-          multiline_arg = Formatter::Model::PyString.new(ma['value'], ma['line'])
+          step.multiline_arg = Formatter::Model::PyString.new(ma['value'], ma['line'])
         end
       end
-      Formatter::Model::Step.new(comments(o), keyword(o), name(o), line(o), multiline_arg)
+
+      step
+    end
+
+    def match(o)
+      if(m = o['match'])
+        Formatter::Model::Match.new(arguments(m), location(m)).replay(@formatter)
+      end
+    end
+
+    def result(o)
+      if(r = o['result'])
+        Formatter::Model::Result.new(status(r), error_message(r)).replay(@formatter)
+      end
+    end
+
+    def embeddings(o)
+      (o['embeddings'] || []).each do |embedding|
+        @formatter.embedding(embedding['mime_type'], decode64(embedding['data']))
+      end
     end
 
     def rows(o)
@@ -84,5 +113,21 @@ module Gherkin
     def line(o)
       o['line']
     end
+
+    def arguments(m)
+      m['arguments'].map{|a| Formatter::Argument.new(a['offset'], a['val'])}
+    end
+
+    def location(m)
+      m['location']
+    end
+
+    def status(r)
+      r['status']
+    end
+
+    def error_message(r)
+      r['error_message']
+    end
   end
 end

data/spec/gherkin/formatter/pretty_formatter_spec.rb

@@ -1,9 +1,9 @@
 # encoding: utf-8
-require 'spec_helper'
 require 'gherkin/formatter/pretty_formatter'
 require 'gherkin/formatter/argument'
 require 'gherkin/formatter/model'
 require 'gherkin/listener/formatter_listener'
+require 'gherkin/parser/parser'
 require 'stringio'
 
 module Gherkin
@@ -28,10 +28,6 @@ module Gherkin
         end
       end
 
-      def result(status, error_message, arguments, stepdef_location)
-        Model::Result.new(status, error_message, arguments, stepdef_location)
-      end
-
       before do
         @io = StringIO.new
         @colf = Gherkin::Formatter::PrettyFormatter.new(@io, false)
@@ -40,47 +36,71 @@ module Gherkin
       it "should print comments when scenario is longer" do
         @colf.uri("features/foo.feature")
         @colf.feature(Model::Feature.new([], [], "Feature", "Hello", "World", 1))
-        step1 = Model::Step.new([], "Given ", "some stuff", 5, nil, result('passed', nil, [], "features/step_definitions/bar.rb:56"))
-        step2 = Model::Step.new([], "When ", "foo", 6, nil, result('passed', nil, [], "features/step_definitions/bar.rb:96"))
+
+        step1 = Model::Step.new([], "Given ", "some stuff", 5)
+        match1 = Model::Match.new([], "features/step_definitions/bar.rb:56")
+        result1 = Model::Result.new('passed', nil)
+
+        step2 = Model::Step.new([], "When ", "foo", 6)
+        match2 = Model::Match.new([], "features/step_definitions/bar.rb:96")
+        result2 = Model::Result.new('passed', nil)
+
         @colf.steps([step1, step2])
         @colf.scenario(Model::Scenario.new([], [], "Scenario", "The scenario", "", 4))
+
         @colf.step(step1)
+        @colf.match(match1)
+        @colf.result(result1)
+
         @colf.step(step2)
+        @colf.match(match2)
+        @colf.result(result2)
 
         assert_io(%{Feature: Hello
   World
 
   Scenario: The scenario #{grey('# features/foo.feature:4')}
-    #{green('Given ')}#{green('some stuff')}     #{grey('# features/step_definitions/bar.rb:56')}
-    #{green('When ')}#{green('foo')}             #{grey('# features/step_definitions/bar.rb:96')}
+    #{magenta('Given ')}#{magenta('some stuff')}     #{grey('# features/step_definitions/bar.rb:56')}
+    #{magenta('When ')}#{magenta('foo')}             #{grey('# features/step_definitions/bar.rb:96')}
 })
       end
 
       it "should print comments when step is longer" do
         @colf.uri("features/foo.feature")
         @colf.feature(Model::Feature.new([], [], "Feature", "Hello", "World", 1))
-        step = Model::Step.new([], "Given ", "some stuff that is longer", 5, nil, result('passed', nil, [], "features/step_definitions/bar.rb:56"))
+        step = Model::Step.new([], "Given ", "some stuff that is longer", 5)
+        match = Model::Match.new([], "features/step_definitions/bar.rb:56")
+        result = Model::Result.new('passed', nil)
+
         @colf.steps([step])
         @colf.scenario(Model::Scenario.new([], [], "Scenario", "The scenario", "", 4))
         @colf.step(step)
+        @colf.match(match)
+        @colf.result(result)
 
         assert_io(%{Feature: Hello
   World
 
   Scenario: The scenario            #{grey('# features/foo.feature:4')}
-    #{green('Given ')}#{green('some stuff that is longer')} #{grey('# features/step_definitions/bar.rb:56')}
+    #{magenta('Given ')}#{magenta('some stuff that is longer')} #{grey('# features/step_definitions/bar.rb:56')}
 })
       end
 
       it "should highlight arguments for regular steps" do
-        step = Model::Step.new([], "Given ", "I have 999 cukes in my belly", 3, nil, result('passed', nil, [Gherkin::Formatter::Argument.new(7, '999')], nil))
+        step = Model::Step.new([], "Given ", "I have 999 cukes in my belly", 3)
+        match = Model::Match.new([Gherkin::Formatter::Argument.new(7, '999')], nil)
+        result = Model::Result.new('passed', nil)
+
         @colf.steps([step])
         @colf.step(step)
+        @colf.match(match)
+        @colf.result(result)
+
         if defined?(JRUBY_VERSION)
           # Not terribly readable. The result on Java is different because JANSI uses semicolons when there are several codes.
-          assert_io("    \e[32mGiven \e[0m\e[32mI have \e[0m\e[32;1m999\e[0m\e[32m cukes in my belly\e[0m\n")
+          assert_io("    \e[35mGiven \e[0m\e[35mI have \e[0m\e[35;1m999\e[0m\e[35m cukes in my belly\e[0m\n")
         else
-          assert_io("    #{green('Given ')}#{green('I have ')}#{green(bold('999'))}#{green(' cukes in my belly')}\n")
+          assert_io("    #{magenta('Given ')}#{magenta('I have ')}#{magenta(bold('999'))}#{magenta(' cukes in my belly')}\n")
         end
       end
 

data/spec/gherkin/java_libs.rb

@@ -1,4 +1,9 @@
-if defined?(JRUBY_VERSION)
+JAVA_LIBS = {}
+
+unless RUBY_VERSION == '1.8.6'
+  # When we're building native windows gems with 1.8.6 this block of code fails.
+  # We'll just disable running it - it's not needed at that stage of the build.
+  
   require 'rexml/document'
   pom = REXML::Document.new(IO.read(File.dirname(__FILE__) + '/../../java/pom.xml'))
   pom_version = REXML::XPath.first(pom, '//xmlns:project/xmlns:version/text()').to_s
@@ -6,8 +11,10 @@ if defined?(JRUBY_VERSION)
     groupId = dep.get_elements('groupId')[0].text()
     artifactId = dep.get_elements('artifactId')[0].text()
     version = dep.get_elements('version')[0].text()
+    scope = dep.get_elements('scope')[0].text() rescue nil
 
     jar = "~/.m2/repository/#{groupId.gsub(/\./, '/')}/#{artifactId}/#{version}/#{artifactId}-#{version}.jar"
-    require jar
+    JAVA_LIBS["#{groupId}-#{artifactId}"] = jar if scope != 'test'
+    require jar if defined?(JRUBY_VERSION)
   end
 end

data/spec/gherkin/json_parser_spec.rb

@@ -14,7 +14,6 @@ module Gherkin
       p.parse(json, 'unknown.json', 0)
       expected = JSON.parse(json)
       actual   = JSON.parse(io.string)
-
       actual.should == expected
     end
 
@@ -60,6 +59,52 @@ module Gherkin
       }})
     end
 
+    it "should parse feature with match, result and embedding" do
+      check_json(%{{
+        "tags": [
+          {
+            "name": "@foo",
+            "line": 22
+          }
+        ],
+        "keyword": "Feature", 
+        "name": "One", 
+        "description": "", 
+        "line": 3,
+        "elements": [
+          {
+            "type": "scenario",
+            "steps": [
+              {
+                "keyword": "Given ",
+                "name": "a passing step",
+                "line": 6,
+                "match": {
+                  "arguments": [
+                    {
+                      "offset": 22,
+                      "val": "cukes"
+                    }
+                  ],
+                  "location": "features/step_definitions/steps.rb:1"
+                },
+                "result": {
+                  "status": "failed",
+                  "error_message": "You suck"
+                },
+                "embeddings": [
+                  {
+                    "mime_type": "text/plain",
+                    "data": "Tm8sIEknbSBub3QgaW50ZXJlc3RlZCBpbiBkZXZlbG9waW5nIGEgcG93ZXJmdWwgYnJhaW4uIEFsbCBJJ20gYWZ0ZXIgaXMganVzdCBhIG1lZGlvY3JlIGJyYWluLCBzb21ldGhpbmcgbGlrZSB0aGUgUHJlc2lkZW50IG9mIHRoZSBBbWVyaWNhbiBUZWxlcGhvbmUgYW5kIFRlbGVncmFwaCBDb21wYW55Lg=="
+                  }
+                ]
+              }
+            ]
+          }
+        ]
+      }})
+    end
+
     it "shoud parse a complex feature" do
       check_json(fixture("complex.json"))
     end

data/spec/spec_helper.rb

@@ -2,12 +2,12 @@ require 'rubygems'
 require 'bundler'
 Bundler.setup
 
+require 'rspec'
 require 'gherkin'
 require 'stringio'
 require 'gherkin/sexp_recorder'
 require 'gherkin/output_stream_string_io'
 require 'gherkin/java_libs'
-require 'gherkin/json'
 require 'gherkin/shared/lexer_group'
 require 'gherkin/shared/tags_group'
 require 'gherkin/shared/py_string_group'

data/tasks/gems.rake

@@ -1,19 +1,12 @@
 namespace :gems do
   task :win do
     unless File.directory?(File.expand_path('~/.rake-compiler'))
-      STDERR.puts <<-EOM
-
-You must install Windows rubies to ~/.rake-compiler with:
-
-  rake-compiler cross-ruby VERSION=1.8.6-p287
-  # (Later 1.9.1 patch levels don't compile on mingw) 
-  rake-compiler cross-ruby VERSION=1.9.1-p243
-EOM
+      STDERR.puts "[ERROR] You must install MinGW rubies to build gherkin gems for Windows. See README.rdoc"
       exit(1)
     end
     # rvm and mingw ruby versions have to match to avoid errors
-    sh "rvm 1.8.6@cucumber rake cross compile RUBY_CC_VERSION=1.8.6"
-    sh "rvm 1.9.1@cucumber rake cross compile RUBY_CC_VERSION=1.9.1"
+    sh "rvm 1.8.6-p399@cucumber rake cross compile RUBY_CC_VERSION=1.8.6"
+    sh "rvm 1.9.1-p243@cucumber rake cross compile RUBY_CC_VERSION=1.9.1"
     # This will copy the .so files to the proper place
     sh "rake cross compile RUBY_CC_VERSION=1.8.6:1.9.1"
   end

data/tasks/ikvm.rake

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec/gherkin/json'
+require File.dirname(__FILE__) + '/../spec/gherkin/java_libs'
 # To test out the pure Java main program on .NET, execute:
 #
 #   rake ikvm
@@ -20,20 +20,45 @@ require File.dirname(__FILE__) + '/../spec/gherkin/json'
 #   [mono] mono ikvm/Gherkin/bin/Debug/Gherkin.exe features/steps_parser.feature
 #
 namespace :ikvm do
+  def mono(args)
+    if(`which mono`.strip =~ /mono/)
+      sh("mono #{args}")
+    else
+      raise "[ERROR] You must install Mono and IKVM build gherkin for .NET. See README.rdoc"
+    end
+  end
+
+  def ikvmc(args)
+    begin
+      mono("/usr/local/ikvm/bin/ikvmc.exe #{args}")
+    rescue => e
+      if e.message =~ /Cannot open assembly/
+        e.message << "\n\n[ERROR] You must install Mono and IKVM build gherkin for .NET. See README.rdoc"
+      end
+      raise e
+    end
+  end
+
+  def references
+    JAVA_LIBS.keys.map{|name| "-reference:release/#{name}.dll"}.join(' ')
+  end
+
   task :dependent_dlls do
     mkdir_p 'release' unless File.directory?('release')
-    sh("mono /usr/local/ikvm/bin/ikvmc.exe -target:library #{JSON_SIMPLE_JAR} -out:release/json-simple.dll")
+    JAVA_LIBS.each do |name, jar|
+      ikvmc("-target:library #{jar} -out:release/#{name}.dll")
+    end
   end
 
   desc 'Make a .NET .exe'
   task :exe => ['lib/gherkin.jar', :dependent_dlls] do
-    sh("mono /usr/local/ikvm/bin/ikvmc.exe -target:exe lib/gherkin.jar -out:release/gherkin-#{Gherkin::VERSION}.exe -reference:release/json-simple.dll")
+    ikvmc("-target:exe lib/gherkin.jar -out:release/gherkin-#{Gherkin::VERSION}.exe #{references}")
   end
 
   desc 'Make a .NET .dll'
   task :dll => ['lib/gherkin.jar', :dependent_dlls] do
     mkdir_p 'release' unless File.directory?('release')
-    sh("mono /usr/local/ikvm/bin/ikvmc.exe -target:library lib/gherkin.jar -out:release/gherkin-#{Gherkin::VERSION}.dll -reference:release/json-simple.dll")
+    ikvmc("-target:library lib/gherkin.jar -out:release/gherkin-#{Gherkin::VERSION}.dll  #{references}")
     cp "release/gherkin-#{Gherkin::VERSION}.dll", 'lib/gherkin.dll'
   end
 
@@ -48,7 +73,7 @@ end
 
 task :ikvm => ['ikvm:copy_ikvm_dlls', 'ikvm:exe', 'ikvm:dll'] do
   puts "************** Pretty printing some features with .NET. **************"
-  sh "mono release/gherkin-#{Gherkin::VERSION}.exe features"
+  mono "release/gherkin-#{Gherkin::VERSION}.exe features"
   puts "************** DONE Pretty printing some features with .NET. All OK. **************"
 end
 

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 2
-  - 2
-  - 9
-  version: 2.2.9
+  - 3
+  - 0
+  version: 2.3.0
 platform: x86-mswin32
 authors: 
 - Mike Sassak
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-15 00:00:00 +02:00
+date: 2010-11-12 00:00:00 +00:00
 default_executable: gherkin
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -90,10 +90,8 @@ dependencies:
         segments: 
         - 2
         - 0
-        - 0
-        - beta
-        - 22
-        version: 2.0.0.beta.22
+        - 1
+        version: 2.0.1
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -107,8 +105,8 @@ dependencies:
         segments: 
         - 0
         - 9
-        - 1
-        version: 0.9.1
+        - 4
+        version: 0.9.4
   type: :development
   version_requirements: *id006
 description: A fast Gherkin lexer/parser based on the Ragel State Machine Compiler.
@@ -152,6 +150,7 @@ files:
 - gherkin.gemspec
 - ikvm/.gitignore
 - java/.gitignore
+- java/Gherkin.iml
 - java/src/main/java/gherkin/lexer/i18n/.gitignore
 - java/src/main/resources/gherkin/.gitignore
 - lib/.gitignore
@@ -161,6 +160,7 @@ files:
 - lib/gherkin/formatter/colors.rb
 - lib/gherkin/formatter/escaping.rb
 - lib/gherkin/formatter/filter_formatter.rb
+- lib/gherkin/formatter/hashable.rb
 - lib/gherkin/formatter/json_formatter.rb
 - lib/gherkin/formatter/line_filter.rb
 - lib/gherkin/formatter/model.rb
@@ -222,7 +222,6 @@ files:
 - spec/gherkin/i18n_spec.rb
 - spec/gherkin/java_lexer_spec.rb
 - spec/gherkin/java_libs.rb
-- spec/gherkin/json.rb
 - spec/gherkin/json_parser_spec.rb
 - spec/gherkin/lexer/i18n_lexer_spec.rb
 - spec/gherkin/output_stream_string_io.rb
@@ -368,7 +367,7 @@ rubyforge_project:
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: gherkin-2.2.9
+summary: gherkin-2.3.0
 test_files: 
 - features/escaped_pipes.feature
 - features/feature_parser.feature
@@ -412,7 +411,6 @@ test_files:
 - spec/gherkin/i18n_spec.rb
 - spec/gherkin/java_lexer_spec.rb
 - spec/gherkin/java_libs.rb
-- spec/gherkin/json.rb
 - spec/gherkin/json_parser_spec.rb
 - spec/gherkin/lexer/i18n_lexer_spec.rb
 - spec/gherkin/output_stream_string_io.rb

data/spec/gherkin/json.rb

@@ -1,5 +0,0 @@
-JSON_SIMPLE_JAR = ENV['HOME'] + '/.m2/repository/com/googlecode/json-simple/json-simple/1.1/json-simple-1.1.jar'
-
-if defined?(JRUBY_VERSION)
-  require JSON_SIMPLE_JAR
-end