spine-rails 0.0.9 → 0.1.0

data/app/assets/javascripts/spine/route.js

@@ -1,34 +1,41 @@
 (function() {
-  var $, escapeRegExp, hashStrip, namedParam, splatParam;
-  var __hasProp = Object.prototype.hasOwnProperty, __extends = function(child, parent) {
-    for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; }
-    function ctor() { this.constructor = child; }
-    ctor.prototype = parent.prototype;
-    child.prototype = new ctor;
-    child.__super__ = parent.prototype;
-    return child;
-  }, __slice = Array.prototype.slice;
-  if (typeof Spine === "undefined" || Spine === null) {
-    Spine = require('spine');
-  }
+  var $, escapeRegExp, hashStrip, namedParam, splatParam,
+    __hasProp = Object.prototype.hasOwnProperty,
+    __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor; child.__super__ = parent.prototype; return child; },
+    __slice = Array.prototype.slice;
+
+  if (typeof Spine === "undefined" || Spine === null) Spine = require('spine');
+
   $ = Spine.$;
+
   hashStrip = /^#*/;
+
   namedParam = /:([\w\d]+)/g;
+
   splatParam = /\*([\w\d]+)/g;
+
   escapeRegExp = /[-[\]{}()+?.,\\^$|#\s]/g;
-  Spine.Route = (function() {
-    __extends(Route, Spine.Module);
+
+  Spine.Route = (function(_super) {
+    var _ref;
+
+    __extends(Route, _super);
+
     Route.extend(Spine.Events);
-    Route.historySupport = "history" in window;
+
+    Route.historySupport = ((_ref = window.history) != null ? _ref.pushState : void 0) != null;
+
     Route.routes = [];
+
     Route.options = {
       trigger: true,
       history: false,
       shim: false
     };
+
     Route.add = function(path, callback) {
       var key, value, _results;
-      if (typeof path === "object" && !(path instanceof RegExp)) {
+      if (typeof path === 'object' && !(path instanceof RegExp)) {
         _results = [];
         for (key in path) {
           value = path[key];
@@ -39,115 +46,115 @@
         return this.routes.push(new this(path, callback));
       }
     };
+
     Route.setup = function(options) {
-      if (options == null) {
-        options = {};
-      }
+      if (options == null) options = {};
       this.options = $.extend({}, this.options, options);
       if (this.options.history) {
         this.history = this.historySupport && this.options.history;
       }
-      if (this.options.shim) {
-        return;
-      }
+      if (this.options.shim) return;
       if (this.history) {
-        $(window).bind("popstate", this.change);
+        $(window).bind('popstate', this.change);
       } else {
-        $(window).bind("hashchange", this.change);
+        $(window).bind('hashchange', this.change);
       }
       return this.change();
     };
+
     Route.unbind = function() {
       if (this.history) {
-        return $(window).unbind("popstate", this.change);
+        return $(window).unbind('popstate', this.change);
       } else {
-        return $(window).unbind("hashchange", this.change);
+        return $(window).unbind('hashchange', this.change);
       }
     };
+
     Route.navigate = function() {
       var args, lastArg, options, path;
       args = 1 <= arguments.length ? __slice.call(arguments, 0) : [];
       options = {};
       lastArg = args[args.length - 1];
-      if (typeof lastArg === "object") {
+      if (typeof lastArg === 'object') {
         options = args.pop();
-      } else if (typeof lastArg === "boolean") {
+      } else if (typeof lastArg === 'boolean') {
         options.trigger = args.pop();
       }
       options = $.extend({}, this.options, options);
-      path = args.join("/");
-      if (this.path === path) {
-        return;
-      }
+      path = args.join('/');
+      if (this.path === path) return;
       this.path = path;
-      if (options.trigger) {
-        this.matchRoute(this.path, options);
-      }
-      if (options.shim) {
-        return;
-      }
+      this.trigger('navigate', this.path);
+      if (options.trigger) this.matchRoute(this.path, options);
+      if (options.shim) return;
       if (this.history) {
-        return history.pushState({}, document.title, this.getHost() + this.path);
+        return history.pushState({}, document.title, this.path);
       } else {
         return window.location.hash = this.path;
       }
     };
+
     Route.getPath = function() {
-      return window.location.pathname;
+      var path;
+      path = window.location.pathname;
+      if (path.substr(0, 1) !== '/') path = '/' + path;
+      return path;
     };
+
     Route.getHash = function() {
       return window.location.hash;
     };
+
     Route.getFragment = function() {
-      return this.getHash().replace(hashStrip, "");
+      return this.getHash().replace(hashStrip, '');
     };
+
     Route.getHost = function() {
-      return (document.location + "").replace(this.getPath() + this.getHash(), "");
+      return (document.location + '').replace(this.getPath() + this.getHash(), '');
     };
+
     Route.change = function() {
       var path;
-      path = this.history ? this.getPath() : this.getFragment();
-      if (path === this.path) {
-        return;
-      }
+      path = this.getFragment() !== '' ? this.getFragment() : this.getPath();
+      if (path === this.path) return;
       this.path = path;
       return this.matchRoute(this.path);
     };
+
     Route.matchRoute = function(path, options) {
-      var route, _i, _len, _ref;
-      _ref = this.routes;
-      for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-        route = _ref[_i];
+      var route, _i, _len, _ref2;
+      _ref2 = this.routes;
+      for (_i = 0, _len = _ref2.length; _i < _len; _i++) {
+        route = _ref2[_i];
         if (route.match(path, options)) {
-          this.trigger("change", route, path);
+          this.trigger('change', route, path);
           return route;
         }
       }
     };
+
     function Route(path, callback) {
       var match;
       this.path = path;
       this.callback = callback;
       this.names = [];
-      if (typeof path === "string") {
+      if (typeof path === 'string') {
+        namedParam.lastIndex = 0;
         while ((match = namedParam.exec(path)) !== null) {
           this.names.push(match[1]);
         }
-        path = path.replace(escapeRegExp, "\\$&").replace(namedParam, "([^\/]*)").replace(splatParam, "(.*?)");
+        path = path.replace(escapeRegExp, '\\$&').replace(namedParam, '([^\/]*)').replace(splatParam, '(.*?)');
         this.route = new RegExp('^' + path + '$');
       } else {
         this.route = path;
       }
     }
+
     Route.prototype.match = function(path, options) {
       var i, match, param, params, _len;
-      if (options == null) {
-        options = {};
-      }
+      if (options == null) options = {};
       match = this.route.exec(path);
-      if (!match) {
-        return false;
-      }
+      if (!match) return false;
       options.match = match;
       params = match.slice(1);
       if (this.names.length) {
@@ -158,9 +165,13 @@
       }
       return this.callback.call(null, options) !== false;
     };
+
     return Route;
-  })();
+
+  })(Spine.Module);
+
   Spine.Route.change = Spine.Route.proxy(Spine.Route.change);
+
   Spine.Controller.include({
     route: function(path, callback) {
       return Spine.Route.add(path, this.proxy(callback));
@@ -178,7 +189,9 @@
       return Spine.Route.navigate.apply(Spine.Route, arguments);
     }
   });
+
   if (typeof module !== "undefined" && module !== null) {
     module.exports = Spine.Route;
   }
+
 }).call(this);

data/app/assets/javascripts/spine/tabs.js

@@ -1,58 +1,66 @@
 (function() {
-  var $;
-  var __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }, __hasProp = Object.prototype.hasOwnProperty, __extends = function(child, parent) {
-    for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; }
-    function ctor() { this.constructor = child; }
-    ctor.prototype = parent.prototype;
-    child.prototype = new ctor;
-    child.__super__ = parent.prototype;
-    return child;
-  };
-  if (typeof Spine === "undefined" || Spine === null) {
-    Spine = require('spine');
-  }
+  var $,
+    __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; },
+    __hasProp = Object.prototype.hasOwnProperty,
+    __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor; child.__super__ = parent.prototype; return child; };
+
+  if (typeof Spine === "undefined" || Spine === null) Spine = require('spine');
+
   $ = Spine.$;
-  Spine.Tabs = (function() {
-    __extends(Tabs, Spine.Controller);
+
+  Spine.Tabs = (function(_super) {
+
+    __extends(Tabs, _super);
+
     Tabs.prototype.events = {
       'click [data-name]': 'click'
     };
+
     function Tabs() {
       this.change = __bind(this.change, this);      Tabs.__super__.constructor.apply(this, arguments);
       this.bind('change', this.change);
     }
+
     Tabs.prototype.change = function(name) {
-      if (!name) {
-        return;
-      }
+      if (!name) return;
       this.current = name;
       this.children().removeClass('active');
-      return this.children("[data-name=" + this.current).addClass('active');
+      return this.children("[data-name=" + this.current + "]").addClass('active');
     };
+
     Tabs.prototype.render = function() {
       this.change(this.current);
       if (!(this.children('.active').length || this.current)) {
         return this.children(':first').click();
       }
     };
+
     Tabs.prototype.children = function(sel) {
       return this.el.children(sel);
     };
+
     Tabs.prototype.click = function(e) {
       var name;
       name = $(e.currentTarget).attr('data-name');
       return this.trigger('change', name);
     };
+
     Tabs.prototype.connect = function(tabName, controller) {
-      return this.bind('change', function(name) {
-        if (name === tabName) {
-          return controller.active();
-        }
+      var _this = this;
+      this.bind('change', function(name) {
+        if (name === tabName) return controller.active();
+      });
+      return controller.bind('active', function() {
+        return _this.change(tabName);
       });
     };
+
     return Tabs;
-  })();
+
+  })(Spine.Controller);
+
   if (typeof module !== "undefined" && module !== null) {
     module.exports = Spine.Tabs;
   }
+
 }).call(this);

data/app/assets/javascripts/spine/tmpl.js

@@ -1,12 +1,16 @@
 (function() {
   var $;
+
   $ = typeof jQuery !== "undefined" && jQuery !== null ? jQuery : require("jqueryify");
+
   $.fn.item = function() {
     var item;
     item = $(this);
     item = item.data("item") || (typeof item.tmplItem === "function" ? item.tmplItem().data : void 0);
-    return item != null ? typeof item.reload === "function" ? item.reload() : void 0 : void 0;
+    if (item != null) if (typeof item.reload === "function") item.reload();
+    return item;
   };
+
   $.fn.forItem = function(item) {
     return this.filter(function() {
       var compare;
@@ -14,4 +18,5 @@
       return (typeof item.eql === "function" ? item.eql(compare) : void 0) || item === compare;
     });
   };
+
 }).call(this);

data/lib/generators/spine/scaffold/templates/controller.coffee.erb

@@ -53,7 +53,7 @@ class Edit extends Spine.Controller
 
 class Show extends Spine.Controller
   events:
-    'click [bata-type=edit]': 'edit'
+    'click [data-type=edit]': 'edit'
     'click [data-type=back]': 'back'
 
   constructor: ->
@@ -105,7 +105,7 @@ class Index extends Spine.Controller
   new: ->
     @navigate '/<%= controller_name %>/new'
     
-class App.<%= controller_class %> extends Spine.Stack
+class <%= app_class %>.<%= controller_class %> extends Spine.Stack
   controllers:
     index: Index
     edit:  Edit

data/lib/generators/spine/scaffold/templates/new.jst.erb

@@ -10,7 +10,7 @@
       type="text" name="<%= field %>" 
       value="<%%= @<%= field %> %>" required
       <%- if field == fields[0] %> autofocus<% end %>>
-      <br />
+    <br />
   </label>
   <% end %>
   <button>Create</button>

data/lib/spine/rails/version.rb

@@ -1,6 +1,6 @@
 module Spine
   module Rails
-    VERSION = "0.0.9"
-    SPINE_VERSION = "1.0.3"
+    VERSION = "0.1.0"
+    SPINE_VERSION = "1.0.6"
   end
 end

metadata

@@ -1,63 +1,45 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: spine-rails
-version: !ruby/object:Gem::Version 
-  hash: 13
+version: !ruby/object:Gem::Version
+  version: 0.1.0
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 9
-  version: 0.0.9
 platform: ruby
-authors: 
+authors:
 - Alex MacCaw
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-15 00:00:00 -08:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-02-12 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rails
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70126037581420 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 3
-        - 1
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.1.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70126037581420
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &70126037579920 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: *70126037579920
 description: This gem provides Spine for your Rails 3 application.
-email: 
+email:
 - info@eribium.org
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - Gemfile.lock
@@ -96,41 +78,28 @@ files:
 - lib/spine/rails/engine.rb
 - lib/spine/rails/version.rb
 - spine-rails.gemspec
-has_rdoc: true
 homepage: http://rubygems.org/gems/spine-rails
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: spine-rails
-rubygems_version: 1.6.2
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Use Spine with Rails 3
 test_files: []
-