bowline 0.1.6 → 0.3.9

data/bin/bowline-gen

@@ -3,4 +3,4 @@
 require File.join(File.dirname(__FILE__), *%w[.. lib bowline])
 require 'bowline/generators'
 
-Bowline::Generators.run_cli(Dir.pwd, 'bowline', Bowline::VERSION, ARGV)
+Bowline::Generators.run_cli(Dir.pwd, 'bowline', Bowline::Version::STRING, ARGV)

data/bowline.gemspec

@@ -2,24 +2,107 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bowline}
-  s.version = "0.1.6"
+  s.version = "0.3.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alex MacCaw"]
-  s.date = %q{2009-04-24}
+  s.date = %q{2009-07-15}
   s.default_executable = %q{bowline-gen}
-  s.description = %q{Ruby desktop application framework}
-  s.email = ["info@eribium.org"]
+  s.description = %q{Ruby/JS GUI framework}
+  s.email = %q{alex@leadthinking.com}
   s.executables = ["bowline-gen"]
-  s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.txt"]
-  s.files = [".gitignore", "History.txt", "MIT-LICENSE", "Manifest.txt", "README.txt", "Rakefile", "assets/jquery.bowline.js", "assets/jquery.chain.js", "assets/jquery.js", "bin/bowline-gen", "bowline.gemspec", "examples/account.rb", "examples/example.js", "examples/twitter.html", "examples/tweets.rb", "examples/users.rb", "lib/bowline.rb", "lib/bowline/binders.rb", "lib/bowline/binders/collection.rb", "lib/bowline/binders/singleton.rb", "lib/bowline/commands/console.rb", "lib/bowline/commands/generate.rb", "lib/bowline/commands/run.rb", "lib/bowline/ext/array.rb", "lib/bowline/ext/class.rb", "lib/bowline/ext/object.rb", "lib/bowline/ext/string.rb", "lib/bowline/gem_dependency.rb", "lib/bowline/generators.rb", "lib/bowline/generators/application.rb", "lib/bowline/generators/binder.rb", "lib/bowline/generators/migration.rb", "lib/bowline/generators/model.rb", "lib/bowline/initializer.rb", "lib/bowline/jquery.rb", "lib/bowline/observer.rb", "lib/bowline/tasks/app.rake", "lib/bowline/tasks/bowline.rb", "lib/bowline/tasks/database.rake", "lib/bowline/tasks/log.rake", "lib/bowline/tasks/misk.rake", "templates/Rakefile", "templates/binder.rb", "templates/config/application.yml", "templates/config/boot.rb", "templates/config/database.yml", "templates/config/environment.rb", "templates/config/manifest", "templates/config/tiapp.xml", "templates/gitignore", "templates/migration.rb", "templates/model.rb", "templates/public/index.html", "templates/public/javascripts/application.js", "templates/public/stylesheets/application.css", "templates/script/console", "templates/script/init", "templates/script/run"]
-  s.has_rdoc = true
+  s.extra_rdoc_files = [
+    "README.txt"
+  ]
+  s.files = [
+    ".gitignore",
+     "History.txt",
+     "MIT-LICENSE",
+     "README.txt",
+     "Rakefile",
+     "VERSION",
+     "assets/jquery.bowline.js",
+     "assets/jquery.chain.js",
+     "assets/jquery.js",
+     "bin/bowline-gen",
+     "bowline.gemspec",
+     "examples/account.rb",
+     "examples/example.js",
+     "examples/tweets.rb",
+     "examples/twitter.html",
+     "examples/users.rb",
+     "lib/bowline.rb",
+     "lib/bowline/async.rb",
+     "lib/bowline/binders.rb",
+     "lib/bowline/binders/collection.rb",
+     "lib/bowline/binders/singleton.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/Rakefile",
+     "lib/bowline/dependencies/TODO.markdown",
+     "lib/bowline/dependencies/init.rb",
+     "lib/bowline/dependencies/lib/dependencies.rb",
+     "lib/bowline/dependencies/lib/dependencies/dependency.rb",
+     "lib/bowline/dependencies/lib/dependencies/reader.rb",
+     "lib/bowline/dependencies/lib/dependencies/repository.rb",
+     "lib/bowline/dependencies/lib/ext/rubygems.rb",
+     "lib/bowline/dependencies/lib/template/app_script.rb",
+     "lib/bowline/dependencies/spec/spec.opts",
+     "lib/bowline/dependencies/tasks/dependencies.rake",
+     "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",
+     "lib/bowline/generators/helper.rb",
+     "lib/bowline/generators/migration.rb",
+     "lib/bowline/generators/model.rb",
+     "lib/bowline/helpers.rb",
+     "lib/bowline/initializer.rb",
+     "lib/bowline/jquery.rb",
+     "lib/bowline/observer.rb",
+     "lib/bowline/tasks/app.rake",
+     "lib/bowline/tasks/bowline.rb",
+     "lib/bowline/tasks/database.rake",
+     "lib/bowline/tasks/gems.rake",
+     "lib/bowline/tasks/log.rake",
+     "lib/bowline/tasks/misc.rake",
+     "lib/bowline/version.rb",
+     "lib/bowline/window.rb",
+     "templates/Rakefile",
+     "templates/binder.rb",
+     "templates/config/application.yml",
+     "templates/config/boot.rb",
+     "templates/config/database.yml",
+     "templates/config/environment.rb",
+     "templates/gitignore",
+     "templates/helper.rb",
+     "templates/migration.rb",
+     "templates/model.rb",
+     "templates/public/icon.png",
+     "templates/public/index.html",
+     "templates/public/javascripts/application.js",
+     "templates/public/stylesheets/application.css",
+     "templates/script/console",
+     "templates/script/init",
+     "templates/script/run"
+  ]
   s.homepage = %q{http://github.com/maccman/bowline}
-  s.rdoc_options = ["--main", "README.txt"]
+  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubyforge_project = %q{maccman}
-  s.rubygems_version = %q{1.3.2}
-  s.summary = %q{Ruby desktop application framework}
+  s.rubygems_version = %q{1.3.4}
+  s.summary = %q{Bowline GUI framework}
+  s.test_files = [
+    "examples/account.rb",
+     "examples/tweets.rb",
+     "examples/users.rb"
+  ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
@@ -28,18 +111,12 @@ 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_development_dependency(%q<newgem>, [">= 1.3.0"])
-      s.add_development_dependency(%q<hoe>, [">= 1.8.0"])
     else
       s.add_dependency(%q<templater>, [">= 0.3.2"])
       s.add_dependency(%q<activesupport>, [">= 2.3.2"])
-      s.add_dependency(%q<newgem>, [">= 1.3.0"])
-      s.add_dependency(%q<hoe>, [">= 1.8.0"])
     end
   else
     s.add_dependency(%q<templater>, [">= 0.3.2"])
     s.add_dependency(%q<activesupport>, [">= 2.3.2"])
-    s.add_dependency(%q<newgem>, [">= 1.3.0"])
-    s.add_dependency(%q<hoe>, [">= 1.8.0"])
   end
 end

data/examples/twitter.html

@@ -1,39 +1,39 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
-   "http://www.w3.org/TR/html4/strict.dtd">
-
-<html lang="en">
+<!DOCTYPE html>
+<html>
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 	<title>Twitter</title>
-  <!-- 
-	<script src="http://getfirebug.com/releases/lite/1.2/firebug-lite-compressed.js" type="text/javascript"></script>
-	 -->
+  <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/jquery.bowline.js" type="text/javascript" charset="utf-8"></script>
-  <script src="../script/init" type="text/ruby" charset="utf-8"></script>
   <script src="javascripts/application.js" type="text/javascript" charset="utf-8"></script>
-  <link rel="stylesheet" href="stylesheets/application.css" type="text/css" charset="utf-8">
   <script type="text/javascript" charset="utf-8">
     jQuery(function($){
-      var tweets = $('#tweets').bowline('tweets');
-      tweets.invoke('index');
+      $.bowline.ready(function(){
+        var tweets = $('#tweets').bowline('tweets');
+        tweets.invoke('index');
 
-      $('#updateSubmit').click(function(){
-        tweets.invoke('update', $('#updateText').val());
-        return false;
-      })
+        $('#updateSubmit').click(function(){
+          tweets.invoke('update', $('#updateText').val());
+          return false;
+        });
+      });
     });
   </script>
 </head>
   <body>
+    <header></header>
+    
     <div id="tweets">
       <div class="item">
         <span class="text"></span>
       </div>
     </div>
 
-    <input type="text" id="updateText">
-    <input type="submit" value="Update &rarr;" id="updateSubmit">
+    <footer>
+      <input type="text" id="updateText">
+      <button id="updateSubmit">Update &rarr;</button>
+    </footer>
 </body>
-</html>
+</html>

data/lib/bowline.rb

@@ -1,23 +1,14 @@
-module Bowline
-  VERSION = '0.1.6'
+Thread.abort_on_exception = true
 
+module Bowline
   # The raw JavaScript window object
   def self.js
-    if defined?($app_window)
-      $app_window
-    else
-      Class.new { 
-        def self.method_missing(*a)
-          Bowline.logger.info "Sending to Window: #{a.inspect}"
-          self
-        end 
-      }
-    end
+    Window.new
   end
   
   # Change which page we're on
   def self.show_view(name)
-    js.window.location = "app://public/#{name}.html"
+    js.location = "app://public/#{name}.html"
   end
   
   class Base
@@ -26,12 +17,17 @@ end
 
 $LOAD_PATH << File.dirname(__FILE__)
 
+require 'bowline/version'
+
 require 'bowline/ext/object'
 require 'bowline/ext/array'
 require 'bowline/ext/class'
 require 'bowline/ext/string'
 
-require 'bowline/gem_dependency'
+require 'bowline/window'
+require 'bowline/async'
+require 'bowline/helpers'
+require 'bowline/dependencies/lib/dependencies'
 require 'bowline/initializer'
 
 require 'bowline/jquery'

data/lib/bowline/async.rb

@@ -0,0 +1,29 @@
+module Bowline
+  module Async
+    def self.included(base)
+      base.extend Methods
+      base.send :include, Methods
+      class << base
+        extend Methods
+      end
+    end
+
+    module Methods
+      def async(*methods)
+        methods.each {|meth|
+          define_method("#{meth}_with_async") {|*args|
+            callback = nil
+            if(args.last.is_a?(::RubyKMethod))
+              callback = args.pop
+            end
+            Thread.new do
+              res = send("#{meth}_without_async", *args)
+              callback.call(res) if callback
+            end
+          }
+          alias_method_chain meth, :async
+        }
+      end
+    end
+  end
+end

data/lib/bowline/binders.rb

@@ -1,8 +1,6 @@
 module Bowline
   module Binders
     class Base
-      cattr_accessor :params
-    
       class << self
         # See Bowline::js
         def js
@@ -16,7 +14,7 @@ module Bowline
       
         # See the Observer class
         def observer
-          @@observer ||= Observer.new
+          @observer ||= Observer.new
         end
         
         # See Bowline::logger
@@ -28,36 +26,37 @@ module Bowline
         def show_view(*args)
           Bowline::show_view(*args)
         end
+        
+        def params
+          @params
+        end
       
         def params=(p)
           case p
           when String
             # Params comes in a string (since it's a
             # serialized form) - we need to make it into
-            # a nestled hash.
-            # Stolen from Ramaze
+            # a nestled hash. Stolen from Ramaze
             m = proc {|_,o,n|o.merge(n,&m)}
-            @@params = params.inject({}) do |hash, (key, value)|
+            @params = params.inject({}) do |hash, (key, value)|
               parts = key.split(/[\]\[]+/)
               hash.merge(parts.reverse.inject(value) { |x, i| {i => x} }, &m) 
             end
           else
-            @@params = p
+            @params = p
           end
         end
       
         def setup(d)
-          @@elements ||= []
-          @@elements << d
+          @elements ||= []
+          @elements << d
           self.item_sync!
         end
       
         def instance(el)
           self.new(el).method(:send)
         end
-      
-        # todo - flash?
-      
+
         def inherited(child)
           return if self == Bowline::Binders::Base
           return if child == Bowline::Binders::Singleton
@@ -73,11 +72,6 @@ module Bowline
       attr_reader :element
       attr_reader :item
     
-      # Todo
-      # We want initialize method to take
-      # no argument, and for every item in items
-      # to have initialize called on startup,
-      # so they can set up event handlers etc
       def self.new(element, *args) #:nodoc:
         allocate.instance_eval do
           # jQuery element
@@ -102,29 +96,6 @@ module Bowline
         self.element.trigger(event, data)
       end
     
-      # Bind event to element:
-      # bind(:click) { puts "element clicked" }
-      # todo - two events with the same item/event overwrite each other
-      # todo - need initalize method on class - so we can set events there
-      def bind(event, method_name, &block)
-        event_name = [event, item_id].join(":")
-        callback = block
-        callback ||= begin
-          method_name.is_a?(Method) ? 
-            method_name : method(method_name)
-        end
-        self.observer.append(event_name, callback)
-        self.element.bind(
-          event.to_s, 
-          event_name, 
-          self.observer.method(:call)
-        )
-      end
-    
-      def click(method_name = nil, &block)
-        bind(:click, method, &block)
-      end
-    
       # Raw DOM element
       def dom
         self.element[0]

data/lib/bowline/binders/collection.rb

@@ -1,24 +1,27 @@
 module Bowline
   module Binders
     class Collection < Base
-      cattr_accessor :items
       class << self
         def items=(args)
-          @@items = args
+          @items = args
           self.item_sync!
-          @@items
+          @items
+        end
+        
+        def items
+          @items ||= []
         end
     
         def item_sync!
-          return unless @@items && @@elements
-          @@elements.each {|i| 
-            i.updateCollection(@@items.to_js) 
+          return unless @items && @elements
+          @elements.each {|i| 
+            i.updateCollection(@items.to_js) 
           }
         end
     
         def find(id)
-          @@items.find {|item| 
-            item.id == id if item.respond_to?(:id) 
+          @items.find {|item| 
+            item.id == id
           }
         end
       end

data/lib/bowline/binders/singleton.rb

@@ -1,23 +1,26 @@
 module Bowline
   module Binders
     class Singleton < Base
-      cattr_accessor :item
       class << self
+        def item
+          @item
+        end
+        
         def item=(arg)
-          @@item = arg
+          @item = arg
           self.item_sync!
         end
     
         def item_sync!
-          return unless @@item && @@elements
+          return unless @item && @elements
           # Call the chain.js function 'item' on elements
-          @@elements.each {|i| 
-            i.updateSingleton(@@item.to_js) 
+          @elements.each {|i| 
+            i.updateSingleton(@item.to_js) 
           }
         end
       
         def find(*a)
-          @@item
+          @item
         end
       end
     end