fu 0.0.1 → 0.0.2

data/README.md

@@ -51,3 +51,9 @@ Then, in your app:
     get "/some_action" do
       fu :some_template, :locals => {...}
     end
+
+Todo
+====
+
+* Support `/`-comments
+ 

data/lib/fu/mustache.rb

@@ -37,6 +37,8 @@ module Fu
       [CGI.escapeHTML(node.text), render_children(node)].compact
     end
 
+    def render_blank(node); end
+
     def render_mustache(node)
       /^\s*(?<action>[#>^]?)\s*(?<identifier>.*)\s*$/ =~ node.statement
       if BLOCK_ACTIONS.include?(action)

data/lib/fu/parser.rb

@@ -32,9 +32,9 @@ module Fu
       if element_statement = scanner.scan(/\%[a-zA-Z0-9\-_]+/) # e.g. '%video'
         node.type = :element
         node.tag = element_statement[1..-1]
-      elsif mustache_statement = scanner.scan(/\{\{[^\S\n]*[#\^][^\S\n]*[a-zA-Z0-9_]+[^\S\n]*\}\}/) # e.g. = {{#comments}}
+      elsif mustache_statement = scanner.scan(/\{\{[^\S\n]*[#\^\>][^\S\n]*[a-zA-Z0-9_]+[^\S\n]*\}\}/) # e.g. = {{#comments}}
         node.type = :mustache
-        node.statement = mustache_statement.scan(/[#\^]\s*[a-zA-Z0-9_]+/).flatten.first
+        node.statement = mustache_statement.scan(/[#\^\>]\s*[a-zA-Z0-9_]+/).flatten.first
       end
 
       # Classes and id's may be added, e.g. #my_special_header_id.alert.featured
@@ -82,7 +82,7 @@ module Fu
           node.text = scan.strip
         end
       end
-
+      node.type ||= :blank
       scanner.scan(/\n/) # Consume end of line
       node
     end

data/lib/fu/tilt.rb

@@ -1,7 +1,7 @@
 # Makes Fu available through Tilt, also contains a utility
 # function that will be added to Sinatra if Sinatra is 
 # defined.
-
+require 'fu'
 require 'tilt'
 require 'mustache'
 

data/lib/fu/version.rb

@@ -1,3 +1,3 @@
 module Fu
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/fu_spec.rb

@@ -93,4 +93,12 @@ describe Fu::Mustache do
     Fu.to_mustache('%p(data-quoted="\\"")').should eq '<p data-quoted="\""></p>'
   end
 
+  it "handle empty lines with spaces okay" do
+    Fu.to_mustache <<-END
+    %p 
+
+    %p
+    END
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fu
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-12 00:00:00.000000000Z
+date: 2011-12-13 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70166767622680 !ruby/object:Gem::Requirement
+  requirement: &70092482432980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70166767622680
+  version_requirements: *70092482432980
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70166767645740 !ruby/object:Gem::Requirement
+  requirement: &70092482432440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70166767645740
+  version_requirements: *70092482432440
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70166767651400 !ruby/object:Gem::Requirement
+  requirement: &70092482431880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70166767651400
+  version_requirements: *70092482431880
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70166768253840 !ruby/object:Gem::Requirement
+  requirement: &70092482431340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70166768253840
+  version_requirements: *70092482431340
 - !ruby/object:Gem::Dependency
   name: mustache
-  requirement: &70166771869320 !ruby/object:Gem::Requirement
+  requirement: &70092482430780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70166771869320
+  version_requirements: *70092482430780
 description: Fu combines the logic–less portability of Mustache with the terse utility
   of Haml.
 email: