emerson 0.0.3 → 0.0.4

data/.gitignore

@@ -19,4 +19,5 @@ tmp
 .gemset
 .rspec
 .rvmrc
-.import/
+.import/
+.sublime*

data/lib/emerson/version.rb

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

data/vendor/assets/javascripts/emerson.js

@@ -1,4 +1,4 @@
-//     Emerson.js 0.0.3
+//     Emerson.js 0.0.4
 //
 //     (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.3';
+  Emerson.VERSION = '0.0.4';
 
   // 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

@@ -15,20 +15,7 @@
   //   * `init` is a hook for initializing the module.
   _.extend(define, {
     ns     : ns,
-    init   : function init() {
-      _before.list = [];
-      _after.list  = [];
-    },
-    before : function before(callback) {
-      if(callback) {
-        _before(callback);
-      }
-    },
-    after  : function after(callback) {
-      if(callback) {
-        _after(callback);
-      }
-    }
+    init   : function init() {}
   });
 
 
@@ -48,46 +35,11 @@
       var key  = elem.data('sink');
 
       if(key) {
-        _before.apply(elem);
         elem.replaceAll('[data-sink="' + key + '"]', 'body');
-        _after.apply(elem);
+        elem.trigger('sink:after');
       }
     });
 
     return this;
   };
-
-
-  // Internal Implementation
-  // --------------------------------------------------------------------------
-
-  // ### 'before' callbacks
-  var _before = function(callback) {
-    var view;
-    if(callback) {
-      _before.list.push(callback);
-    }
-    else {
-      view = this;
-      _.each(_before.list, function(fn) {
-        fn(view);
-      });
-    }
-  };
-  _.extend(_before,  { list : [] });
-
-  // ### 'after' callbacks
-  var _after = function(callback) {
-    var view;
-    if(callback) {
-      _after.list.push(callback);
-    }
-    else {
-      view = this;
-      _.each(_after.list, function(fn) {
-        fn(view);
-      });
-    }
-  };
-  _.extend(_after,  { list : [] });
 })(Emerson);

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

@@ -9,14 +9,26 @@
 
   // ### Emerson.view module
   // Entry point for defining a new View.
-  var define = ns.view = function(name, setup) {
-    return (library[name] = construct(name, setup || {}));
+  var view = ns.view = function(name, setup) {
+    return (views[name] = construct(name, setup || {}));
+  };
+
+  // ### Emerson.trait module
+  // Entry point for defining a new "trait".
+  //
+  // A trait can be thought of as a set of related behaviors and is essentially
+  // a special form of view.
+  //
+  // Traits have the additional capability of responding to an optional "mode"
+  // at intialization.
+  var trait = ns.trait = function(name, setup) {
+    return (traits[name] = construct(name, setup || {}));
   };
 
   // ### Module API
   //   * `ns` is a reference to the namespace.
   //   * `init` is a hook for initializing the module.
-  _.extend(define, {
+  _.extend(view, {
     ns   : ns,
     init : function init() {
       configure();
@@ -36,21 +48,17 @@
   //     $.view(key);
   //
   // Accessor for defined Views.
+  $.view = function(key) {
+    return views[key];
+  };
+
+  // ### $.trait
   //
-  // Note that, while it is possible to manually execute View methods on an
-  // object like so:
-  //
-  //     $.view(key).fn.method.apply(object, arguments);
-  //
-  // such usage is not recommended as it:
-  //
-  //   1. circumvents the intentional transience provided by the framework.
-  //   2. is likely to cause issues in that the called method will be working
-  //      with a non-initialized/-decorated object which may not have the
-  //      expected API.
+  //     $.trait(key);
   //
-  $.view = function(key) {
-    return library[key];
+  // Accessor for defined Traits. See `$.view`.
+  $.trait = function(key) {
+    return traits[key];
   };
 
   // ### $.fn.view
@@ -72,14 +80,12 @@
 
       _.each(as_view, function(html) {
         var element = $(html);
-        attach.apply(element, [element.data(attrs.view)]);
+        attach.call(element, views, [element.data(attrs.view)]);
       });
 
       _.each(as_trait, function(html) {
         var element = $(html);
-        attach.apply(element, _.map(element.data(attrs.traits).split(/\s+/), function(key) {
-          return [':', key].join('');
-        }));
+        attach.call(element, traits, element.data(attrs.traits).split(/\s+/), true);
       });
     });
 
@@ -121,7 +127,11 @@
 
   // Storage place for the defined Views.
   // @private
-  var library = {};
+  var views = {};
+
+  // Storage place for the defined Traits.
+  // @private
+  var traits = {};
 
   // Storage place for attachments made.
   // @private
@@ -166,8 +176,8 @@
   }
 
   // ### attach
-  // Given a (complex) list of keys, search the library for applicable View and
-  // Trait definitions to apply to the object.
+  // Given a (complex) list of keys, search the libraries for applicable View
+  // and Trait definitions to apply to the object.
   //
   // Keeps track of which definitions have been applied, and does not re-apply.
   //
@@ -175,15 +185,24 @@
   // a single element.  e.g.,
   //
   //     _.each($(selector), function(element) {
-  //       attach.apply($(element), [key, [subkey]]);
+  //       attach.apply($(element), views, [key, [subkey]]);
   //     });
-  function attach() {
+  //
+  // The `mode_p` predicate argument indicates whether the view type may accept
+  // a "mode", which should be true for traits (not for views).
+  function attach(library, keys, mode_p) {
     var self = this, def;
     var id   = eid(this[0]);
 
-    _.each(_.flatten(arguments), function(key) {
-      var set = (attachments[key] || (attachments[key] = []));
-      var built, init, events;
+    _.each(_.flatten(keys), function(key) {
+      var mode, match, built, init, events, set;
+
+      if(mode_p && (match = /^([^(]+)\((.+)\)/.exec(key))) {
+        key  = match[1];
+        mode = match[2];
+      }
+
+      set = (attachments[key] || (attachments[key] = []));
 
       if(_.include(set, id)) {
         return; // do not re-apply.
@@ -199,7 +218,7 @@
           bind(built, key, handler);
         });
 
-        init.call(built);
+        init.call(built, mode);
         set.push(id);
       }
     });
@@ -220,10 +239,18 @@
   //         },
   //         document      : {           // bind document, for events
   //           'click'     : handler     // fired outside of the view
+  //           'selector'  : {           // TODO
+  //             'click'   : handler
+  //           } 
   //         }
   //       }
   //     });
   //
+  // Emerson event handling differs from that of, say, stock jQuery in that
+  // `this` within the context of the handler will be a view instance.  The
+  // event argument is unadultered, allowing access to the full set of targets
+  // as defined by the baselib (e.g., jQuery).
+  //
   // Note that, in the document-binding case, an event like `click` would be a
   // bad idea.  A more useful (and less costly) use case would be a form of
   // pub/sub.

metadata

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