liquid_assets 0.1.1 → 0.3.2

data/lib/liquid_assets.rb

@@ -1,13 +1,16 @@
 require 'liquid_assets/version'
+require 'liquid_assets/eval'
 require 'liquid_assets/config'
 require 'liquid_assets/template_handler'
-require 'liquid_assets/tilt_engine'
+
+require 'liquid_assets/resolver'
+
 module LiquidAssets
 
     extend Config
 
     autoload :TinyLiquid, 'liquid_assets/tiny_liquid'
-    autoload :TiltEngine, 'liquid_assets/tilt_engine'
+    autoload :PipelineTemplateEngine, 'liquid_assets/pipeline_template_engine'
 
     if defined? Rails
         require 'liquid_assets/engine'

data/liquid_assets.gemspec

@@ -1,76 +1,28 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'liquid_assets/version'
 
-Gem::Specification.new do |s|
-  s.name = "liquid_assets"
-  s.version = "0.1.0"
+Gem::Specification.new do |spec|
+    spec.name          = "liquid_assets"
+    spec.version       = LiquidAssets::VERSION
+    spec.authors       = ["Nathan Stitt"]
+    spec.email         = ["nathan@stitt.org"]
+    spec.description   = %q{A rails engine that supports writing both server and client side templates in Liqud markup}
+    spec.summary       = %q{Liquid formmated views and assets}
+    spec.homepage      = "http://github.com/nathanstitt/liquid_assets"
+    spec.license       = "MIT"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Nathan Stitt"]
-  s.date = "2013-03-14"
-  s.description = "Allows you to use Liquid format templates in Rails, both as\nview templates and as compiled JavaScript via the asset_pipeline."
-  s.email = "nathan@stitt.org"
-  s.extra_rdoc_files = [
-    "LICENSE.txt",
-    "README.md"
-  ]
-  s.files = [
-    ".document",
-    "Gemfile",
-    "Gemfile.lock",
-    "LICENSE.txt",
-    "README.md",
-    "Rakefile",
-    "VERSION",
-    "lib/liquid_assets.rb",
-    "lib/liquid_assets/config.rb",
-    "lib/liquid_assets/engine.rb",
-    "lib/liquid_assets/template_handler.rb",
-    "lib/liquid_assets/tilt_engine.rb",
-    "lib/liquid_assets/tiny_liquid.rb",
-    "lib/liquid_assets/version.rb",
-    "liquid_assets.gemspec",
-    "test/helper.rb",
-    "test/test_liquid_assets.rb",
-    "vendor/assets/javascripts/liquid_assets.js",
-    "vendor/tinyliquid.js"
-  ]
-  s.homepage = "http://github.com/nathanstitt/liquid_assets"
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.23"
-  s.summary = "Liquid formmated views and assets"
+    spec.files         = `git ls-files`.split($/)
+    spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+    spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+    spec.require_paths = ["lib"]
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
+    spec.add_dependency 'liquid'
+    spec.add_dependency 'tilt'
+    spec.add_dependency 'execjs'
+    spec.add_dependency 'actionpack', '>=3.2'
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<liquid>, [">= 0"])
-      s.add_runtime_dependency(%q<tilt>, [">= 0"])
-      s.add_runtime_dependency(%q<sprockets>, [">= 0"])
-      s.add_runtime_dependency(%q<execjs>, [">= 0"])
-      s.add_development_dependency(%q<rdoc>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-    else
-      s.add_dependency(%q<liquid>, [">= 0"])
-      s.add_dependency(%q<tilt>, [">= 0"])
-      s.add_dependency(%q<sprockets>, [">= 0"])
-      s.add_dependency(%q<execjs>, [">= 0"])
-      s.add_dependency(%q<rdoc>, [">= 0"])
-      s.add_dependency(%q<bundler>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<liquid>, [">= 0"])
-    s.add_dependency(%q<tilt>, [">= 0"])
-    s.add_dependency(%q<sprockets>, [">= 0"])
-    s.add_dependency(%q<execjs>, [">= 0"])
-    s.add_dependency(%q<rdoc>, [">= 0"])
-    s.add_dependency(%q<bundler>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-  end
+    spec.add_development_dependency "bundler", "~> 1.3"
+    spec.add_development_dependency "rake"
 end
-

data/test/helper.rb

@@ -15,7 +15,7 @@ require 'liquid_assets'
 
 module LiquidAssets::Config
     def reset!
-        %w(env path_prefix template_namespace filters ).each do |option|
+        %w(env path_prefix namespace filters ).each do |option|
             send "#{option}=", nil
         end
     end

data/test/test_liquid_assets.rb

@@ -9,18 +9,17 @@ class TestLiquidAssets < Test::Unit::TestCase
     end
 
     def test_mime_type
-        assert_equal 'application/javascript', LiquidAssets::TiltEngine.default_mime_type
+        assert_equal 'application/javascript', LiquidAssets::PipelineTemplateEngine.default_mime_type
     end
 
     def test_tilt_engine_rendering
         scope = make_scope '/myapp/app/assets/javascripts', 'path/to/template.mustache'
 
-        template = LiquidAssets::TiltEngine.new(scope.s_path) { "This is {{me}}" }
+        template = LiquidAssets::PipelineTemplateEngine.new(scope.s_path) { "This is {{me}}" }
+
+tmpl="LQT.Templates[\"path/to/template\"] =                  function(locals,filters){\n                     var $_tmpbuf, $_html = LQT._FNS.html, $_err = LQT._FNS.err,\n                         $_rethrow=LQT._FNS.rethrow, $_merge=LQT._FNS.merge,\n                         $_range=LQT._FNS.range, $_array=LQT._FNS.array;\n                         /* == Template Begin == */\nvar $_buf = '';\nvar $_line_num = 0;\n/* == define cycles == */\nvar $_cycle_next = function (n) {\nn.i++;\nif (n.i >= n.length) n.i = 0;\n}\n$_buf+=('This is ');\n$_line_num = 1;\n$_tmpbuf = locals.me;\n$_buf+=($_tmpbuf===null||typeof($_tmpbuf)===\"undefined\"?\"\":$_tmpbuf);\n                         return $_buf;\n                }\n;"
+        assert_equal tmpl, template.render(scope, {})
 
-        assert_equal <<-END_EXPECTED, template.render(scope, {})
-                this.LQT || (this.LQT = {});
-                this.LQT[\"path/to/template\"] = function(locals,filters){\nvar $_tmpbuf, $_html = LQT._FNS.html, $_err = LQT._FNS.err, $_rethrow=LQT._FNS.rethrow, $_merge=LQT._FNS.merge, $_range=LQT._FNS.range, $_array=LQT._FNS.array;\n/* == Template Begin == */\nvar $_buf = '';\nvar $_line_num = 0;\n/* == define cycles == */\nvar $_cycle_next = function (n) {\nn.i++;\nif (n.i >= n.length) n.i = 0;\n}\n$_buf+=('This is ');\n$_line_num = 1;\n$_tmpbuf = locals.me;\n$_buf+=($_tmpbuf===null||typeof($_tmpbuf)===\"undefined\"?\"\":$_tmpbuf);\nreturn $_buf;\n};
-      END_EXPECTED
     end
 
     def test_template_rendering
@@ -30,4 +29,48 @@ class TestLiquidAssets < Test::Unit::TestCase
         assert_equal 'foo=bar', template
     end
 
+
+    def test_resolver
+        LiquidAssets::Config.content_provider = lambda do | path |
+            'good' == path ? 'Hello {{bob|upcase}}' : false
+        end
+
+        details = {:formats=>[:liquid], :locale=>[:en], :handlers=>[] }
+        resolver = LiquidAssets::Resolver.instance
+
+        assert_empty     resolver.find_all('bad','',false, details )
+        assert_not_empty resolver.find_all('good','',false, details )
+    end
+
+    def test_resolver_caches
+        times_called = 0
+        LiquidAssets::Config.content_provider = lambda do | path |
+            times_called += 1
+            'foo/bar/good' == path ? 'Hello {{bob|upcase}}' : false
+        end
+
+        details = {:formats=>[:liquid], :locale=>[:en], :handlers=>[] }
+        resolver = LiquidAssets::Resolver.instance
+        key = 'dumb-key'
+        (0...3).each do
+            resolver.find_all('foo/bar/good',nil ,false, details, key )
+        end
+        assert_equal 1, times_called
+
+        times_called = 0
+
+        resolver.clear_cache_for( 'bad' ) # shouldn't clear cache for 'good'
+
+        resolver.find_all('foo/bar/good',nil,false, details, key )
+
+        assert_equal 0, times_called
+
+        resolver.clear_cache_for( 'foo/bar/good' )
+
+        resolver.find_all('foo/bar/good',nil,false, details, key )
+
+        assert_equal 1, times_called
+
+
+    end
 end

data/vendor/assets/javascripts/liquid_assets.js.erb

@@ -0,0 +1,228 @@
+(function( namespace, document, undefined) {
+
+    namespace = namespace.<%= LiquidAssets::Config.namespace%> || (namespace.<%=LiquidAssets::Config.namespace%>={});
+    namespace.Templates || ( namespace.Templates={} );
+
+    namespace.Globals || ( namespace.Globals = {} );
+    var server_globals = <%= LiquidAssets::Config.globals.to_json.html_safe %>;
+    for ( var key in server_globals ){
+        namespace.Globals[ key ] = server_globals[key];
+    }
+
+    namespace.Render = function( name, data ){
+        if (data == null) {
+            data = {};
+        }
+        for ( var key in namespace.Globals )
+            if (! data.hasOwnProperty(key) )
+                data[key] = namespace.Globals[key];
+
+        return namespace.Templates[name]( data, namespace.Filters );
+    };
+
+    namespace.RenderPartial = function( name, data ){
+        var path, parts = name.split('/');
+        if ( parts.length > 1 )
+            path = parts.slice( 0, parts.length-1) +'/_'+parts[ parts.length-1 ];
+        else
+            path = '_' + parts[ parts.length-1 ];
+        return namespace.Render( path, data );
+    };
+
+    namespace._FNS = {
+        html: function (html) {
+            return html.replace(/\\/g, '\\\\')
+                .replace(/'/g, '\\\'')
+                .replace(/"/g, '\\\"')
+                .replace(/\r/g, '\\r')
+                .replace(/\n/g, '\\n');
+        },
+        err: function (msg) {
+            var html = '<pre style="font-family:Courier; font-weight:bold; \
+font-size:14px; color:red; padding:4px 20px 4px 20px; border:1px solid #CCC; \
+background-color:#FFF5F0; line-height:1.6em; white-space:pre-wrap; \
+white-space:-moz-pre-wrap; white-space:-pre-wrap; white-space:-o-pre-wrap; \
+word-wrap:break-word; z-index:9999">' + msg + '</pre>';
+            return html;
+        },
+        rethrow: function (err, filename) {
+            var msg = 'An error occurred while rendering\n' +
+                'Line: ' + $_line_num + (filename ? '  File: ' + filename : '') +
+                '\n    ' + err;
+            $_buf += $_err(msg);
+        },
+        merge: function () {
+            var ret = {};
+            for (var i in arguments) {
+                var obj = arguments[i];
+                for (var j in obj) {
+                    ret[j] = obj[j];
+                }
+            }
+            return ret;
+        },
+        range: function (s, e) {
+            s = parseInt(s);
+            e = parseInt(e);
+            var r = [];
+            if (isNaN(s) || isNaN(e)) return r;
+            for (; s <= e; s++) {
+                r.push(s);
+            }
+            return r;
+        },
+        'array': function (data) {
+            if (Array.isArray(data)) return data;
+            var ret = [];
+            for (var i in data) {
+                if (i !== 'size') {
+                    ret.push(data[i]);
+                }
+            }
+            return ret;
+        }
+    };
+
+    var toNumber = function(input) {
+        return Number(input);
+    };
+
+    var toString = function(input) {
+        if (!input) {
+            return '';
+        }
+        if (_.isString(input)) {
+            return input;
+        } else if (typeof input.toString === "function") {
+            return input.toString();
+        } else {
+            return Object.prototype.toString.call(input);
+        }
+    };
+
+    namespace.Filters = {
+        size: function(input) {
+            return input.length;
+        },
+        downcase: function(input) {
+            return toString(input).toLowerCase();
+        },
+        upcase: function(input) {
+            return toString(input).toUpperCase();
+        },
+        append: function(input, other) {
+            return [toString(input), toString(other)].join();
+        },
+        prepend: function(input, other) {
+            return [toString(other), toString(input)].join();
+        },
+        empty: function(input) {
+            if (!input) {
+                return true;
+            }
+            if (input.length == null) {
+                return false;
+            }
+            return true;
+        },
+        truncate: function(input, length, truncateString) {
+            var l;
+
+            if (length == null) {
+                length = 50;
+            }
+            if (truncateString == null) {
+                truncateString = '...';
+            }
+            input = toString(input);
+            truncateString = toString(truncateString);
+            if (input == null) {
+                return '';
+            }
+            if (!input.slice) {
+                return '';
+            }
+            length = toNumber(length);
+            l = length - truncateString.length;
+            if (l < 0) {
+                l = 0;
+            }
+            if (input.length > length) {
+                return input.slice(0, +l + 1 || 9e9) + truncateString;
+            } else {
+                return input;
+            }
+        },
+        truncatewords: function(input, words, truncateString) {
+            var l, wordlist;
+
+            if (words == null) {
+                words = 15;
+            }
+            if (truncateString == null) {
+                truncateString = '...';
+            }
+            input = toString(input);
+            if (input == null) {
+                return '';
+            }
+            if (!input.slice) {
+                return '';
+            }
+            wordlist = input.split(" ");
+            words = toNumber(words);
+            l = words - 1;
+            if (l < 0) {
+                l = 0;
+            }
+            if (wordlist.length > l) {
+                return wordlist.slice(0, +l + 1 || 9e9).join(" ") + truncateString;
+            } else {
+                return input;
+            }
+        },
+        split: function(input, pattern) {
+            input = toString(input);
+            if (!input) {
+                return null;
+            }
+            return input.split(pattern);
+        },
+        join: function(input, glue) {
+            if (glue == null) {
+                glue = ' ';
+            }
+            return _(input).flatten().join(glue);
+        },
+        first: function(array) {
+            if (array.length > 0) {
+                return array[0];
+            } else {
+                return null;
+            }
+        },
+        last: function(array) {
+            if (array.length > 0) {
+                return array[array.length - 1];
+            } else {
+                return null;
+            }
+        },
+        plus: function(input, operand) {
+            return toNumber(input) + toNumber(operand);
+        },
+        minus: function(input, operand) {
+            return toNumber(input) - toNumber(operand);
+        },
+        times: function(input, operand) {
+            return toNumber(input) * toNumber(operand);
+        },
+        dividedBy: function(input, operand) {
+            return toNumber(input) / toNumber(operand);
+        },
+        modulo: function(input, operand) {
+            return toNumber(input) % toNumber(operand);
+        }
+    };
+
+}(window, document));

data/vendor/tinyliquid.js

@@ -2139,11 +2139,14 @@ exports.tags = function (text, start, context) {
               setLineNumber();
               var include_parts = inc_tag.name.split('/');
               include_parts[ include_parts.length-1] = '_' + include_parts[ include_parts.length - 1 ];
-              var partial_function = context.partials_namespace + '[\'' + include_parts.join('/') + '\']';
-              script += 'if ( ' + partial_function + '){' +
-                  '  $_buf+=' + partial_function + '(' + (inc_tag.with ? inc_tag.with : 'locals') + ',filters);' +
-                  '} else {' +
-                  '  $_buf+=\'No such template ' + include_parts.join('/') + '\';' +
+              var partial_function = context.namespace + '.Templates[\'' + include_parts.join('/') + '\']';
+              script += 'if ( ' + partial_function + '){';
+                  if ( inc_tag.with )
+                      script+='  $_buf+=' + partial_function + '({\'' + inc_tag.with + '\': locals.' + (inc_tag.with) + '},filters);';
+                  else
+                      script+='  $_buf+=' + partial_function + '(locals,filters);';
+              script+='} else {' +
+                  '  $_buf+=\'Partial not found: ' + include_parts.join('/') + '\';' +
                   '}';
               // script += '/* === include "' + inc_tag.name + '"' +
               //           (inc_tag.with ? ' with "' + inc_tag.with + '"' : '') +
@@ -2224,7 +2227,7 @@ exports.parse = function (text, options) {
   };
 
   // 初始化编译环境
-  context.partials_namespace = options.partials_namespace;
+  context.namespace = options.namespace;
   context.customTags = options.tags;  // 自定义的标记解析
   context.loop = 0;                   // { 嵌套层数
   context.loopName = [];              // 当前嵌套标记名称