fifty 0.0.1 → 0.0.2

data/lib/fifty.rb

@@ -2,32 +2,27 @@ module Fifty
 
   require 'handlebars'
   require 'haml'
-  require 'binding_of_caller'
-  
-  VERSION = '0.0.1'
-  
+
+  VERSION = '0.0.2'
+
   class << self
     attr_accessor :views
     attr_accessor :compiled
+    attr_accessor :context
   end
-  
+
   self.views = ['./views/**/*.haml']
   self.compiled = false
-  
-  def self.cdn(name)
-   if name == :handlebars
-     'https://cdnjs.cloudflare.com/ajax/libs/'  +
-     'handlebars.js/1.0.0-rc.3/handlebars.min.js'
-    elsif name == :jquery
-      'https://cdnjs.cloudflare.com/' +
-      'ajax/libs/jquery/1.9.1/jquery.min.js'
-    end
-  end
 
   @@handlebars = Handlebars::Context.new
+
+  @@handlebars.partial_missing do |a|
+    Fifty.hbs2html(Fifty.render_haml(a, context), @@current)
+  end
+
   @@helpers, @@shared, @@partials = {}, {}, {}
   @@view_paths = []
-  
+
   def self.helper(name, fn)
     code = self.register_helper(name, fn)
     @@helpers[name] = code
@@ -39,7 +34,7 @@ module Fifty
     @@shared[name] = code
     self.eval_js(code)
   end
-  
+
   def self.compile
     self.compile_statics
     self.compile_inlines
@@ -50,24 +45,32 @@ module Fifty
     views = self.views.map { |p| Dir[p] }.flatten
     context = binding.of_caller(3)
     views.each do |file|
+
+      puts "Trying to register #{file}"
+      next if file.index('layout')
       path = File.dirname(file)
+
+      name = '_' + file.gsub('./', '')
+      .gsub('.haml', '')
+      .split('/')[1..-1].join('-')
+
       unless @@view_paths.include?(path)
+        puts path.inspect
         @@view_paths << path
       end
       template = File.read(file)
-      name = '_' + File.basename(file, '.haml')
-      next if name == '_layout'
+
       partial = Haml::Engine.
-        new(template).render(
-        context, layout: false)
+      new(template).render(context, layout: false)
       partial = self.escape_hbs(partial)
       @@partials[name] = partial
+      puts "Registered #{name}"
+
     end
   end
 
   def self.compile_inlines
     inlines = Sinatra::Application.templates
-    context = binding.of_caller(3)
     inlines.each do |name, info|
       next if name == :layout
       partial = Haml::Engine.
@@ -76,7 +79,7 @@ module Fifty
       @@partials[name] = partial
     end
   end
-  
+
   def self.register_helper(name, fn)
     "Handlebars.registerHelper('#{name}', #{fn});"
   end
@@ -86,7 +89,7 @@ module Fifty
       @js.runtime.eval(code)
     end
   end
-  
+
   def self.escape_hbs(partial)
     2.times do
       partial.gsub!("{{", "{%{")
@@ -94,68 +97,71 @@ module Fifty
     end
     partial
   end
-  
+
   def self.included(base)
     base.class_eval {
     Fifty::Helpers::Locales.compile  }
   end
 
-  def fifty(view, data)
+  def fifty(view, data, globals = {})
     Fifty.compile unless Fifty.compiled
-    hbs2html(haml2hbs(view), data)
+    Fifty.hbs2html(Fifty.haml2hbs(view, globals), data)
   end
 
   alias :fu :fifty
-
-  def self.partials
-    partials_hbs = ''
-    @@partials.each do |name, code|
-      partials_hbs += script_tag(name,
-        code, 'x-text-handlebars')
+  
+  def self.core_js
+    
+    core_js = ''
+    @@helpers.each do |name, code|
+      core_js += code + "\n"
     end
+    script_tag('helpers', core_js)
+    
+  end
+
+  def self.partials_js
     partials_js = ''
     @@partials.each do |name, code|
-      partials_js += register_partial(name) + "\n"
+      partials_js += register_partial(name, code) + "\n"
     end
-    partials_js = script_tag('partials', partials_js)
-    [partials_hbs, partials_js].join
+    script_tag('partials', partials_js)
   end
 
-  def self.scripts
-    scripts_js = ''
-    @@helpers.each do |name, code|
-      scripts_js += code + "\n"
-    end
-    scripts_js = script_tag('helpers', scripts_js)
+  def self.shared_js
+    
     shared_js = "\n"
     @@shared.each do |name, code|
       shared_js += code + "\n"
     end
-    shared_js = script_tag('shared', shared_js)
-    [scripts_js, shared_js].join
+    script_tag('shared', shared_js)
+    
+  end
+
+  def self.helpers
+    [core_js, partials_js, shared_js].join
   end
 
   require_relative 'fifty/helpers'
 
   private
 
-  def haml2hbs(name)
-    context = binding.of_caller(4)
+  def self.haml2hbs(name, options = {})
+    puts "Rendering #{name} from HAML to HBS"
     result = render_haml(name, context, layout: false)
-    while data = result.match(/{{> ([^}]*)}}/)  
+    while data = result.match(/{{> ([^}]*)}}/)
       partial = render_haml($1, context, layout: false)
       result = result.gsub(data[0], partial)
     end
-    render_layout(context, result)
+    render_layout(context, result, options)
   end
-  
-  def render_layout(context, insert)
-    render_haml(:layout, context) do
-      insert
-    end
+
+  def self.render_layout(context, insert, options)
+    !options[:layout] ? insert :
+    render_haml(:layout, context) { insert }
   end
 
-  def get_template(name)
+  def self.get_template(name)
     inlines = Sinatra::Application.templates
     if path = find_haml_template(name)
       File.read(path)
@@ -165,24 +171,25 @@ module Fifty
       raise "No template for #{name}."
     end
   end
-  
-  def find_haml_template(name)
-    @@view_paths.each do |path|
-      file = File.join(path, name.to_s + '.haml')
-      return file if File.readable?(file)
-    end
-    nil
+
+  def self.find_haml_template(name)
+    file = './views/' + name.to_s.gsub('-', '/') + '.haml'
+    return file if File.readable?(file)
   end
 
-  def render_haml(name, context = nil, options = {}, &block)
-    Haml::Engine.new(get_template(name), options).render(context, &block)
+  def self.render_haml(name, context = nil, options = {}, &block)
+    puts "Rendering HAML template #{name}"
+    Haml::Engine.new(get_template(name),
+    options).render(context, &block)
   end
-  
-  def hbs2html(html, data)
+
+  def self.hbs2html(html, data)
+    @@current = data
+    puts "-> with partials #{data}"
     unescape_hbs(@@handlebars.compile(html).call(data))
   end
 
-  def unescape_hbs(html)
+  def self.unescape_hbs(html)
     html.gsub("{%{", "{{").gsub("}%}", "}}")
   end
 
@@ -190,9 +197,24 @@ module Fifty
     "\n<script id='#{id}' type='#{type}'>#{code}</script>\n"
   end
 
-  def self.register_partial(name)
-    "Handlebars.registerPartial('#{name[1..-1]}'," +
-    " document.getElementById('#{name}').innerText);"
+  def self.register_partial(name, code)
+    "Handlebars.registerPartial('#{name[1..-1]}', " +
+    "'#{escape_javascript(code)}');"
+  end
+
+  JS_ESCAPE_MAP = {
+    '\\'    => '\\\\',
+    '</'    => '<\/',
+    "\r\n"  => '\n',
+    "\n"    => '\n',
+    "\r"    => '\n',
+    '"'     => '\\"',
+    "'"     => "\\'"
+  }
+
+  def self.escape_javascript(javascript)
+    regexp = /(\\|<\/|\r\n|\342\200\250|[\n\r"'])/u
+    javascript.gsub(regexp) {|match| JS_ESCAPE_MAP[match] }
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fifty
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-17 00:00:00.000000000 Z
+date: 2013-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json