emerson 0.0.4 → 0.0.5

data/lib/emerson/version.rb

@@ -1,3 +1,3 @@
 module Emerson
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/vendor/assets/javascripts/emerson.js

@@ -1,4 +1,4 @@
-//     Emerson.js 0.0.4
+//     Emerson.js 0.0.5
 //
 //     (c) 2012 Corey Innis
 //     Emerson may be freely distributed under the MIT license.

data/vendor/assets/javascripts/emerson/base.js

@@ -2,7 +2,7 @@
 //
 //     Defines the Emerson namespace (global).
 
-(function(){
+(function() {
 
   // Initial Setup
   // --------------------------------------------------------------------------
@@ -21,7 +21,7 @@
   }
 
   // Current version of the library. Keep in sync with `package.json`.
-  Emerson.VERSION = '0.0.4';
+  Emerson.VERSION = '0.0.5';
 
   // Reference the base lib (one of jQuery, Zepto or Ender) as $.
   var $ = Emerson.base = (root.jQuery || root.Zepto || root.ender);
@@ -36,6 +36,7 @@
   //   * Given an object the current configuration will be extended with that.
   //   * Given a "dot-notated" string a lookup will be performed.
   //   * With no argument a copy of the current configuration will be returned.
+  //   * Given a single argument as `true`, defaults will be restored.
   //
   Emerson.config = function config() {
     var arg = arguments[0];
@@ -45,6 +46,10 @@
       return _.clone(configuration);
     }
 
+    if(arg === true) {
+      configuration = defaults();
+    }
+
     if(typeof arg === 'string') {
       result = configuration;
 
@@ -57,10 +62,10 @@
         return undefined;
       }
 
-      return _.clone(result);
+      return result;
     }
     else {
-      _.extend(configuration, arg);
+      _.deepExtend(configuration, arg);
     }
   };
 
@@ -82,9 +87,72 @@
   };
 
 
+  // Underscore Extension
+  // --------------------------------------------------------------------------
+
+  // ### deepExtend
+  //
+  //   * Author: Kurt Milam - http://xioup.com
+  //   * https://gist.github.com/1868955
+  _.deepExtend = function(obj) {
+    var parentRE = /#{\s*?_\s*?}/,
+        slice = Array.prototype.slice,
+        hasOwnProperty = Object.prototype.hasOwnProperty;
+
+    _.each(slice.call(arguments, 1), function(source) {
+      for (var prop in source) {
+        if (hasOwnProperty.call(source, prop)) {
+          if (_.isUndefined(obj[prop])) {
+            obj[prop] = source[prop];
+          }
+          else if (_.isString(source[prop]) && parentRE.test(source[prop])) {
+            if (_.isString(obj[prop])) {
+              obj[prop] = source[prop].replace(parentRE, obj[prop]);
+            }
+          }
+          else if (_.isArray(obj[prop]) || _.isArray(source[prop])){
+            if (!_.isArray(obj[prop]) || !_.isArray(source[prop])){
+              throw 'Error: Trying to combine an array with a non-array (' + prop + ')';
+            } else {
+              obj[prop] = _.reject(_.deepExtend(obj[prop], source[prop]), function (item) { return _.isNull(item);});
+            }
+          }
+          else if (_.isObject(obj[prop]) || _.isObject(source[prop])){
+            if (!_.isObject(obj[prop]) || !_.isObject(source[prop])){
+              throw 'Error: Trying to combine an object with a non-object (' + prop + ')';
+            } else {
+              obj[prop] = _.deepExtend(obj[prop], source[prop]);
+            }
+          } else {
+            obj[prop] = source[prop];
+          }
+        }
+      }
+    });
+    return obj;
+  };
+
+
   // Internal Implementation
   // --------------------------------------------------------------------------
 
+  // ### defaults
+  // Default configuration.
+  // var defaults = {
+  //   attrs : {
+  //     view   : 'view',
+  //     traits : 'traits'
+  //   }
+  // };
+  function defaults() {
+    return {
+      attrs : {
+        view   : 'view',
+        traits : 'traits'
+      }
+    };
+  }
+
   // ### configuration
   // Stores library config, with defaults.
   //
@@ -101,10 +169,5 @@
   //       }
   //     });
   //     Emerson.init();
-  var configuration = {
-    attrs : {
-      view   : 'view',
-      traits : 'traits'
-    }
-  };
+  var configuration = _.deepExtend({}, defaults());
 }).call(this);

data/vendor/assets/javascripts/emerson/http.js

@@ -69,9 +69,9 @@
   // ### sink
   //
   //     json: <response [action, data, path, view]>
-  //     html: <response> (string)
-  //     head: <response> single space string
+  //     html: <response> (string) ... TODO
+  //     head: <response> single space string ... TODO
   function sink(response, status) {
-    $(response.view).view().sink();
+    $(response.view).sink();
   }
 })(Emerson);

data/vendor/assets/javascripts/emerson/sink.js

@@ -29,17 +29,43 @@
   //
   //     $(target).sink()
   //
+  // Given "replacement" content and for each "sink" (existing content):
+  //
+  //   1. fire "sink:before" with the sink as the target.
+  //   2. replace the sink with a "prepared" replacement.
+  //   3. fire "sink:after" with the replacement as the target.
   $.fn.sink = function() {
     _.each(this, function(e) {
       var elem = $(e);
       var key  = elem.data('sink');
 
       if(key) {
-        elem.replaceAll('[data-sink="' + key + '"]', 'body');
-        elem.trigger('sink:after');
+        $('[data-sink="' + key + '"]').each(function() {
+          $(this)
+            .trigger('sink:before')
+            .replaceWith(prepare(elem));
+        });
+
+        $('[data-sink="' + key + '"]').trigger('sink:after');
       }
     });
 
     return this;
   };
+
+
+  // Internal Implementation
+  // --------------------------------------------------------------------------
+
+  // ### prepare
+  // Clone the replacement source and, if Emerson.view is defined, apply that.
+  function prepare(source) {
+    var result = source.clone();
+
+    if(Emerson.view) {
+      result.view();
+    }
+
+    return result;
+  }
 })(Emerson);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: emerson
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-12 00:00:00.000000000 Z
+date: 2012-05-13 00:00:00.000000000 Z
 dependencies: []
 description: transcendent views
 email: