embient 0.0.6 → 0.0.8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    embient (0.0.6)
+    embient (0.0.8)
       emberjs-rails
       rails (>= 3.1.0)
 
@@ -41,8 +41,11 @@ GEM
       hamlbars
       rails (~> 3.1)
     erubis (2.7.0)
+    execjs (1.3.0)
+      multi_json (~> 1.0)
     haml (3.1.4)
-    hamlbars (2012.2.22)
+    hamlbars (2012.3.21)
+      execjs (>= 1.2)
       haml
       sprockets
       tilt
@@ -50,11 +53,11 @@ GEM
     i18n (0.6.0)
     journey (1.0.3)
     json (1.6.5)
-    mail (2.4.3)
+    mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.17.2)
+    mime-types (1.18)
     multi_json (1.1.0)
     polyglot (0.3.3)
     rack (1.4.1)

data/lib/embient/version.rb

@@ -1,3 +1,3 @@
 module Embient
-  VERSION = "0.0.6"
+  VERSION = "0.0.8"
 end

data/vendor/assets/javascripts/embient/ember-layout.js

@@ -123,7 +123,7 @@ Ember.LayoutState = Ember.State.extend({
     // the layoutStates property.
     var viewClass = get(this, 'viewClass');
     if(viewClass) {
-      var layoutStates = get(viewClass, 'proto').layoutStates;
+      var layoutStates = viewClass.proto().layoutStates;
       set(this, 'states', layoutStates);
     }
     
@@ -143,7 +143,6 @@ Ember.LayoutState = Ember.State.extend({
     if (view) {
       ember_assert('view must be an Ember.View', view instanceof Ember.View);
 
-
       // if there is another view in the hierarchy then
       // set its content
       var parentView = get(this, 'parentView') || get(stateManager, 'rootView');

data/vendor/assets/javascripts/embient/ember-routemanager.js

@@ -240,9 +240,9 @@ Ember.RouteManager = Ember.StateManager.extend({
         } else {
           // we don't use a Ember.Timer because we don't want
           // a run loop to be triggered at each ping
-          var invokeHashChange = function() {
-            this.hashChange();
-            this._timerId = setTimeout(invokeHashChange, 100);
+          var _this = this, invokeHashChange = function() {
+            _this.hashChange();
+            _this._timerId = setTimeout(invokeHashChange, 100);
           };
 
           invokeHashChange();
@@ -316,10 +316,15 @@ Ember.RouteManager = Ember.StateManager.extend({
         var cleanState = result.cleanStates.join('.');
         this.goToState(cleanState);
       }
+      
       // 2. We transition to the dirty state. This forces dirty
       // states to be transitioned.
       if(result.dirtyStates.length > 0) {
         var dirtyState = result.cleanStates.concat(result.dirtyStates).join('.');
+        // Special case for re-entering the root state on a parameter change
+        if(this.currentState && dirtyState === this.currentState.get('path')) {
+          this.goToState('__nullState');
+        }
         this.goToState(dirtyState);
       }
     } else {
@@ -437,7 +442,7 @@ Ember.RouteManager = Ember.StateManager.extend({
         }
         var part = parts.shift();
         var partDefinition = partDefinitions[i];
-        var partParams = this._matchPart(partDefinition, part);
+        var partParams = this._matchPart(partDefinition, part, state);
         if(!partParams) {
           return false;
         }
@@ -451,10 +456,9 @@ Ember.RouteManager = Ember.StateManager.extend({
       }
     }
 
-    if(Ember.typeOf(state.willAccept) == 'function') {
-      if(!state.willAccept(params)) {
-        return false;
-      }
+    var enabled = get(state, 'enabled');
+    if(enabled !== undefined && !enabled) {
+      return false;
     }
 
     return {
@@ -467,7 +471,9 @@ Ember.RouteManager = Ember.StateManager.extend({
   /** @private
    Returns params if the part matches the partDefinition
    */
-  _matchPart: function(partDefinition, part) {
+  _matchPart: function(partDefinition, part, state) {
+    var params = {};
+
     // Handle string parts
     if( typeof partDefinition == "string") {
 
@@ -475,7 +481,6 @@ Ember.RouteManager = Ember.StateManager.extend({
         // 1. dynamic routes
         case ':':
           var name = partDefinition.slice(1, partDefinition.length);
-          var params = {};
           params[name] = part;
           return params;
 
@@ -493,8 +498,26 @@ Ember.RouteManager = Ember.StateManager.extend({
       return false;
     }
 
-    // Handle RegExp parts
-    return partDefinition.test(part) ? {} : false;
+    if (partDefinition instanceof RegExp) {
+      // JS doesn't support named capture groups in Regexes so instead
+      // we can define a list of 'captures' which maps to the matched groups
+      var captures = get(state, 'captures');
+      var matches = partDefinition.exec(part);
+
+      if (matches) {
+        if (captures) {
+          var len = captures.length, i;
+          for(i = 0; i < len; ++i) {
+            params[captures[i]] = matches[i+1];
+          }
+        }
+        return params;
+      } else {
+        return false;
+      }
+    }
+
+    return false;
   },
 
   /**
@@ -542,7 +565,10 @@ Ember.RouteManager = Ember.StateManager.extend({
       }
     }
     routes._skipRoute = false;
-  }
+  },
+  
+  // This is used to re-enter a dirty root state
+  __nullState: Ember.State.create({enabled: false})
 
 });
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: embient
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-20 00:00:00.000000000 Z
+date: 2012-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2160652320 !ruby/object:Gem::Requirement
+  requirement: &2152345520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2160652320
+  version_requirements: *2152345520
 - !ruby/object:Gem::Dependency
   name: emberjs-rails
-  requirement: &2160651840 !ruby/object:Gem::Requirement
+  requirement: &2152356700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160651840
+  version_requirements: *2152356700
 description: Pulls together various existing ember/sproutcore addons and provides
   structure for future extensions.
 email:
@@ -71,7 +71,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -431204952262710765
+      hash: -3816048520545035377
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -80,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -431204952262710765
+      hash: -3816048520545035377
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10