fu 0.0.2 → 0.1.1

data/README.md

@@ -36,21 +36,9 @@ A contrived example using all aspects of the syntax:
 Usage
 =====
 
-Direct:
-
     Fu.to_mustache("%p Hello {{mustache}}")
 
-With Sinatra and Tilt:
-
-    require 'fu/tilt'
-
-Stick your fu-templates in your views-folder with the extension `.fu`.    
-
-Then, in your app:
-
-    get "/some_action" do
-      fu :some_template, :locals => {...}
-    end
+Sinatra w/Tilt? See https://github.com/benglerpebbles/fu-tilt#readme
 
 Todo
 ====

data/fu.gemspec

@@ -21,7 +21,6 @@ Gem::Specification.new do |s|
   # specify any dependencies here; for example:
   s.add_development_dependency "rspec"
   s.add_development_dependency "sinatra"
-  s.add_development_dependency "sinatra"
   s.add_development_dependency "rack-test"
   s.add_development_dependency "mustache"
 

data/lib/fu/mustache.rb

@@ -7,19 +7,20 @@ module Fu
     attr_reader :mustache
     SELF_CLOSING_TAGS = %w(meta img link br hr input area param col base)
     BLOCK_ACTIONS = %w(# ^)   # <- Mustache actions that take a block
-    NO_SPACE_CHARS = /[{}<>]/ # <- Characters that do not need to be separated by a space
+    NO_SPACE_CHARS = /[{}<>\s]|^$/ # <- Characters that do not need to be separated by a space
                               #    when joining elements (e.g. "<p>!</p>", not "<p> ! </p>")
 
     def initialize(root)
-      @mustache = flatten(render_children(root))
+      @mustache = flatten(render_children(root).compact)
     end
 
     private
 
     # Flatten the tag_tree inserting spaces only where they have to be.
     def flatten(tag_tree)
-      tag_tree.flatten.inject("") do |result, element| 
-        if result[-1] =~ NO_SPACE_CHARS || element[0] =~ NO_SPACE_CHARS
+      tag_tree.flatten.inject("") do |result, element|
+        tail, incoming = result[-1], element[0]
+        if tail.nil? || (tail+incoming) =~ NO_SPACE_CHARS
           "#{result}#{element}"
         else
           "#{result} #{element}"
@@ -27,6 +28,11 @@ module Fu
       end
     end
 
+    # Restore include tags that have been destroyed by escaping
+    def escape_html(text)
+      CGI.escapeHTML(text).gsub(/\{\{\s*\&gt\;/, "{{>")
+    end
+
     # 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)
@@ -34,7 +40,7 @@ module Fu
     end
 
     def render_text(node)
-      [CGI.escapeHTML(node.text), render_children(node)].compact
+      [escape_html(node.text), render_children(node)].compact
     end
 
     def render_blank(node); end

data/lib/fu/version.rb

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

data/spec/fu_spec.rb

@@ -84,7 +84,6 @@ describe Fu::Mustache do
     result.should eq "{{^children}}{{name}} and {{address}}{{/children}}"
   end
 
-
   it "handles mustache in attributes" do
     Fu.to_mustache('%p(data-bingo="{{bingo}}")').should eq '<p data-bingo="{{bingo}}"></p>'
   end
@@ -101,4 +100,7 @@ describe Fu::Mustache do
     END
   end
 
+  it "never escapes the gt-character of include-statements" do
+    Fu.to_mustache("Bingo{{>partial}}bongo").should eq "Bingo{{>partial}}bongo"
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fu
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-13 00:00:00.000000000Z
+date: 2011-12-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70092482432980 !ruby/object:Gem::Requirement
+  requirement: &70312003890400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70092482432980
+  version_requirements: *70312003890400
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70092482432440 !ruby/object:Gem::Requirement
+  requirement: &70312003889520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,21 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70092482432440
-- !ruby/object:Gem::Dependency
-  name: sinatra
-  requirement: &70092482431880 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70092482431880
+  version_requirements: *70312003889520
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70092482431340 !ruby/object:Gem::Requirement
+  requirement: &70312003888900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70092482431340
+  version_requirements: *70312003888900
 - !ruby/object:Gem::Dependency
   name: mustache
-  requirement: &70092482430780 !ruby/object:Gem::Requirement
+  requirement: &70312003888480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70092482430780
+  version_requirements: *70312003888480
 description: Fu combines the logic–less portability of Mustache with the terse utility
   of Haml.
 email:
@@ -83,11 +72,9 @@ files:
 - lib/fu/error.rb
 - lib/fu/mustache.rb
 - lib/fu/parser.rb
-- lib/fu/tilt.rb
 - lib/fu/version.rb
 - spec/fixtures/views/list.fu
 - spec/fu_spec.rb
-- spec/fu_tilt_spec.rb
 - spec/spec_helper.rb
 homepage: ''
 licenses: []
@@ -116,5 +103,4 @@ summary: Fu template engine
 test_files:
 - spec/fixtures/views/list.fu
 - spec/fu_spec.rb
-- spec/fu_tilt_spec.rb
 - spec/spec_helper.rb

data/lib/fu/tilt.rb

@@ -1,31 +0,0 @@
-# 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'
-
-module Tilt
-  class FuTemplate < Template
-    self.default_mime_type = "text/html"
-    def initialize_engine
-      return if defined? ::Fu
-      require_template_library 'fu'
-    end
-
-    def prepare; end
-
-    def evaluate(scope, locals, &block)      
-      Mustache.render(Fu.to_mustache(data), locals.merge(scope.is_a?(Hash) ? scope : {}).merge({:yield => block.nil? ? '' : block.call}))
-    end
-  end
-  register FuTemplate, 'fu'
-end
-
-if defined?(Sinatra)
-  module Sinatra::Templates
-    def fu(template, options={}, locals={})
-      render :fu, template, options, locals
-    end
-  end
-end

data/spec/fu_tilt_spec.rb

@@ -1,24 +0,0 @@
-require 'spec_helper'
-require 'sinatra'
-require 'rack/test'
-require 'fu/tilt'
-
-class FuApp < Sinatra::Base
-  set :root, File.dirname(__FILE__)+"/fixtures"
-  get "/list" do
-    fu :list, :locals => {:children => [{:name => "Arne"}, {:name => "Bjarne"}]}
-  end
-end
-
-describe "API v1 posts" do
-  include Rack::Test::Methods
-
-  def app
-    FuApp
-  end
-
-  it "'s alive" do
-    get "/list"
-    last_response.body.should eq "<ul><li>Arne</li><li>Bjarne</li></ul>"
-  end
-end