gherkin 1.0.23-java → 1.0.24-java

data/History.txt

@@ -1,3 +1,8 @@
+== 1.0.24 (2010-05-02)
+
+=== Bugfixes
+* hard tabs crazy indentation for pystrings in formatter (#55 Aslak Hellesøy)
+
 == 1.0.23 (2010-05-02)
 
 === Changed Features

data/VERSION.yml

@@ -2,4 +2,4 @@
 :major: 1
 :minor: 0
 :build: 
-:patch: 23
+:patch: 24

data/ragel/lexer.c.rl.erb

@@ -290,7 +290,7 @@ store_pystring_content(VALUE listener,
   VALUE con = ENCODED_STR_NEW(at, length);
   // Gherkin will crash gracefully if the string representation of start_col pushes the pattern past 32 characters
   char pat[32]; 
-  snprintf(pat, 32, "^ {0,%d}", start_col); 
+  snprintf(pat, 32, "^[\t ]{0,%d}", start_col); 
   VALUE re = rb_reg_regcomp(rb_str_new2(pat));
   VALUE re2 = rb_reg_regcomp(rb_str_new2("\r\\Z"));
   VALUE unescape_escaped_quotes = rb_reg_regcomp(rb_str_new2("\\\\\"\\\\\"\\\\\""));

data/ragel/lexer.java.rl.erb

@@ -29,7 +29,7 @@ public class <%= @i18n.underscored_iso_code.upcase %> implements Lexer {
     }
 
     action store_pystring_content {
-      String con = unindent(startCol, substring(data, contentStart, nextKeywordStart-1).replaceFirst("(\\r?\\n)?( )*\\Z", "").replaceAll("\\\\\"\\\\\"\\\\\"", "\"\"\""));
+      String con = unindent(startCol, substring(data, contentStart, nextKeywordStart-1).replaceFirst("(\\r?\\n)?([\\t ])*\\Z", "").replaceAll("\\\\\"\\\\\"\\\\\"", "\"\"\""));
       listener.pyString(con, currentLine);
     }
 
@@ -198,7 +198,7 @@ public class <%= @i18n.underscored_iso_code.upcase %> implements Lexer {
   }
 
   private String unindent(int startCol, String text) {
-    return Pattern.compile("^ {0," + startCol + "}", Pattern.MULTILINE).matcher(text).replaceAll("");
+    return Pattern.compile("^[\t ]{0," + startCol + "}", Pattern.MULTILINE).matcher(text).replaceAll("");
   }
 
   private String currentLineContent(byte[] data, int lastNewline) {

data/ragel/lexer.rb.rl.erb

@@ -21,7 +21,7 @@ module Gherkin
         }
 
         action store_pystring_content {
-          con = unindent(@start_col, data[@content_start...@next_keyword_start-1].utf8_pack("c*").sub(/(\r?\n)?( )*\Z/, '').gsub(/\\"\\"\\"/, '"""'))
+          con = unindent(@start_col, utf8_pack(data[@content_start...@next_keyword_start-1]).sub(/(\r?\n)?([\t ])*\Z/, '').gsub(/\\"\\"\\"/, '"""'))
           @listener.py_string(con, @current_line) 
         }
  
@@ -56,18 +56,18 @@ module Gherkin
         }
 
         action store_step_content {
-          con = data[@content_start...p].utf8_pack("c*").strip
+          con = utf8_pack(data[@content_start...p]).strip
           @listener.step(@keyword, con, @current_line)
         }
  
         action store_comment_content {
-          con = data[@content_start...p].utf8_pack("c*").strip
+          con = utf8_pack(data[@content_start...p]).strip
           @listener.comment(con, @line_number)
           @keyword_start = nil
         }
  
         action store_tag_content {
-          con = data[@content_start...p].utf8_pack("c*").strip
+          con = utf8_pack(data[@content_start...p]).strip
           @listener.tag(con, @current_line)
           @keyword_start = nil
         }
@@ -85,7 +85,7 @@ module Gherkin
         }
  
         action end_keyword {
-          @keyword = data[@keyword_start...p].utf8_pack("c*").sub(/:$/,'')
+          @keyword = utf8_pack(data[@keyword_start...p]).sub(/:$/,'')
           @keyword_start = nil
         }
  
@@ -104,7 +104,7 @@ module Gherkin
         }
 
         action store_cell_content {
-          con = data[@content_start...p].utf8_pack("c*").strip
+          con = utf8_pack(data[@content_start...p]).strip
           current_row << con
         }
 
@@ -153,18 +153,22 @@ module Gherkin
       end
 
       def unindent(startcol, text)
-        text.gsub(/^ {0,#{startcol}}/, "")
+        text.gsub(/^[\t ]{0,#{startcol}}/, "")
       end
  
       def store_keyword_content(event, data, p, eof)
         end_point = (!@next_keyword_start or (p == eof)) ? p : @next_keyword_start
-        con = yield data[@content_start...end_point].utf8_pack("c*")
+        con = yield utf8_pack(data[@content_start...end_point])
         @listener.send(event, @keyword, con, @current_line)
       end
       
       def current_line_content(data, p)
         rest = data[@last_newline..-1]
-        rest[0..rest.index(10)||-1].utf8_pack("c*").strip
+        utf8_pack(rest[0..rest.index(10)||-1]).strip
+      end
+
+      def utf8_pack(array)
+        (RUBY_VERSION =~ /^1\.9/) ? array.pack("c*").force_encoding("UTF-8") : array.pack("c*")
       end
     end
   end

data/spec/gherkin/formatter/pretty_formatter_spec.rb

@@ -13,15 +13,17 @@ module Gherkin
         actual.should == s
       end
       
-      def assert_pretty(text)
-        io = StringIO.new
-        l = PrettyFormatter.new(io, true)
-        parser = Gherkin::Parser::Parser.new(l, true, "root")
-        lexer  = Gherkin::I18nLexer.new(parser, true)
-        lexer.scan(text)
-        io.rewind
-        actual = io.read
-        actual.should == text
+      def assert_pretty(input, output=input)
+        [true, false].each do |force_ruby|
+          io = StringIO.new
+          l = PrettyFormatter.new(io, true)
+          parser = Gherkin::Parser::Parser.new(l, true, "root")
+          lexer  = Gherkin::I18nLexer.new(parser, force_ruby)
+          lexer.scan(input)
+          io.rewind
+          actual = io.read
+          actual.should == output
+        end
       end
 
       before do
@@ -142,6 +144,10 @@ Feature: Feature Description
       | Bed    | They | are tired   |
 })
       end
+
+      it "should preserve tabs" do
+        assert_pretty(IO.read(File.dirname(__FILE__) + '/tabs.feature'), IO.read(File.dirname(__FILE__) + '/spaces.feature'))
+      end
     end
   end
 end

data/spec/gherkin/formatter/spaces.feature

@@ -0,0 +1,9 @@
+Feature: Adding
+
+  Scenario: Add two numbers
+    Given the following input:
+      """
+      hello
+      """
+    When the calculator is run
+    Then the output should be 4

data/spec/gherkin/formatter/tabs.feature

@@ -0,0 +1,9 @@
+Feature: Adding
+
+	Scenario: Add two numbers
+		Given the following input:
+			"""
+			hello
+			"""
+		When the calculator is run
+		Then the output should be 4

data/tasks/compile.rake

@@ -21,7 +21,7 @@ file 'lib/gherkin.jar' => Dir['java/src/main/java/**/*.java'] do
 end
 
 rl_langs = ENV['RL_LANGS'] ? ENV['RL_LANGS'].split(',') : []
-langs = Gherkin::I18n.all.select { |lang| rl_langs.empty? || rl_langs.include?(lang.key) }
+langs = Gherkin::I18n.all.select { |lang| rl_langs.empty? || rl_langs.include?(lang.iso_code) }
 
 langs.each do |i18n|
   java = RagelTask.new('java', i18n)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
     - 1
     - 0
-    - 23
-  version: 1.0.23
+    - 24
+  version: 1.0.24
 platform: java
 authors: 
   - Mike Sassak
@@ -99,7 +99,6 @@ files:
   - lib/gherkin.rb
   - lib/gherkin/c_lexer.rb
   - lib/gherkin/cli/main.rb
-  - lib/gherkin/core_ext/array.rb
   - lib/gherkin/csharp_lexer.rb
   - lib/gherkin/formatter/argument.rb
   - lib/gherkin/formatter/colors.rb
@@ -145,6 +144,8 @@ files:
   - spec/gherkin/formatter/argument_spec.rb
   - spec/gherkin/formatter/colors_spec.rb
   - spec/gherkin/formatter/pretty_formatter_spec.rb
+  - spec/gherkin/formatter/spaces.feature
+  - spec/gherkin/formatter/tabs.feature
   - spec/gherkin/i18n_lexer_spec.rb
   - spec/gherkin/i18n_spec.rb
   - spec/gherkin/java_lexer_spec.rb

data/lib/gherkin/core_ext/array.rb

@@ -1,5 +0,0 @@
-class Array
-  def utf8_pack(fmt)
-    (RUBY_VERSION =~ /^1\.9/) ? pack(fmt).force_encoding("UTF-8") : pack(fmt)
-  end
-end