bowline 0.5.8 → 0.6.0

data/README.txt

@@ -142,7 +142,7 @@ $.bowline.helper('name', 'arg1', ['arg2'])
 
 Bowline supports ActiveRecord and the Sqlite3 database. 
 The packaging for distributing databases is still in development though.
-Bowline also has a LocalModel class for models held in memory.
+You can use the SuperModel gem (http://github.com/maccman/supermodel) for models held in memory.
 
 = WINDOWS
 
@@ -160,7 +160,7 @@ http://github.com/maccman/bowline-desktop
 = DISTRIBUTING
 
 Once your app is ready for a release, you should run the following command to make sure all the gems required have been vendorised:
-  rake gems:sync
+  gem bundle
 
 Then, run:
   ./script/build

data/Rakefile

@@ -8,8 +8,9 @@ begin
     gemspec.description = "Ruby/JS GUI framework"
     gemspec.authors = ["Alex MacCaw"]
     gemspec.add_dependency('templater',     '>= 0.3.2')
-    gemspec.add_dependency('activesupport', '>= 2.3.2')
+    gemspec.add_dependency('activesupport', '>= 3.0.0.beta')
     gemspec.add_dependency('rubyzip2',      '>= 2.0.1')
+    gemspec.add_dependency('supermodel')
   end
 rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
@@ -28,4 +29,4 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.options << "--line-numbers" << "--inline-source"
   rdoc.rdoc_files.include("README.txt")
   rdoc.rdoc_files.include("lib/**/*.rb")
-end
+end

data/TODO

@@ -25,6 +25,8 @@ Tutorials:
 - Add first-run initializers
 - Add reload keyboard shortcut
 - Add some sort of production mode
+- Generate correct shebang on script files
+- Use App.root rather than APP_ROOT
 
 - strip exe (to make smaller)
 - remove framework headers

data/VERSION

@@ -1 +1 @@
-0.5.8
+0.6.0

data/assets/bowline.js

@@ -118,6 +118,83 @@
 
 */
 
+var BowlineBound = function(klass){
+  this.klass = klass;
+  this.options  = {};
+  this.elements = jQuery();
+};
+
+BowlineBound.fn = BowlineBound.prototype;
+
+BowlineBound.fn.updateOptions = function(opts){
+  this.options = jQuery.extend({}, this.options, opts);
+  this.singleton = this.options.singleton;
+}
+
+BowlineBound.fn.push = function(element){
+  this.elements = this.elements.add(element);
+  this.setup();
+}
+
+BowlineBound.fn.replace = function(items){
+  if(this.singleton) {
+    this.elements.item("replace", items);
+  } else {
+    this.elements.items("replace", items);
+  }
+}
+
+BowlineBound.fn.create = function(id, item){
+  if(this.singleton) {
+    this.elements.item(item);
+  } else {
+    this.elements.items("add", item);
+  }
+}
+
+BowlineBound.fn.update = function(id, item){
+  if(this.singleton){
+    this.elements.item(item);
+  } else {
+    this.findElement(id).item(item);
+  }
+}
+
+BowlineBound.fn.remove = function(id){
+  if(this.singleton) {
+    this.elements.item("replace", {});
+  } else {
+    this.findElement(id).item("remove");
+  }
+}
+
+BowlineBound.fn.invoke = function(){
+  var args = $.makeArray(arguments);
+  args.unshift(this.klass);
+  Bowline.invoke.apply(Bowline, args);
+}
+
+BowlineBound.fn.findElement = function(id){
+  // TODO - increase efficiency
+  var element = jQuery();
+  jQuery.each(this.elements.items(true), function(){
+    var sameItem = $(this).item().id == id;
+    if(sameItem) element = element.add(this);
+  });
+  return element;
+}
+
+BowlineBound.fn.setup = function(){
+  if (this.hasSetup) return;
+  this.hasSetup = true;
+  var self = this;
+  jQuery(function(){
+    Bowline.invoke(self.klass, "setup", function(opts){
+      self.updateOptions(opts);
+    });
+  });
+}
+
 var Bowline = {
   callbacks: {},
   uuid: 0,
@@ -154,6 +231,8 @@ var Bowline = {
 
     Bowline.log("New message:", msg);
     
+    Bowline.log(JSON.stringify(msg))
+    
     if(Bowline.enabled)
       _app.call(JSON.stringify(msg));
   },
@@ -174,100 +253,91 @@ var Bowline = {
   
   helper: function(){
     var args = jQuery.makeArray(arguments);
-    args.unshift("Helper");
+    args.unshift("Bowline::Helpers");
     Bowline.invoke.apply(this, args);
   },
   
   bind: function(el, klass, options){
     el = jQuery(el);
+    
+    el.data("bowline", klass);
     el.chain(options);
-    el.data('bowline', klass);
+    
     if(!Bowline.bounds[klass]) 
-      Bowline.bounds[klass] = [];
+      Bowline.bounds[klass] = new BowlineBound(klass);
+
     Bowline.bounds[klass].push(el);
-    jQuery(function(){
-      Bowline.invoke(klass, "setup", function(res){
-        Bowline.populate(klass, res);
-      });
-    });
+     
+     // Shortcut
+    Bowline[klass] = Bowline.bounds[klass];
   },
   
   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;
+    // TODO
+    // var array = Bowline.bounds[klass];
+    // if(!array) return;
+    // array = jQuery.grep(array, 
+    //   function(n){ return n.el != el }
+    // );
+    // Bowline.bounds[klass] = array;
+  },
+  
+  openInspector: function(){
+    if(Bowline.enabled)
+      _app.openInspector();
   },
   
   // Bowline functions
   
   invokeJS: function(str){
     Bowline.log("Invoking:", str);
-    return JSON.stringify(eval(str));
+    try {
+      return JSON.stringify(eval(str));
+    } catch(e) {
+      Bowline.warn(e);
+    }
   },
   
   invokeCallback: function(id, res){
     Bowline.log("Callback:", id, res);
-    if(!Bowline.callbacks[id]) return true;
+    if(!Bowline.callbacks[id]) return;
     try {
       Bowline.callbacks[id](JSON.parse(res));
       delete Bowline.callbacks[id];
     } catch(e) { 
-      Bowline.log(e) 
+      Bowline.warn(e) 
     }
-    return true;
   },
   
-  populate: function(klass, items){
-    if(!Bowline.bounds[klass]) return true;
-    jQuery.each(Bowline.bounds[klass], function(){
-      this.items('replace', items);
-    });
-    return true;
+  replace: function(klass, items){
+    if(!Bowline.bounds[klass]) return;
+    Bowline.bounds[klass].replace(items);
   },
   
   created: function(klass, id, item){
-    if(!Bowline.bounds[klass]) return true;
-    if(!item.id) item.id = id;
-    jQuery.each(Bowline.bounds[klass], function(){
-      this.items('add', item);
-    });
-    return true;
+    if(!Bowline.bounds[klass]) return;
+    Bowline.bounds[klass].create(id, item);
   },
   
   updated: function(klass, id, item){
-    if(!Bowline.bounds[klass]) return true;
+    if(!Bowline.bounds[klass]) return;
     if(!item.id) item.id = id;
-    jQuery.each(Bowline.bounds[klass], function(){
-      Bowline.findItem(this, id).item('replace', item);
-    });
-    return true;
+    Bowline.bounds[klass].update(id, item);
   },
   
   removed: function(klass, id){
-    if(!Bowline.bounds[klass]) return true;
-    jQuery.each(Bowline.bounds[klass], function(){
-      Bowline.findItem(this, id).item('remove');
-    });
-    return true;
+    if(!Bowline.bounds[klass]) return;
+    Bowline.bounds[klass].remove(id);
   },
   
   trigger: function(klass, event, data){
-    if(!Bowline.bounds[klass]) return true;
-    jQuery.each(Bowline.bounds[klass], function(){
-      this.trigger(event, data);
-    });
-    return true;
+    if(!Bowline.bounds[klass]) return;
+    Bowline.bounds[klass].elements.trigger(event, data);
   },
   
   element: function(klass, id){
-    var el = jQuery();
-    jQuery.each(Bowline.bounds[klass], function(){
-      el = el.add(findItem(this, id));
-    });
-    return el;
+    if(!Bowline.bounds[klass]) return;
+    return Bowline.bounds[klass].findElement(id);
   },
   
   // System functions
@@ -276,13 +346,6 @@ var Bowline = {
     Bowline.windowInvoke("loaded!");
   },
   
-  findItem: function(el, id){
-    var items = jQuery.grep(el.items(true), function(n, i){
-      return jQuery(n).item().id == id;
-    });
-    return(jQuery(items[0]));
-  },
-  
   log: function(){
     if( !Bowline.trace ) return;
     var args = jQuery.makeArray(arguments);
@@ -299,20 +362,20 @@ var Bowline = {
 
 (function($){
   $.fn.invoke = function(){
-    if($(this).chain('active')){
-      var args = $.makeArray(arguments);
-      if($(this).data('bowline')){
-        // Class method
-        var klass = $(this).data('bowline');
-        args.unshift(klass);
-        Bowline.invoke.apply(Bowline, args);
-      } else {
-        // Instance method
-        var klass = $(this).item('root').data('bowline');
-        var id = $(this).item().id;
+    if($(this).chain("active")){
+      var args  = $.makeArray(arguments);
+      var element = $(this).item("root");
+      var klass = element.data("bowline");      
+      if(!klass) throw "Unknown class: " + klass;
+      
+      if(Bowline[klass].singleton){
+        var id = element.item().id;
         args.unshift(id);
         args.unshift(klass);
         Bowline.instanceInvoke.apply(Bowline, args);
+      } else {
+        args.unshift(klass);
+        Bowline.invoke.apply(Bowline, args); 
       }
     } else {
       throw 'Chain not active';

data/assets/bowline.test.js

@@ -0,0 +1,86 @@
+// Emulates a Bowline backend
+
+BowlineTest = {};
+BowlineTest.trace = true;
+BowlineTest.setup = function(){
+  window._app = {}
+  window._app.call = function(json){    
+    var msg = JSON.parse(json);
+        
+    if(msg.klass == "_window") return;
+
+    var klass = BowlineTest.klasses[msg.klass];
+    if(klass)
+      var method = klass[msg.method];
+      
+    if(!method && msg.method == "setup"){
+      return;
+    }
+    
+    if(!klass || !method) {
+      BowlineTest.log("Missing method:", msg.klass + "#" + msg.method);
+      return;
+    }
+    
+    BowlineTest.log("Handling method:", msg.klass + "#" + msg.method);
+    
+    var replace = function(val){
+      Bowline.replace(msg.klass, val);
+    }
+    
+    var created = function(id, val){
+      Bowline.created(msg.klass, id, val);
+    }
+   
+    var updated = function(id, val){
+      Bowline.updated(msg.klass, id, val);
+    }
+    
+    var removed = function(id){
+      Bowline.removed(msg.klass, id);
+    }
+    
+    var context = {
+      replace: replace,
+      created: created,
+      updated: updated,
+      removed: removed
+    };
+   
+    var result;
+    try {
+      result = method.apply(context, msg.args);
+    } catch(e) {
+      console.error("Error in method:", klass + "#" + method);
+      throw(e);
+    }
+       
+    if(msg.id != -1) {
+      Bowline.invokeCallback(
+        msg.id, JSON.stringify(result)
+      )
+    }
+ }
+ Bowline.enabled = true;
+};
+
+BowlineTest.log = function(){
+  if( !BowlineTest.trace ) return;
+  var args = jQuery.makeArray(arguments);
+  args.unshift("(BowlineTest)");
+  console.log.apply(console, args);
+};
+
+BowlineTest.klasses = {};
+BowlineTest.register = function(className, object) {
+  BowlineTest.klasses[className] = object;
+  var bound = Bowline.bounds[className];
+  if(bound) bound.singleton = object.singleton;
+}
+
+BowlineTest.enabled = !Bowline.enabled;
+
+if(BowlineTest.enabled){
+  BowlineTest.log("Enabled");
+  BowlineTest.setup();
+}

data/bowline.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bowline}
-  s.version = "0.5.8"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alex MacCaw"]
-  s.date = %q{2010-01-19}
+  s.date = %q{2010-02-10}
   s.default_executable = %q{bowline-gen}
   s.description = %q{Ruby/JS GUI framework}
   s.email = %q{alex@leadthinking.com}
@@ -30,6 +30,7 @@ Gem::Specification.new do |s|
      "assets/bowline.js",
      "assets/bowline.menu.js",
      "assets/bowline.state.js",
+     "assets/bowline.test.js",
      "assets/bowline.view.js",
      "assets/jquery.chain.js",
      "assets/jquery.dataset.js",
@@ -46,19 +47,15 @@ Gem::Specification.new do |s|
      "examples/twitter.html",
      "examples/users.rb",
      "lib/bowline.rb",
+     "lib/bowline/app_config.rb",
      "lib/bowline/binders.rb",
+     "lib/bowline/binders/collection.rb",
+     "lib/bowline/binders/observer.rb",
+     "lib/bowline/binders/singleton.rb",
      "lib/bowline/commands/build.rb",
      "lib/bowline/commands/console.rb",
      "lib/bowline/commands/generate.rb",
      "lib/bowline/commands/run.rb",
-     "lib/bowline/dependencies/FAQ.markdown",
-     "lib/bowline/dependencies/MIT-LICENSE",
-     "lib/bowline/dependencies/README.markdown",
-     "lib/bowline/dependencies/TODO.markdown",
-     "lib/bowline/dependencies/lib/dependencies.rb",
-     "lib/bowline/dependencies/lib/dependencies/dependency.rb",
-     "lib/bowline/dependencies/lib/dependencies/repository.rb",
-     "lib/bowline/dependencies/lib/ext/rubygems.rb",
      "lib/bowline/desktop.rb",
      "lib/bowline/desktop/app.rb",
      "lib/bowline/desktop/bridge.rb",
@@ -70,14 +67,13 @@ Gem::Specification.new do |s|
      "lib/bowline/desktop/misc.rb",
      "lib/bowline/desktop/network.rb",
      "lib/bowline/desktop/proxy.rb",
+     "lib/bowline/desktop/runtime.rb",
      "lib/bowline/desktop/sound.rb",
      "lib/bowline/desktop/window.rb",
      "lib/bowline/desktop/window_manager.rb",
      "lib/bowline/desktop/window_methods.rb",
      "lib/bowline/ext/array.rb",
-     "lib/bowline/ext/class.rb",
      "lib/bowline/ext/object.rb",
-     "lib/bowline/ext/string.rb",
      "lib/bowline/generators.rb",
      "lib/bowline/generators/application.rb",
      "lib/bowline/generators/binder.rb",
@@ -88,18 +84,17 @@ Gem::Specification.new do |s|
      "lib/bowline/helpers.rb",
      "lib/bowline/initializer.rb",
      "lib/bowline/library.rb",
-     "lib/bowline/local_model.rb",
      "lib/bowline/logging.rb",
      "lib/bowline/platform.rb",
      "lib/bowline/tasks/app.rake",
      "lib/bowline/tasks/bowline.rb",
      "lib/bowline/tasks/database.rake",
-     "lib/bowline/tasks/gems.rake",
      "lib/bowline/tasks/libs.rake",
      "lib/bowline/tasks/log.rake",
      "lib/bowline/tasks/misc.rake",
      "lib/bowline/version.rb",
      "lib/bowline/watcher.rb",
+     "templates/Gemfile",
      "templates/Rakefile",
      "templates/binder.rb",
      "templates/config/application.yml",
@@ -140,17 +135,20 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<templater>, [">= 0.3.2"])
-      s.add_runtime_dependency(%q<activesupport>, [">= 2.3.2"])
+      s.add_runtime_dependency(%q<activesupport>, [">= 3.0.0.beta"])
       s.add_runtime_dependency(%q<rubyzip2>, [">= 2.0.1"])
+      s.add_runtime_dependency(%q<supermodel>, [">= 0"])
     else
       s.add_dependency(%q<templater>, [">= 0.3.2"])
-      s.add_dependency(%q<activesupport>, [">= 2.3.2"])
+      s.add_dependency(%q<activesupport>, [">= 3.0.0.beta"])
       s.add_dependency(%q<rubyzip2>, [">= 2.0.1"])
+      s.add_dependency(%q<supermodel>, [">= 0"])
     end
   else
     s.add_dependency(%q<templater>, [">= 0.3.2"])
-    s.add_dependency(%q<activesupport>, [">= 2.3.2"])
+    s.add_dependency(%q<activesupport>, [">= 3.0.0.beta"])
     s.add_dependency(%q<rubyzip2>, [">= 2.0.1"])
+    s.add_dependency(%q<supermodel>, [">= 0"])
   end
 end