bowline 0.6.3 → 0.9.1

data/lib/bowline/generators/application.rb

@@ -39,11 +39,13 @@ module Bowline::Generators
     glob! "public/stylesheets"
     
     glob! "script", [nil]
+    chmod "script", :mode => 0755
     
-    file :jquery,    "../assets/jquery.js",        "public/javascripts/jquery.js"
-    file :chainjs,   "../assets/jquery.chain.js",  "public/javascripts/jquery.chain.js"
-    file :json2js,   "../assets/json2.js",         "public/javascripts/json2.js"
-    file :bowlinejs, "../assets/bowline.js",       "public/javascripts/bowline.js"
+    file :jquery,         "../assets/jquery.js",        "public/javascripts/jquery.js"
+    file :chainjs,        "../assets/jquery.chain.js",  "public/javascripts/jquery.chain.js"
+    file :superclassjs,   "../assets/superclass.js",    "public/javascripts/superclass.js"
+    file :bowlinejs,      "../assets/bowline.js",       "public/javascripts/bowline.js"
+    file :bowlinechainjs, "../assets/bowline.chain.js", "public/javascripts/bowline.chain.js"
     
     empty_directory :app, "app"
     empty_directory :models, "app/models"

data/lib/bowline/generators/model.rb

@@ -5,11 +5,7 @@ module Bowline::Generators
     DESC
     
     def class_name
-      if local
-        super + " < SuperModel::Base"
-      else
-        super + " < ActiveRecord::Base"
-      end
+      super + " < SuperModel::Base"
     end
     
     def modules
@@ -17,7 +13,6 @@ module Bowline::Generators
     end
     
     first_argument :name, :required => true, :desc => "model name"
-    second_argument :local, :required => false
     
     template :model do |template|
       template.source       = "model.rb"

data/lib/bowline/initializer.rb

@@ -7,6 +7,7 @@ module Bowline
     def configuration
       @@configuration
     end
+    alias_method :conf, :configuration
 
     def configuration=(configuration) #:nodoc:
       @@configuration = configuration
@@ -227,7 +228,9 @@ module Bowline
     end
     
     def load_application_environment
-      require(Bowline.root.join(*%w{config environments}, Bowline.env))
+      config = configuration
+      path   = Bowline.root.join(*%w{config environments}, Bowline.env + ".rb").to_s
+      eval(IO.read(path), binding, path)
     end
     
     def load_application_initializers
@@ -269,17 +272,6 @@ module Bowline
       end
     end
     
-    # For Ruby 1.8, this initialization sets $KCODE to 'u' to enable the
-    # multibyte safe operations. Plugin authors supporting other encodings
-    # should override this behaviour and set the relevant +default_charset+
-    # on ActionController::Base.
-    #
-    # For Ruby 1.9, this does nothing. Specify the default encoding in the Ruby
-    # shebang line if you don't want UTF-8.
-    def initialize_encoding
-      $KCODE='u' if RUBY_VERSION < '1.9'
-    end
-    
     def initialize_name
       unless configuration.name
         raise "You must provide an application name in environment.rb"
@@ -337,13 +329,14 @@ module Bowline
       set_load_path
       load_gems
       
+      load_application_environment
+      
       require_frameworks
       set_autoload_paths
       add_plugin_load_paths
       initialize_dependency_mechanism
       disable_dependency_loading
       
-      initialize_encoding
       initialize_database
       
       initialize_logger
@@ -363,12 +356,11 @@ module Bowline
       load_application_helpers
       
       initialize_desktop
+      initialize_marshal
       initialize_windows
       initialize_trap
       initialize_path
-      initialize_marshal
-            
-      load_application_environment
+      
       load_application_initializers
       load_application_first_run
       

data/lib/bowline/tasks/app.rake

@@ -19,11 +19,16 @@ namespace :app do
       app_path    = File.join(build_path, "#{config.name}.zip")
       FileUtils.rm_rf(app_path)
       
-      dirs = Dir[Bowline.root.join("**/**").to_s]
-      dirs.delete(build_path)
+      dirs = Dir[Bowline.root.join("**").to_s]
+      dirs.delete(build_path.to_s)
       dirs.delete(Bowline.root.join("log").to_s)
       dirs.delete(Bowline.root.join(*%w{db migrate}).to_s)
       dirs.delete_if {|i| i =~ /\.svn|\.DS_Store|\.git/ }
+
+      bundle_dir = Bowline.root.join(".bundle")
+      dirs += bundle_dir if bundle_dir.exist?
+      
+      dirs = Dir[*dirs.map {|d| "#{d}/**/**" }]
       
       Zip::ZipFile.open(app_path, Zip::ZipFile::CREATE) do |zf|
         # This is horrible - but RubyZIP's API sucks
@@ -80,6 +85,10 @@ namespace :app do
           dirs.delete(File.join(APP_ROOT, "log"))
           dirs.delete(File.join(APP_ROOT, *%w{db migrate}))
           dirs.delete_if {|i| i =~ /\.svn|\.DS_Store|\.git/ }
+          
+          bundle_dir = File.join(APP_ROOT, ".bundle")
+          dirs << bundle_dir if File.exist?(bundle_dir)
+          
           FileUtils.cp_r(dirs, ".")
           
           FileUtils.touch("app_production")

data/lib/bowline/version.rb

@@ -1,8 +1,8 @@
 module Bowline  
   module Version #:nodoc:
     MAJOR    = 0
-    MINOR    = 6
-    TINY     = 3
+    MINOR    = 9
+    TINY     = 1
     
     STRING   = [MAJOR, MINOR, TINY].join('.')
     

data/templates/Gemfile

@@ -1,7 +1,6 @@
 # Edit this Gemfile to bundle your application's dependencies.
+source 'http://rubygems.org'
 
-gem "rubygems-update", "= 1.3.5"
-gem "bundler08"
 gem "bowline"
 
 ## Bundle the gems you use:

data/templates/config/boot.rb

@@ -1,13 +1,14 @@
 APP_ROOT = File.expand_path(File.join(File.dirname(__FILE__), "..")) unless defined?(APP_ROOT)
 
+require "rubygems"
+
 # Use Bundler (preferred)
 environment = File.expand_path("../../vendor/gems/environment", __FILE__)
 if File.exist?("#{environment}.rb")
   require environment
 
 # Use RubyGems
-else
-  require "rubygems"
+else  
   require "bundler"
   Bundler.setup
 end

data/templates/model.rb

@@ -1,4 +1,2 @@
-<%- with_modules(modules) do -%>
 class <%= class_name %>
-end
-<%- end -%>
+end

data/templates/public/index.html

@@ -6,13 +6,14 @@
   <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/superclass.js" type="text/javascript" charset="utf-8"></script>
   <script src="javascripts/bowline.js" type="text/javascript" charset="utf-8"></script>
+  <script src="javascripts/bowline.chain.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">
     // Binder Example:
     // jQuery(function($){
-    //  $('#tweets').bowlineBind('TweetsBinder');
+    //  $('#tweets').bowlineChain('TweetsBinder');
     // });
   </script>
 </head>

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 6
-  - 3
-  version: 0.6.3
+  - 9
+  - 1
+  version: 0.9.1
 platform: ruby
 authors: 
 - Alex MacCaw
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-06 00:00:00 +01:00
+date: 2010-05-21 00:00:00 -04:00
 default_executable: bowline-gen
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -61,7 +61,7 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: supermodel
+  name: bundler08
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
@@ -69,9 +69,25 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        version: "0"
+        - 8
+        - 5
+        version: 0.8.5
   type: :runtime
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: supermodel
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 1
+        - 3
+        version: 0.1.3
+  type: :runtime
+  version_requirements: *id005
 description: Ruby/JS GUI framework
 email: alex@leadthinking.com
 executables: 
@@ -89,19 +105,15 @@ files:
 - 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

data/assets/animations.css

@@ -1,92 +0,0 @@
-.drag {
-  -webkit-user-drag: element;
-  -webkit-user-select: none;
-}
-
-.in, .out {
-  -webkit-animation-timing-function: ease-in-out;
-	-webkit-animation-duration: 350ms;
-}
-
-.slideup.in {
-	-webkit-animation-name: slideupbottom;
-	z-index: 10;
-}
-
-.slideup.out {
-	-webkit-animation-name: slideuptop;
-	z-index: 0;
-}
-
-.slidedown.in {
-	-webkit-animation-name: slidedowntop;
-	z-index: 10;
-}
-
-.slidedown.out {
-	-webkit-animation-name: slidedownbottom;
-	z-index: 0;
-}
-
-@-webkit-keyframes dontmove {
-    from { opacity: 1; }
-    to { opacity: 1; }
-}
-
-@-webkit-keyframes slideuptop {
-    from { -webkit-transform: translateY(0); }
-    to { -webkit-transform: translateY(-100%); }
-}
-
-@-webkit-keyframes slideupbottom {
-    from { -webkit-transform: translateY(100%); }
-    to { -webkit-transform: translateY(0); }
-}
-
-@-webkit-keyframes slidedowntop {
-    from { -webkit-transform: translateY(-100%); }
-    to { -webkit-transform: translateY(0); }
-}
-
-@-webkit-keyframes slidedownbottom {
-    from { -webkit-transform: translateY(0); }
-    to { -webkit-transform: translateY(100%); }
-}
-
-.explode.in {
-  -webkit-animation-name: explodein;
-}
-
-.explode.out {
-  -webkit-animation-name: explodeout;
-}
-
-@-webkit-keyframes explodein {
-    from { -webkit-transform: scale(1.3); opacity: 0; }
-    to { -webkit-transform: scale(1); opacity: 1; }
-}
-
-@-webkit-keyframes explodeout {
-    from { -webkit-transform: scale(1); opacity: 1; }
-    to { -webkit-transform: scale(1.3); opacity: 0; }
-}
-
-.fade.in {
-	z-index: 10;
-	-webkit-animation-name: fadein;
-}
-
-.fade.out {
-	z-index: 0;
-	-webkit-animation-name: fadeout;
-}
-
-@-webkit-keyframes fadein {
-    from { opacity: 0; }
-    to { opacity: 1; }
-}
-
-@-webkit-keyframes fadeout {
-    from { opacity: 1; }
-    to { opacity: 0; }
-}

data/assets/bowline.menu.js

@@ -1,81 +0,0 @@
-var BowlineMenu = function(element, options){
-  var defaults = {childSelector: "li", trace: false};
-  this.options = jQuery.extend({}, defaults, options);
-  
-  this.element = jQuery(element);
-  
-  if(this.options.current) this.change(this.options.current);
-    
-  var self = this;
-  this.elements().click(function(){
-    var view = self.viewName(this);
-    self.change(view);
-  });
-};
-
-BowlineMenu.fn = BowlineMenu.prototype;
-
-BowlineMenu.fn.log = function(){
-  if( !this.options.trace ) return;
-  var args = jQuery.makeArray(arguments);
-  args.unshift("(BowlineMenu)");
-  console.log.apply(console, args);
-};
-
-BowlineMenu.fn.onChange = function(func){
-  this.element.bind("change.bowline", func);
-};
-
-BowlineMenu.fn.triggerChange = function(data){
-  this.element.trigger("change.bowline", data);
-};
-
-BowlineMenu.fn.viewName = function(element){
-  return jQuery(element).dataset("view");
-};
-
-BowlineMenu.fn.currentName = function(){
-  return this.viewName(this.current);
-};
-
-BowlineMenu.fn.elements = function(){
-  return this.element.find(this.options.childSelector);
-};
-
-BowlineMenu.fn.elementFor = function(name){
-  return this.element.find(
-    "[data-view='" + name + "']:first"
-  );
-};
-
-BowlineMenu.fn.items = function(){
-  var self = this;
-  return jQuery.map(this.elements(), function(n){
-    return self.viewName(n);
-  });
-};
-
-BowlineMenu.fn.change = function(name){  
-  if(name != false && jQuery.inArray(name, this.items()) == -1) return false;
-
-  var fromView      = this.current;
-  var fromViewName  = this.viewName(fromView);
-  
-  var toView        = this.elementFor(name);
-  var toViewName    = name;
-  
-  this.log("changing:", fromViewName, toViewName);
-  
-  this.elements().removeClass("current");
-  if(toView) {
-    this.current = toView;
-    toView.addClass("current");
-  }
-  
-  this.triggerChange({
-    toView:       toView, 
-    toViewName:   toViewName,
-    fromView:     fromView,
-    fromViewName: fromViewName
-  });
-};