fu 0.1.3 → 0.1.4

data/lib/fu/mustache.rb

@@ -36,7 +36,14 @@ module Fu
     # Returns a tag-tree of nested arrays reflecting the structure of the
     # document. E.g. ["<p>",["<em>", "Italicized text", "</em>"],"</p>"]
     def render_children(node)
-      node.children.map { |child| self.send("render_#{child.type}", child) }
+      node.children.each_with_index.inject([]) do |rendered, (child, i)|
+        rendered << self.send("render_#{child.type}", child)
+        next_sibling = node.children[i+1]
+        if child.type == :text  && !next_sibling.nil? && [:mustache, :text].include?(next_sibling.type)
+          rendered << " "
+        end
+        rendered
+      end
     end
 
     def render_text(node)

data/lib/fu/parser.rb

@@ -16,6 +16,9 @@ module Fu
     private
 
     def parse_children(parent, scanner, parent_indent = -1)
+      if scanner.check(/\S/).nil?
+        scanner.scan(/(\s*\n)*/) #consume blank lines
+      end
       indent = (scanner.check(/\ +/) || '').size
       while indent > parent_indent && !scanner.eos? do
         node = parse_line(parent, scanner)

data/lib/fu/version.rb

@@ -1,3 +1,3 @@
 module Fu
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/spec/fu_spec.rb

@@ -100,6 +100,52 @@ describe Fu::Mustache do
     END
   end
 
+  it "handles mustache sections" do
+    result = Fu.to_mustache <<-END
+      {{#children}}
+        {{name}} and {{address}}
+    END
+    result.should eq "{{#children}}{{name}} and {{address}}{{/children}}"
+  end
+
+  it "treats blank line after tag as a single space" do
+    result = Fu.to_mustache <<-END
+      %p
+        {{#children}} {{firstname}}
+          {{lastname}}
+          and {{address}}
+    END
+    result.should eq "<p>{{#children}}{{firstname}} {{lastname}} and {{address}}{{/children}}</p>"
+  end
+
+  it "it ignores blank lines" do
+    result = Fu.to_mustache <<-END
+        %p
+
+          Hello
+
+          {{#children}}
+            {{firstname}}
+
+            {{lastname}}
+
+            and {{address}}
+    END
+    result.should eq '<p>Hello {{#children}}{{firstname}} {{lastname}} and {{address}}{{/children}}</p>'
+  end
+
+  it "inserts whitespace where newline separates mustache sections" do
+    result = Fu.to_mustache <<-END
+      %p {{this}}
+        {{is}}
+      Another
+      {{#funky}}
+        {{mega}}
+        {{test}}
+    END
+    result.should eq "<p>{{this}} {{is}}</p>Another {{#funky}}{{mega}} {{test}}{{/funky}}"
+  end
+
   it "never escapes the gt-character of include-statements" do
     Fu.to_mustache("Bingo{{>partial}}bongo").should eq "Bingo{{>partial}}bongo"
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fu
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-14 00:00:00.000000000Z
+date: 2012-01-30 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70187449764540 !ruby/object:Gem::Requirement
+  requirement: &70186053869080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70187449764540
+  version_requirements: *70186053869080
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70187449763300 !ruby/object:Gem::Requirement
+  requirement: &70186053868400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70187449763300
+  version_requirements: *70186053868400
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70187449762160 !ruby/object:Gem::Requirement
+  requirement: &70186053867620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70187449762160
+  version_requirements: *70186053867620
 - !ruby/object:Gem::Dependency
   name: mustache
-  requirement: &70187449750660 !ruby/object:Gem::Requirement
+  requirement: &70186053866700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70187449750660
+  version_requirements: *70186053866700
 description: Fu combines the logic–less portability of Mustache with the terse utility
   of Haml.
 email: