muj 0.0.1 → 0.0.2

data/bin/muj

@@ -4,6 +4,8 @@ require 'optparse'
 require 'muj'
 
 $muj_cli_json = false
+$muj_cli_views = nil
+$muj_cli_layout = nil
 
 module Muj
   class CLI
@@ -22,6 +24,14 @@ module Muj
 
         opts.on("-j","--json", "Skip YAML parser") { $muj_cli_json = true; ARGV.delete("-j"); ARGV.delete("--json") }
 
+        opts.on('-v', '--views DIR', 'views directory') do |dir|
+          $muj_cli_views = dir
+        end
+
+        opts.on('-l', '--layout NAME', 'layout name (should be in views dir use > instead of / for subdir)') do |name|
+          $muj_cli_layout = name
+        end
+
         opts.on_tail("-h", "--help", "Show this message") do
           puts opts
           exit
@@ -43,10 +53,11 @@ module Muj
         data = File.open(argv.first).read
       end
       template = File.open(argv[1]).read
+      opts = {'views' => $muj_cli_views, 'layout' => $muj_cli_layout}
       if $muj_cli_json
-        puts Muj.render_with_json(template,data)
+        puts Muj.render_with_json(template,data,opts)
       else
-        puts Muj.render_with_yaml(template,data)
+        puts Muj.render_with_yaml(template,data,opts)
       end
     end
   end

data/lib/muj.rb

@@ -1,3 +1,4 @@
+require 'yaml'
 require 'tilt' unless defined? Tilt
 require 'json' unless defined? JSON
 
@@ -17,25 +18,53 @@ module Tilt
 end
 
 module Muj
+  class Partials
+    def initialize(dir)
+      @dir = File.expand_path(dir)
+    end
+    
+    def __exists(name)
+      fname = name.gsub('>','/')
+      File.exists?("#{@dir}/#{fname}.muj")
+    end
+
+    def __read(name)
+      fname = name.gsub('>','/')
+      f = File.open("#{@dir}/#{fname}.muj")
+      r = f.read.chomp
+      f.close
+      r
+    end
+  end
+
+  def self.escape_template(v)
+    v.chomp.gsub("\n",'\n\\').gsub('"','\"')
+  end
 
-  def self.eval(data,json)
+  def self.eval(str,json,opts={})
     require 'v8' unless defined? ::V8
     cxt = ::V8::Context.new
-    cxt.eval('var locals='+json+'; for(var attrname in locals) {this[attrname] = locals[attrname]; }');
     cxt.load(File.dirname(__FILE__)+"/mustache.js")
-    cxt.eval(data)
+    opts['views'] = '.' unless opts['views']
+    cxt['partials'] = Muj::Partials.new(opts['views'])
+    cxt.eval("var locals = #{json};")
+    r = cxt.eval(%Q{locals.__yield__ = Mustache.to_html("#{Muj.escape_template(str)}", locals, partials);})
+    if opts['layout']
+      layout = cxt['partials'].__read(opts['layout'])
+      r = cxt.eval(%Q{Mustache.to_html("#{Muj.escape_template(layout)}", locals, partials);})
+    end
+    r
   end
 
-  def self.render(str,locals={})
-    self.eval(str,locals.to_json)
+  def self.render(str,locals={},opts={})
+    self.eval(str,locals.to_json,opts)
   end
 
-  def self.render_with_json(str,json)
-    self.eval(str,json)
+  def self.render_with_json(str,json,opts={})
+    self.eval(str,json,opts)
   end
 
-  def self.render_with_yaml(str,yml)
-    require 'yaml' unless defined? YAML
-    self.render(str,YAML.load(yml))
+  def self.render_with_yaml(str,yml,opts={})
+    self.render(str,YAML::load(yml),opts)
   end
 end

data/lib/mustache.js

@@ -107,7 +107,11 @@ var Mustache = function() {
     render_partial: function(name, context, partials) {
       name = this.trim(name);
       if(!partials || partials[name] === undefined) {
-        throw({message: "unknown_partial '" + name + "'"});
+        if (partials && partials['__exists'] && partials.__exists(name)) {
+          partials[name] = partials.__read(name);
+        } else {
+          throw({message: "unknown_partial '" + name + "'"});
+        }
       }
       if(typeof(context[name]) != "object") {
         return this.render(partials[name], context, partials, true);

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: muj
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 27
+  prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Foy Savas
@@ -14,16 +15,17 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-26 00:00:00 -05:00
-default_executable: 
+date: 2011-11-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: tilt
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -33,9 +35,11 @@ dependencies:
   name: therubyracer
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -54,7 +58,6 @@ files:
 - lib/muj.rb
 - lib/mustache.js
 - bin/muj
-has_rdoc: true
 homepage: http://github.com/foysavas/muj
 licenses: []
 
@@ -64,23 +67,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Muj is Mustache.js for Ruby and your command line.