bowline 0.1.6 → 0.3.9

data/lib/bowline/ext/array.rb

@@ -1,5 +1,5 @@
 class Array
   def to_js(opts = {})
-    collect {|i| i.to_js(opts) }
+    map {|i| i.to_js(opts) }
   end
 end

data/lib/bowline/generators.rb

@@ -56,4 +56,5 @@ end
 require "bowline/generators/application"
 require "bowline/generators/binder"
 require "bowline/generators/model"
+require "bowline/generators/helper"
 require "bowline/generators/migration"

data/lib/bowline/generators/application.rb

@@ -31,7 +31,10 @@ module Bowline::Generators
     file :gitignore, "gitignore", ".gitignore"
     
     empty_directory :public, "public"
+    
     template :index, "public/index.html", "public/index.html"
+    file :logo, "public/icon.png", "public/icon.png"
+    
     glob! "public/javascripts"
     glob! "public/stylesheets"
     
@@ -44,14 +47,16 @@ module Bowline::Generators
     empty_directory :app, "app"
     empty_directory :models, "app/models"
     empty_directory :binders, "app/binders"
+    empty_directory :binders, "app/helpers"
     empty_directory :config, "config"
     
     template :environment, "config/environment.rb", "config/environment.rb"
-    template :tiapp,       "config/tiapp.xml", "config/tiapp.xml"
-    ["application.yml", "database.yml", "manifest", "boot.rb"].each {|action|
+    ["application.yml", "database.yml", "boot.rb"].each {|action|
       action = File.join('config', action)
       file(action.downcase.gsub(/[^a-z0-9]+/, '_').to_sym, action, action)
     }
+    
+    empty_directory :initializers, "config/initializers"
   end
   
   add :app, ApplicationGenerator

data/lib/bowline/generators/helper.rb

@@ -0,0 +1,28 @@
+module Bowline::Generators
+  class HelperGenerator < NamedGenerator
+    desc <<-DESC
+      Generates a new helper.
+    DESC
+    
+    def modules
+      []
+    end
+    
+    def module_name
+      "#{self.name.camel_case}Helper"
+    end
+    
+    def file_name
+      "#{name}_helper"
+    end
+    
+    first_argument :name, :required => true, :desc => "helper name"
+    
+    template :helper do |template|
+      template.source       = "helper.rb"
+      template.destination  = "app/helpers/#{file_name}.rb"
+    end
+  end
+  
+  add :helper, HelperGenerator
+end

data/lib/bowline/helpers.rb

@@ -0,0 +1,7 @@
+module Bowline
+  module Helpers
+    def self.init
+      Bowline.js.send("bowline_helper=", method(:send))
+    end
+  end
+end

data/lib/bowline/initializer.rb

@@ -65,7 +65,7 @@ module Bowline
     end
     
     def set_load_path
-      load_paths = configuration.load_paths + configuration.framework_paths
+      load_paths = configuration.load_paths
       load_paths.reverse_each { |dir| $LOAD_PATH.unshift(dir) if File.directory?(dir) }
       $LOAD_PATH.uniq!
     end
@@ -172,25 +172,27 @@ module Bowline
       end
     end
     
-    def initialize_rubygems
-      # todo - use custom rubygems on deployment
-      # $LOAD_PATH << File.join(root, 'ruby', 'rubygems')
-      # ::GEM_DIR = File.join(root, 'ruby', 'gems')
-      # $LOAD_PATH << GEM_DIR
-      # ENV['GEM_HOME'] = GEM_DIR
-      # require 'rubygems'
-      # Gem.use_paths(GEM_DIR, [GEM_DIR])
-      # Gem.source_index.refresh!
-    end
-    
-    def add_gem_load_paths
-      unless configuration.gems.empty?
-        configuration.gems.each { |gem| gem.add_load_paths }
-      end
+    def initialize_gems
+      require 'rubygems'
+      Gem.clear_paths
+      Gem.path.unshift(configuration.gem_path)
     end
     
     def load_gems
-      configuration.gems.each { |gem| gem.load }
+      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
@@ -212,6 +214,13 @@ module Bowline
       end
     end
     
+    def load_application_helpers
+      helpers = configuration.helpers
+      helpers = helpers.map(&:constantize)
+      helpers.each {|h| Helpers.module_eval { extend h } }
+      Helpers.init
+    end
+        
     def load_application_classes
       if configuration.cache_classes
         configuration.eager_load_paths.each do |load_path|
@@ -252,12 +261,15 @@ module Bowline
       })
     end
     
+    def initialize_js
+      Bowline.js.bowline_loaded
+    end
+    
     def process
       Bowline.configuration = configuration
       
       set_load_path
-      initialize_rubygems
-      add_gem_load_paths
+      initialize_gems
       
       require_frameworks
       set_autoload_paths
@@ -286,6 +298,9 @@ module Bowline
       after_initialize
       
       load_application_classes
+      load_application_helpers
+      
+      initialize_js
       
       Bowline.initialized = true
     end
@@ -317,8 +332,6 @@ module Bowline
      attr_accessor :bowline
      
      attr_accessor :frameworks
-     
-     attr_accessor :framework_paths
 
      # Whether or not classes should be cached (set to false if you want
      # application classes to be reloaded on each request)
@@ -371,7 +384,7 @@ module Bowline
      # 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:install
+     #   rake gems:sync
      #
      # You can add gems with the #gem method.
      attr_accessor :gems
@@ -387,11 +400,12 @@ module Bowline
      # 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(name, options = {})
-       # todo
-       @gems << Bowline::GemDependency.new(name, options)
+     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
      # timezone to <tt>:utc</tt>.
@@ -399,17 +413,25 @@ module Bowline
      
      attr_accessor :plugin_glob
      
+     attr_accessor :helper_glob
+     
      attr_accessor :initializer_glob
      
      attr_accessor :name
-     
-     # Create a new Configuration instance, initialized with the default
-     # values.
+     attr_accessor :id
+     attr_accessor :version
+     attr_accessor :description
+     attr_accessor :publisher
+     attr_accessor :url
+     attr_accessor :icon
+     attr_accessor :sdk
+     attr_accessor :copyright
+     
+     # Create a new Configuration instance, initialized with the default values.
      def initialize
        set_root_path!
        
        self.frameworks                   = default_frameworks
-       self.framework_paths              = default_framework_paths
        self.load_paths                   = default_load_paths
        self.load_once_paths              = default_load_once_paths
        self.eager_load_paths             = default_eager_load_paths
@@ -421,7 +443,9 @@ module Bowline
        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
        
        for framework in default_frameworks
@@ -462,6 +486,10 @@ module Bowline
        YAML::load(ERB.new(IO.read(database_configuration_file)).result) if File.exists?(database_configuration_file)
      end
      
+     def helpers
+       Dir[helper_glob].map {|f| File.basename(f, '.rb').classify }
+     end
+     
      # Adds a block which will be executed after bowline has been fully initialized.
      # Useful for per-environment configuration which depends on the framework being
      # fully initialized.
@@ -479,16 +507,7 @@ module Bowline
      def default_frameworks
        [:active_support, :bowline]
      end
-   
-     def default_framework_paths
-       [
-         File.join(root_path, 'vendor', 'bowline', 'lib'),
-         File.join(root_path, 'vendor', 'rails', 'activesupport',  'lib'),
-         File.join(root_path, 'vendor', 'rails', 'activerecord',   'lib'),
-         File.join(root_path, 'vendor', 'rails', 'activeresource', 'lib')
-        ]
-     end
-     
+        
      def default_load_paths
        paths = []
 
@@ -498,6 +517,7 @@ module Bowline
          app/binders
          app/models
          app/remote
+         app/helpers
          lib
          vendor
        ).map { |dir| "#{root_path}/#{dir}" }.select { |dir| File.directory?(dir) }
@@ -512,9 +532,10 @@ module Bowline
 
      def default_eager_load_paths
        %w(
+         app/binders
          app/models
          app/remote
-         app/binders
+         app/helpers
        ).map { |dir| "#{root_path}/#{dir}" }.select { |dir| File.directory?(dir) }
      end
      
@@ -547,13 +568,26 @@ module Bowline
      end
      
      def default_gems
-       []
+       gems = []
+       gems << Dependencies::Dependency.new(
+        "bowline", Bowline::Version::STRING, :lib => false
+       )
+       gems << Dependencies::Dependency.new("activesupport")
+       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
      
+     def default_helper_glob
+       File.join(root_path, *%w{ app helpers *.rb })
+     end
+     
      def default_initalizer_glob
        File.join(root_path, *%w{ config initializers **/*.rb })
      end

data/lib/bowline/observer.rb

@@ -1,4 +1,4 @@
-# o = Observer.new
+# o = Observable.new
 # o.append('greet') {
 #  puts 'hi'
 # }
@@ -7,35 +7,58 @@
 # def greet(who)
 #  puts "Hi #{who}"
 # end
-# o.append('greet', method(:greet), 'Alex')
+# event = o.append('greet', method(:greet), 'Alex')
 # o.call('greet')
+# event.remove
 
 module Bowline
-  class Observer
+  class Observable
+    class Event
+      attr_reader :type, :callback
+      def initialize(observable, type, callback = nil)
+        @observable = observable
+        @type       = type
+        @callback   = callback
+      end
+      
+      def call(*args)
+        @callback.call(*args)
+      end
+      
+      def remove
+        @observable.remove(self)
+      end
+    end
+    
     def initialize
       @listeners = {}
     end
-    
-    # Append block/method to listeners
-    def append(event, method = nil, *args, &block)
-      (@listeners[event.to_s] ||= []) << [method||block, args]
+
+    def append(event, method = nil, &block)
+      event = Event.new(self, event, method||block)
+      (@listeners[event] ||= []) << event
+      event
     end
-    
-    # Like append, but adds it to the body too
-    def on(event, method = nil, &block)
-      append(event, method, &block)
-      JQuery.bind(event.to_s, method(:call), event)
+
+    def call(event, *args)
+      return unless @listeners[event]
+      @listeners[event].each do |callback|
+        callback.call(*args)
+      end
     end
     
-    # Call event
-    def call(event)
-      event = event.to_s
-      @listeners[event].each do |callback|
-        callback[0].call(*callback[1])
+    def remove(event, value=nil)
+      return unless @listeners[event]
+      if value
+        @listeners[event].delete(value)
+        if @listeners[event].empty?
+          @listeners.delete(event)
+        end
+      else
+        @listeners.delete(event)
       end
-      @listeners.delete(event)
     end
-  
+
     def clear
       @listeners = {}
     end

data/lib/bowline/tasks/app.rake

@@ -1,90 +1,156 @@
 require 'fileutils'
-namespace :app do
-  desc "Bundles up app into executables"
-  task :bundle => ["bundle:windows", "bundle:linux", "bundle:osx"]
-  
-  namespace :bundle do    
-    task :windows => :environment do
-    end
-  
-    task :linux => :environment do
+namespace :app do  
+  task :configure => :environment do
+    build_path    = File.join(APP_ROOT, 'build')
+        
+    conf = Bowline.configuration
+    
+    # Titanium complains about whitespace
+    manifest =  <<-EOF
+#appname:#{conf.name}
+#appid:#{conf.id}
+#publisher:#{conf.publisher}
+#image:public/logo.png
+#url:#{conf.url}
+#guid:0e70684a-dd4b-4d97-9396-6bc01ba10a4e
+#desc:#{conf.description}
+#type:desktop
+runtime:0.4.4
+api:0.4.4
+tiapp:0.4.4
+tifilesystem:0.4.4
+tiplatform:0.4.4
+tiui:0.4.4
+javascript:0.4.4
+ruby:0.4.4
+tidatabase:0.4.4
+tidesktop:0.4.4
+tigrowl:0.4.4
+timedia:0.4.4
+timonkey:0.4.4
+tinetwork:0.4.4
+tinotification:0.4.4
+tiprocess:0.4.4
+    EOF
+    
+    conf.publisher ||= 'Bowline'
+    conf.copyright ||= "Copyright © #{Time.now.year}"
+    
+    tiapp = <<-EOF
+<?xml version='1.0' encoding='UTF-8'?>
+<ti:app xmlns:ti='http://ti.appcelerator.org'>
+  <id>#{conf.id}</id>
+  <name>#{conf.name}</name>
+  <version>#{conf.version}</version>
+  <publisher>#{conf.publisher}</publisher>
+  <url>#{conf.url}</url>
+  <icon>public/icon.png</icon>
+  <copyright>#{conf.copyright}</copyright>
+  <window>
+    <id>initial</id>
+    <title>#{conf.name}</title>
+    <url>app://public/index.html</url>
+    <width>700</width>
+    <max-width>3000</max-width>
+    <min-width>0</min-width>
+    <height>800</height>
+    <max-height>3000</max-height>
+    <min-height>0</min-height>
+    <fullscreen>false</fullscreen>
+    <resizable>true</resizable>
+    <chrome scrollbars="true">true</chrome>
+    <maximizable>true</maximizable>
+    <minimizable>true</minimizable>
+    <closeable>true</closeable>
+  </window>
+</ti:app>
+    EOF
+    
+    FileUtils.makedirs(build_path)
+    FileUtils.cd(build_path) do
+      File.open('manifest', 'w+') {|f| f.write manifest }
+      File.open('tiapp.xml', 'w+') {|f| f.write tiapp }
     end
+  end
   
-    task :osx => :environment do
-      build_path    = File.join(APP_ROOT, 'build')
-      titanium_path = ENV['TIPATH']
-      raise 'You need to provide TIPATH' unless titanium_path
-      titanium_path = File.expand_path(titanium_path)
+  desc "Bundles up app into executables"  
+  task :bundle do
+    build_path    = File.join(APP_ROOT, 'build')
+    app_path      = File.join(build_path, 'app')
     
-      titanium_path = File.join(titanium_path, 'build', 'osx')
-      build_path    = File.join(build_path, 'osx')
-      FileUtils.rm_rf(build_path)
+    tiapp    = File.join(build_path, 'tiapp.xml')
+    manifest = File.join(build_path, 'manifest')
     
-      build_path    = File.join(build_path, "#{APP_NAME}.app", 'Contents')
-      FileUtils.mkdir_p(build_path)
+    if !File.exists?(tiapp) || !File.exists?(manifest)
+      Rake::Task['app:configure'].invoke
+    end
     
-      exec_path     = File.join(build_path, 'MacOS')
-      FileUtils.mkdir_p(exec_path)
+    FileUtils.rm_rf(app_path)
+    FileUtils.makedirs(app_path)
     
-      FileUtils.cd(titanium_path) do
-        FileUtils.cp_r('runtime/template/kboot', File.join(exec_path, APP_NAME))
-        FileUtils.cp_r('runtime/installer',  build_path)
-        FileUtils.cp_r('modules',    build_path)
-        FileUtils.cp_r('runtime',    build_path)
-        # FileUtils.cp_r('Frameworks', build_path) # todo
-      end
-      
-      # Todo - put this in config?
-      File.open(File.join(build_path, 'Info.plist'), 'w+') do |f|
-        f.write <<-EOF
-        <?xml version="1.0" encoding="UTF-8"?>
-        <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-        <plist version="1.0">
-          <dict>
-            <key>CFBundleDevelopmentRegion</key>
-            <string>English</string>
-            <key>CFBundleExecutable</key>
-            <string>#{APP_NAME}</string>
-            <key>CFBundleIconFile</key>
-            <string>titanium.icns</string>
-            <key>CFBundleIdentifier</key>
-            <string>com.titaniumapp.testapp</string>
-            <key>CFBundleInfoDictionaryVersion</key>
-            <string>6.0</string>
-            <key>CFBundleName</key>
-            <string>#{APP_NAME}</string>
-            <key>CFBundlePackageType</key>
-            <string>APPL</string>
-            <key>CFBundleSignature</key>
-            <string>WRUN</string>
-            <key>CFBundleVersion</key>
-            <string>0.4</string>
-            <key>NSMainNibFile</key>
-            <string>MainMenu</string>
-            <key>NSPrincipalClass</key>
-            <string>NSApplication</string>
-          </dict>
-        </plist>
-        EOF
-      end
+    FileUtils.cp(tiapp,    app_path)
+    FileUtils.cp(manifest, app_path)
     
-      resources_path = File.join(build_path, 'Resources')
-      FileUtils.mkdir_p(resources_path)
+    dirs = Dir[File.join(APP_ROOT, '**')]
+    dirs.delete(build_path)
+    dirs.delete(File.join(APP_ROOT, 'log'))
+    dirs.delete(File.join(APP_ROOT, 'tmp'))
+    dirs.delete(File.join(APP_ROOT, 'db'))
+    dirs.delete_if {|i| i =~ /\.svn|\.DS_Store/ }
     
-      english_path = File.join(resources_path, 'English.lproj')
-      FileUtils.mkdir_p(english_path)
-      FileUtils.cd(build_path) do
-        FileUtils.cp_r('runtime/template/MainMenu.nib',  english_path)
-        FileUtils.cp_r('runtime/template/titanium.icns', english_path)
+    FileUtils.cd(app_path) do
+      FileUtils.makedirs('Resources')
+      FileUtils.cp_r(dirs, 'Resources')
+      schema_path = File.join(APP_ROOT, 'db', 'schema.rb')
+      if File.exists?(schema_path)
+        FileUtils.cp(
+          schema_path, 
+          File.join('Resources', 'db')
+        )
       end
-    
-      dirs = Dir[File.join(APP_ROOT, '*')] - [File.join(APP_ROOT, 'build')]
-      FileUtils.cp_r(dirs, resources_path)
-    
-      FileUtils.cd(resources_path) do
-        FileUtils.mv(File.join('config', 'manifest'),  build_path)
-        FileUtils.mv(File.join('config', 'tiapp.xml'), build_path)
+    end
+  end
+  
+  desc "Use the Titanium SDK to build the app"
+  task :build do
+    build_path    = File.join(APP_ROOT, 'build')
+    app_path      = File.join(build_path, 'app')
+
+    ti_path = ENV['TIPATH'] || begin 
+      if RUBY_PLATFORM =~ /darwin/
+        '/Library/Application Support/Titanium'
+      elsif RUBY_PLATFORM =~ /win/
+        'C:/ProgramData/Titanium'
+      elsif RUBY_PLATFORM =~ /linux/
+        '/opt/titanium'
+      else
+        raise "Unknown platform"
       end
     end
+
+    unless File.directory?(ti_path)
+      raise "Titanium SDK not found, " \
+              "install the SDK or " \
+              "specify the ENV variable TIPATH"
+    end
+
+    ti_lib_path = Dir[File.join(ti_path, "sdk", "*", "*")][-1]
+
+    # Space in osx path
+    ti_path.gsub!(' ', '\ ')
+    ti_lib_path.gsub!(' ', '\ ')
+
+    command = []
+    command << File.join(ti_lib_path, "tibuild.py")
+    command << "-d #{build_path}"
+    command << "-s #{ti_path}"
+    command << "-r" if ENV['TIRUN']
+    command << "-a #{ti_lib_path}"
+    command << app_path
+
+    exec(command.join(' '))
   end
-end
+end
+
+desc "Bundle and build app"
+task :app => ["app:bundle", "app:build"]