eyeballs 0.3.7 → 0.4.1

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

@@ -1,7 +1,12 @@
 /*
-  mustache.js — Logic-less templates in JavaScript
+  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>
 
-  See http://mustache.github.com/ for more info.
+  Thanks @defunkt for the awesome code.
+
+  See http://github.com/defunkt/mustache for more info.
 */
 
 var Mustache = function() {
@@ -17,12 +22,8 @@ var Mustache = function() {
     },
 
     render: function(template, context, partials, in_recursion) {
-      // reset buffer
-      // TODO: make this non-lazy
-      if(!in_recursion)
-        this.buffer = [];
       // fail fast
-      if(!this.includes("", template)) {
+      if(template.indexOf(this.otag) == -1) {
         if(in_recursion) {
           return template;
         } else {
@@ -58,7 +59,7 @@ var Mustache = function() {
     */
     render_pragmas: function(template) {
       // no pragmas
-      if(!this.includes("%", template)) {
+      if(template.indexOf(this.otag + "%") == -1) {
         return template;
       }
 
@@ -94,48 +95,29 @@ var Mustache = function() {
     },
 
     /*
-      Renders inverted (^) and normal (#) sections
+      Renders boolean and enumerable sections
     */
     render_section: function(template, context, partials) {
-      if(!this.includes("#", template) && !this.includes("^", template)) {
+      if(template.indexOf(this.otag + "#") == -1) {
         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 + "\\/\\2" + this.ctag +
-              "\\s*", "mg");
+      var regex = new RegExp(this.otag + "\\#(.+)" + this.ctag +
+              "\\s*([\\s\\S]+?)" + this.otag + "\\/\\1" + this.ctag + "\\s*", "mg");
 
       // for each {{#foo}}{{/foo}} section do...
-      return template.replace(regex, function(match, type, name, content) {
+      return template.replace(regex, function(match, name, content) {
         var 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);
-          } 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.merge(context,
-                      that.create_context(row)), partials, true);
-            }).join("");
-          } else if(that.is_object(value)) { // Object, Use it as subcontext!
-            return that.render(content,
-              that.merge(context, 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 "";
-          }
+        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 "";
         }
       });
     },
@@ -148,7 +130,7 @@ 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");
       };
 
@@ -158,7 +140,7 @@ var Mustache = function() {
          lines[i] = lines[i].replace(regex, function(match, operator, name) {
            switch(operator) {
              case "!": // ignore comments
-               return "";
+               return match;
              case "=": // set new delimiters, rebuild the replace regexp
                that.set_delimiters(name);
                regex = new_regex();
@@ -219,16 +201,11 @@ 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(/&(?!\w+;)|["<>\\]/g, function(s) {
+      return ((s == null) ? "" : s).toString().replace(/[&"<>\\]/g, function(s) {
         switch(s) {
           case "&": return "&amp;";
           case "\\": return "\\\\";;
@@ -305,7 +282,7 @@ var Mustache = function() {
 
   return({
     name: "mustache.js",
-    version: "0.3.0-dev",
+    version: "0.2.3",
 
     /*
       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.3.7"
+  s.version = "0.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Paul Campbell"]
-  s.date = %q{2010-07-02}
+  s.date = %q{2010-07-06}
   s.default_executable = %q{eyeballs}
   s.email = %q{paul@rslw.com}
   s.executables = ["eyeballs"]
@@ -18,16 +18,18 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     "CHANGELOG",
+     "Gemfile",
+     "Gemfile.lock",
      "README.md",
      "Rakefile",
      "app.rb",
      "bin/eyeballs",
      "config.ru",
-     "dist/jquery-1.4.2.min.js",
-     "dist/jquery.livequery.js",
-     "dist/mustache.js",
+     "dist/jquery/jquery-1.4.2.min.js",
+     "dist/jquery/jquery.ba-hashchange.js",
+     "dist/jquery/jquery.livequery.js",
+     "dist/mustache/mustache.0.2.3.js",
      "eyeballs.gemspec",
-     "eyeballs.js.gemspec",
      "lib/eyeballs.rb",
      "lib/eyeballs/app_detector.rb",
      "lib/eyeballs/app_generator.rb",
@@ -35,12 +37,18 @@ Gem::Specification.new do |s|
      "lib/eyeballs/controller_generator.rb",
      "lib/eyeballs/model_generator.rb",
      "lib/eyeballs/scaffold_generator.rb",
-     "src/jquery.o_O.couchdb.js",
-     "src/jquery.o_O.dom.js",
-     "src/jquery.o_O.js",
-     "src/jquery.o_O.rails.js",
+     "src/adapters/o_O.localstorage.js",
+     "src/drivers/jquery/adapters/o_O.couchdb.js",
+     "src/drivers/jquery/adapters/o_O.dom.js",
+     "src/drivers/jquery/adapters/o_O.rest.js",
+     "src/drivers/jquery/modules/o_O.controller.js",
+     "src/drivers/jquery/modules/o_O.routes.js",
+     "src/drivers/jquery/modules/o_O.support.js",
+     "src/modules/o_O.model.js",
+     "src/modules/o_O.validations.js",
      "src/o_O.js",
-     "src/o_O.localstorage.js",
+     "templates/app_root/config/initializer.js",
+     "templates/app_root/config/routes.js",
      "templates/app_root/index.html",
      "templates/controller.js",
      "templates/model.js",
@@ -58,12 +66,13 @@ Gem::Specification.new do |s|
      "test/unit/test_localstorage.html",
      "test/unit/test_model.html",
      "test/unit/test_model_with_callbacks.html",
-     "test/unit/test_rails.html"
+     "test/unit/test_rest.html",
+     "test/unit/test_routing.html"
   ]
   s.homepage = %q{http://www.github.com/paulca/eyeballs.js}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{A lightweight javascript MVC framework.}
   s.test_files = [
     "spec/app_generator_spec.rb",
@@ -78,7 +87,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<thor>, [">= 0"])
       s.add_runtime_dependency(%q<activesupport>, [">= 0"])
     else

data/lib/eyeballs/app_generator.rb

@@ -17,9 +17,9 @@ module Eyeballs
   
     def build_the_app
       directory "templates/app_root", new_app_path
-      copy_file 'dist/jquery-1.4.2.min.js', "#{new_app_path}/vendor/jquery/jquery-1.4.2.min.js"
-      copy_file 'dist/jquery.livequery.js', "#{new_app_path}/vendor/jquery/jquery.livequery.js"
-      copy_file 'dist/mustache.js', "#{new_app_path}/vendor/mustache/mustache.js"
+      copy_file 'dist/jquery/jquery-1.4.2.min.js', "#{new_app_path}/vendor/jquery/jquery-1.4.2.min.js"
+      copy_file 'dist/jquery/jquery.livequery.js', "#{new_app_path}/vendor/jquery/jquery.livequery.js"
+      copy_file 'dist/mustache/mustache.0.2.3.js', "#{new_app_path}/vendor/mustache/mustache.0.2.3.js"
       directory "src", "#{new_app_path}/vendor/eyeballs/"
     end
   

data/spec/app_generator_spec.rb

@@ -12,6 +12,7 @@ describe Eyeballs::AppGenerator do
     let(:model_dir) { file('test', 'app', 'models') }
     let(:controller_dir) { file('test', 'app', 'controllers') }
     let(:view_dir) { file('test', 'app', 'views') }
+    let(:config_dir) { file('test', 'config') }
     let(:vendor_dir) { file('test', 'vendor') }
     let(:jquery_dir) { file('test', 'vendor', 'jquery') }
     let(:eyeballs_dir) { file('test', 'vendor', 'eyeballs') }
@@ -19,8 +20,10 @@ 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.js') }
+    let(:mustache_file) { file('test', 'vendor', 'mustache', 'mustache.0.2.3.js') }
     let(:index_file) { file('test', 'index.html') }
+    let(:initializer_file) { file('test', 'config', 'initializer.js')}
+    let(:routes_file) { file('test', 'config', 'routes.js')}
     
     it "should create the test root" do
       File.exists?(test_root).should be_true
@@ -31,6 +34,7 @@ describe Eyeballs::AppGenerator do
       model_dir.should exist
       controller_dir.should exist
       view_dir.should exist
+      config_dir.should exist
       vendor_dir.should exist
       jquery_dir.should exist
       eyeballs_dir.should exist
@@ -42,6 +46,8 @@ describe Eyeballs::AppGenerator do
       livequery_file.should exist
       mustache_file.should exist
       index_file.should exist
+      initializer_file.should exist
+      routes_file.should exist
     end
     
     after(:all) do

data/spec/spec_helper.rb

@@ -1,8 +1,7 @@
 require 'eyeballs'
 require 'fileutils'
-require 'ruby-debug'
 require 'pathname'
-Debugger.settings[:autoeval] = true
+# Debugger.settings[:autoeval] = true
 
 def create_test_root
   FileUtils.mkdir_p(test_root)

data/src/{jquery.o_O.rails.js → drivers/jquery/adapters/o_O.rest.js}

@@ -1,5 +1,5 @@
 // REST & Rails, woop!
-o_O.rails = {
+o_O.rest = {
   all: function(model, callback){
     $.get('/' + model.table_name, function(response){
       var documents = JSON.parse(response);

data/src/{jquery.o_O.js → drivers/jquery/modules/o_O.controller.js}

@@ -12,6 +12,7 @@ o_O.controller = {
     var controller = controller;
 
     $(function(){
+      
       for(var action in controller)
       {        
         var selector = '[data-controller=' + controller_name + '][data-action=' + action + ']';
@@ -25,13 +26,13 @@ o_O.controller = {
         })
       }
       $('[data-bind]').livequery(function(){
-        var binders = $(this).attr('data-bind').match(/[\+]?(\s+)?[^ :]?[: ]?[^ \/]+[ \/]+[^ ;]+[ ;]?/g)
+        var binders = $(this).attr('data-bind').match(/[\+]?(\s+)?[^ :]?[: ]?[^ #]+[ #]+[^ ;]+[ ;]?/g)
         if(binders != null && binders.length > 0)
         {
           for(i = 0; i < binders.length; i++)
           {
             var rule = binders[i];
-            var parts = rule.match(/([\+])?(\s+)?(([^ :]+)([: ]+))?([^ \/]+)[ \/]+([^ ;]+)[ ;]?/)
+            var parts = rule.match(/([\+])?(\s+)?(([^ :]+)([: ]+))?([^ #]+)[ #]+([^ ;]+)[ ;]?/)
             var default_bit = parts[1];
             var this_action_event = parts[4];
             if(this_action_event === undefined)
@@ -54,67 +55,4 @@ o_O.controller = {
     });
     return controller;
   }
-}
-
-o_O.find_attributes = function(template, callback){
-  var object = {};
-  for(i = 0; i<template.find('[data-attribute]').length; i++)
-  {
-    field = $(template.find('[data-attribute]')[i]);
-    object[field.attr('data-attribute')] = callback(field);
-  }
-  return object;
-}
-
-o_O.params = function(form){
-    return o_O.find_attributes(form, function(field){
-      if(field.is('[type=radio]'))
-      {
-        return $('[data-attribute=' + field.attr('data-attribute') + ']:checked').val()
-      }
-      else
-      {
-        return field.val();
-      }
-    });
-  }
-  
-o_O.render = function(template, data, options){
-  o_O.get_template(template, data, function(data, template){ 
-    var rendered = Mustache.to_html(template, data);
-    if(typeof options === 'object')
-    {
-      if(options.append)
-      {
-        $(options.append).append(rendered);
-      }
-      if(options.prepend)
-      {
-        $(options.prepend).prepend(rendered);
-      }
-    }
-  });
-}
-
-o_O.get_template = function(template, data, callback){
-  if(o_O.templates[template])
-  {
-    callback(data, o_O.templates[template]);
-  }
-  else
-  {
-    var url;
-    if(o_O.config.template_path)
-    {
-      url = o_O.config.template_path + '/';
-    }
-    else
-    {
-      url = 'app/views/'
-    }
-    $.get(url + template + '.html.mustache', function(response){
-      o_O.templates[template] = response;
-      callback(data, response);
-    });
-  }
 }

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

@@ -0,0 +1,45 @@
+o_O.routes = {
+  
+  rules: {},
+  urls: [],
+  
+  router: {
+    match: function(route, options){
+      
+      var figure_action = function(options){
+        var parts = options.to.split('#');
+        var controller = parts[0];
+        var action = parts[1];
+        
+        controller = controller.capitalize() + "Controller";
+        return window[controller][action];
+      }
+      
+      o_O.routes.rules[route] = {"action": figure_action(options), "with": options.with};
+      o_O.routes.urls.push(route);
+    }
+  },
+  
+  draw: function(callback){    
+    $(function(){
+      
+      callback(o_O.routes.router);
+      
+      $(window).bind( 'hashchange', function(){
+        var hash = location.hash.replace(/^(#)/, '');
+        if(o_O.routes.urls.indexOf(hash) >= 0)
+        {
+          o_O.routes.rules[hash].action(o_O.routes.rules[hash].with);
+        }
+      });
+      
+      $('a').live('click', function(){
+        if($(this).is('a[data-ajax-history=true]'))
+        {
+          document.location.hash = $(this).attr('href')
+          return false;
+        }
+      });
+    })
+  }
+}

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

@@ -0,0 +1,69 @@
+o_O.find_attributes = function(template, callback){
+  var object = {};
+  for(i = 0; i<template.find('[data-attribute]').length; i++)
+  {
+    field = $(template.find('[data-attribute]')[i]);
+    object[field.attr('data-attribute')] = callback(field);
+  }
+  return object;
+}
+
+o_O.params = function(form){
+    return o_O.find_attributes(form, function(field){
+      if(field.is('[type=radio]'))
+      {
+        return $('[data-attribute=' + field.attr('data-attribute') + ']:checked').val()
+      }
+      else
+      {
+        return field.val();
+      }
+    });
+  }
+  
+o_O.render = function(template, data, options){
+  o_O.get_template(template, data, function(data, template){ 
+    var rendered = Mustache.to_html(template, data);
+    if(typeof options === 'object')
+    {
+      if(options.append)
+      {
+        $(options.append).append(rendered);
+      }
+      if(options.prepend)
+      {
+        $(options.prepend).prepend(rendered);
+      }
+    }
+  });
+}
+
+o_O.get_template = function(template, data, callback){
+  if(o_O.templates[template])
+  {
+    callback(data, o_O.templates[template]);
+  }
+  else
+  {
+    var url;
+    if(o_O.config.template_path)
+    {
+      url = o_O.config.template_path + '/';
+    }
+    else
+    {
+      url = 'app/views/'
+    }
+    $.get(url + template + '.html.mustache', function(response){
+      o_O.templates[template] = response;
+      callback(data, response);
+    });
+  }
+}
+
+if(typeof String.prototype.capitalize == 'undefined')
+{
+  String.prototype.capitalize = function(){
+    return this.charAt(0).toUpperCase() + this.slice(1);
+  }
+}