bivouac 0.2.2 → 0.2.3

data/doc/rdoc/files/README.html

@@ -87,7 +87,7 @@ end</strong>
     <div id="README" class="page_shade">
 <div class="page">
 <div class="header">
-  <div class="path">README / Wed Apr 09 20:07:58 +0200 2008</div>
+  <div class="path">README / Tue Jun 03 16:17:16 +0200 2008</div>
 </div>
 
 <h1>Bivouac</h1>
@@ -130,6 +130,46 @@ href="http://code.whytheluckystiff.net/camping">camping</a>.
 </li>
 </ul>
 <h2>FEATURES/PROBLEMS:</h2>
+<h3>0.2.3:</h3>
+<ul>
+<li>Ruby 1.9&#8230; not yet !
+
+</li>
+<li>Database configuration use YAML
+
+</li>
+<li>Add not_found controller and view
+
+</li>
+<li>Remove :id column definition in migrate.rb
+
+</li>
+<li>Add helper FormView#editable_content from
+
+<pre>
+      http://blog.codahale.com/2006/01/14/a-rails-howto-simplify-in-place-editing-with-scriptaculous/
+      Example at http://bivouac.rubyforge.org/svn/trunk/bivouac/examples/bivouac_sample/
+</pre>
+</li>
+<li>model generator now work with column name and type. Example :
+
+<pre>
+              ruby script/generate model user name:string mail:string
+</pre>
+</li>
+<li>Add Multiple Layouts support (see <a
+href="http://rubyforge.org/pipermail/camping-list/2008-May/000729.html">rubyforge.org/pipermail/camping-list/2008-May/000729.html</a>)
+
+</li>
+<li>Thin is not more the default server (because layouts don&#8216;t work with
+Thin :()
+
+</li>
+<li>Add Cookie session support. Use -S to specify session type (db or cookie -
+default).
+
+</li>
+</ul>
 <h3>0.2.2:</h3>
 <ul>
 <li>Postamble has been completely rewritten. So :

data/doc/rdoc/files/lib/bivouac/helpers/view/goh/form_rb.html

@@ -87,7 +87,7 @@ end</strong>
     <div id="lib/bivouac/helpers/view/goh/form.rb" class="page_shade">
 <div class="page">
 <div class="header">
-  <div class="path">lib/bivouac/helpers/view/goh/form.rb / Wed Sep 12 11:41:16 +0200 2007</div>
+  <div class="path">lib/bivouac/helpers/view/goh/form.rb / Sat Apr 19 08:59:28 +0200 2008</div>
 </div>
 
 <p>

data/doc/rdoc/files/lib/bivouac/helpers/view/goh/javascript_rb.html

@@ -87,7 +87,7 @@ end</strong>
     <div id="lib/bivouac/helpers/view/goh/javascript.rb" class="page_shade">
 <div class="page">
 <div class="header">
-  <div class="path">lib/bivouac/helpers/view/goh/javascript.rb / Wed Sep 12 12:22:52 +0200 2007</div>
+  <div class="path">lib/bivouac/helpers/view/goh/javascript.rb / Fri Apr 18 17:33:31 +0200 2008</div>
 </div>
 
 <p>

data/examples/bivouac_sample/Rakefile

@@ -1,4 +1,11 @@
+#
+#  Project BivouacSample
+#
+#  Created using bivouac on Sat Apr 19 09:06:09 +0200 2008.
+#  Copyright (c) 2008 __My__. All rights reserved.
+#
 require 'rubygems'
+require 'rake/rdoctask'
 require 'camping'
 require 'camping/session'
 require 'bivouac'
@@ -46,3 +53,16 @@ namespace :db do
     end
   end
 end
+
+namespace :plugin do
+  desc "List plugins"
+  task :list do
+    Dir.glob( filePath( __FILE__, 'plugins/**' ) ).each do |p|
+      pn = p.gsub( /.*\//, "" )
+      print "  - #{pn} : "
+      Rake::Task["plugin:#{pn}:desc"].invoke
+    end
+  end
+  
+  Dir.glob( filePath( __FILE__, 'plugins/**/tasks/**.rake' ) ).each { |p| load p }  
+end

data/examples/bivouac_sample/app/bivouac_sample.rb

@@ -3,10 +3,12 @@
 #
 #  Project BivouacSample
 #
-#  Created using bivouac on Sun Mar 23 20:30:13 +0100 2008.
+#  Created using bivouac on Sat Apr 19 09:06:06 +0200 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
+#
 require 'rubygems'
 require 'camping'
 require 'camping/session'
@@ -53,8 +55,14 @@ module BivouacSample::Controllers
       else
         type = (MIME::Types.type_for(file)[0] || '/text/plain').to_s
         @headers['Content-Type'] = type
-        @body = open( File.join( PATH, '..', 'public', file ) )
-        # @headers['X-Sendfile'] = File.join PATH, '..', 'public', file
+        begin
+          @body = open( File.join( PATH, '..', 'public', file ) ).read
+        rescue Errno::ENOENT => e
+          @path = File.join '/public', file
+          @status = '404'
+          @headers['Content-Type'] = "text/html"
+          render :not_found
+        end
       end
     end
   end

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

@@ -0,0 +1,17 @@
+#
+#  Project BivouacSample
+#
+#  Created using bivouac on Fri Apr 18 17:49:46 +0200 2008.
+#  Copyright (c) 2008 __My__. All rights reserved.
+#
+
+module BivouacSample::Controllers
+  class EditInPlace < R '/edit_in_place'
+    def get
+      render :edit_in_place
+    end
+    def post
+      text input.value
+    end
+  end
+end

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

@@ -1,7 +1,17 @@
+#
+#  Project BivouacSample
+#
+#  Created using bivouac on Sat Apr 19 10:36:31 +0200 2008.
+#  Copyright (c) 2008 __My__. All rights reserved.
+#
+
 module BivouacSample::Controllers
   class Index < R '/', '/index'
     def get
-      redirect Public, "index.html"
+      render :index
+    end
+    def post
+      render :index
     end
   end
 end

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

@@ -0,0 +1,16 @@
+#
+#  Project BivouacSample
+#
+#  Created using bivouac on Sat Apr 19 09:06:10 +0200 2008.
+#  Copyright (c) 2008 __My__. All rights reserved.
+#
+
+module BivouacSample::Controllers
+  class NotFound
+    def get( path )
+      @status = 404
+      @path = path
+      render :not_found
+    end
+  end
+end

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

@@ -1,7 +1,7 @@
 #
 #  Project BivouacSample
 #
-#  Created using bivouac on Sun Mar 23 20:30:14 +0100 2008.
+#  Created using bivouac on Sat Apr 19 09:06:07 +0200 2008.
 #  Copyright (c) 2008 __My__. All rights reserved.
 #
 #  DO NOT EDIT THIS FILE OR YOU REALLY KNOW WHAT YOU ARE DOING
@@ -13,7 +13,6 @@ 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 = [
   BivouacHelpers::BaseView,
@@ -22,7 +21,10 @@ helpers = [
   BivouacHelpers::ScriptAculoUsView,
   BivouacHelpers::JavaScriptView, 
   BivouacHelpers::SoundView, 
-  BivouacHelpers::TooltipView
 ] + viewHelperModule
 
 BivouacSample.module_eval "class Mab < Markaby::Builder; include #{helpers.join(', ')}; end"
+
+if controllerHelperModule.size > 0
+  Camping.class_eval "include #{controllerHelperModule.join(', ')}"
+end

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

@@ -0,0 +1,52 @@
+#
+#  Project BivouacSample
+#
+#  Created using bivouac on Fri Apr 18 17:49:47 +0200 2008.
+#  Copyright (c) 2008 __My__. All rights reserved.
+#
+
+module BivouacSample::Views
+  def edit_in_place
+    html do
+      head do
+        javascript_include_tag :defaults
+        stylesheet_link_tag "coderay"
+      end
+      body do
+        table :border => 1 do
+          tr do
+            td "Test this : "
+            td do
+              editable_content(
+                :content => {
+                  :element => 'b',
+                  :text => "Welcome",
+                  :options => {
+                    :id => "test_1",
+                    :class => 'editable-content'
+                  }
+                },
+                :url => R( EditInPlace ),
+                :ajax => {
+                  :okText => "'Ok, change!'",
+                  :cancelText => "'Nevermind'"
+                }
+              ); text " le monde"
+            end
+          end
+          tr do
+            td "Mais pas ça"
+            td "Hop"
+          end
+        end
+
+        hr
+        p { span "Source du controller "; tt "app/controller/edit_in_place.rb" }
+        highlight_file( File.dirname( __FILE__ ) + "/../controllers/edit_in_place.rb", :id => "source0")
+        
+        p { span "Source de la vue "; tt "app/views/edit_in_place.rb" }
+        highlight_file( __FILE__, :id => "source1" )
+      end
+    end
+  end
+end

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

@@ -1,18 +1,28 @@
+#
+#  Project BivouacSample
+#
+#  Created using bivouac on Sat Apr 19 10:36:32 +0200 2008.
+#  Copyright (c) 2008 __My__. All rights reserved.
+#
+
 module BivouacSample::Views
   def index
     html do
+      head do
+        title "bivouac samples"
+      end
       body do
-        h1 "test_suite"
-        
-        a( "toggle", :href => R(Toggle) ); br
-        a( "toggle/sortable", :href => R(ToggleSortable) ); br
-        a( "autocomplete", :href => R(Autocomplete) ); br
-        a( "remote link", :href => R(RemoteLink) ); br
-        a( "submit to remote", :href => R(SubmitRemote) ); br
-        a( "observable", :href => R(Observe) ); br
-        a( "periodically call", :href => R(PeriodicallyCall) ); br
-        a( "remote form", :href => R(RemoteForm) ); br
-        a( "drag and drop", :href => R(DragAndDrop) ); br
+        a "Autocomplete", :href => R(Autocomplete); br
+        a "Drag'n'Drop", :href => R(DragAndDrop); br
+        a "Edit In Place", :href => R(EditInPlace); br
+        a "Observe", :href => R(Observe); br
+        a "Periodically Call", :href => R(PeriodicallyCall); br
+        a "Remote Form", :href => R(RemoteForm); br
+        a "Remote Link", :href => R(RemoteLink); br
+        a "Sound", :href => R(Sound); br
+        a "Submit Remote", :href => R(SubmitRemote); br
+        a "Toggle", :href => R(Toggle); br
+        a "Toggle Sortable", :href => R(ToggleSortable); br
       end
     end
   end

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

@@ -0,0 +1,13 @@
+#
+#  Project BivouacSample
+#
+#  Created using bivouac on Sat Apr 19 09:06:10 +0200 2008.
+#  Copyright (c) 2008 __My__. All rights reserved.
+#
+
+module BivouacSample::Views
+  def not_found
+    h1.header { "BivouacSample::Views#not_found" }
+    p "Sorry baby, #{@path} does nor exist !"
+  end
+end

data/examples/bivouac_sample/config/database.yml

@@ -0,0 +1,3 @@
+--- 
+:database: db/bivouac_sample.db
+:adapter: sqlite3

data/examples/bivouac_sample/config/environment.rb

@@ -1,11 +1,12 @@
 #
 #  Project BivouacSample
 #
-#  Created using bivouac on Sun Mar 23 20:30:12 +0100 2008.
+#  Created using bivouac on Sat Apr 19 09:06:04 +0200 2008.
 #  Copyright (c) 2008 __My__. All rights reserved.
 #
 
 require 'ostruct'
+require 'yaml'
 
 module Bivouac
   class Environment
@@ -21,7 +22,7 @@ module Bivouac
         :port     => 3301,
         
         # Database configuration
-        :db       => {:database=>"db/bivouac_sample.db", :adapter=>"sqlite3"},
+        :db       => open("#{File.dirname( __FILE__ )}/database.yml") {|f| YAML.load(f)},
         
         # Name of the application
         # DO NOT CHANGE IT, OR YOU REALLY KNOW WHAT YOU ARE DOING!

data/examples/bivouac_sample/config/postamble.rb

@@ -1,10 +1,14 @@
 #
 #  Project BivouacSample
 #
-#  Created using bivouac on Sun Mar 23 20:30:13 +0100 2008.
+#  Created using bivouac on Sat Apr 19 09:06:06 +0200 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
+#
 
+## If the app run on Windows, check if win32/process is installed
 windows_process = false
 if /Windows/.match( ENV['OS'] )
   begin
@@ -21,54 +25,103 @@ DIRNAME = File.expand_path( File.dirname(__FILE__) )
 SimpleDaemon::WORKING_DIRECTORY = DIRNAME + "/../log/"
 
 class BivouacSampleDaemon < SimpleDaemon::Base
+  begin
+    begin
+      require 'thin'
+      @@loaded_server = 'thin'
+    rescue LoadError
+      require 'mongrel/camping'
+      @@loaded_server = 'mongrel'
+    end
+  rescue LoadError
+    require 'webrick/httpserver'
+    require 'camping/webrick'
+    @@loaded_server = 'webrick'
+  end
+  
   @@server = nil
-  @@use = nil
+  @@force_use = nil
+  @@server_ip = nil
+  @@server_port = nil
   
   def self.use=(x)
-    @@use=x
+    @@force_use=x
+  end
+  
+  def self.ip=(x)
+    @@server_ip=x
+  end
+  
+  def self.port=(x)
+    @@server_port=x
   end
   
   def self.start
+    ## Load configuration
     config = Bivouac::Environment.new( )
     
+    ## Initialize database connection
     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
+    
+    ## Define log
     BivouacSample::Models::Base.logger = Logger.new(DIRNAME + "/../log/BivouacSample.log")
-    # -- DON'T WORK WITH RAILS 2 -- # BivouacSample::Models::Base.threaded_connections = false
+    
+    ## Migrate database if needed
     BivouacSample.create if BivouacSample.respond_to? :create
     
+    ## Initialize trap
     trap(:INT) do
       stop
     end
     
+    ## Set server to use
+    if @@force_use.nil?
+      @@use_server = @@loaded_server
+    else
+      @@use_server = @@force_use
+    end
+    
+    ## Set ip and port
+    @@server_port = config.environment.port if @@server_port.nil?
+    @@server_ip = config.environment.address if @@server_ip.nil?
+    
     begin
-      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
+      case @@use_server
+      when 'thin'
+        if @@loaded_server != @@use_server
+          require 'thin'
+        end
+        
+        # Rack::Handler::Thin.run Rack::Adapter::Camping.new( BivouacSample ), :Host => @@server_ip, :Port => @@server_port
+        @@server = Thin::Server.new( @@server_ip, @@server_port.to_i, Rack::Adapter::Camping.new( BivouacSample ) )
+        puts "** BivouacSample is running at http://#{@@server_ip}:#{@@server_port}"
+        @@server.start
+      when 'mongrel'
+        if @@loaded_server != @@use_server
           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
         end
+        
+        @@server = Mongrel::Camping.start( @@server_ip, @@server_port, "/", BivouacSample)
+        puts "** BivouacSample is running at http://#{@@server_ip}:#{@@server_port}"
+        @@server.run.join
+      when 'webrick'
+        if @@loaded_server != @@use_server
+          require 'webrick/httpserver'
+          require 'camping/webrick'
+        end
+        
+        @@server = WEBrick::HTTPServer.new :BindAddress => @@server_ip, :Port => @@server_port
+        puts "** BivouacSample is running at http://#{@@server_ip}:#{@@server_port}"
+        @@server.mount "/", WEBrick::CampingHandler, BivouacSample
+        @@server.start
       else
-        raise LoadError, "I want to use WEBrick please!"
+        puts "Don't know how to use server `#{@@use_server}'!"
+        exit 0
       end
-    rescue LoadError => e
-      require 'webrick/httpserver'
-      require 'camping/webrick'
-      
-      @@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
   
@@ -80,16 +133,8 @@ class BivouacSampleDaemon < SimpleDaemon::Base
     end
     @@server = nil
   end
-end
-
-while ARGV.size > 0
-  deamonize = ARGV.shift
-  case deamonize
-  when 'webrick'
-    BivouacSampleDaemon.use='webrick'
-  when '-c'
-    ARGV.clear
-    
+  
+  def self.console
     include BivouacSample::Models
     
     config = Bivouac::Environment.new( )
@@ -106,24 +151,39 @@ while ARGV.size > 0
       ENV['IRBRC'] = ".irbrc"
     end
     IRB.start
+  end
+end
+
+while ARGV.size > 0
+  deamonize = ARGV.shift
+  case deamonize
+  when 'webrick'
+    BivouacSampleDaemon.use='webrick'
+  when 'mongrel'
+    BivouacSampleDaemon.use='mongrel'
+  when 'thin'
+    BivouacSampleDaemon.use='thin'
+  when '-c'
+    ARGV.clear
+    BivouacSampleDaemon.console
+    break
+  when '-h'
+    puts "Usage: server [thin|mongrel|webrick] [option]"
+    puts "  -p port                : Runs Bivouac on the specified port (default 3301)"
+    puts "  -b ip                  : Binds Bivouac to the specified ip (default 0.0.0.0)"
+    puts "  -d start|stop|restart  : Make server run as a Daemon."
     break
+  when '-p'
+    BivouacSampleDaemon.port=ARGV.shift
+  when '-b'
+    BivouacSampleDaemon.ip=ARGV.shift
   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

data/examples/bivouac_sample/script/generate

@@ -1,3 +1,9 @@
 #!/usr/bin/env ruby
 require 'rubygems'
+
+def filePath( from, *data )
+  File.join File.expand_path(File.dirname(from)), data
+end
+
+Dir.glob( filePath( __FILE__, '../plugins/**/generators/*.rb' ) ).each { |p| require p }
 require 'bivouac/commands/generate'

data/examples/bivouac_sample/test/test_edit_in_place.rb

@@ -0,0 +1,22 @@
+#
+#  Project BivouacSample
+#
+#  Created using bivouac on Fri Apr 18 17:49:47 +0200 2008.
+#  Copyright (c) 2008 __My__. All rights reserved.
+#
+
+require 'rubygems'
+require 'mosquito'
+
+ENV['BIVOUAC_ROOT'] = File.expand_path( File.dirname(__FILE__) + "/../" )
+require ENV['BIVOUAC_ROOT'] + "/app/bivouac_sample"
+
+BivouacSample.create if BivouacSample.respond_to? :create
+include BivouacSample::Models
+
+class TestBivouacSample < Camping::FunctionalTest
+  def test_edit_in_place
+    get '/edit_in_place'
+    assert_response :success
+  end
+end

data/examples/bivouac_sample/test/test_index.rb

@@ -0,0 +1,22 @@
+#
+#  Project BivouacSample
+#
+#  Created using bivouac on Sat Apr 19 10:36:32 +0200 2008.
+#  Copyright (c) 2008 __My__. All rights reserved.
+#
+
+require 'rubygems'
+require 'mosquito'
+
+ENV['BIVOUAC_ROOT'] = File.expand_path( File.dirname(__FILE__) + "/../" )
+require ENV['BIVOUAC_ROOT'] + "/app/bivouac_sample"
+
+BivouacSample.create if BivouacSample.respond_to? :create
+include BivouacSample::Models
+
+class TestBivouacSample < Camping::FunctionalTest
+  def test_index
+    get '/index'
+    assert_response :success
+  end
+end