emerson 0.0.7 → 0.0.8

data/lib/emerson/version.rb

@@ -1,3 +1,3 @@
 module Emerson
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/vendor/assets/javascripts/emerson.js

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

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

@@ -21,7 +21,7 @@
   }
 
   // Current version of the library. Keep in sync with `package.json`.
-  Emerson.VERSION = '0.0.7';
+  Emerson.VERSION = '0.0.8';
 
   // Reference the base lib (one of jQuery, Zepto or Ender) as $.
   var $ = Emerson.base = (root.jQuery || root.Zepto || root.ender);

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

@@ -45,32 +45,31 @@
   // Pass an `override` argument to target a specific sink, say:
   //
   //     data-sink="modal"
+  //
+  // Strategies:
+  //
+  //   * `replace` (default)
+  //   * `inner`
+  //   * `prepend`
+  //   * `append`
+  //   * `before`
+  //   * `after`
+  //
+  //     data-sink"modal:inner"
+  //
   $.fn.sink = function(override) {
     _.each(this, function(e) {
-      var elem = $(e);
-      var key  = override || elem.data('sink');
-      var selector, matches;
+      var element = $(e);
+      var key     = override || element.data('sink');
+      var selector, matches, count;
 
       if(key) {
-        selector = '[data-sink="' + key + '"]';
+        selector = '[data-sink^="' + key + '"]';
         matches  = $(selector);
+        count    = matches.length;
 
-        if(matches.length > 1) {
-          matches.each(function() {
-            var replacement = prepare(elem.clone(true));
-
-            $(this)
-              .trigger('sink:before')
-              .replaceWith(replacement);
-
-            replacement.trigger('sink:after');
-          });
-        }
-        else {
-          matches.trigger('sink:before');
-          prepare(elem)
-            .replaceAll(matches)
-            .trigger('sink:after');
+        if(count) {
+          process(element, matches);
         }
       }
     });
@@ -82,6 +81,18 @@
   // Internal Implementation
   // --------------------------------------------------------------------------
 
+  var strategies = {
+    replace : $.fn.replaceAll,
+    inner   : function(target) {
+      target.empty();
+      return this.appendTo(target);
+    },
+    prepend : $.fn.prependTo,
+    append  : $.fn.appendTo,
+    before  : $.fn.insertBefore,
+    after   : $.fn.insertAfter
+  };
+
   // ### prepare
   // Clone the replacement source and, if Emerson.view is defined, apply that.
   function prepare(source) {
@@ -93,4 +104,32 @@
 
     return result;
   }
+
+  // ### process
+  // ...
+  function process(element, matches) {
+    var parts, strategy, clone;
+
+    if(matches.length > 1) {
+      matches.each(function() {
+        clone    = prepare(element.clone(true));
+        parts    = $(this).data('sink').split(':');
+        strategy = parts[1] || 'replace';
+
+        $(this).trigger('sink:before');
+        strategies[strategy].call(clone, $(this))
+          .trigger('sink:after');
+
+        clone.trigger('sink:after');
+      });
+    }
+    else {
+      parts    = matches.data('sink').split(':');
+      strategy = parts[1] || 'replace';
+
+      matches.trigger('sink:before');
+      strategies[strategy].call(prepare(element), matches)
+        .trigger('sink:after');
+    }
+  }
 })(Emerson);

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

@@ -213,8 +213,16 @@
   //   2. A "subclass", extended with the View prototype.
   function construct(name, setup) {
     var sub = _.extend($sub(), {
-      constructor : View,
-      setup       : _.extend({}, View.setup, setup)
+      constructor  : View,
+      setup        : _.extend({
+        initialize : function() {},
+        connected  : false,
+        subscribe  : {},
+      }, setup),
+      // experimental... allows for easier spec'ing of a view/trait
+      build : function build(element, mode) {
+        return instance(this, element, mode);
+      }
     });
 
     _.extend(sub.fn, View.prototype);
@@ -222,6 +230,21 @@
     return sub;
   }
 
+  // ### instance
+  // experimental (see `build` definition in `construct`).
+  function instance(def, element, mode) {
+    var setup = def.setup;
+    var built = def(element, element.context);
+    built.connect(setup.connected);
+
+    _.each(setup.subscribe, function(handler, key) {
+      bind(built, key, handler);
+    });
+
+    setup.initialize.call(built, mode);
+    return built;
+  }
+
   // ### attach
   // Given a (complex) list of keys, search the libraries for applicable View
   // and Trait definitions to apply to the object.
@@ -257,15 +280,17 @@
 
       // Build an instance, connect outlets, bind events, init and record.
       if(def = library[key]) {
-        setup = def.setup;
-        built = def(self, self.context);
-        built.connect(setup.connected);
-
-        _.each(setup.subscribe, function(handler, key) {
-          bind(built, key, handler);
-        });
-
-        setup.initialize.call(built, mode);
+        // experimental...
+        instance(def, self, mode);
+        // setup = def.setup;
+        // built = def(self, self.context);
+        // built.connect(setup.connected);
+        // 
+        // _.each(setup.subscribe, function(handler, key) {
+        //   bind(built, key, handler);
+        // });
+        // 
+        // setup.initialize.call(built, mode);
         set.push(id);
       }
     });

metadata

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