cuporter 0.3.3 → 0.3.4

data/Rakefile

@@ -56,7 +56,7 @@ namespace :cuporter do
 
   spec = Gem::Specification.new do |s|
     s.name = 'cuporter'
-    s.version = '0.3.3'
+    s.version = '0.3.4'
     s.rubyforge_project = s.name
 
     s.platform = Gem::Platform::RUBY

data/lib/cuporter/extensions/string.rb

@@ -3,6 +3,16 @@ module StringExtensions
   def to_class_name
     gsub(/(^|_)([a-zA-Z])/) {$2.upcase}
   end
+
+  APOSTROPHE = "\047"
+  APOS_ENTITY = "'"
+  def escape_apostrophe
+    gsub(APOSTROPHE, APOS_ENTITY)
+  end
+
+  def unescape_apostrophe
+    gsub(APOS_ENTITY, APOSTROPHE)
+  end
 end
 
 class String

data/lib/cuporter/feature_parser.rb

@@ -2,14 +2,14 @@
 
 module Cuporter
   class FeatureParser
-    FEATURE_LINE          = /^\s*(Feature:[^#]*)/
-    TAG_LINE              = /^\s*(@\w.+)/
-    SCENARIO_LINE         = /^\s*(Scenario:[^#]*)$/
-    SCENARIO_OUTLINE_LINE = /^\s*(Scenario Outline:[^#]*)$/
-    SCENARIO_SET_LINE     = /^\s*(Scenarios:[^#]*)$/
-    EXAMPLE_SET_LINE      = /^\s*(Examples:[^#]*)$/
-    EXAMPLE_LINE          = /^\s*(\|.*\|)\s*$/
-    PY_STRING_LINE        = /^\s*"""\s*$/
+    FEATURE_LINE          = /^\s*(Feature:[^#]*)/u
+    TAG_LINE              = /^\s*(@\w.+)/u
+    SCENARIO_LINE         = /^\s*(Scenario:[^#]*)$/u
+    SCENARIO_OUTLINE_LINE = /^\s*(Scenario Outline:[^#]*)$/u
+    SCENARIO_SET_LINE     = /^\s*(Scenarios:[^#]*)$/u
+    EXAMPLE_SET_LINE      = /^\s*(Examples:[^#]*)$/u
+    EXAMPLE_LINE          = /^\s*(\|.*\|)\s*$/u
+    PY_STRING_LINE        = /^\s*"""\s*$/u
 
     # adds a node to the doc for each cucumber '@' tag, populated with features and
     # scenarios
@@ -49,30 +49,30 @@ module Cuporter
           @open_comment_block = !@open_comment_block
         when TAG_LINE
           # may be more than one tag line
-          @current_tags |= $1.strip.split(/\s+/)
+          @current_tags |= clean_cuke_line($1).split(/\s+/)
         when FEATURE_LINE
-          @feature = new_feature_node($1.strip, file_relative_path)
+          @feature = new_feature_node(clean_cuke_line($1), file_relative_path)
           @current_tags = []
         when SCENARIO_LINE
           # How do we know when we have read all the lines from a "Scenario Outline:"?
           # One way is when we encounter a "Scenario:"
           close_scenario_outline
 
-          handle_scenario_line($1.strip)
+          handle_scenario_line(clean_cuke_line($1))
           @current_tags = []
         when SCENARIO_OUTLINE_LINE
           # ... another is when we hit a subsequent "Scenario Outline:"
           close_scenario_outline
 
-          @scenario_outline  = new_scenario_outline_node($1.strip)
+          @scenario_outline  = new_scenario_outline_node(clean_cuke_line($1))
           @current_tags = []
         when EXAMPLE_SET_LINE, SCENARIO_SET_LINE
           handle_example_set_line if @example_set
 
-          @example_set = new_example_set_node($1.strip)
+          @example_set = new_example_set_node(clean_cuke_line($1))
           @current_tags = []
         when @example_set && EXAMPLE_LINE
-          new_example_line($1.strip)
+          new_example_line(clean_cuke_line($1))
         end
       end
 
@@ -81,5 +81,8 @@ module Cuporter
       return @feature
     end
 
+    def clean_cuke_line(sub_expression)
+      sub_expression.strip.escape_apostrophe
+    end
   end
 end

data/lib/cuporter/formatters/csv.rb

@@ -35,7 +35,7 @@ module Cuporter
       end
 
       def cuke_name(value)
-        "#{value},"
+        "#{value ? value.unescape_apostrophe : nil},"
       end
 
       def fs_name(value)

data/lib/cuporter/formatters/text.rb

@@ -131,7 +131,8 @@ module Cuporter
         l
       end
       def cuke_name(value)
-        value || ""
+        return "" unless value
+        value.unescape_apostrophe
       end
       def fs_name(value)
         return "" unless value

data/lib/cuporter/formatters/xml_to_html.xslt

@@ -242,7 +242,7 @@
   <xsl:template match="@cuke_name">
     <xsl:element name="span">
       <xsl:attribute name="class">cuke_name</xsl:attribute>
-      <xsl:value-of select="."/>
+      <xsl:value-of select="." disable-output-escaping="yes"/>
     </xsl:element>
   </xsl:template>
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cuporter
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 3
-  - 3
-  version: 0.3.3
+  - 4
+  version: 0.3.4
 platform: ruby
 authors: 
 - Tim Camper