macros4cuke 0.3.18 → 0.3.19

data/.rubocop.yml

@@ -11,9 +11,9 @@ DefWithParentheses:
 EmptyLines:
   Enabled: false
   
-# Avoid methods longer than 40 lines of code
+# Avoid methods longer than 30 lines of code
 MethodLength:
-  Max: 40
+  Max: 30
 
 SpaceInsideBrackets:
   Enabled: false

data/CHANGELOG.md

@@ -1,7 +1,14 @@
+## 0.3.19 / 2013-05-22
+* [CHANGE] File `.rubocop.yml`: Reduced MethodLength to 30 (lines in a method).
+* [CHANGE] Method `Engine#compile_line refactored: Extract Method pattern => new method line_rep_ending added.
+* [CHANGE] Method `Engine#compile_sections refactored: Extract Method pattern => new method validate_section_end added.
+* [FIX] File `exceptions.rb`: Removal of useless assignment (detected by Rubocop). No runtime impact.
+
+
 ## 0.3.18 / 2013-05-21
 * [FEATURE] Support for sub-steps having multiline text arguments (docstring).
-* [CHANGE] Method MacroStep#expand passes also built-in arguments to template engine.
-* [CHANGE] Method MacroStep#validate_phrase_args does not apply validations on built-in arguments.
+* [CHANGE] Method `MacroStep#expand passes` also built-in arguments to template engine.
+* [CHANGE] Method `MacroStep#validate_phrase_args` does not apply validations on built-in arguments.
 * [CHANGE] File `macro-step_spec.rb`: Added one example to test the insertion of triple quotes.
 * [NEW] File `multiline.feature` added in examples/features/ folder.
 * [CHANGE] File `README.md`: Added section 'Sub-steps with multiline text argument'

data/lib/macros4cuke/constants.rb

@@ -4,7 +4,7 @@
 
 module Macros4Cuke # Module used as a namespace
   # The version number of the gem.
-  Version = '0.3.18'
+  Version = '0.3.19'
 
   # Brief description of the gem.
   Description = "Macros for Cucumber"

data/lib/macros4cuke/exceptions.rb

@@ -81,9 +81,6 @@ class DataTableNotFound < Macros4CukeError
   end
 end # class
 
-    msg = 
-
-
 
 # Raised when Macros4Cuke encountered an issue
 # that it can't handle properly.

data/lib/macros4cuke/templating/engine.rb

@@ -394,20 +394,25 @@ private
     if line_to_squeeze && ! section_item.nil?
       line_rep = [section_item]
     else
-      # Apply another rule: if last item in line is an end of section marker, 
-      # then place eoline before that item. 
-      # Otherwise, end the line with a eoline marker.
-      if line_rep.last.is_a?(SectionEndMarker)
-        section_end = line_rep.pop()
-        line_rep << EOLine.new
-        line_rep << section_end
-      else
-        line_rep << EOLine.new
-      end
+      line_rep_ending(line_rep)
     end
     
     return line_rep
   end
+  
+
+  # Apply rule: if last item in line is an end of section marker, 
+  # then place eoline before that item. 
+  # Otherwise, end the line with a eoline marker.  
+  def line_rep_ending(theLineRep)
+    if theLineRep.last.is_a?(SectionEndMarker)
+      section_end = theLineRep.pop()
+      theLineRep << EOLine.new
+      theLineRep << section_end
+    else
+      theLineRep << EOLine.new
+    end  
+  end
 
   
   # @param aCouple [Array] a two-element array of the form: [kind, text]
@@ -461,24 +466,18 @@ private
         when Section
           open_sections << element
         
-        when SectionEndMarker
-          if open_sections.empty?
-            raise StandardError, "End of section</#{element.name}> found while no corresponding section is open."
-          end
-          if element.name != open_sections.last.name
-            msg = "End of section</#{element.name}> doesn't match current section '#{open_sections.last.name}'."
-            raise StandardError, msg
-          end
+        when SectionEndMarker           
+          validate_section_end(element, open_sections)
           subResult << open_sections.pop()
-          
+         
         else
           if open_sections.empty?
             subResult << element
           else
             open_sections.last.add_child(element)
           end
-      end
-      
+
+      end 
     end
     
     unless open_sections.empty?
@@ -488,6 +487,18 @@ private
     
     return compiled
   end
+  
+  # Validate the given end of section marker taking into account the open sections.
+  def validate_section_end(marker, sections)
+    if sections.empty?
+      msg = "End of section</#{marker.name}> found while no corresponding section is open."
+      raise StandardError, msg
+    end
+    if marker.name != sections.last.name
+      msg = "End of section</#{marker.name}> doesn't match current section '#{sections.last.name}'."
+      raise StandardError, msg
+    end
+  end
  
 end # class
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: macros4cuke
 version: !ruby/object:Gem::Version
-  version: 0.3.18
+  version: 0.3.19
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-21 00:00:00.000000000 Z
+date: 2013-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber