poirot 0.0.3 → 0.1.0

data/lib/poirot/asset_helper.rb

@@ -2,13 +2,27 @@ module Poirot
   module AssetHelper
     def template_include_tag(*sources)
       sources.collect do |source|
-        template = File.open(_poirot_resolve_partial_path(source), "rb")
-        content_tag :script, template.read.html_safe, :type => "text/mustache", :id => "#{source.parameterize.dasherize}-template"
+        template = File.open(resolve_partial_path(source), "rb")
+        content_tag :script, template.read.html_safe, :type => "text/mustache", :id => "#{template_name(source).parameterize.dasherize}-template"
       end.join("\n").html_safe
     end
-    
-    def _poirot_resolve_partial_path(source)
-      if source.to_s =~ /^\// # absolute path to a different view folder
+
+    private
+
+    def is_absolute_path?(source)
+      source.to_s =~ /^\//
+    end
+
+    def template_name(source)
+      if is_absolute_path?(source)
+        source.to_s.split('/').last
+      else
+        source
+      end
+    end
+
+    def resolve_partial_path(source)
+      if is_absolute_path?(source)
         segments = source.to_s.split('/')
         partial_name = "_#{segments.pop}.html.mustache"
         segments << partial_name
@@ -17,6 +31,5 @@ module Poirot
         Rails.root.join('app/views', controller_name, "_#{source}.html.mustache")
       end
     end
-    
   end
 end

data/lib/poirot/handler.rb

@@ -6,6 +6,7 @@ module Poirot
       view_class = begin
         view_path.classify.constantize
       rescue NameError => e
+        Rails.logger.info ">>> #{e}"
         Poirot::View
       end
       "#{view_class}.new(self, '#{template.source.gsub(/'/, "\\\\'")}').render.html_safe"

data/lib/poirot/version.rb

@@ -1,3 +1,3 @@
 module Poirot
-  VERSION = "0.0.3"
+  VERSION = "0.1.0"
 end

data/lib/poirot/view.rb

@@ -3,18 +3,42 @@ module Poirot
 
     def initialize(view_context, template_source)
       @view_context = view_context
+      @params = view_context.params || {}
       self.template = template_source
       assign_variables!
     end
 
+    self.template_extension = 'html.mustache'
+
+    def self.inherited(view_class)
+      self.template_path = Rails.root.join('app', 'views', view_class.name.split('::').first.downcase)
+    end
+
     def respond_to?(method_sym, include_private = false)
-      if view_context.respond_to?(method_sym) 
+      if view_context.respond_to?(method_sym)
         true
       else
         super
       end
     end
 
+    def render_buffer(buffer)
+      self.render(buffer, context).html_safe
+    end
+
+    def include_partial(name)
+      path = ["app/views", controller_name]
+      path += name.split("/")
+      path.delete(nil)
+      path.last.replace("_#{path.last}.html.mustache")
+
+      filename = path.join("/")
+
+      Dir.chdir(Rails.root) do
+        render_buffer(File.read(filename))
+      end
+    end
+
     def method_missing(method_name, *args, &block)
       instance_var = instance_variable_get("@#{method_name}")
       if defined?(instance_var) && args.empty?
@@ -27,6 +51,7 @@ module Poirot
     private
 
     attr_reader :view_context
+    attr_reader :params
 
     def assign_variables!
       variables = view_context.instance_variable_names.select{|name| name =~ /^@[^_]/}
@@ -36,12 +61,14 @@ module Poirot
         self[name.tr('@','').to_sym] = instance_var
       end
 
-      # get the locals from the view context, is there a better way?
-      locals = view_context.send(:view_renderer).send(:_partial_renderer).instance_variable_get("@locals") || {}
+      if Rails.version >= "3.1"
+        # get the locals from the view context, is there a better way?
+        locals = view_context.send(:view_renderer).send(:_partial_renderer).instance_variable_get("@locals") || {}
 
-      locals.each do |name, val|
-        instance_variable_set("@#{name}", val)
-        self[name] = val
+        locals.each do |name, val|
+          instance_variable_set("@#{name}", val)
+          self[name] = val
+        end
       end
     end
   end

data/vendor/assets/javascripts/poirot/mustache.js

@@ -5,6 +5,7 @@
 */
 
 var Mustache = function() {
+  var regexCache = {};
   var Renderer = function() {};
 
   Renderer.prototype = {
@@ -34,13 +35,22 @@ var Mustache = function() {
         }
       }
 
+      // get the pragmas together
       template = this.render_pragmas(template);
+
+      // render the template
       var html = this.render_section(template, context, partials);
-      if(in_recursion) {
-        return this.render_tags(html, context, partials, in_recursion);
+
+      // render_section did not find any sections, we still need to render the tags
+      if (html === false) {
+        html = this.render_tags(template, context, partials, in_recursion);
       }
 
-      this.render_tags(html, context, partials, in_recursion);
+      if (in_recursion) {
+        return html;
+      } else {
+        this.sendLines(html);
+      }
     },
 
     /*
@@ -52,6 +62,15 @@ var Mustache = function() {
       }
     },
 
+    sendLines: function(text) {
+      if (text) {
+        var lines = text.split("\n");
+        for (var i = 0; i < lines.length; i++) {
+          this.send(lines[i]);
+        }
+      }
+    },
+
     /*
       Looks for %PRAGMAS
     */
@@ -62,11 +81,13 @@ var Mustache = function() {
       }
 
       var that = this;
-      var regex = new RegExp(this.otag + "%([\\w-]+) ?([\\w]+=[\\w]+)?" +
-            this.ctag, "g");
+      var regex = this.getCachedRegex("render_pragmas", function(otag, ctag) {
+        return new RegExp(otag + "%([\\w-]+) ?([\\w]+=[\\w]+)?" + ctag, "g");
+      });
+
       return template.replace(regex, function(match, pragma, options) {
         if(!that.pragmas_implemented[pragma]) {
-          throw({message: 
+          throw({message:
             "This implementation of mustache doesn't understand the '" +
             pragma + "' pragma"});
         }
@@ -99,45 +120,74 @@ var Mustache = function() {
     */
     render_section: function(template, context, partials) {
       if(!this.includes("#", template) && !this.includes("^", template)) {
-        return template;
+        // did not render anything, there were no sections
+        return false;
       }
 
       var that = this;
-      // CSW - Added "+?" so it finds the tighest bound, not the widest
-      var regex = new RegExp(this.otag + "(\\^|\\#)\\s*(.+)\\s*" + this.ctag +
-              "\n*([\\s\\S]+?)" + this.otag + "\\/\\s*\\2\\s*" + this.ctag +
-              "\\s*", "mg");
+
+      var regex = this.getCachedRegex("render_section", function(otag, ctag) {
+        // This regex matches _the first_ section ({{#foo}}{{/foo}}), and captures the remainder
+        return new RegExp(
+          "^([\\s\\S]*?)" +         // all the crap at the beginning that is not {{*}} ($1)
+
+          otag +                    // {{
+          "(\\^|\\#)\\s*(.+)\\s*" + //  #foo (# == $2, foo == $3)
+          ctag +                    // }}
+
+          "\n*([\\s\\S]*?)" +       // between the tag ($2). leading newlines are dropped
+
+          otag +                    // {{
+          "\\/\\s*\\3\\s*" +        //  /foo (backreference to the opening tag).
+          ctag +                    // }}
+
+          "\\s*([\\s\\S]*)$",       // everything else in the string ($4). leading whitespace is dropped.
+
+        "g");
+      });
+
 
       // for each {{#foo}}{{/foo}} section do...
-      return template.replace(regex, function(match, type, name, content) {
-        var value = that.find(name, context);
-        if(type == "^") { // inverted section
-          if(!value || that.is_array(value) && value.length === 0) {
+      return template.replace(regex, function(match, before, type, name, content, after) {
+        // before contains only tags, no sections
+        var renderedBefore = before ? that.render_tags(before, context, partials, true) : "",
+
+        // after may contain both sections and tags, so use full rendering function
+            renderedAfter = after ? that.render(after, context, partials, true) : "",
+
+        // will be computed below
+            renderedContent,
+
+            value = that.find(name, context);
+
+        if (type === "^") { // inverted section
+          if (!value || that.is_array(value) && value.length === 0) {
             // false or empty list, render it
-            return that.render(content, context, partials, true);
+            renderedContent = that.render(content, context, partials, true);
           } else {
-            return "";
+            renderedContent = "";
           }
-        } else if(type == "#") { // normal section
-          if(that.is_array(value)) { // Enumerable, Let's loop!
-            return that.map(value, function(row) {
-              return that.render(content, that.create_context(row),
-                partials, true);
+        } else if (type === "#") { // normal section
+          if (that.is_array(value)) { // Enumerable, Let's loop!
+            renderedContent = that.map(value, function(row) {
+              return that.render(content, that.create_context(row), partials, true);
             }).join("");
-          } else if(that.is_object(value)) { // Object, Use it as subcontext!
-            return that.render(content, that.create_context(value),
+          } else if (that.is_object(value)) { // Object, Use it as subcontext!
+            renderedContent = that.render(content, that.create_context(value),
               partials, true);
-          } else if(typeof value === "function") {
+          } else if (typeof value === "function") {
             // higher order section
-            return value.call(context, content, function(text) {
+            renderedContent = value.call(context, content, function(text) {
               return that.render(text, context, partials, true);
             });
-          } else if(value) { // boolean section
-            return that.render(content, context, partials, true);
+          } else if (value) { // boolean section
+            renderedContent = that.render(content, context, partials, true);
           } else {
-            return "";
+            renderedContent = "";
           }
         }
+
+        return renderedBefore + renderedContent + renderedAfter;
       });
     },
 
@@ -148,9 +198,12 @@ var Mustache = function() {
       // tit for tat
       var that = this;
 
+
+
       var new_regex = function() {
-        return new RegExp(that.otag + "(=|!|>|\\{|%)?([^\\/#\\^]+?)\\1?" +
-          that.ctag + "+", "g");
+        return that.getCachedRegex("render_tags", function(otag, ctag) {
+          return new RegExp(otag + "(=|!|>|\\{|%)?([^\\/#\\^]+?)\\1?" + ctag + "+", "g");
+        });
       };
 
       var regex = new_regex();
@@ -216,10 +269,20 @@ var Mustache = function() {
       }
 
       var value;
-      if(is_kinda_truthy(context[name])) {
-        value = context[name];
-      } else if(is_kinda_truthy(this.context[name])) {
-        value = this.context[name];
+      
+      // check for dot notation eg. foo.bar
+      if(name.match(/([a-z_]+)\./ig)){
+        var childValue = this.walk_context(name, context);
+        if(is_kinda_truthy(childValue)) {
+          value = childValue;
+        }
+      }
+      else{
+        if(is_kinda_truthy(context[name])) {
+          value = context[name];
+        } else if(is_kinda_truthy(this.context[name])) {
+          value = this.context[name];
+        }
       }
 
       if(typeof value === "function") {
@@ -232,6 +295,22 @@ var Mustache = function() {
       return "";
     },
 
+    walk_context: function(name, context){
+      var path = name.split('.');
+      // if the var doesn't exist in current context, check the top level context
+      var value_context = (context[path[0]] != undefined) ? context : this.context;
+      var value = value_context[path.shift()];
+      while(value != undefined && path.length > 0){
+        value_context = value;
+        value = value[path.shift()];
+      }
+      // if the value is a function, call it, binding the correct context
+      if(typeof value === "function") {
+        return value.apply(value_context);
+      }
+      return value;
+    },
+
     // Utility methods
 
     /* includes tag */
@@ -247,7 +326,6 @@ var Mustache = function() {
       return s.replace(/&(?!\w+;)|["'<>\\]/g, function(s) {
         switch(s) {
         case "&": return "&amp;";
-        case "\\": return "\\\\";
         case '"': return '&quot;';
         case "'": return '&#39;';
         case "<": return "&lt;";
@@ -301,12 +379,31 @@ var Mustache = function() {
         }
         return r;
       }
+    },
+
+    getCachedRegex: function(name, generator) {
+      var byOtag = regexCache[this.otag];
+      if (!byOtag) {
+        byOtag = regexCache[this.otag] = {};
+      }
+
+      var byCtag = byOtag[this.ctag];
+      if (!byCtag) {
+        byCtag = byOtag[this.ctag] = {};
+      }
+
+      var regex = byCtag[name];
+      if (!regex) {
+        regex = byCtag[name] = generator(this.otag, this.ctag);
+      }
+
+      return regex;
     }
   };
 
   return({
     name: "mustache.js",
-    version: "0.3.1-dev",
+    version: "0.4.0-dev",
 
     /*
       Turns a template and view into HTML
@@ -316,7 +413,7 @@ var Mustache = function() {
       if(send_fun) {
         renderer.send = send_fun;
       }
-      renderer.render(template, view, partials);
+      renderer.render(template, view || {}, partials);
       if(!send_fun) {
         return renderer.buffer.join("\n");
       }

data/vendor/assets/javascripts/poirot/poirot.js

@@ -1,7 +1,14 @@
 var poirot = (function ($) {
 
+  var viewFactory = function (template, partials) {
+    return function (data) {
+      return $(Mustache.to_html(template, data, partials))
+    }
+  }
+
   var poirot = {
-    partials: {}
+    partials: {},
+    _viewFactory: viewFactory
   }
 
   $(document).ready(function () {
@@ -13,9 +20,7 @@ var poirot = (function ($) {
 
       poirot.partials[methodName] = template
 
-      poirot[methodName] = function (presenter) {
-        return $(Mustache.to_html(template, presenter, poirot.partials))
-      }
+      poirot[methodName] = poirot._viewFactory(template, poirot.partials)
     })
   })
 

metadata

@@ -1,57 +1,46 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: poirot
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 3
-  version: 0.0.3
+version: !ruby/object:Gem::Version
+  version: 0.1.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Oliver Nightingale
 - Mark Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-15 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-01-04 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rails
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        version: "3"
+  requirement: &70170133189960 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: mustache
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: *70170133189960
+- !ruby/object:Gem::Dependency
+  name: mustache
+  requirement: &70170133189380 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: *70170133189380
 description: mustaches are cool
-email: 
+email:
 - oliver.nightingale1@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - Gemfile.lock
@@ -67,35 +56,28 @@ files:
 - vendor/assets/javascripts/poirot/index.js
 - vendor/assets/javascripts/poirot/mustache.js
 - vendor/assets/javascripts/poirot/poirot.js
-has_rdoc: true
 homepage: http://rubygems.org/gems/poirot
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: poirot
-rubygems_version: 1.3.6
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: mustaches
 test_files: []
-