bowline 0.5.8 → 0.6.0

data/examples/tweet.rb

@@ -1,4 +1,6 @@
-class Tweet < Bowline::LocalModel
+require "supermodel"
+
+class Tweet < SuperModel::Base
   class << self
     def poll
       destroy_all

data/lib/bowline.rb

@@ -1,3 +1,7 @@
+require 'active_support'
+require 'active_support/dependencies'
+require 'active_support/core_ext/string/access'
+
 Thread.abort_on_exception = true
 
 module Bowline
@@ -24,12 +28,9 @@ require 'bowline/version'
 
 require 'bowline/ext/object'
 require 'bowline/ext/array'
-require 'bowline/ext/class'
-require 'bowline/ext/string'
 
 require 'bowline/logging'
 require 'bowline/watcher'
-require 'bowline/local_model'
 
 require 'bowline/platform'
 require 'bowline/library'
@@ -52,7 +53,10 @@ require 'bowline/desktop/bridge'
 require 'bowline/desktop/window_manager.rb'
 
 require 'bowline/helpers'
-require 'bowline/dependencies/lib/dependencies'
+require 'bowline/app_config'
 require 'bowline/initializer'
 
-require 'bowline/binders'
+require 'bowline/binders'
+require 'bowline/binders/observer'
+require 'bowline/binders/collection'
+require 'bowline/binders/singleton'

data/lib/bowline/app_config.rb

@@ -0,0 +1,41 @@
+module Bowline
+  class AppConfig
+    attr_reader :keys, :path
+    def initialize(path)
+      @path = path
+      @keys = {}
+      load!
+    end
+    
+    def load!
+      return unless File.exist?(path)
+      @keys = YAML::load(File.read(path))
+    end
+    
+    def dump!
+      File.open(path, "w+") {|f| f.write(YAML::dump(keys)) }
+    end
+    
+    def delete(key)
+      @keys.delete(key)
+      dump!
+    end
+    
+    def method_missing(sym, *args)
+      method_name = sym.to_s
+      
+      if method_name =~ /(=|\?)$/
+        case $1
+        when "="
+          keys[$`] = args.first
+          dump!
+        when "?"
+          keys[$`]
+        end
+      else
+        return keys[method_name] if keys.include?(method_name)
+        super
+      end
+    end
+  end
+end

data/lib/bowline/binders.rb

@@ -65,11 +65,13 @@ module Bowline
         def windows
           @windows ||= []
         end
-         
+        
         def setup(window) #:nodoc:
           self.windows << window
-          items = initial
-          items.try(:to_js) || []
+          if initial_items = initial
+            self.items = initial_items
+          end
+          Hash.new # Empty options
         end
         
         # Called by a window's JavaScript whenever that window is bound to this Binder.
@@ -80,7 +82,6 @@ module Bowline
         #     klass.all(:limit => 10)
         #   end
         def initial
-          klass.all
         end
         
         def js_invoke(window, method, *args) #:nodoc:
@@ -104,7 +105,7 @@ module Bowline
         
         # Set the binder's items. This will replace all items, and update the HTML.
         def items=(items)
-          bowline.populate(name, items.to_js).call
+          bowline.replace(name, items.to_js).call
         end
         
         # Add a new item to the binder, updating the HTML.
@@ -138,103 +139,71 @@ module Bowline
             item.id
           ).call
         end
-        
-        protected
-          # Associate the binder with a model to setup callbacks so 
-          # changes to the model are automatically reflected in the view.
-          # Example:
-          #   bind Post
-          #
-          # When the bound class is created/updated/deleted
-          # the binder's callbacks are executed and the view
-          # updated accordingly.
-          # 
-          # Classes inheriting fromActiveRecord and Bowline::LocalModel are 
-          # automatically compatable, but if you're using your own custom model
-          # you need to make sure it responds to the following methods:
-          #  * all                    - return all records
-          #  * find(id)               - find record by id
-          #  * after_create(method)   - after_create callback
-          #  * after_update(method)   - after_update callback
-          #  * after_destroy(method)  - after_destroy callback
-          #
-          # The klass' instance needs to respond to:
-          #   * id      - returns record id
-          #   * to_js   - return record's attribute hash
-          #
-          # You can override the to_js method on the model instance
-          # in order to return specific attributes for the view.
-          def bind(klass)
-            @klass = klass
-            @klass.after_create(method(:created))
-            @klass.after_update(method(:updated))
-            @klass.after_destroy(method(:removed))
-          end
-          
-          # Returns class set by the 'bind' method
-          def klass
-            @klass || raise("klass not set - see bind method")
-          end
-          
-          # JavaScript proxy to the page. 
-          # See Bowline::Desktop::Proxy for more information.
-          # Example:
-          #   page.myFunc(1,2,3).call
-          def page
-            Bowline::Desktop::Proxy.new(
-              windows.length == 1 ? windows.first : windows
-            )
-          end
-          
-          # JavaScript proxy to the Bowline object.
-          # See Bowline::Desktop::Proxy for more information.
-          # Example:
-          #   bowline.log("msg").call
-          def bowline
-            page.Bowline
-          end
+
+        # Returns class set by the 'bind' method
+        def klass
+          @klass || raise("klass not set - see bind method")
+        end
       
-          # Javascript proxy to jQuery.
-          # See Bowline::Desktop::Proxy for more information.
-          # Example:
-          #   jquery.getJSON("http://example.com").call
-          def jquery
-            page.jQuery
-          end
-        
-          # See Bowline::logger
-          def logger
-            Bowline::logger
-          end
-          
-          # Trigger events on all elements
-          # bound to this binder.
-          # Example:
-          #   trigger(:reload, {:key => :value})
-          def trigger(event, data = nil)
-            bowline.trigger(
-              name,
-              format_event(event), 
-              data
-            ).call
-          end
-          
-          # Helper method to trigger a loading 
-          # event either side of a block:
-          #  loading {
-          #   # Slow code, e.g. http call
-          #  }
-          def loading(&block)
-            trigger(:loading, true)
-            yield
-            trigger(:loading, false)
-          end
-        
-          def format_event(name) #:nodoc:
-            name.is_a?(Array) ? 
-              name.join('.') : 
-                name.to_s
-          end
+        # JavaScript proxy to the page. 
+        # See Bowline::Desktop::Proxy for more information.
+        # Example:
+        #   page.myFunc(1,2,3).call
+        def page
+          Bowline::Desktop::Proxy.new(
+            windows.length == 1 ? windows.first : windows
+          )
+        end
+      
+        # JavaScript proxy to the Bowline object.
+        # See Bowline::Desktop::Proxy for more information.
+        # Example:
+        #   bowline.log("msg").call
+        def bowline
+          page.Bowline
+        end
+  
+        # Javascript proxy to jQuery.
+        # See Bowline::Desktop::Proxy for more information.
+        # Example:
+        #   jquery.getJSON("http://example.com").call
+        def jquery
+          page.jQuery
+        end
+    
+        # See Bowline::logger
+        def logger
+          Bowline::logger
+        end
+      
+        # Trigger events on all elements
+        # bound to this binder.
+        # Example:
+        #   trigger(:reload, {:key => :value})
+        def trigger(event, data = nil)
+          bowline.trigger(
+            name,
+            format_event(event), 
+            data
+          ).call
+        end
+      
+        # Helper method to trigger a loading 
+        # event either side of a block:
+        #  loading {
+        #   # Slow code, e.g. http call
+        #  }
+        def loading(&block)
+          trigger(:loading, true)
+          yield
+          trigger(:loading, false)
+        end
+    
+        def format_event(name) #:nodoc:
+          name.is_a?(Array) ? 
+            name.join('.') : 
+              name.to_s
+        end
       end
       
       # jQuery element object

data/lib/bowline/binders/collection.rb

@@ -0,0 +1,37 @@
+module Bowline
+  module Binders
+    class Collection < Base
+      class << self
+        # Associate the binder with a model to setup callbacks so 
+        # changes to the model are automatically reflected in the view.
+        # Example:
+        #   bind Post
+        #
+        # When the bound class is created/updated/deleted
+        # the binder's callbacks are executed and the view
+        # updated accordingly.
+        # 
+        # Classes inheriting from ActiveRecord and SuperModel are 
+        # automatically compatible, but if you're using your own custom model
+        # you need to make sure it responds to the following methods:
+        #  * all                    - return all records
+        #  * find(id)               - find record by id
+        #  * after_create(method)   - after_create callback
+        #  * after_update(method)   - after_update callback
+        #  * after_destroy(method)  - after_destroy callback
+        #
+        # The klass' instance needs to respond to:
+        #   * id      - returns record id
+        #   * to_js   - return record's attribute hash
+        #
+        # You can override the to_js method on the model instance
+        # in order to return specific attributes for the view.
+        def bind(klass)
+          @klass = klass
+          observer = Observer.new(self)
+          @klass.add_observer(observer)
+        end
+      end
+    end
+  end
+end

data/lib/bowline/binders/observer.rb

@@ -0,0 +1,30 @@
+module Bowline
+  module Binders
+    class Observer
+      attr_reader :binder
+      def initialize(binder)
+        @binder = binder
+      end
+      
+      def after_create(rec)
+        binder.created(rec)
+      end
+      
+      def after_update(rec)
+        binder.updated(rec)
+      end
+      
+      def after_destroy(rec)
+        binder.removed(rec)
+      end
+      
+      def update(observed_method, object) #:nodoc:
+        send(observed_method, object) if respond_to?(observed_method)
+      end
+
+      def observed_class_inherited(subclass) #:nodoc:
+        subclass.add_observer(self)
+      end
+    end
+  end
+end

data/lib/bowline/binders/singleton.rb

@@ -0,0 +1,43 @@
+module Bowline
+  module Binders
+    class Singleton < Base
+      class << self
+        def setup(*args) #:nodoc
+          super(*args)
+          {:singleton => true}
+        end
+        
+        alias :item= :items=
+        
+        # Associate the binder with a model to setup callbacks so 
+        # changes to the model are automatically reflected in the view.
+        # Example:
+        #   bind Post
+        #
+        # When the bound class is updated/deleted
+        # the binder's callbacks are executed and the view
+        # updated accordingly.
+        # 
+        # Classes inheriting from ActiveRecord and SuperModel are 
+        # automatically compatable, but if you're using your own custom model
+        # you need to make sure it responds to the following methods:
+        #  * all                    - return all records
+        #  * find(id)               - find record by id
+        #  * after_update(method)   - after_update callback
+        #  * after_destroy(method)  - after_destroy callback
+        #
+        # The klass' instance needs to respond to:
+        #   * id      - returns record id
+        #   * to_js   - return record's attribute hash
+        #
+        # You can override the to_js method on the model instance
+        # in order to return specific attributes for the view.
+        def bind(klass)
+          @klass = klass
+          observer = Observer.new(self)
+          @klass.add_observer(observer)
+        end
+      end
+    end
+  end
+end

data/lib/bowline/commands/run.rb

@@ -1,4 +1,5 @@
 unless Bowline::Library.ready?
+  puts "Setting up Bowline. This could take a while..."
   require 'bowline/tasks/bowline'
   Rake::Task['libs:setup'].invoke
 end

data/lib/bowline/desktop/bridge.rb

@@ -24,7 +24,7 @@ module Bowline
           # TODO - implement options, 
           # like :except and :only
           instance_eval <<-RUBY
-            def js_exposed?
+            def js_exposed?(meth)
               true
             end
             
@@ -61,10 +61,10 @@ module Bowline
             object = klass.constantize
           end
           trace "JS invoking: #{klass}.#{method}(#{args.join(',')})"
-          if object.respond_to?(:js_exposed?) && object.js_exposed?
+          if object.respond_to?(:js_exposed?) && object.js_exposed?(method)
             result = object.js_invoke(window, method, *args)
             if callback?
-              proxy  = Proxy.new(window)
+              proxy = Proxy.new(window)
               proxy.Bowline.invokeCallback(id, result.to_js.to_json)
               window.run_script(proxy.to_s)
             end
@@ -80,7 +80,7 @@ module Bowline
         result = JSON.parse(str)
         Message.new(window, result).invoke
       rescue => e
-        Bowline::Logging.log_error(e)
+        Bowline::Logging.log_error e
       end
       module_function :call
     end

data/lib/bowline/desktop/js.rb

@@ -41,15 +41,18 @@ module Bowline
           end
         
           def parse(str)
+            return if str.blank?
             # This is crazy! The JSON 
             # lib can't parse booleans
             case str
             when "true"  then true
             when "false" then false
-            when nil     then nil
             else
               JSON.parse(str)
             end
+          rescue => e
+            trace "Parsing: #{str}"
+            raise e
           end
       end
 
@@ -59,7 +62,7 @@ module Bowline
       module_function :poll
       
       def setup
-        Desktop.on_tick(method(:poll))
+        Desktop.on_idle(method(:poll))
       end
       module_function :setup
     
@@ -76,8 +79,9 @@ module Bowline
       private
         def run_scripts
           ready_scripts = scripts.select(&:ready?)
-          while script  = ready_scripts.shift
+          ready_scripts.each do |script|
             script.call
+            scripts.delete(script)
           end
         end
         module_function :run_scripts