bowline 0.5.8 → 0.6.0

data/lib/bowline/desktop/runtime.rb

@@ -0,0 +1,29 @@
+module Bowline
+  module Desktop
+    module Runtime
+      def setup
+        Desktop.on_tick(method(:poll))
+      end
+      module_function :setup
+      
+      def run_in_main_thread(method = nil, &block)
+        procs << method||block
+      end
+      module_function :run_in_main_thread
+      
+      private      
+        def poll
+          while proc = procs.shift
+            proc.call
+          end
+        end
+        module_function :poll
+      
+        # TODO - thread safety, needs mutex
+        def procs
+          Thread.main[:procs] ||= []
+        end
+        module_function :procs 
+    end
+  end
+end

data/lib/bowline/desktop/window.rb

@@ -37,6 +37,10 @@ module Bowline
       # :singleton-method: enable
       # Enable user input to the window.
       
+      ##
+      # :singleton-method: enable_developer
+      # Enable developer menu.
+      
       ##
       # :singleton-method: chome=(bool)
       # Enable/disable window's chrome, 
@@ -90,6 +94,10 @@ module Bowline
       # :singleton-method: raise
       # Raise this window above all other ones.
       
+      ##
+      # :singleton-method: refresh
+      # Refresh window.
+      
       ##
       # :singleton-method: show
       # Show this window. By default, windows are hidden.
@@ -155,7 +163,7 @@ module Bowline
       
       ##
       # :singleton-method: show_inspector(console = false)
-      # Show WebInspector
+      # Show WebInspector.
     end
     
     class MainWindow #:nodoc:

data/lib/bowline/desktop/window_methods.rb

@@ -30,7 +30,7 @@ module Bowline
       
       def url=(address)
         unless address.is_a?(URI)
-          address = URI.parse(path)
+          address = URI.parse(address)
         end
         self._url = address.to_s
       end

data/lib/bowline/generators/application.rb

@@ -27,6 +27,7 @@ module Bowline::Generators
     empty_directory :log,     "log"
     
     template :rakefile, "Rakefile", "Rakefile"
+    template :gemfile, "Gemfile", "Gemfile"
     
     file :gitignore, "gitignore", ".gitignore"
     

data/lib/bowline/generators/binder.rb

@@ -6,19 +6,24 @@ module Bowline::Generators
     
     alias :plain_class_name :class_name
     def class_name
-      super + "Binder < Bowline::Binders::Base"
+      super + "Binder < Bowline::Binders::#{bind_type.capitalize}"
     end
     
     def bind_name
       plain_class_name.singularize
     end
     
+    def bind_type
+      "Collection"
+    end
+    
     def file_name
       super + "_binder"
     end
     
     first_argument :name, :required => true, :desc => "binder name"
-        
+    second_argument :bind_type, :default => "collection", :desc => "binder type (singleton/collection)"
+    
     template :binder do |template|
       template.source       = "binder.rb"
       template.destination  = "app/binders/#{file_name}.rb"

data/lib/bowline/generators/model.rb

@@ -6,7 +6,7 @@ module Bowline::Generators
     
     def class_name
       if local
-        super + " < Bowline::LocalModel"
+        super + " < SuperModel::Base"
       else
         super + " < ActiveRecord::Base"
       end

data/lib/bowline/helpers.rb

@@ -1,4 +1,6 @@
 module Bowline
   module Helpers #:nodoc:
+    extend Bowline::Desktop::Bridge::ClassMethods
+    js_expose
   end
 end

data/lib/bowline/initializer.rb

@@ -71,6 +71,17 @@ module Bowline
       $LOAD_PATH.uniq!
     end
     
+    def load_gems
+      if defined?(Bundler)
+        # API changed between 0.8 and 0.9
+        if defined?(Bundler.require_env)
+          Bundler.require_env
+        else
+          Bundler.require
+        end
+      end
+    end
+    
     # Set the paths from which Bowline will automatically load source files, and
     # the load_once paths.
     def set_autoload_paths
@@ -183,30 +194,7 @@ module Bowline
         ActiveSupport.send("#{setting}=", value)
       end
     end
-    
-    def initialize_gems
-      require "rubygems"
-      Gem.clear_paths
-      Gem.path.unshift(configuration.gem_path)
-    end
-    
-    def load_gems
-      configuration.gems.each do |dep| 
-        options = {
-          :lib => dep.name
-        }.merge(dep.options)
         
-        next unless options[:lib]
-        begin
-          gem(dep.name, *dep.versions)
-          require(options[:lib])
-        rescue LoadError => e
-          puts "was unable to require #{dep.name} as '#{options[:lib]}'
-          Reason: #{e.class.name} error raised with message: #{e.message}"
-        end
-      end
-    end
-    
     def load_plugins
       Dir.glob(File.join(configuration.plugin_glob, 'init.rb')).sort.each do |path|
         config = configuration # Need local config variable
@@ -264,14 +252,7 @@ module Bowline
     # Creates a class called AppConfig from configuration
     # variables found in config/application.yml
     def load_app_config
-      app_config = configuration.app_config
-      return unless app_config
-      Object.const_set("AppConfig", Class.new {
-        app_config.keys.each do |key|
-          cattr_accessor key
-          send("#{key}=", app_config[key])
-        end
-      })
+      Object.const_set("AppConfig", AppConfig.new(configuration.app_config_file))
     end
     
     def initialize_js
@@ -283,14 +264,28 @@ module Bowline
       return unless Bowline::Desktop.enabled?
       MainWindow.setup
       MainWindow.name = configuration.name
-      MainWindow.file = configuration.index_path
+    end
+    
+    def initialize_trap
+      return unless Bowline::Desktop.enabled?
+      trap("INT") {
+        Bowline::Desktop::App.exit
+      }
+    end
+    
+    def initialize_marshal
+      return unless defined?(SuperModel)
+      SuperModel::Marshal.path = configuration.marshal_path
+      SuperModel::Marshal.load
+      at_exit {
+        SuperModel::Marshal.dump
+      }
     end
     
     def process
       Bowline.configuration = configuration
       
       set_load_path
-      initialize_gems
       load_gems
       
       require_frameworks
@@ -324,6 +319,9 @@ module Bowline
             
       initialize_js
       initialize_windows
+      initialize_trap
+      
+      initialize_marshal
       
       Bowline.initialized = true
     end
@@ -362,6 +360,8 @@ module Bowline
      
      attr_accessor :binder_paths
      
+     attr_accessor :marshal_path
+     
      # The path to the database configuration file to use. (Defaults to
      # <tt>config/database.yml</tt>.)
      attr_accessor :database_configuration_file
@@ -403,14 +403,6 @@ module Bowline
      def reload_plugins?
        !!@reload_plugins
      end
-
-     # An array of gems that this Bowline application depends on.  Bowline will automatically load
-     # these gems during installation, and allow you to install any missing gems with:
-     #
-     #   rake gems:sync
-     #
-     # You can add gems with the #gem method.
-     attr_accessor :gems
      
      attr_accessor :dependency_loading
      
@@ -418,23 +410,6 @@ module Bowline
         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.
-     #
-     #   # gem 'aws-s3', '>= 0.4.0'
-     #   # require 'aws/s3'
-     #   config.gem 'aws-s3', :lib => 'aws/s3', :version => '>= 0.4.0', \
-     #     :source => "http://code.whytheluckystiff.net"
-     #
-     # To require a library be installed, but not attempt to load it, pass :lib => false
-     #
-     #   config.gem 'qrp', :version => '0.4.1', :lib => false
-     def gem(*args)
-       @gems << Dependencies::Dependency.new(*args)
-     end
-     
-     attr_accessor :gem_path
           
      # Sets the default +time_zone+.  Setting this will enable +time_zone+
      # awareness for Active Record models and set the Active Record default
@@ -446,11 +421,7 @@ module Bowline
      attr_accessor :helper_glob
      
      attr_accessor :initializer_glob
-     
-     # Set the path that MainWindow will load
-     # when the application starts.
-     attr_accessor :index_path
-     
+          
      # Set the application's name.
      # This is required.
      attr_accessor :name
@@ -492,16 +463,14 @@ module Bowline
        self.log_path                     = default_log_path
        self.log_level                    = default_log_level
        self.binder_paths                 = default_binder_paths
+       self.marshal_path                 = default_marshal_path
        self.cache_classes                = default_cache_classes
        self.whiny_nils                   = default_whiny_nils
        self.database_configuration_file  = default_database_configuration_file
        self.app_config_file              = default_app_config_file
-       self.gems                         = default_gems
-       self.gem_path                     = default_gem_path
        self.plugin_glob                  = default_plugin_glob
        self.helper_glob                  = default_helper_glob
        self.initializer_glob             = default_initalizer_glob
-       self.index_path                   = default_index_path       
        self.publisher                    = default_publisher
        self.copyright                    = default_copyright
        
@@ -530,11 +499,6 @@ module Bowline
        ::APP_ROOT.replace @root_path
      end
      
-     def app_config
-       require 'erb'
-       YAML::load(ERB.new(IO.read(app_config_file)).result) if File.exists?(app_config_file)
-     end
-     
      # Loads and returns the contents of the #database_configuration_file. The
      # contents of the file are processed via ERB before being sent through
      # YAML::load.
@@ -621,6 +585,10 @@ module Bowline
      def default_binder_paths
        File.join(root_path, 'app', 'binders')
      end
+     
+     def default_marshal_path
+       File.join(root_path, 'db', 'marshal.db')
+     end
 
      def default_cache_classes
        true
@@ -630,18 +598,6 @@ module Bowline
        false
      end
      
-     def default_gems
-       gems = []
-       gems << Dependencies::Dependency.new(
-         "activesupport", :lib => "active_support"
-       )
-       gems
-     end
-          
-     def default_gem_path
-       File.join(root_path, *%w{ vendor gems })
-     end
-     
      def default_plugin_glob
        File.join(root_path, *%w{ vendor plugins * })
      end
@@ -653,10 +609,6 @@ module Bowline
      def default_initalizer_glob
        File.join(root_path, *%w{ config initializers **/*.rb })
      end
-     
-     def default_index_path
-       File.join(root_path, *%w{ public index.html })
-     end
           
      def default_publisher
        "Bowline"

data/lib/bowline/library.rb

@@ -25,11 +25,6 @@ module Bowline
     end
     module_function :libs_path
     
-    def local_bowline_path
-      File.join(APP_ROOT, "vendor", "bowline")
-    end
-    module_function :local_bowline_path
-    
     def local_build_path
       File.join(APP_ROOT, "build")
     end
@@ -38,8 +33,7 @@ module Bowline
     # Returns true if all required libraries exist.
     def ready?
       File.exist?(desktop_path) && 
-        File.directory?(libs_path) && 
-          File.directory?(local_bowline_path)
+        File.directory?(libs_path)
     end
     module_function :ready?
     

data/lib/bowline/tasks/app.rake

@@ -3,45 +3,7 @@ require 'erb'
 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
-    
+  namespace :build do    
     task :osx => :environment do
       unless Bowline::Library.ready?
         Rake::Task["libs:setup"].invoke
@@ -86,20 +48,6 @@ namespace :app do
           dirs.delete(File.join(APP_ROOT, 'db', 'migrate'))
           dirs.delete_if {|i| i =~ /\.svn|\.DS_Store/ }
           FileUtils.cp_r(dirs, '.')
-          
-          FileUtils.mkdir_p("vendor")
-          FileUtils.cd("vendor") do
-            # Copy Bowline lib
-            bowline_path = "bowline"
-            FileUtils.rm_rf(bowline_path)
-            FileUtils.cp_r(
-              Pathname.new(Bowline.lib_path).realpath, 
-              bowline_path
-            )
-            %w{assets pkg examples bin templates .git}.each do |unused|
-              FileUtils.rm_rf(File.join(bowline_path, unused))
-            end
-          end
         end
         
         # Copy Bowline binary & libs

data/lib/bowline/tasks/libs.rake

@@ -5,14 +5,14 @@ require 'progressbar'
 require 'zip/zip'
 
 def download(url)
-  puts "Retrieving: #{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 || 0)
+      pbar = ProgressBar.new("", resp.content_length || 0)
       resp.read_body {|seg|
         pbar.inc(seg.length)
         file.write(seg)
@@ -43,19 +43,6 @@ def sym_or_copy(from, to)
 end
 
 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
-    # Bowline gem is if it's an 1.8 gem dir. So, we just symlink
-    # it to vendor/bowline. One caveat though, is that you have to
-    # re-run this task when you update the gem.
-    local_bowline_path = Bowline::Library.local_bowline_path    
-    sym_or_copy(
-      Bowline.lib_path, 
-      local_bowline_path
-    ) unless File.directory?(local_bowline_path)
-  end
-  
   desc "Download Bowline's binary and pre-compiled libs"
   task :download => :environment do
     FileUtils.mkdir_p(Bowline::Library.path)
@@ -73,12 +60,12 @@ namespace :libs do
     unless File.directory?(libs_path)
       libs_tmp = download(Bowline::Library::LIBS_URL)
       libs_tmp.close
-      puts "Extracting libs.zip (this could take some time)"
+      puts "Extracting libs.zip"
       unzip(libs_tmp.path, Bowline::Library.path)
     end
   end
     
-  task :setup => [:environment, "gems:sync", "libs:download", "libs:unpack"]
+  task :setup => [:environment, "libs:download", "libs:unpack"]
   
   desc "Update Bowline's binary and pre-compiled libs"
   task :update => :environment do