shared_mustache 0.0.3 → 0.1.0

data/lib/shared_mustache/mustache_view.rb

@@ -0,0 +1,7 @@
+require 'mustache'
+
+class MustacheView < Mustache
+  def partial(name)
+    File.read("#{template_path}/#{name}.#{template_extension}")
+  end
+end

data/lib/shared_mustache/version.rb

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

data/lib/shared_mustache/view_helpers.rb

@@ -1,4 +1,4 @@
-require 'mustache'
+require 'shared_mustache/mustache_view'
 
 module SharedMustache
   module ViewHelpers
@@ -13,8 +13,9 @@ module SharedMustache
     end
 
     def render_mustache(template, options={})
-      view = Mustache.new
-      view.template = File.read(SharedMustache.find_template_path(template, params[:controller]))
+      view = MustacheView.new
+      view.template_name = SharedMustache.find_template_path(template, params[:controller])
+      view.template_path = SharedMustache.view_dir
       view.render(options).html_safe
     end
   end

data/lib/shared_mustache.rb

@@ -13,7 +13,7 @@ module SharedMustache
   end
 
   def self.file_name_to_id(filename)
-    filename.gsub('.mustache', '').gsub("#{view_dir}/", '').gsub('/', '-')
+    filename.gsub('.mustache', '').gsub("#{view_dir}/", '')
   end
 
   def self.find_template_path(filename, controller)
@@ -21,7 +21,6 @@ module SharedMustache
     if directory == '.'
       directory = controller
     end
-
-    File.join(view_dir, directory, "_#{File.basename(filename)}.mustache")
+    File.join(directory, "_#{File.basename(filename)}")
   end
 end

data/vendor/assets/javascripts/shared_mustache/mustache-loader.js

@@ -29,15 +29,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 /*
  * mustache-loader.js - Mustache template loader to go with flask-mustache
  *
- * This depends on jQuery, and either:
- * - Twitter's Hogan.js:  https://github.com/twitter/hogan.js or
- * - Mustache.js:         https://github.com/janl/mustache.js
+ * This depends on jQuery, and Twitter's Hogan.js
+ * https://github.com/twitter/hogan.js or
  *
  * Usage:
  *
  *   $('#target').mustache('includes/_user.mustache', {user_name:'Jan'});
  *   var html = $.mustache('includes/_user.mustache', {user_name:'Jan'});
- *   $.mustacheAsFunction('includes/_user.mustache')({user_name:'Jan'});
  */
 
 /*jslint
@@ -55,14 +53,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     // this is a cached lookup table of templates
     var cache = {};
 
+    // only load partials once
+    var partialsLoaded = false;
+
     var load = function(templateName) {
         // this function takes names like: "includes/_user.mustache"
         // and loads them from somewhere else.
 
-        // first we need to convert slashes to hyphens, since
-        // they're DOM valid
-        templateName = templateName.replace('/', '-');
-
         // they can be cached as functions, or as strings.
         // Strings are template content.
         if (typeof cache[templateName] === 'undefined') {
@@ -72,7 +69,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
                 cache[templateName] = $('<div />').html(
                     $(document.getElementById(templateName)).html().trim()).text();
             }
-            else if (templates[templateName]){
+            else if (window.templates && templates[templateName]){
                 cache[templateName] = templates[templateName];
             }
         }
@@ -80,34 +77,30 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
         return cache[templateName];
     };
 
-    var compile = function(templateName) {
-        // returns a compiled template.
-        // only works with Hogan.js or if templates pre-compiled.
-        var templateContent = load(templateName),
-            template = null;
-
-        if (typeof templateContent === 'string' && window.Hogan) {
-            template = cache[templateName] = window.Hogan.compile(templateContent);
+    var loadPartials = function() {
+        var templateName;
+
+        if (partialsLoaded === false){
+            if(typeof templates === "undefined"){
+                $('script[type="text/mustache"]').each(function(i, el){
+                    templateName = $(el).attr('id');
+                    // stupid hack to turn HTML-encoded templates into strings, see:
+                    // http://stackoverflow.com/a/2419664/61435
+                    cache[templateName] = $('<div />').html($(el).html().trim()).text();
+                });
+            }
         }
-        if (template === null) {
-            $.error("Couldn't compile template " + templateName);
+        else if (window.templates) {
+            for(template in templates){
+                cache[templateName] = templates[templateName];
+            }
         }
-        return template;
     };
 
-    var renderFunction = function(templateName) {
-        // returns a wrapped `render` function
-        // only works with Hogan.js or if templates pre-compiled.
-        var template = compile(templateName);
-
-        return function(context) {
-            return template.render(context);
-        };
-    };
 
     var render = function(templateName, context) {
-
-        // first we need to try and load the template
+        // first we need to try and load the template and partials
+        loadPartials();
         var template = load(templateName);
 
         if (typeof template === 'undefined') {
@@ -116,21 +109,17 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
         // pre-compiled hogan templates are objects
         else if (typeof template === 'object') {
             // template has been pre-compiled, just render and return it
-            return template.render(context);
+            return template.render(context, cache);
         }
 
         // template hasn't been pre-compiled yet
         // so we need to do other things
         if (window.Hogan) {
-            return window.Hogan.compile(template).render(context);
-        }
-
-        if (window.Mustache) {
-            return window.Mustache.render(template, context);
+            return window.Hogan.compile(template).render(context, cache);
         }
 
-        // we don't have Hogan or Mustache, so we need to bail
-        $.error('Must have either Hogan.js or Mustache.js to load string templates');
+        // we don't have Hogan so we need to bail
+        $.error('Must have Hogan.js to load string templates');
     };
 
     $.fn.mustache = function(templateName, context) {
@@ -145,12 +134,4 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
         return render(templateName, context);
     };
-
-    $.mustacheAsFunction = function(templateName) {
-        // returns a function that can be used to render the
-        // mustache template
-
-        return renderFunction(templateName);
-    };
-
 }(jQuery));

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shared_mustache
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-02 00:00:00.000000000 Z
+date: 2014-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mustache
@@ -77,6 +77,7 @@ files:
 - lib/shared_mustache/config.rb
 - lib/shared_mustache/engine.rb
 - lib/shared_mustache/hogan.rb
+- lib/shared_mustache/mustache_view.rb
 - lib/shared_mustache/railtie.rb
 - lib/shared_mustache/version.rb
 - lib/shared_mustache/view_helpers.rb
@@ -101,7 +102,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2914413933080530514
+      hash: -2201938304553543237
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -110,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2914413933080530514
+      hash: -2201938304553543237
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23