bowline 0.6.3 → 0.9.1

data/assets/superclass.js

@@ -0,0 +1,93 @@
+var SuperClass = function(parent){  
+  var result = function(){
+    this.init.apply(this, arguments);
+  };
+  
+  result.prototype.init  = function(){};
+  
+  if (parent){
+    for(var i in parent){
+      result[i] = SuperClass.clone(parent[i]);
+    }
+        
+    for(var i in parent.prototype){
+      result.prototype[i] = SuperClass.clone(parent.prototype[i]);
+    }
+    
+    result.parent = parent;
+    result.prototype.parent = parent.prototype;
+    
+    result._super = function(){
+      var parent  = this.parent;
+      
+      var key     = this.findProperty(arguments.callee.caller);
+      var method  = parent[key];
+                  
+      if (!method) return;
+      
+      var oldParent       = parent;
+      var oldFindProperty = this.findProperty;
+      
+      // In case parent method calls super
+      this.findProperty = $.proxy(this.findProperty, parent);
+      this.parent       = parent.parent;
+      var value         = method.apply(this, arguments);
+      
+      // Reset functions refs
+      this.findProperty = oldFindProperty;
+      this.parent       = oldParent;
+      
+      return value;
+    };
+    result.prototype._super = result._super;
+  }
+
+  result.fn = result.prototype;
+  result.fn._class      = result;
+    
+  result.findProperty = function(val){
+    for(var key in this)
+      if(this[key] == val) return key;
+  };
+  result.fn.findProperty = result.findProperty;
+
+  result.extend = function(obj){
+    var extended = obj.extended;
+    delete obj.extended;
+    for(var i in obj){
+      result[i] = obj[i];
+    }
+    
+    if (extended) extended(result)
+  };
+
+  result.include = function(obj){
+    var included = obj.included;
+    delete obj.included;    
+    for(var i in obj){
+      result.fn[i] = obj[i];
+    }
+    
+    if (included) included(result)
+  };
+  
+  result.aliasMethod = function(newName, oldName){
+    this[newName] = this[oldName];
+  };
+  result.fn.aliasMethod = result.aliasMethod;
+  
+  result.aliasMethodChain = function(method, name){
+    this.aliasMethod(method + "Without" + name, method);
+    this.aliasMethod(method, method + "With" + name);
+  };
+  result.fn.aliasMethodChain = result.aliasMethodChain;
+
+  return result;
+};
+
+SuperClass.clone = function(obj){
+  if (typeof obj == "function") return obj;
+  if (typeof obj != "object") return obj;  
+  if (jQuery.isArray(obj)) return jQuery.extend([], obj);
+  return jQuery.extend({}, obj);
+};

data/bowline.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bowline}
-  s.version = "0.6.3"
+  s.version = "0.9.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alex MacCaw"]
-  s.date = %q{2010-04-06}
+  s.date = %q{2010-05-21}
   s.default_executable = %q{bowline-gen}
   s.description = %q{Ruby/JS GUI framework}
   s.email = %q{alex@leadthinking.com}
@@ -26,19 +26,15 @@ Gem::Specification.new do |s|
      "Rakefile",
      "TODO",
      "VERSION",
-     "assets/animations.css",
+     "assets/application.js",
+     "assets/bowline.chain.js",
      "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",
      "assets/jquery.js",
-     "assets/json2.js",
      "assets/osx/Info.plist.erb",
      "assets/osx/bowline.png",
      "assets/osx/makeicns",
+     "assets/superclass.js",
      "bin/bowline-gen",
      "bowline.gemspec",
      "examples/example.js",
@@ -150,18 +146,21 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<templater>, [">= 0.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"])
+      s.add_runtime_dependency(%q<bundler08>, [">= 0.8.5"])
+      s.add_runtime_dependency(%q<supermodel>, [">= 0.1.3"])
     else
       s.add_dependency(%q<templater>, [">= 0.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"])
+      s.add_dependency(%q<bundler08>, [">= 0.8.5"])
+      s.add_dependency(%q<supermodel>, [">= 0.1.3"])
     end
   else
     s.add_dependency(%q<templater>, [">= 0.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"])
+    s.add_dependency(%q<bundler08>, [">= 0.8.5"])
+    s.add_dependency(%q<supermodel>, [">= 0.1.3"])
   end
 end
 

data/examples/example.js

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

data/examples/twitter.html

@@ -6,12 +6,11 @@
   <link rel="stylesheet" href="stylesheets/application.css" type="text/css" charset="utf-8">
 	<script src="javascripts/jquery.js" type="text/javascript" charset="utf-8"></script>
 	<script src="javascripts/jquery.chain.js" type="text/javascript" charset="utf-8"></script>
-	<script src="javascripts/json2.js" type="text/javascript" charset="utf-8"></script>
   <script src="javascripts/bowline.js" type="text/javascript" charset="utf-8"></script>
   <script src="javascripts/application.js" type="text/javascript" charset="utf-8"></script>
   <script type="text/javascript" charset="utf-8">
     jQuery(function($){
-      var tweets = $('#tweets').bowlineBind('TweetsBinder');
+      var tweets = $('#tweets').bowlineChain('TweetsBinder');
 
       $('#updateSubmit').click(function(){
         tweets.invoke('update', $('#updateText').val());

data/lib/bowline/app_config.rb

@@ -9,15 +9,25 @@ module Bowline
         @instance ||= create
       end
       
-      def marshal_records(record = nil)
+      def marshal_records=(record)
         self.instance.load(record.attributes) if record
         self.instance
       end
       
+      def marshal_records
+        self.instance
+      end
+      
       def load!(path)
         self.instance.load_path(path)
         self.instance
       end
+      
+      def reset!
+        @instance = nil
+      end
+      alias_method :destroy_all, :reset!
+      alias_method :delete_all,  :reset!
     end
     
     def load_path(path)

data/lib/bowline/binders.rb

@@ -55,6 +55,17 @@ module Bowline
     #   </script>
     #
     # For more documentation on Bowline's JavaScript API, see bowline.js
+    
+    def active(binder = nil) #:nodoc:
+      @active ||= []
+      if binder
+        @active << binder
+        @active.uniq!
+      end
+      @active
+    end
+    module_function :active
+    
     class Base
       extend Bowline::Watcher::Base
       extend Bowline::Desktop::Bridge::ClassMethods
@@ -66,11 +77,11 @@ module Bowline
           if block_given?
             Thread.new(callback_proc) do |proc|
               begin
-              self.callback_proc = proc
-              yield
-            rescue => e
-              Bowline::Logging.log_error(e)
-            end
+                self.callback_proc = proc
+                yield
+              rescue => e
+                Bowline::Logging.log_error(e)
+              end
             end
           else
             methods.each do |method|
@@ -89,7 +100,7 @@ module Bowline
       include Async
       class << self; extend Async; end
       
-      class << self        
+      class << self
         def callback_proc(proc = nil) #:nodoc:
           Thread.current[:callback] = proc if proc
           Thread.current[:callback]
@@ -115,19 +126,27 @@ module Bowline
         end
         
         # An array of window currently bound.
-        def windows
+        def windows(window = nil)
           @windows ||= []
+          if window
+            @windows << window
+            @windows.uniq!
+          end
+          @windows
         end
         
         def setup(window) #:nodoc:
-          self.windows << window
-          self.windows.uniq!
-          if initial_items = initial
-            self.items = initial_items
-          end
+          Binders.active(self)
+          windows(window)
+          populate
           callback(true)
         end
         
+        # Populate initial items
+        def populate(items = initial)
+          self.items = items if items
+        end
+        
         # Called by a window's JavaScript whenever that window is bound to this Binder.
         # This method populates the window's HTML with all bound class' records.
         # Override this if you don't want to send all the class' records to the window.

data/lib/bowline/desktop/bridge.rb

@@ -74,7 +74,7 @@ module Bowline
             object = klass.constantize
           end
 
-          trace "JS invoking: #{klass}.#{method_name}(#{args.join(',')})"
+          debug "JS invoking: #{klass}.#{method_name}(#{args.join(',')})"
 
           if object.respond_to?(:js_exposed?) && 
               object.js_exposed?(method_name)

data/lib/bowline/desktop/js.rb

@@ -20,7 +20,7 @@ module Bowline
       
         def call
           if Desktop.enabled?
-            trace "JS eval on #{window}: #{script}"
+            debug "JS eval on #{window}: #{script}"
             if multiple_windows?
               windows.each {|w| w.run_script(script) }
               raise "Can't return from multiple windows" if prok
@@ -30,7 +30,7 @@ module Bowline
             end
             result
           else
-            trace "Pseudo JS eval on #{window}: #{script}"
+            debug "Pseudo JS eval on #{window}: #{script}"
             prok.call(nil) if prok
           end
         end
@@ -51,7 +51,7 @@ module Bowline
               JSON.parse(str)
             end
           rescue => e
-            trace "Parsing: #{str}"
+            debug "Parsing: #{str}"
             raise e
           end
       end

data/lib/bowline/desktop/window.rb

@@ -63,9 +63,9 @@ module Bowline
       # Internal ID for the window. 
       
       ##
-      # :singleton-method: dealocated?
-      # Returns true if the window has been dealocated. 
-      # Calling methods on dealocated windows has no effect. 
+      # :singleton-method: deallocated?
+      # Returns true if the window has been deallocated. 
+      # Calling methods on deallocated windows has no effect. 
       # Instead, you'll need to create a new instance.
       
       ##

data/lib/bowline/desktop/window_manager.rb

@@ -49,7 +49,11 @@ module Bowline
         end
         
         def allocated?
-          !!@window
+          !deallocated?
+        end
+        
+        def deallocated?
+          !@window || @window.deallocated?
         end
         
         # Call this method to allocate a new window.
@@ -57,7 +61,7 @@ module Bowline
         # or after it has been closed.
         def setup!
           return unless Desktop.enabled?
-          return if @window && !@window.dealocated?
+          return if allocated?
           if self.name == "MainWindow"
             @window = MainWindow.get
           else
@@ -69,6 +73,7 @@ module Bowline
             Bowline::Desktop::Bridge.call(self, str)
           }
           @window.script_callback = @script_callback
+          true
         end
         
         # Evaluate JavaScript in this window. Pass

data/lib/bowline/desktop/window_methods.rb

@@ -65,7 +65,7 @@ module Bowline
       
       # Window was shut; setup!
       # needs to be called again
-      def dealocated?
+      def deallocated?
         id == -1
       end
       

data/lib/bowline/generators.rb

@@ -6,23 +6,22 @@ module Templater
   module Actions
     class Touch < Action
 
-      def initialize(generator, name, destination, options={})
-        self.generator = generator
-        self.name = name
+      def initialize(generator, destination, options={})
+        self.generator   = generator
         self.destination = destination
-        self.options = options
+        self.options     = options
       end
 
       def render
         ''
       end
-
+      
       def exists?
-        ::File.exists?(destination)
+        false
       end
   
       def identical?
-        exists?
+        false
       end
   
       def invoke!
@@ -30,12 +29,39 @@ module Templater
         ::FileUtils.touch(destination)
         callback(:after)
       end
+
+    end # Touch
     
-      def revoke!
-        ::FileUtils.rm_rf(::File.expand_path(destination))
+    class Chmod < Action
+
+      attr_accessor :mode
+      
+      def initialize(generator, destination, options={})
+        self.generator   = generator
+        self.destination = destination
+        self.options     = options
+        self.mode        = self.options[:mode] || 0755
       end
 
-    end # Touch
+      def render
+        ''
+      end
+      
+      def exists?
+        false
+      end
+  
+      def identical?
+        false
+      end
+  
+      def invoke!
+        callback(:before)
+        ::FileUtils.chmod_R(self.mode, destination)
+        callback(:after)
+      end
+
+    end # Chmod
   end # Actions
 end # Templater
 
@@ -64,9 +90,15 @@ module Bowline
         "#!/usr/bin/env #{RbConfig::CONFIG["RUBY_INSTALL_NAME"]}"
       end
       
-      def self.touch(name, destination)
-        empty_directories << Templater::ActionDescription.new(name) do |generator|
-          Templater::Actions::Touch.new(generator, name, destination)
+      def self.touch(destination, options = {})
+        empty_directories << Templater::ActionDescription.new("touch") do |generator|
+          Templater::Actions::Touch.new(generator, destination, options)
+        end
+      end
+      
+      def self.chmod(destination, options = {})
+        files << Templater::ActionDescription.new("chmod") do |generator|
+          Templater::Actions::Chmod.new(generator, destination, options)
         end
       end