eyeballs 0.5.7.2 → 0.5.8

data/Rakefile

@@ -27,7 +27,7 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |s|
     s.name = "eyeballs"
-    s.version = "0.5.7.2"
+    s.version = "0.5.8"
     s.author = "Paul Campbell"
     s.email = "paul@rslw.com"
     s.homepage = "http://www.github.com/paulca/eyeballs.js"

data/dist/mustache/{mustache.0.2.3.js → mustache.0.3.0.js}

@@ -1,12 +1,7 @@
 /*
-  Shameless port of http://github.com/defunkt/mustache
-  by Jan Lehnardt <jan@apache.org>,
-     Alexander Lang <alex@upstream-berlin.com>,
-     Sebastian Cohnen <sebastian.cohnen@googlemail.com>
+  mustache.js — Logic-less templates in JavaScript
 
-  Thanks @defunkt for the awesome code.
-
-  See http://github.com/defunkt/mustache for more info.
+  See http://mustache.github.com/ for more info.
 */
 
 var Mustache = function() {
@@ -20,10 +15,17 @@ var Mustache = function() {
     pragmas_implemented: {
       "IMPLICIT-ITERATOR": true
     },
+    context: {},
 
     render: function(template, context, partials, in_recursion) {
+      // reset buffer & set context
+      if(!in_recursion) {
+        this.context = context;
+        this.buffer = []; // TODO: make this non-lazy
+      }
+
       // fail fast
-      if(template.indexOf(this.otag) == -1) {
+      if(!this.includes("", template)) {
         if(in_recursion) {
           return template;
         } else {
@@ -32,10 +34,6 @@ var Mustache = function() {
         }
       }
 
-      if(!in_recursion) {
-        this.buffer = [];
-      }
-
       template = this.render_pragmas(template);
       var html = this.render_section(template, context, partials);
       if(in_recursion) {
@@ -59,17 +57,18 @@ var Mustache = function() {
     */
     render_pragmas: function(template) {
       // no pragmas
-      if(template.indexOf(this.otag + "%") == -1) {
+      if(!this.includes("%", template)) {
         return template;
       }
 
       var that = this;
-      var regex = new RegExp(this.otag + "%([\\w_-]+) ?([\\w]+=[\\w]+)?"
-        + this.ctag);
+      var regex = new RegExp(this.otag + "%([\\w-]+) ?([\\w]+=[\\w]+)?" +
+            this.ctag);
       return template.replace(regex, function(match, pragma, options) {
         if(!that.pragmas_implemented[pragma]) {
-          throw({message: "This implementation of mustache doesn't understand the '"
-            + pragma + "' pragma"});
+          throw({message: 
+            "This implementation of mustache doesn't understand the '" +
+            pragma + "' pragma"});
         }
         that.pragmas[pragma] = {};
         if(options) {
@@ -82,42 +81,62 @@ var Mustache = function() {
     },
 
     /*
-      Tries to find a partial in the global scope and render it
+      Tries to find a partial in the curent scope and render it
     */
     render_partial: function(name, context, partials) {
-      if(!partials || !partials[name]) {
+      name = this.trim(name);
+      if(!partials || partials[name] === undefined) {
         throw({message: "unknown_partial '" + name + "'"});
       }
       if(typeof(context[name]) != "object") {
-        return partials[name];
+        return this.render(partials[name], context, partials, true);
       }
       return this.render(partials[name], context[name], partials, true);
     },
 
     /*
-      Renders boolean and enumerable sections
+      Renders inverted (^) and normal (#) sections
     */
     render_section: function(template, context, partials) {
-      if(template.indexOf(this.otag + "#") == -1) {
+      if(!this.includes("#", template) && !this.includes("^", template)) {
         return template;
       }
+
       var that = this;
       // CSW - Added "+?" so it finds the tighest bound, not the widest
-      var regex = new RegExp(this.otag + "\\#(.+)" + this.ctag +
-              "\\s*([\\s\\S]+?)" + this.otag + "\\/\\1" + this.ctag + "\\s*", "mg");
+      var regex = new RegExp(this.otag + "(\\^|\\#)\\s*(.+)\\s*" + this.ctag +
+              "\n*([\\s\\S]+?)" + this.otag + "\\/\\s*\\2\\s*" + this.ctag +
+              "\\s*", "mg");
 
       // for each {{#foo}}{{/foo}} section do...
-      return template.replace(regex, function(match, name, content) {
+      return template.replace(regex, function(match, type, name, content) {
         var value = that.find(name, context);
-        if(that.is_array(value)) { // Enumerable, Let's loop!
-          return that.map(value, function(row) {
-            return that.render(content, that.merge(context,
-                    that.create_context(row)), partials, true);
-          }).join("");
-        } else if(value) { // boolean section
-          return that.render(content, context, partials, true);
-        } else {
-          return "";
+        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);
+          } else {
+            return "";
+          }
+        } 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);
+            }).join("");
+          } else if(that.is_object(value)) { // Object, Use it as subcontext!
+            return that.render(content, that.create_context(value),
+              partials, true);
+          } else if(typeof value === "function") {
+            // higher order section
+            return 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 {
+            return "";
+          }
         }
       });
     },
@@ -130,37 +149,38 @@ var Mustache = function() {
       var that = this;
 
       var new_regex = function() {
-        return new RegExp(that.otag + "(=|!|>|\\{|%)?([^\/#]+?)\\1?" +
+        return new RegExp(that.otag + "(=|!|>|\\{|%)?([^\\/#\\^]+?)\\1?" +
           that.ctag + "+", "g");
       };
 
       var regex = new_regex();
+      var tag_replace_callback = function(match, operator, name) {
+        switch(operator) {
+        case "!": // ignore comments
+          return "";
+        case "=": // set new delimiters, rebuild the replace regexp
+          that.set_delimiters(name);
+          regex = new_regex();
+          return "";
+        case ">": // render partial
+          return that.render_partial(name, context, partials);
+        case "{": // the triple mustache is unescaped
+          return that.find(name, context);
+        default: // escape the value
+          return that.escape(that.find(name, context));
+        }
+      };
       var lines = template.split("\n");
-       for (var i=0; i < lines.length; i++) {
-         lines[i] = lines[i].replace(regex, function(match, operator, name) {
-           switch(operator) {
-             case "!": // ignore comments
-               return match;
-             case "=": // set new delimiters, rebuild the replace regexp
-               that.set_delimiters(name);
-               regex = new_regex();
-               return "";
-             case ">": // render partial
-               return that.render_partial(name, context, partials);
-             case "{": // the triple mustache is unescaped
-               return that.find(name, context);
-             default: // escape the value
-               return that.escape(that.find(name, context));
-           }
-         }, this);
-         if(!in_recursion) {
-           this.send(lines[i]);
-         }
-       }
-
-       if(in_recursion) {
-         return lines.join("\n");
-       }
+      for(var i = 0; i < lines.length; i++) {
+        lines[i] = lines[i].replace(regex, tag_replace_callback, this);
+        if(!in_recursion) {
+          this.send(lines[i]);
+        }
+      }
+
+      if(in_recursion) {
+        return lines.join("\n");
+      }
     },
 
     set_delimiters: function(delimiters) {
@@ -180,7 +200,7 @@ var Mustache = function() {
           '(\\' + specials.join('|\\') + ')', 'g'
         );
       }
-    return text.replace(arguments.callee.sRE, '\\$1');
+      return text.replace(arguments.callee.sRE, '\\$1');
     },
 
     /*
@@ -189,11 +209,24 @@ var Mustache = function() {
     */
     find: function(name, context) {
       name = this.trim(name);
-      if(typeof context[name] === "function") {
-        return context[name].apply(context);
+
+      // Checks whether a value is thruthy or false or 0
+      function is_kinda_truthy(bool) {
+        return bool === false || bool === 0 || bool;
       }
-      if(context[name] !== undefined) {
-        return context[name];
+
+      var value;
+      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") {
+        return value.apply(context);
+      }
+      if(value !== undefined) {
+        return value;
       }
       // silently ignore unkown variables
       return "";
@@ -201,47 +234,37 @@ var Mustache = function() {
 
     // Utility methods
 
+    /* includes tag */
+    includes: function(needle, haystack) {
+      return haystack.indexOf(this.otag + needle) != -1;
+    },
+
     /*
       Does away with nasty characters
     */
     escape: function(s) {
-      return ((s == null) ? "" : s).toString().replace(/[&"<>\\]/g, function(s) {
+      s = String(s === null ? "" : s);
+      return s.replace(/&(?!\w+;)|["<>\\]/g, function(s) {
         switch(s) {
-          case "&": return "&amp;";
-          case "\\": return "\\\\";;
-          case '"': return '\"';;
-          case "<": return "&lt;";
-          case ">": return "&gt;";
-          default: return s;
+        case "&": return "&amp;";
+        case "\\": return "\\\\";
+        case '"': return '\"';
+        case "<": return "&lt;";
+        case ">": return "&gt;";
+        default: return s;
         }
       });
     },
 
-    /*
-      Merges all properties of object `b` into object `a`.
-      `b.property` overwrites a.property`
-    */
-    merge: function(a, b) {
-      var _new = {};
-      for(var name in a) {
-        if(a.hasOwnProperty(name)) {
-          _new[name] = a[name];
-        }
-      };
-      for(var name in b) {
-        if(b.hasOwnProperty(name)) {
-          _new[name] = b[name];
-        }
-      };
-      return _new;
-    },
-
     // by @langalex, support for arrays of strings
     create_context: function(_context) {
       if(this.is_object(_context)) {
         return _context;
-      } else if(this.pragmas["IMPLICIT-ITERATOR"]) {
-        var iterator = this.pragmas["IMPLICIT-ITERATOR"].iterator || ".";
+      } else {
+        var iterator = ".";
+        if(this.pragmas["IMPLICIT-ITERATOR"]) {
+          iterator = this.pragmas["IMPLICIT-ITERATOR"].iterator;
+        }
         var ctx = {};
         ctx[iterator] = _context;
         return ctx;
@@ -272,7 +295,7 @@ var Mustache = function() {
       } else {
         var r = [];
         var l = array.length;
-        for(var i=0;i<l;i++) {
+        for(var i = 0; i < l; i++) {
           r.push(fn(array[i]));
         }
         return r;
@@ -282,7 +305,7 @@ var Mustache = function() {
 
   return({
     name: "mustache.js",
-    version: "0.2.3",
+    version: "0.3.0",
 
     /*
       Turns a template and view into HTML

data/eyeballs.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{eyeballs}
-  s.version = "0.5.7.2"
+  s.version = "0.5.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Paul Campbell"]
-  s.date = %q{2010-08-08}
+  s.date = %q{2010-08-23}
   s.default_executable = %q{eyeballs}
   s.email = %q{paul@rslw.com}
   s.executables = ["eyeballs"]
@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
      "config.ru",
      "dist/jquery/jquery-1.4.2.min.js",
      "dist/jquery/jquery.ba-hashchange.js",
-     "dist/mustache/mustache.0.2.3.js",
+     "dist/mustache/mustache.0.3.0.js",
      "eyeballs.gemspec",
      "lib/eyeballs.rb",
      "lib/eyeballs/app_detector.rb",

data/lib/eyeballs/app_generator.rb

@@ -18,7 +18,7 @@ module Eyeballs
     def build_the_app
       directory "templates/app_root", new_app_path
       copy_file 'dist/jquery/jquery-1.4.2.min.js', "#{new_app_path}/vendor/jquery/jquery-1.4.2.min.js"
-      copy_file 'dist/mustache/mustache.0.2.3.js', "#{new_app_path}/vendor/mustache/mustache.0.2.3.js"
+      copy_file 'dist/mustache/mustache.0.3.0.js', "#{new_app_path}/vendor/mustache/mustache.0.3.0.js"
       directory "src", "#{new_app_path}/vendor/eyeballs/"
       template "templates/initializer.js", "#{new_app_path}/config/initializer.js"
     end

data/lib/eyeballs/controller_generator.rb

@@ -17,6 +17,7 @@ module Eyeballs
   
     def build_the_model
       template "templates/controller.js", "#{app_path}/app/controllers/#{name.downcase}_controller.js"
+      empty_directory "#{app_path}/app/views/#{name.downcase}"
     end
   
     def farewell

data/spec/app_generator_spec.rb

@@ -20,7 +20,7 @@ describe Eyeballs::AppGenerator do
     
     let(:jquery_file) { file('test', 'vendor', 'jquery', 'jquery-1.4.2.min.js') }
     let(:livequery_file) { file('test', 'vendor', 'jquery', 'jquery.livequery.js') }
-    let(:mustache_file) { file('test', 'vendor', 'mustache', 'mustache.0.2.3.js') }
+    let(:mustache_file) { file('test', 'vendor', 'mustache', 'mustache.0.3.0.js') }
     let(:index_file) { file('test', 'index.html') }
     let(:initializer_file) { file('test', 'config', 'initializer.js')}
     let(:routes_file) { file('test', 'config', 'routes.js')}

data/spec/controller_generator_spec.rb

@@ -9,6 +9,7 @@ describe Eyeballs::ControllerGenerator do
   end
   
   let(:controller_file) { file('app/controllers/paul_controller.js') }
+  let(:controller_view_dir) { file('app/views/paul') }
   
   it "should create my controller" do
     controller_file.should exist
@@ -18,6 +19,10 @@ describe Eyeballs::ControllerGenerator do
     controller_file.read.should include("o_O('PaulController', {")
   end
   
+  it "should create an empty dir for views" do
+    controller_view_dir.should exist
+  end
+  
   after(:all) do
     remove_test_root
   end

data/src/drivers/jquery/modules/o_O.support.js

@@ -34,6 +34,10 @@ o_O.render = function(template, data, options){
       {
         $(options.prepend).prepend(rendered);
       }
+      if(options.replace)
+      {
+        $(options.replace).replaceWith(rendered);
+      }
     }
   });
 }

data/templates/initializer.js

@@ -3,6 +3,12 @@
 <% if rack_app? %>
 o_O.model.adapter = o_O.rest;
 o_O.config.authenticity_token = $('meta[name=csrf-token]').attr('content')
+o_O.config.template_path = '/javascripts/app/views';
+
+jQuery.ajaxSetup({ 
+  'beforeSend': function(xhr) {xhr.setRequestHeader("Accept",
+    "text/javascript")} 
+})
 <% else %>
 o_O.model.adapter = o_O.localstorage;
 <% end %>

data/templates/scaffold_index.html

@@ -29,7 +29,7 @@
     </div>
   </body>
   <script src="<%= prefix %>vendor/jquery/jquery-1.4.2.min.js"></script>
-  <script src="<%= prefix %>vendor/mustache/mustache.0.2.3.js"></script>
+  <script src="<%= prefix %>vendor/mustache/mustache.0.3.0.js"></script>
   <script src="<%= prefix %>vendor/eyeballs/o_O.js"></script>
   <script src="<%= prefix %>vendor/eyeballs/modules/o_O.model.js"></script>
   <script src="<%= prefix %>vendor/eyeballs/modules/o_O.validations.js"></script>

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: eyeballs
 version: !ruby/object:Gem::Version 
-  hash: 127
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 5
-  - 7
-  - 2
-  version: 0.5.7.2
+  - 8
+  version: 0.5.8
 platform: ruby
 authors: 
 - Paul Campbell
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-08 00:00:00 +01:00
+date: 2010-08-23 00:00:00 +01:00
 default_executable: eyeballs
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -67,7 +66,7 @@ files:
 - config.ru
 - dist/jquery/jquery-1.4.2.min.js
 - dist/jquery/jquery.ba-hashchange.js
-- dist/mustache/mustache.0.2.3.js
+- dist/mustache/mustache.0.3.0.js
 - eyeballs.gemspec
 - lib/eyeballs.rb
 - lib/eyeballs/app_detector.rb