macros4cuke 0.2.22 → 0.3.00

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.3.00 / 2013-05-09 Version number bumped
+* [CHANGE] Class `Templating::Engine` can handle conditional tags (TODO: document).
+* [CHANGE] File `engine_spec.rb`: Added a RSpec examples to test the conditional tags.
+
+
 ## 0.2.22 / 2013-05-08
  [CHANGE] File `README.md`: expanded the section on macro arguments.
 
@@ -7,7 +12,7 @@
 * [NEW] Added new class `Templating::Section`, a subclass of `UnaryElement`.
 * [NEW] Added new class `Templating::ConditionalSection, a subclass of `Section`.
 * [CHANGE] Method Engine#parse_tag modified in prevision of conditional tags.
-* [NEW] File `section_spec.rb`: Added a RSpec to test the Conditional class.
+* [NEW] File `section_spec.rb`: Added a RSpec file to test the Conditional class.
 
 ## 0.2.20 / 2013-05-07
 * [NEW] Added `examples` folder with a first example of an internationalized customisation of __Macros4Cuke__.

data/lib/macros4cuke/constants.rb

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

data/lib/macros4cuke/templating/engine.rb

@@ -299,7 +299,7 @@ private
     end
     
     compiled_lines = raw_lines.map { |line| compile_line(line) }
-    return compiled_lines.flatten()
+    return compile_sections(compiled_lines.flatten())
   end
   
   # Convert the array of raw entries into full-fledged template elements.
@@ -352,6 +352,37 @@ private
 
     return result
   end
+  
+  # Group the elements by sections.
+  # @param flat_sequence [Array] a linear list of elements (including sections)
+  def compile_sections(flat_sequence)
+    open_sections = []  # The list of nested open sections
+    compiled = flat_sequence.each_with_object([]) do |element, subResult|
+      case element
+        when Section
+          open_sections << element
+        
+        when SectionEndMarker
+          if open_sections.empty?
+            raise StandardError, "End of section</#{element.name}> found while no corresponding section must be closed."
+          end
+          if element.name != open_sections.last.name
+            raise StandardError, "End of section</#{element.name}> doesn't match current section '#{open_sections.last.name}'."
+          end
+          subResult << open_sections.pop()
+          
+        else
+          if open_sections.empty?
+            subResult << element
+          else
+            open_sections.last.add_child(element)
+          end
+      end
+      
+    end
+    
+    return compiled
+  end
  
 end # class
 

data/spec/macros4cuke/templating/engine_spec.rb

@@ -11,6 +11,7 @@ module Templating # Open this namespace to get rid of module qualifier prefixes
 
 
 describe Engine do
+  # Sample template (consisting of a sequence of steps)
   let(:sample_template) do
       source = <<-SNIPPET
   Given I landed in the homepage
@@ -20,6 +21,21 @@ describe Engine do
   And I click "Sign in"
 SNIPPET
     end
+    
+  # Template containing two conditional sections
+  let(:sophisticated_template) do
+      source = <<-SNIPPET
+  When I fill in "firstname" with "<firstname>"
+  And I fill in "lastname" with "<lastname>"
+  <?address>And I fill in "address" with "<address>"</address>
+  <?birthdate>
+  And I fill in "birthdate" with "<birthdate>"
+  </birthdate>
+  And I click "Register"
+SNIPPET
+    end    
+  
+  
 
   # Rule for default instantiation
   subject { Engine.new sample_template }
@@ -167,6 +183,11 @@ SNIPPET
       instance = Engine.new ''
       instance.source.should be_empty
     end
+    
+    it "should accept conditional section" do
+      lambda { Engine.new sophisticated_template }.should_not raise_error
+      instance = Engine.new sophisticated_template
+    end
 
     it "should complain when a placeholder is empty or blank" do
       text_w_empty_arg = sample_template.sub(/userid/, '')
@@ -179,6 +200,7 @@ SNIPPET
       error_message = "The invalid sign '%' occurs in the argument/tag 'user%id'."
       lambda { Engine.new text_w_empty_arg }.should raise_error(Macros4Cuke::InvalidCharError, error_message)
     end
+    
   end # context
 
   context "Provided services" do
@@ -248,6 +270,30 @@ SNIPPET
       instance = Engine.new ''
       instance.render(nil, {}).should be_empty
     end
+    
+    
+    it "should render conditional sections" do
+      instance = Engine.new(sophisticated_template)
+      
+      locals = {'firstname' => "Anon", 
+        "lastname" => "Eemoos" ,
+        "birthdate" => "1976-04-21"
+        }
+      rendered_text = instance.render(Object.new, locals)
+      expected = <<-SNIPPET
+  When I fill in "firstname" with "Anon"
+  And I fill in "lastname" with "Eemoos"
+  
+  
+  And I fill in "birthdate" with "1976-04-21"
+  
+  And I click "Register"
+SNIPPET
+
+      rendered_text.should == expected
+      
+    end
+    
 
     it "should render multivalued actuals" do
       locals = {'userid' => ["johndoe", "yeti"] } # Silly case

metadata

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