bowline 0.5.6 → 0.5.7

data/README.txt

@@ -99,7 +99,7 @@ Which will generate code a bit like this:
 
 Now, in the view you can bind HTML to this collection, by
 using the following javascript:
-  $('#users').bindto('users');
+  $('#users').bowlineBind('UsersBinder');
   
 You should probably become familiar with Chain.js (which bowline uses for binding): http://wiki.github.com/raid-ox/chain.js/
 
@@ -222,7 +222,7 @@ Usage for a collection (of users):
   		jQuery(function($){
   		  $.bowline.ready(function(){
           // Bind the element users to UserBinder
-      	  var users = $('#users').bindto('users', function(){
+      	  var users = $('#users').bowlineBind('UsersBinder', function(){
       	    var self = $(this);
       	    self.find('.destroy').click(function(){
       	      self.invoke('destroy');

data/TODO

@@ -3,7 +3,7 @@ Use new Rails gem packaging system
 Ideas: 
   * bowline-notification gem (Growl)
 
-Investigate thread safety
+Investigate thread safety (for Bowline::Desktop::JS)
 
 Load all required JS through Bowline (so you only have to require one JS file)
 
@@ -20,4 +20,11 @@ Tutorials:
   CSS webkit-box (layouts)
   CSS search box & placeholder
   
-Don't run initializers during rake tasks
+- Don't run initializers during rake tasks
+- Find out why build is taking so long
+- Add first-run initializers
+- Add reload keyboard shortcut
+- Add some sort of production mode
+
+- strip exe (to make smaller)
+- remove framework headers

data/VERSION

@@ -1 +1 @@
-0.5.6
+0.5.7

data/assets/animations.css

@@ -0,0 +1,92 @@
+.drag {
+  -webkit-user-drag: element;
+  -webkit-user-select: none;
+}
+
+.in, .out {
+  -webkit-animation-timing-function: ease-in-out;
+	-webkit-animation-duration: 350ms;
+}
+
+.slideup.in {
+	-webkit-animation-name: slideupbottom;
+	z-index: 10;
+}
+
+.slideup.out {
+	-webkit-animation-name: slideuptop;
+	z-index: 0;
+}
+
+.slidedown.in {
+	-webkit-animation-name: slidedowntop;
+	z-index: 10;
+}
+
+.slidedown.out {
+	-webkit-animation-name: slidedownbottom;
+	z-index: 0;
+}
+
+@-webkit-keyframes dontmove {
+    from { opacity: 1; }
+    to { opacity: 1; }
+}
+
+@-webkit-keyframes slideuptop {
+    from { -webkit-transform: translateY(0); }
+    to { -webkit-transform: translateY(-100%); }
+}
+
+@-webkit-keyframes slideupbottom {
+    from { -webkit-transform: translateY(100%); }
+    to { -webkit-transform: translateY(0); }
+}
+
+@-webkit-keyframes slidedowntop {
+    from { -webkit-transform: translateY(-100%); }
+    to { -webkit-transform: translateY(0); }
+}
+
+@-webkit-keyframes slidedownbottom {
+    from { -webkit-transform: translateY(0); }
+    to { -webkit-transform: translateY(100%); }
+}
+
+.explode.in {
+  -webkit-animation-name: explodein;
+}
+
+.explode.out {
+  -webkit-animation-name: explodeout;
+}
+
+@-webkit-keyframes explodein {
+    from { -webkit-transform: scale(1.3); opacity: 0; }
+    to { -webkit-transform: scale(1); opacity: 1; }
+}
+
+@-webkit-keyframes explodeout {
+    from { -webkit-transform: scale(1); opacity: 1; }
+    to { -webkit-transform: scale(1.3); opacity: 0; }
+}
+
+.fade.in {
+	z-index: 10;
+	-webkit-animation-name: fadein;
+}
+
+.fade.out {
+	z-index: 0;
+	-webkit-animation-name: fadeout;
+}
+
+@-webkit-keyframes fadein {
+    from { opacity: 0; }
+    to { opacity: 1; }
+}
+
+@-webkit-keyframes fadeout {
+    from { opacity: 1; }
+    to { opacity: 0; }
+}

data/assets/bowline.js

@@ -30,11 +30,11 @@
   helper(method, *args)
     Invoke a method defined in any helper.
     
-  bindto(element, klass, options = {})
+  bind(element, klass, options = {})
     Bind a element to a Bowline binder. 
     Usually called via the jQuery helper functions.
     Usage:
-      Bowline.bindto('#users', 'UsersBinder');
+      Bowline.bind('#users', 'UsersBinder');
     
     The options can either be a template hash:
         {
@@ -82,11 +82,16 @@
   
   These are how you usually bind elements, or invoke a binders class/instance methods.
   
-  $.fn.bindto(klass, options)
+  $.fn.bowlineBind(klass, options)
     Associate an an element with a Bowline binder.
     Example:
-      $("#users").bindto('UsersBinder');
-  
+      $("#users").bowlineBind('UsersBinder');
+
+  $.fn.bowlineUnbind(klass)
+    Opposite of bowlineBind.
+    Example:
+      $("#users").bowlineUnbind('UsersBinder');
+          
   $.fn.invoke(method, *args)
     Invoke a class/instance method on a Bowline binder. 
     
@@ -118,6 +123,8 @@ var Bowline = {
   uuid: 0,
   bounds: {},
   trace: false,
+  // _app is a function defined in Objective C
+  enabled: typeof(_app) != "undefined",
   
   id: function(){
     return ++Bowline.uuid;
@@ -125,53 +132,53 @@ var Bowline = {
   
   // Usage: invoke(klass, method, *args)
   invoke: function(){
-    var args    = $.makeArray(arguments);
+    var args    = jQuery.makeArray(arguments);
     var klass   = args.shift();
     var method  = args.shift();
-    var id      = Bowline.id();
+    var id      = -1;
     
     var callback  = args.pop();
     if(typeof(callback) == "function"){
+      id = Bowline.id();
       Bowline.callbacks[id] = callback;
     } else if(callback) {
       args.push(callback);
     }
+    
     var msg = {
-      klass:klass, 
-      method:method, 
-      args:args, 
-      id:id
+      klass:  klass, 
+      method: method, 
+      args:   args, 
+      id:     id,
     };
 
-    Bowline.log("New message:")
-    Bowline.log(msg);
+    Bowline.log("New message:", msg);
     
-    // wx is a function defined in Objective C
-    if(typeof(wx) != undefined)
-      wx.call(JSON.stringify(msg));
+    if(Bowline.enabled)
+      _app.call(JSON.stringify(msg));
   },
   
   // Usage: instanceInvoke(klass, id, method, *args)
   instanceInvoke: function(){
-    var args = $.makeArray(arguments);
+    var args = jQuery.makeArray(arguments);
     args.splice(1, 0, "instance_invoke");
     Bowline.invoke.apply(this, args);
   },
   
   // Usage: windowInvoke(method, *args)
   windowInvoke: function(){
-    var args = $.makeArray(arguments);
+    var args = jQuery.makeArray(arguments);
     args.unshift("_window");
     Bowline.invoke.apply(this, args);    
   },
   
   helper: function(){
-    var args = $.makeArray(arguments);
+    var args = jQuery.makeArray(arguments);
     args.unshift("Helper");
-    Bowline.invoke(args);
+    Bowline.invoke.apply(this, args);
   },
   
-  bindto: function(el, klass, options){
+  bind: function(el, klass, options){
     el = jQuery(el);
     el.chain(options);
     el.data('bowline', klass);
@@ -179,22 +186,37 @@ var Bowline = {
       Bowline.bounds[klass] = [];
     Bowline.bounds[klass].push(el);
     jQuery(function(){
-      Bowline.invoke(klass, "setup");
+      Bowline.invoke(klass, "setup", function(res){
+        Bowline.populate(klass, res);
+      });
     });
   },
   
+  unbind: function(el, klass){
+    var array = Bowline.bounds[klass]
+    if(!array) return;
+    array = jQuery.grep(array, 
+      function(n){ return n != el }
+    );
+    Bowline.bounds[klass] = array;
+  },
+  
   // Bowline functions
   
   invokeJS: function(str){
-    Bowline.log("Invoking: " + str);
+    Bowline.log("Invoking:", str);
     return JSON.stringify(eval(str));
   },
   
   invokeCallback: function(id, res){
-    Bowline.log("Callback: " + id);
+    Bowline.log("Callback:", id, res);
     if(!Bowline.callbacks[id]) return true;
-    Bowline.callbacks[id](JSON.parse(res));
-    delete Bowline.callbacks[id];
+    try {
+      Bowline.callbacks[id](JSON.parse(res));
+      delete Bowline.callbacks[id];
+    } catch(e) { 
+      Bowline.log(e) 
+    }
     return true;
   },
   
@@ -256,18 +278,22 @@ var Bowline = {
   
   findItem: function(el, id){
     var items = jQuery.grep(el.items(true), function(n, i){
-      return $(n).item().id == id;
+      return jQuery(n).item().id == id;
     });
-    return($(items[0]));
+    return(jQuery(items[0]));
   },
   
-  log: function(msg){
-    if(Bowline.trace)
-      console.log(msg);
+  log: function(){
+    if( !Bowline.trace ) return;
+    var args = jQuery.makeArray(arguments);
+    args.unshift("(Bowline)");
+    console.log.apply(console, args);
   },
   
-  warn: function(msg){
-    console.warn(msg);
+  warn: function(){
+    var args = jQuery.makeArray(arguments);
+    args.unshift("(Bowline)");
+    console.warn.apply(console, args);
   }
 };
 
@@ -279,25 +305,31 @@ var Bowline = {
         // Class method
         var klass = $(this).data('bowline');
         args.unshift(klass);
-        Bowline.invoke.apply(this, args);
+        Bowline.invoke.apply(Bowline, args);
       } else {
         // Instance method
         var klass = $(this).item('root').data('bowline');
         var id = $(this).item().id;
         args.unshift(id);
         args.unshift(klass);
-        Bowline.instanceInvoke.apply(this, args);
+        Bowline.instanceInvoke.apply(Bowline, args);
       }
     } else {
       throw 'Chain not active';
     }
   };
-  
-  $.fn.bindto = function(){
+    
+  $.fn.bowlineBind = function(){
     var args = $.makeArray(arguments);
     args.unshift(this);
-    Bowline.bindto.apply(this, args);
+    Bowline.bind.apply(Bowline, args);
   };
+  
+  $.fn.bowlineUnbind = function(){
+    var args = $.makeArray(arguments);
+    args.unshift(this);
+    Bowline.unbind.apply(Bowline, args);
+  }  
 })(jQuery);
 
 jQuery(function($){

data/assets/bowline.menu.js

@@ -0,0 +1,81 @@
+var BowlineMenu = function(element, options){
+  var defaults = {childSelector: "li", trace: false};
+  this.options = jQuery.extend({}, defaults, options);
+  
+  this.element = jQuery(element);
+  
+  if(this.options.current) this.change(this.options.current);
+    
+  var self = this;
+  this.elements().click(function(){
+    var view = self.viewName(this);
+    self.change(view);
+  });
+};
+
+BowlineMenu.fn = BowlineMenu.prototype;
+
+BowlineMenu.fn.log = function(){
+  if( !this.options.trace ) return;
+  var args = jQuery.makeArray(arguments);
+  args.unshift("(BowlineMenu)");
+  console.log.apply(console, args);
+};
+
+BowlineMenu.fn.onChange = function(func){
+  this.element.bind("change.bowline", func);
+};
+
+BowlineMenu.fn.triggerChange = function(data){
+  this.element.trigger("change.bowline", data);
+};
+
+BowlineMenu.fn.viewName = function(element){
+  return jQuery(element).dataset("view");
+};
+
+BowlineMenu.fn.currentName = function(){
+  return this.viewName(this.current);
+};
+
+BowlineMenu.fn.elements = function(){
+  return this.element.find(this.options.childSelector);
+};
+
+BowlineMenu.fn.elementFor = function(name){
+  return this.element.find(
+    "[data-view='" + name + "']:first"
+  );
+};
+
+BowlineMenu.fn.items = function(){
+  var self = this;
+  return jQuery.map(this.elements(), function(n){
+    return self.viewName(n);
+  });
+};
+
+BowlineMenu.fn.change = function(name){  
+  if(name != false && jQuery.inArray(name, this.items()) == -1) return false;
+
+  var fromView      = this.current;
+  var fromViewName  = this.viewName(fromView);
+  
+  var toView        = this.elementFor(name);
+  var toViewName    = name;
+  
+  this.log("changing:", fromViewName, toViewName);
+  
+  this.elements().removeClass("current");
+  if(toView) {
+    this.current = toView;
+    toView.addClass("current");
+  }
+  
+  this.triggerChange({
+    toView:       toView, 
+    toViewName:   toViewName,
+    fromView:     fromView,
+    fromViewName: fromViewName
+  });
+};

data/assets/bowline.state.js

@@ -0,0 +1,66 @@
+function BowlineState(opts){
+  this.options = opts || {};
+  this.states  = {}
+  this.events  = {}
+  this.current = this.options.initial;
+}
+
+BowlineState.fn = BowlineState.prototype;
+
+BowlineState.fn.log = function(){
+  if( !this.options.trace ) return;
+  var args = jQuery.makeArray(arguments);
+  args.unshift("(BowlineState)");
+  console.log.apply(console, args);
+};
+
+BowlineState.fn.newEvent = function(name, opts){
+  if(!name) throw "Must supply name";
+  // Defaults to the same named state
+  if(!opts) opts = {};
+  if(!opts.to) opts.to = name;
+  this.events[name] = opts;
+}
+
+BowlineState.fn.newState = function(name, callbacks){
+  if(!name) throw "Must supply name";
+  this.states[name] = callbacks || {};
+}
+
+BowlineState.fn.change = function(){
+  var args = $.makeArray(arguments);  
+  var name = args.shift();
+    
+  var event = this.events[name]
+  if(!event) throw "Unknown event: " + name;
+  // TODO support arrays in event.from
+  if(event.from && 
+      event.from != "all" && 
+        this.current &&
+          event.from != this.current) {
+    this.log("Not changing state to:", event.to);
+    return;
+  }
+  
+  if(!this.states.hasOwnProperty(event.to)) {
+    throw "Unknown state: " + event.to;
+  }
+  
+  // Already at state
+  if(event.to == this.current) return;
+  
+  var oldState   = this.current;
+  var oldStateCB = this.states[oldState];
+  var newState   = event.to;
+  var newStateCB = this.states[newState];
+  
+  this.log("changing:", oldState, newState);
+  
+  if(oldStateCB && oldStateCB.beforeExit) oldStateCB.beforeExit();  
+  if(newStateCB.beforeEnter) newStateCB.beforeEnter.apply(this, args);
+    
+  this.current = newState;
+  
+  if(oldStateCB && oldStateCB.afterExit) oldStateCB.afterExit();
+  if(newStateCB.afterEnter) newStateCB.afterEnter();
+}

data/assets/bowline.view.js

@@ -0,0 +1,108 @@
+// #view > *:not(.current) {
+//   display: none;
+// }
+
+jQuery.support.WebKitAnimationEvent = (typeof WebKitTransitionEvent == "object");
+
+var BowlineView = function(element, options){
+  var defaults = {trace:false};
+  this.options = jQuery.extend({}, defaults, options);
+  
+  if (this.options.preloadImages) {
+    jQuery.each(this.options.preloadImages, function(e){
+      (new Image()).src = e;
+    });
+  }
+  
+  this.element = jQuery(element);
+
+  if(this.options.current){
+    this.current = jQuery(this.options.current);
+    this.current.addClass("current");
+  }
+};
+
+BowlineView.fn = BowlineView.prototype;
+
+BowlineView.fn.log = function(){
+  if( !this.options.trace ) return;
+  var args = jQuery.makeArray(arguments);
+  args.unshift("(BowlineView)");
+  console.log.apply(console, args);
+};
+
+BowlineView.fn.onChange = function(func){
+  this.element.bind("change.bowline", func);
+};
+
+BowlineView.fn.triggerChange = function(data){
+  this.element.trigger("change.bowline", data);
+};
+
+BowlineView.fn.elements = function(){
+  return this.element.find(">*");
+}
+
+BowlineView.fn.findView = function(name){
+  return this.element.find("[data-view='" + name + "']:first");
+};
+
+BowlineView.fn.viewName = function(element){
+  return jQuery(element).dataset("view");
+};
+
+BowlineView.fn.change = function(name){
+  var fromView      = this.current;
+  var fromViewName  = this.viewName(fromView);
+  var toView        = this.findView(name);
+  var toViewName    = name;
+  
+  this.log("changing:", fromViewName, toViewName);
+  
+  if(toView.length == 0) throw 'Unknown view: ' + toViewName;
+  
+  if(fromViewName == toViewName) return;
+  
+  var animation = null;
+  if(this.options.animationCallback){
+    animation = this.options.animationCallback(
+      fromViewName, toViewName
+    );
+  } else {
+    // Could be blank - doesn't matter.
+    animation = this.current.dataset("animation");
+  }
+    
+  if(!fromView) {
+    animation = null;
+  }  
+    
+  var self = this;
+  var callback = function(){
+    if (animation){
+      toView.removeClass("in " + animation);
+      if(fromView) {
+        fromView.removeClass("current out " + animation);
+      }      
+    } else {
+      if(fromView) fromView.removeClass("current");
+    }
+    self.current = toView;
+    self.triggerChange({
+      fromView:     fromView,
+      fromViewName: fromViewName,
+      toView:       toView,
+      toViewName:   toViewName
+    });
+  }
+    
+  if(jQuery.support.WebKitAnimationEvent && animation){
+    toView.one("webkitAnimationEnd", callback);
+    this.log("using animation:", animation, toViewName);
+    toView.addClass(animation + " in current");
+    if(fromView) fromView.addClass(animation + " out");    
+  } else {
+    toView.addClass("current");
+    callback();
+  }
+};

data/assets/jquery.dataset.js

@@ -0,0 +1,167 @@
+/// jquery.dataset v0.1.0 -- HTML5 dataset jQuery plugin
+/// http://orangesoda.net/jquery.dataset.html
+
+/// Copyright (c) 2009, Ben Weaver.  All rights reserved.
+/// This software is issued "as is" under a BSD license
+/// <http://orangesoda.net/license.html>.  All warrenties disclaimed.
+
+///  The HTML5 specification allows elements to have custom data
+///  attributes that are prefixed with `data-'.  They may be
+///  conveniently accessed through an element's `dataset' property.
+///  This plugin provides similar functionality.
+///
+///  The methods in the plugin are designed to be similar to the
+///  built-in `attr' and `data' methods.  All names are without the
+///  `data-' prefix.
+//
+///  These methods are defined:
+///
+///    dataset()
+///      Return an object with all custom attribute (name, value) items.
+///
+///    dataset(name)
+///      Return the value of the attribute `data-NAME'.
+///
+///    dataset(name, value)
+///      Set the value of attribtue `data-NAME' to VALUE.
+///
+///    dataset({...})
+///      Set many custom attributes at once.
+///
+///    removeDataset(name)
+///      Remove the attribute `data-NAME'.
+///
+///    removeDataset([n1, n2, ...])
+///      Remove the attributes `data-N1', `data-N2', ...
+
+(function($) {
+     var PREFIX = 'data-',
+	 PATTERN = /^data\-(.*)$/;
+
+     function dataset(name, value) {
+	 if (value !== undefined) {
+	     // dataset(name, value): set the NAME attribute to VALUE.
+	     return this.attr(PREFIX + name, value);
+	 }
+
+	 switch (typeof name) {
+	 case 'string':
+	     // dataset(name): get the value of the NAME attribute.
+	     return this.attr(PREFIX + name);
+
+	 case 'object':
+	     // dataset(items): set the values of all (name, value) items.
+	     return set_items.call(this, name);
+
+	 case 'undefined':
+	     // dataset(): return a mapping of (name, value) items for the
+	     // first element.
+	     return get_items.call(this);
+
+	 default:
+	     throw 'dataset: invalid argument ' + name;
+	 }
+     }
+
+     function get_items() {
+	 return this.foldAttr(function(index, attr, result) {
+	     var match = PATTERN.exec(this.name);
+	     if (match) result[match[1]] = this.value;
+	 });
+     }
+
+     function set_items(items) {
+	 for (var key in items) {
+	     this.attr(PREFIX + key, items[key]);
+	 }
+	 return this;
+     }
+
+     function remove(name) {
+	 if (typeof name == 'string') {
+	     // Remove a single attribute;
+	     return this.removeAttr(PREFIX + name);
+	 }
+	 return remove_names(name);
+     }
+
+     function remove_names(obj) {
+	 var idx, length = obj && obj.length;
+
+	 // For any object, remove attributes named by the keys.
+	 if (length === undefined) {
+	     for (idx in obj) {
+		 this.removeAttr(PREFIX + idx);
+	     }
+	 }
+	 // For an array, remove attributes named by the values.
+	 else {
+	     for (idx = 0; idx < length; idx++) {
+		 this.removeAttr(PREFIX + obj[idx]);
+	     }
+	 }
+
+	 return this;
+     }
+
+     $.fn.dataset = dataset;
+     $.fn.removeDataset = remove_names;
+
+})(jQuery);
+
+(function($) {
+
+     function each_attr(proc) {
+	 if (this.length > 0) {
+	     $.each(this[0].attributes, proc);
+	 }
+	 return this;
+     }
+
+     function fold_attr(proc, acc) {
+	 return fold((this.length > 0) && this[0].attributes, proc, acc);
+     }
+
+     /*
+      * A left-fold operator. The behavior is the same as $.each(),
+      * but the callback is called with the accumulator as the third
+      * argument.  The default accumulator is an empty object.
+      */
+     function fold(object, proc, acc) {
+	 var length = object && object.length;
+
+	 // The default accumulator is an empty object.
+	 if (acc === undefined) acc = {};
+
+	 // Returning an empty accumulator when OBJECT is "false"
+	 // makes FOLD more composable.
+	 if (!object) return acc;
+
+	 // Check to see if OBJECT is an array.
+	 if (length !== undefined) {
+	     for (var i = 0, value = object[i];
+		  (i < length) && (proc.call(value, i, value, acc) !== false);
+		  value = object[++i])
+	     { }
+	 }
+	 // Object is a map of (name, value) items.
+	 else {
+	     for (var name in object) {
+		 if (proc.call(object[name], name, object[name], acc) === false) break;
+	     }
+	 }
+
+	 return acc;
+     }
+
+     function fold_jquery(proc, acc) {
+	 if (acc === undefined) acc = [];
+	 return fold(this, proc, acc);
+     }
+
+     $.fn.eachAttr = each_attr;
+     $.fn.foldAttr = fold_attr;
+     $.fn.fold = fold_jquery;
+     $.fold = fold;
+
+})(jQuery);

data/bowline.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bowline}
-  s.version = "0.5.6"
+  s.version = "0.5.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alex MacCaw"]
-  s.date = %q{2009-12-27}
+  s.date = %q{2010-01-19}
   s.default_executable = %q{bowline-gen}
   s.description = %q{Ruby/JS GUI framework}
   s.email = %q{alex@leadthinking.com}
@@ -26,8 +26,13 @@ Gem::Specification.new do |s|
      "Rakefile",
      "TODO",
      "VERSION",
+     "assets/animations.css",
      "assets/bowline.js",
+     "assets/bowline.menu.js",
+     "assets/bowline.state.js",
+     "assets/bowline.view.js",
      "assets/jquery.chain.js",
+     "assets/jquery.dataset.js",
      "assets/jquery.js",
      "assets/json2.js",
      "assets/osx/Info.plist.erb",

data/examples/example.js

@@ -1,4 +1,4 @@
-$('#users').bindto('UsersBinder');
+$('#users').bowlineBind('UsersBinder');
 
 // invoke collection method
 // This will invoke UserBinder.admins and fill #users with admins

data/examples/twitter.html

@@ -11,7 +11,7 @@
   <script src="javascripts/application.js" type="text/javascript" charset="utf-8"></script>
   <script type="text/javascript" charset="utf-8">
     jQuery(function($){
-      var tweets = $('#tweets').bindto('tweets');
+      var tweets = $('#tweets').bowlineBind('TweetsBinder');
 
       $('#updateSubmit').click(function(){
         tweets.invoke('update', $('#updateText').val());

data/lib/bowline/binders.rb

@@ -68,10 +68,8 @@ module Bowline
          
         def setup(window) #:nodoc:
           self.windows << window
-          window.bowline.populate(
-            name, initial.to_js
-          ).call
-          true
+          items = initial
+          items.try(:to_js) || []
         end
         
         # Called by a window's JavaScript whenever that window is bound to this Binder.

data/lib/bowline/desktop/bridge.rb

@@ -41,12 +41,16 @@ module Bowline
         attr_reader :window, :id, :klass, :method, :args
         
         def initialize(window, atts)
-          @window = window
-          atts = atts.with_indifferent_access
-          @id     = atts[:id]
-          @klass  = atts[:klass]
-          @method = atts[:method].to_sym
-          @args   = atts[:args] || []
+          @window   = window
+          atts      = atts.with_indifferent_access
+          @id       = atts[:id]
+          @klass    = atts[:klass]
+          @method   = atts[:method].to_sym
+          @args     = atts[:args] || []
+        end
+        
+        def callback?
+          @id != -1
         end
 
         def invoke
@@ -59,9 +63,11 @@ module Bowline
           trace "JS invoking: #{klass}.#{method}(#{args.join(',')})"
           if object.respond_to?(:js_exposed?) && object.js_exposed?
             result = object.js_invoke(window, method, *args)
-            proxy  = Proxy.new(window)
-            proxy.Bowline.invokeCallback(id, result)
-            window.run_script(proxy.to_s)
+            if callback?
+              proxy  = Proxy.new(window)
+              proxy.Bowline.invokeCallback(id, result.to_js.to_json)
+              window.run_script(proxy.to_s)
+            end
           else
             raise "Method not allowed"
           end

data/lib/bowline/desktop/window.rb

@@ -49,7 +49,11 @@ module Bowline
       #   window.file = :about
       # Passing a symbol will load the corrosponding HTML file
       # in the public directory. In this case, it'll load about.html
-      
+
+      ##
+      # :singleton-method: url=(address)
+      # Navigate to a HTTP address.
+            
       ##
       # :singleton-method: id
       # Internal ID for the window. 
@@ -148,6 +152,10 @@ module Bowline
       ##
       # :singleton-method: shown?
       # Is this window currently shown?
+      
+      ##
+      # :singleton-method: show_inspector(console = false)
+      # Show WebInspector
     end
     
     class MainWindow #:nodoc:

data/lib/bowline/desktop/window_manager.rb

@@ -63,9 +63,12 @@ module Bowline
           else
             @window = Window.new
           end
-          @window.script_callback = Proc.new {|str|
+          # Has to be an instance variable since
+          # it is getting GCed (even if I mark it).
+          @script_callback = Proc.new {|str|
             Bowline::Desktop::Bridge.call(self, str)
           }
+          @window.script_callback = @script_callback;
         end
         
         # Evaluate JavaScript in this window. Pass

data/lib/bowline/desktop/window_methods.rb

@@ -1,3 +1,5 @@
+require "net/http"
+
 module Bowline
   module Desktop
     module WindowMethods #:nodoc:
@@ -26,6 +28,13 @@ module Bowline
       end
       alias :load_file :file=
       
+      def url=(address)
+        unless address.is_a?(URI)
+          address = URI.parse(path)
+        end
+        self._url = address.to_s
+      end
+      
       def select_dir(options = {})
         flags = 0
         flags |= Window::FD_OPEN if options[:open]

data/lib/bowline/initializer.rb

@@ -100,6 +100,16 @@ module Bowline
       $LOAD_PATH.uniq!
     end
     
+    def disable_dependency_loading
+      if configuration.cache_classes && !configuration.dependency_loading
+        ActiveSupport::Dependencies.unhook!
+      end
+    end
+    
+    def initialize_dependency_mechanism
+      ActiveSupport::Dependencies.mechanism = configuration.cache_classes ? :require : :load
+    end
+    
     # Initializes ActiveRecord databases
     def initialize_database
       if defined?(ActiveRecord)
@@ -286,6 +296,8 @@ module Bowline
       require_frameworks
       set_autoload_paths
       add_plugin_load_paths
+      initialize_dependency_mechanism
+      disable_dependency_loading
       
       initialize_encoding
       initialize_database
@@ -303,14 +315,13 @@ module Bowline
       load_app_config
       
       load_plugins
+      load_application_classes
+      load_application_helpers
             
       load_application_initializers
       
       after_initialize
-      
-      load_application_classes
-      load_application_helpers
-      
+            
       initialize_js
       initialize_windows
       
@@ -401,6 +412,13 @@ module Bowline
      # You can add gems with the #gem method.
      attr_accessor :gems
      
+     attr_accessor :dependency_loading
+     
+     def threadsafe!
+        self.cache_classes = true
+        self.dependency_loading = false
+     end
+     
      # Adds a single Gem dependency to the Bowline application. By default, it will require
      # the library with the same name as the gem. Use :lib to specify a different name.
      #
@@ -469,6 +487,7 @@ module Bowline
        self.frameworks                   = default_frameworks
        self.load_paths                   = default_load_paths
        self.load_once_paths              = default_load_once_paths
+       self.dependency_loading           = default_dependency_loading
        self.eager_load_paths             = default_eager_load_paths
        self.log_path                     = default_log_path
        self.log_level                    = default_log_level
@@ -568,14 +587,18 @@ module Bowline
      def default_load_once_paths
        []
      end
+     
+     def default_dependency_loading
+       true
+     end
 
      def default_eager_load_paths
        %w(
-         app/binders
          app/models
          app/remote
-         app/helpers
          app/windows
+         app/binders
+         app/helpers
        ).map { |dir| "#{root_path}/#{dir}" }.select { |dir| File.directory?(dir) }
      end
      

data/lib/bowline/library.rb

@@ -2,8 +2,8 @@ module Bowline
   # Provides paths to Bowline's required libraries.
   module Library
     PROJECT_URL  = "http://bowline.s3.amazonaws.com/#{Platform.type}"
-    DESKTOP_URL  = "#{PROJECT_URL}/bowline-desktop"
-    RUBYLIB_URL  = "#{PROJECT_URL}/rubylib.zip"
+    DESKTOP_URL  = "#{PROJECT_URL}/bowline-desktop.zip"
+    LIBS_URL     = "#{PROJECT_URL}/libs.zip"
     
     # Path to a folder stored under the users
     # home directory containing the downloaded libraries.
@@ -20,22 +20,16 @@ module Bowline
     end
     module_function :desktop_path
     
-    # Path to Ruby's stdlib
-    def rubylib_path
-      File.join(path, "rubylib")
+    def libs_path
+      File.join(path, "libs")
     end
-    module_function :rubylib_path
+    module_function :libs_path
     
     def local_bowline_path
       File.join(APP_ROOT, "vendor", "bowline")
     end
     module_function :local_bowline_path
     
-    def local_rubylib_path
-      File.join(APP_ROOT, "vendor", "rubylib")
-    end
-    module_function :local_rubylib_path
-    
     def local_build_path
       File.join(APP_ROOT, "build")
     end
@@ -44,7 +38,7 @@ module Bowline
     # Returns true if all required libraries exist.
     def ready?
       File.exist?(desktop_path) && 
-        File.directory?(rubylib_path) && 
+        File.directory?(libs_path) && 
           File.directory?(local_bowline_path)
     end
     module_function :ready?

data/lib/bowline/logging.rb

@@ -15,7 +15,7 @@ module Bowline
     
     # Log an error backtrace if debugging is activated
     def log_error(e=$!)
-      debug "#{e}\n\t" + e.backtrace.join("\n\t")
+      Bowline.logger.error "#{e}\n\t" + e.backtrace.join("\n\t")
     end
     module_function :log_error
     public :log_error

data/lib/bowline/tasks/app.rake

@@ -4,6 +4,44 @@ require 'rbconfig'
 
 namespace :app do  
   namespace :build do
+    namespace :osx do
+      desc "Copy WebKit into app's Frameworks"
+      task :webkit_framework => :environment do
+        config = Bowline.configuration
+        build_path  = Bowline::Library.local_build_path
+        app_path    = File.join(build_path, "#{config.name}.app")
+        contents_path = File.join(app_path, "Contents")
+        
+        webkit_path = ENV["WEBKIT_PATH"] || "/Applications/WebKit.app/Contents/Frameworks/10.5"
+        unless File.directory?(webkit_path)
+          raise "Install the WebKit nightly: http://nightly.webkit.org/"
+        end
+        frameworks = ["WebKit", "JavaScriptGlue", "WebCore", "JavaScriptCore"]
+        
+        FileUtils.cd(contents_path) do
+          FileUtils.mkdir("Frameworks")
+          
+          frameworks.each {|name|
+            name = "#{name}.framework"
+            FileUtils.cp_r(
+              File.join(webkit_path, name), 
+              "Frameworks"
+            )
+          }
+        
+          `install_name_tool -change \
+           /Volumes/Data/WebKit/52531/10.5/WebKit.framework/Versions/A/WebKit \
+           @executable_path/../Frameworks/WebKit.framework/Versions/A/WebKit \
+           MacOS/#{config.name}`
+           
+          `install_name_tool -change \
+           /Volumes/Data/WebKit/52531/10.5/WebCore.framework/Versions/A/WebCore \
+           @executable_path/../Frameworks/WebCore.framework/Versions/A/WebCore \
+           MacOS/#{config.name}`
+         end
+      end
+    end
+    
     task :osx => :environment do
       unless Bowline::Library.ready?
         Rake::Task["libs:setup"].invoke
@@ -61,22 +99,19 @@ namespace :app do
             %w{assets pkg examples bin templates .git}.each do |unused|
               FileUtils.rm_rf(File.join(bowline_path, unused))
             end
-            
-            rubylib_path = "rubylib"
-            FileUtils.rm_rf(rubylib_path)
-            FileUtils.cp_r(
-              Bowline::Library.rubylib_path, 
-              rubylib_path
-            )
           end
         end
         
-        # Copy Bowline binary
+        # Copy Bowline binary & libs
         FileUtils.mkdir("MacOS")
         FileUtils.cp(
           Bowline::Library.desktop_path, 
           File.join("MacOS", config.name)
         )
+        FileUtils.cp_r(
+          Bowline::Library.libs_path, 
+          File.join("MacOS", "libs")
+        )
       end
       FileUtils.chmod_R(0755, app_path)
       FileUtils.chmod(0644, File.join(contents_path, "Info.plist"))

data/lib/bowline/tasks/libs.rake

@@ -5,13 +5,14 @@ require 'progressbar'
 require 'zip/zip'
 
 def download(url)
+  puts "Retrieving: #{url}"
   name = url.split("/").last
   file = Tempfile.new("download_#{name}")
   url  = URI.parse(url)
   req  = Net::HTTP::Get.new(url.path)
   res  = Net::HTTP.start(url.host, url.port) {|http|
     http.request(req) {|resp|
-      pbar = ProgressBar.new("Downloading...", resp.content_length)
+      pbar = ProgressBar.new("Downloading", resp.content_length || 0)
       resp.read_body {|seg|
         pbar.inc(seg.length)
         file.write(seg)
@@ -41,7 +42,7 @@ def sym_or_copy(from, to)
   end
 end
 
-namespace :libs do
+namespace :libs do  
   task :unpack => :environment do
     # Lots of people are using Ruby 1.8 with Bowline.
     # When bowline-desktop loads, it doesn't know where the
@@ -53,33 +54,27 @@ namespace :libs do
       Bowline.lib_path, 
       local_bowline_path
     ) unless File.directory?(local_bowline_path)
-        
-    local_rubylib_path = Bowline::Library.local_rubylib_path
-    raise "Run libs:download task first" unless File.directory?(Bowline::Library.rubylib_path)
-    sym_or_copy(
-      Bowline::Library.rubylib_path, 
-      local_rubylib_path
-    ) unless File.directory?(local_rubylib_path)
   end
   
   desc "Download Bowline's binary and pre-compiled libs"
   task :download => :environment do
     FileUtils.mkdir_p(Bowline::Library.path)
     desktop_path = Bowline::Library.desktop_path
-    rubylib_path = Bowline::Library.rubylib_path
+    libs_path    = Bowline::Library.libs_path
     
     unless File.exist?(desktop_path)
       desktop_tmp = download(Bowline::Library::DESKTOP_URL)
       desktop_tmp.close
-      FileUtils.mv(desktop_tmp.path, desktop_path)
+      puts "Extracting bowline-desktop.zip"
+      unzip(desktop_tmp.path, Bowline::Library.path)
       FileUtils.chmod(0755, desktop_path)
     end
     
-    unless File.directory?(rubylib_path)
-      rubylib_tmp = download(Bowline::Library::RUBYLIB_URL)
-      rubylib_tmp.close
-      puts "Extracting..."
-      unzip(rubylib_tmp.path, Bowline::Library.path)
+    unless File.directory?(libs_path)
+      libs_tmp = download(Bowline::Library::LIBS_URL)
+      libs_tmp.close
+      puts "Extracting libs.zip (this could take some time)"
+      unzip(libs_tmp.path, Bowline::Library.path)
     end
   end
     
@@ -88,8 +83,6 @@ namespace :libs do
   desc "Update Bowline's binary and pre-compiled libs"
   task :update => :environment do
     FileUtils.rm_rf(Bowline::Library.path)
-    FileUtils.rm_rf(Bowline::Library.local_bowline_path)
-    FileUtils.rm_rf(Bowline::Library.local_rubylib_path)
     Rake::Task["libs:setup"].invoke
   end
 end

data/lib/bowline/version.rb

@@ -2,10 +2,10 @@ module Bowline
   module Version #:nodoc:
     MAJOR    = 0
     MINOR    = 5
-    TINY     = 6
+    TINY     = 7
     
     STRING   = [MAJOR, MINOR, TINY].join('.')
     
     CODENAME = "If you can meet with Triumph and Disaster".freeze
   end
-end
+end

data/templates/config/environment.rb

@@ -10,8 +10,5 @@ Bowline::Initializer.run do |config|
     
   # config.gem "activerecord"
   # config.gem "net-mdns", :lib => 'net/dns/mdns'
-  # config.gem "rack"
   # config.gem "rubyzip", :lib => 'zip/zip'
-  # Bowline Edge:
-  # config.gem "maccman-bowline", :lib => "bowline", :source => "http://gems.github.com"
 end

data/templates/public/index.html

@@ -12,9 +12,7 @@
   <script type="text/javascript" charset="utf-8">
     // Binder Example:
     // jQuery(function($){
-    //   $.bowline.ready(function(){
-    //     $('#tweets').bindto('TweetsBinder');
-    //   })
+    //  $('#tweets').bowlineBind('TweetsBinder');
     // });
   </script>
 </head>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bowline
 version: !ruby/object:Gem::Version 
-  version: 0.5.6
+  version: 0.5.7
 platform: ruby
 authors: 
 - Alex MacCaw
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-27 00:00:00 +00:00
+date: 2010-01-19 00:00:00 +00:00
 default_executable: bowline-gen
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -59,8 +59,13 @@ files:
 - Rakefile
 - TODO
 - VERSION
+- assets/animations.css
 - assets/bowline.js
+- assets/bowline.menu.js
+- assets/bowline.state.js
+- assets/bowline.view.js
 - assets/jquery.chain.js
+- assets/jquery.dataset.js
 - assets/jquery.js
 - assets/json2.js
 - assets/osx/Info.plist.erb