bivouac 0.1.4 → 0.1.5

data/examples/bivouac_sample/app/controllers/index.rb

@@ -1,7 +1,7 @@
 module BivouacSample::Controllers
-  class Root < R '/', '/index'
+  class Index < R '/', '/index'
     def get
-      render :index
+      redirect Public, "index.html"
     end
   end
 end

data/examples/bivouac_sample/app/controllers/sound.rb

@@ -0,0 +1,10 @@
+module BivouacSample::Controllers
+  class Sound < R '/sound'
+    def get
+      render :sound
+    end
+    def post
+      render :sound
+    end
+  end
+end

data/examples/bivouac_sample/app/helpers/_helpers.rb

@@ -1,8 +1,8 @@
 #
 #  Project BivouacSample
 #
-#  Created using bivouac on Mon Sep 10 21:47:54 +0200 2007.
-#  Copyright (c) 2007 __My__. All rights reserved.
+#  Created using bivouac on Sun Mar 23 20:30:14 +0100 2008.
+#  Copyright (c) 2008 __My__. All rights reserved.
 #
 #  DO NOT EDIT THIS FILE OR YOU REALLY KNOW WHAT YOU ARE DOING
 #  USE script/generate helper my_helper
@@ -12,6 +12,7 @@ require 'bivouac/helpers/view/goh/html'
 require 'bivouac/helpers/view/goh/form'
 require 'bivouac/helpers/view/goh/scriptaculous'
 require 'bivouac/helpers/view/goh/javascript'
+require 'bivouac/helpers/view/goh/sound'
 require 'bivouac/helpers/view/goh/tooltip'
 
 helpers = [
@@ -20,6 +21,8 @@ helpers = [
   BivouacHelpers::FormView,
   BivouacHelpers::ScriptAculoUsView,
   BivouacHelpers::JavaScriptView, 
+  BivouacHelpers::SoundView, 
   BivouacHelpers::TooltipView
-]
+] + viewHelperModule
+
 BivouacSample.module_eval "class Mab < Markaby::Builder; include #{helpers.join(', ')}; end"

data/examples/bivouac_sample/app/views/sound.rb

@@ -0,0 +1,16 @@
+module BivouacSample::Views
+  def sound
+    html do
+      head do
+        javascript_include_tag :defaults
+      end
+      body do
+        h1 "Sound"
+        a "play sound (parallel)", :href => "#", :onclick => play_sound_js( "sound/sword.mp3" ); br
+        a "play sound (overwrite)", :href => "#", :onclick => play_sound_js( "sound/sword.mp3", :replace => true ); br
+        a "Mute", :href => "#", :onclick => disable_sound_js
+        a "Enable sounds", :href => "#", :onclick => enable_sound_js
+      end
+    end
+  end
+end

data/examples/bivouac_sample/config/environment.rb

@@ -1,8 +1,8 @@
 #
 #  Project BivouacSample
 #
-#  Created using bivouac on Mon Sep 10 21:47:54 +0200 2007.
-#  Copyright (c) 2007 __My__. All rights reserved.
+#  Created using bivouac on Sun Mar 23 20:30:12 +0100 2008.
+#  Copyright (c) 2008 __My__. All rights reserved.
 #
 
 require 'ostruct'
@@ -20,6 +20,9 @@ module Bivouac
         # Application port
         :port     => 3301,
         
+        # Database configuration
+        :db       => {:database=>"db/bivouac_sample.db", :adapter=>"sqlite3"},
+        
         # Name of the application
         # DO NOT CHANGE IT, OR YOU REALLY KNOW WHAT YOU ARE DOING!
         :appname  => "BivouacSample",

data/examples/bivouac_sample/config/postamble.rb

@@ -1,23 +1,43 @@
 #
 #  Project BivouacSample
 #
-#  Created using bivouac on Mon Sep 10 21:47:54 +0200 2007.
-#  Copyright (c) 2007 __My__. All rights reserved.
+#  Created using bivouac on Sun Mar 23 20:30:13 +0100 2008.
+#  Copyright (c) 2008 __My__. All rights reserved.
 #
 
+windows_process = false
+if /Windows/.match( ENV['OS'] )
+  begin
+    require 'win32/process'
+    windows_process = true
+  rescue LoadError => e
+    warn "`win32-process' is not installed!"
+  end
+end
+
 require 'simple-daemon'
 
 DIRNAME = File.expand_path( File.dirname(__FILE__) )
-SimpleDaemon::WorkingDirectory = DIRNAME + "/../log/"
+SimpleDaemon::WORKING_DIRECTORY = DIRNAME + "/../log/"
+
 class BivouacSampleDaemon < SimpleDaemon::Base
   @@server = nil
+  @@use = nil
+  
+  def self.use=(x)
+    @@use=x
+  end
   
   def self.start
     config = Bivouac::Environment.new( )
     
-    BivouacSample::Models::Base.establish_connection :adapter => 'sqlite3', :database => DIRNAME + "/../db/BivouacSample.db"
+    database_connection = config.environment.db
+    if database_connection[:adapter] =~ /sqlite/
+      database_connection[:database] = DIRNAME + "/../" + database_connection[:database]
+    end
+    BivouacSample::Models::Base.establish_connection database_connection
     BivouacSample::Models::Base.logger = Logger.new(DIRNAME + "/../log/BivouacSample.log")
-    # BivouacSample::Models::Base.threaded_connections = false
+    # -- DON'T WORK WITH RAILS 2 -- # BivouacSample::Models::Base.threaded_connections = false
     BivouacSample.create if BivouacSample.respond_to? :create
     
     trap(:INT) do
@@ -25,11 +45,22 @@ class BivouacSampleDaemon < SimpleDaemon::Base
     end
     
     begin
-      require 'mongrel/camping'
+      if @@use.nil?
+        begin
+          require 'thin' 
+          
+          Rack::Handler::Thin.run Rack::Adapter::Camping.new( BivouacSample ), :Host => config.environment.address, :Port => config.environment.port
+          puts "** BivouacSample is running at http://#{config.environment.address}:#{config.environment.port}"
+        rescue LoadError
+          require 'mongrel/camping'
       
-      @@server = Mongrel::Camping.start( config.environment.address, config.environment.port, "/", BivouacSample)
-      puts "** BivouacSample is running at http://#{config.environment.address}:#{config.environment.port}"
-      @@server.run.join
+          @@server = Mongrel::Camping.start( config.environment.address, config.environment.port, "/", BivouacSample)
+          puts "** BivouacSample is running at http://#{config.environment.address}:#{config.environment.port}"
+          @@server.run.join
+        end
+      else
+        raise LoadError, "I want to use WEBrick please!"
+      end
     rescue LoadError => e
       require 'webrick/httpserver'
       require 'camping/webrick'
@@ -37,6 +68,7 @@ class BivouacSampleDaemon < SimpleDaemon::Base
       @@server = WEBrick::HTTPServer.new :BindAddress => config.environment.address, :Port => config.environment.port
       puts "** BivouacSample is running at http://#{config.environment.address}:#{config.environment.port}"
       @@server.mount "/", WEBrick::CampingHandler, BivouacSample
+      @@server.start
     end
   end
   
@@ -50,13 +82,52 @@ class BivouacSampleDaemon < SimpleDaemon::Base
   end
 end
 
-deamonize = ARGV.shift
-case deamonize
-when '-d'
-  BivouacSampleDaemon.daemonize
-when '-h'
-  puts "script/server [-d start|stop|restart] [-h]"
-  exit
-else
-  BivouacSampleDaemon.start
+while ARGV.size > 0
+  deamonize = ARGV.shift
+  case deamonize
+  when 'webrick'
+    BivouacSampleDaemon.use='webrick'
+  when '-c'
+    ARGV.clear
+    
+    include BivouacSample::Models
+    
+    config = Bivouac::Environment.new( )
+    database_connection = config.environment.db
+    if database_connection[:adapter] =~ /sqlite/
+      database_connection[:database] = DIRNAME + "/../" + database_connection[:database]
+    end
+    BivouacSample::Models::Base.establish_connection database_connection
+    BivouacSample.create if BivouacSample.respond_to? :create
+    
+    require 'irb'
+    require 'irb/completion'
+    if File.exists? ".irbrc"
+      ENV['IRBRC'] = ".irbrc"
+    end
+    IRB.start
+    break
+  when '-d'
+    if /Windows/.match( ENV['OS'] ) and windows_process == false
+      warn "You must install `win32-process' to daemonize this app."
+      exit 1
+    end
+    
+    BivouacSampleDaemon.daemonize
+    break
+  when '-h'
+    begin
+      require 'mongrel/camping'
+      puts "=> Booting Mongrel (use 'script/server webrick [options]' to force WEBrick)"
+    rescue LoadError => e
+      puts "=> Booting WEBrick"
+    end
+    puts "script/server [-d start|stop|restart] [-h]"
+    exit
+  when '--'
+    BivouacSampleDaemon.start
+    break
+  else
+    puts "Ignore unknown option '#{deamonize}' !"
+  end
 end

data/examples/bivouac_sample/public/javascripts/builder.js

@@ -1,6 +1,6 @@
-// script.aculo.us builder.js v1.7.0, Fri Jan 19 19:16:36 CET 2007
+// script.aculo.us builder.js v1.8.1, Thu Jan 03 22:07:12 -0500 2008
 
-// Copyright (c) 2005, 2006 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+// Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
 //
 // script.aculo.us is freely distributable under the terms of an MIT-style license.
 // For details, see the script.aculo.us web site: http://script.aculo.us/
@@ -48,7 +48,8 @@ var Builder = {
     // attributes (or text)
     if(arguments[1])
       if(this._isStringOrNumber(arguments[1]) ||
-        (arguments[1] instanceof Array)) {
+        (arguments[1] instanceof Array) ||
+        arguments[1].tagName) {
           this._children(element, arguments[1]);
         } else {
           var attrs = this._attributes(arguments[1]);
@@ -66,7 +67,7 @@ var Builder = {
             }
             if(element.tagName.toUpperCase() != elementName)
               element = parentElement.getElementsByTagName(elementName)[0];
-            }
+          }
         } 
 
     // text, or array of children
@@ -88,10 +89,14 @@ var Builder = {
     var attrs = [];
     for(attribute in attributes)
       attrs.push((attribute in this.ATTR_MAP ? this.ATTR_MAP[attribute] : attribute) +
-          '="' + attributes[attribute].toString().escapeHTML() + '"');
+          '="' + attributes[attribute].toString().escapeHTML().gsub(/"/,'"') + '"');
     return attrs.join(" ");
   },
   _children: function(element, children) {
+    if(children.tagName) {
+      element.appendChild(children);
+      return;
+    }
     if(typeof children=='object') { // array can hold nodes and text
       children.flatten().each( function(e) {
         if(typeof e=='object')
@@ -101,8 +106,8 @@ var Builder = {
             element.appendChild(Builder._text(e));
       });
     } else
-      if(Builder._isStringOrNumber(children)) 
-         element.appendChild(Builder._text(children));
+      if(Builder._isStringOrNumber(children))
+        element.appendChild(Builder._text(children));
   },
   _isStringOrNumber: function(param) {
     return(typeof param=='string' || typeof param=='number');