bivouac 0.2.2 → 0.2.3

data/lib/bivouac/commands/generate.rb

@@ -245,8 +245,9 @@ module Bivouac
       else
         model_list = [ model ]
       end
-        
-      model_list.each do |model_name|
+      
+      model_name = model_list.shift
+      #model_list.each do |model_name|
         # Model class name, passed to the template
         @model_class_name = model_name.classify
       
@@ -255,8 +256,8 @@ module Bivouac
           io.puts template( "generate/model", binding )
         end
       
-        migration( model_name )
-      end
+        migration( [model_name] + model_list )
+      #end
     end
     
     def migration( model = nil )
@@ -283,7 +284,7 @@ module Bivouac
         model = @script_arguments
         from_model = false
       else
-        model = [ model ]
+        # model = [ model ]
         from_model = true
       end
       
@@ -313,23 +314,43 @@ module Bivouac
       end
       
       puts "\t* Migration from version #{old_version} to version #{@new_version}" if old_version > 0.0
-      
-      model.each do |model_name|
+     
+      model_name = model.shift
+      # model.each do |model_name|
         # Model class name
         @model_class_name = model_name.classify
         
-        # Model class name
-        @model_table_name = (@app.environment.appname.downcase + "_" + model_name).tableize
-      
         destination_file = File.dirname( $0 ) + "/../db/migrate/" + file_prefix + "_" + model_name.underscore + ".rb"
         createFile( destination_file ) do |io|
           if from_model
-            io.puts template( "generate/migrate", binding )
+            # Model table name
+            @model_table_name = (@app.environment.appname.downcase + "_" + model_name).tableize
+
+            io.puts template( "generate/migrate_begin", binding )
+            
+            model.each do |column|
+              @model_data_name, @model_data_type = column.split( /:/ )
+              io.puts template( "generate/migrate_column", binding )
+            end
+            
+            io.puts template( "generate/migrate_end", binding )
           else
-            io.puts template( "generate/migration", binding )
+            # Model table name
+            @model_table_name = (@app.environment.appname.downcase + "_" + (model_name.underscore.split( /_/ ))[-1]).tableize
+            io.puts template( "generate/migration_begin", binding )
+            model.each do |column|
+              @model_data_name, @model_data_type = column.split( /:/ )
+              io.puts template( "generate/migration_add", binding )
+            end
+            io.puts template( "generate/migration_middle", binding )
+            model.each do |column|
+              @model_data_name, @model_data_type = column.split( /:/ )
+              io.puts template( "generate/migration_remove", binding )
+            end
+            io.puts template( "generate/migration_end", binding )
           end
         end
-      end
+      # end
       
       destination_file = File.dirname( $0 ) + "/../db/create.rb"
       createFile( destination_file, false, false ) do |io|

data/lib/bivouac/commands/generate.rb_OLD

@@ -0,0 +1,342 @@
+#!/usr/bin/env ruby
+# bivouac
+# (c)2007, 2008 Grégoire Lejeune
+
+require 'rubygems'
+require 'optparse'
+require 'ostruct'
+require 'bivouac/template'
+require 'bivouac/utils'
+require 'active_support'
+require 'active_record'
+require 'find'
+require File.dirname($0) + '/../config/environment.rb'
+
+module Bivouac
+  class Generate
+    include Bivouac::Template
+    # Initialize the optionnal generators table
+    add_generator []
+    
+    def initialize( argv )
+      # Generator type (controller, model, migration, view, ...)
+      @generator_type = argv.shift 
+      
+      # Display help if asked
+      if ['-h', '--help'].include?( @generator_type )
+        help
+        exit
+      end
+      
+      # Generator arguments.
+      # Example :
+      #   script/generate controller Hello World
+      # @script_arguments = ['Hello', 'World']
+      @script_arguments = argv.dup
+      
+      # Application environment
+      @app = Bivouac::Environment.new( )
+      
+      # Database configuration
+      @database_configuration = @app.environment.db
+      if @database_configuration[:adapter] =~ /sqlite/
+        @database_configuration[:database] = File.expand_path( File.dirname( $0 ) + "/../" + @database_configuration[:database] )
+      end        
+    end
+    
+    def run
+      # If the générator is not installed, display help and exit
+      unless ( ["controller", "model", "migration", "view", "test"] + @@plugins_generators ).include?( @generator_type )
+        help
+        exit
+      end
+      
+      # Call generator
+      send( @generator_type.to_sym )
+      return
+    end
+    
+    private
+    def help
+      puts "Usage: script/generate generator [options] [args]"
+    	puts ""
+      puts "Generators"
+      puts "  Builtin: controller, model, migration, view, test"
+      puts "  Plugins: " + @@plugins_generators.join(", ") if @@plugins_generators.size > 0
+      puts ""
+    	puts "Commun options:"
+    	puts "    -h, --help                    Show general help message"
+    end
+    
+    def controller
+      # controller generator options
+      controller_options = OpenStruct.new( :noview => false, :notest => false, :default_route => true, :routes => [] )
+      
+      # Controller options
+      argument_options = OptionParser.new do |opts|
+      	opts.banner = ""
+      	opts.separator "controller generator options:"
+      	opts.on("-v", "--no-view", "Do not generate any view for the controller") { |controller_options.noview|
+    	    controller_options.noview = true
+      	}
+      	opts.on("-d", "--no-route", "Do not add the default route to the controller (/controller_name)") { |controller_options.default_route|
+    	    controller_options.default_route = false
+      	}
+      	opts.on("-r", "--route ROUTE,ROUTE,...", "Add ROUTES to the controller") { |routes|
+      	  controller_options.routes = routes.split(',')
+      	}
+        opts.on("-t", "--no-test", "Do not generate any test for the controller") { |controller_options.notest|
+    	    controller_options.notest = true
+      	}
+        
+      	opts.separator ""
+      	opts.on_tail("-h", "--help", "Show this message") do
+      	  help
+      	  puts opts
+      	  exit
+      	end
+      end
+      
+      # parse options
+      argument_options.parse! @script_arguments
+      if @script_arguments.length < 1
+        help
+        puts argument_options
+        exit
+      end
+
+      @script_arguments.each do |controller_name|
+        # Controller class name, passed to the template
+        @controller_class_name = controller_name.classify
+        # File name for the template
+        controller_file_name = @controller_class_name.underscore
+        
+        # Destination file
+        destination_file = File.dirname( $0 ) + "/../app/controllers/" + controller_file_name + ".rb"
+        
+        # Set view name, passed to the template
+        @view_name = @controller_class_name.underscore
+
+        # Set routes, passed to the template
+        default_route = @view_name
+        controller_options.routes << default_route if controller_options.default_route and controller_options.routes.include?( default_route ) == false
+        @controller_routes = if controller_options.routes.size > 0
+          " < R '/" + controller_options.routes.join("', '/") + "'"
+        else
+          ""
+        end
+
+        # Create controller
+        createFile( destination_file ) do |io|
+          io.puts template( "generate/controller", binding )
+        end
+
+        # Create view @view_name
+        view( @view_name ) if controller_options.noview == false
+        
+        # Create test for @view_name with routes controller_options.routes
+        test( @view_name, controller_options.routes ) if controller_options.notest == false
+      end
+    end
+    
+    def view( view_name = nil )
+      if @app.environment.orgtype.downcase == "erb"
+        raise "ERB applications are no longer supported. Sorry!"
+      end
+      
+      # View options
+      argument_options = OptionParser.new do |opts|
+      	opts.banner = ""
+        opts.separator "view generator options:"
+      	opts.on_tail("-h", "--help", "Show this message") do
+      	  help
+      	  puts opts
+      	  exit
+      	end
+      end
+      
+      # parse options if view name is not passed
+      if view_name.nil?
+        argument_options.parse! @script_arguments
+        if @script_arguments.length < 1
+          help
+          puts argument_options
+          exit
+        end
+        
+        view_name = @script_arguments
+      else 
+        view_name = [ view_name ]
+      end
+      
+      view_name.each do |view|
+        # Set view name, passed to the template
+        @view_name = view.underscore
+        
+        # Set destination file, passed to the template
+        @destination_file = File.dirname( $0 ) + "/../app/views/" + @view_name.underscore + ".rb"
+      
+        # Create view file
+        createFile( @destination_file ) do |io|
+          io.puts template( "generate/view_goh", binding )
+        end
+      end
+    end
+    
+    def test( test_name = nil, routes = nil )
+      # Test options
+      argument_options = OptionParser.new do |opts|
+      	opts.banner = ""
+        opts.separator "test generator options:"
+      	opts.on_tail("-h", "--help", "Show this message") do
+      	  help
+      	  puts opts
+      	  exit
+      	end
+      end
+      
+      # parse options if view name is not passed
+      if test_name.nil?
+        argument_options.parse! @script_arguments
+        if @script_arguments.length < 1
+          help
+          puts argument_options
+          exit
+        end
+        
+        test_name = @script_arguments.shift
+        routes = @script_arguments
+      end
+      
+      # Create test file
+      destination_file = File.dirname( $0 ) + "/../test/test_" + test_name.underscore + ".rb"
+      createFile( destination_file ) do |io|
+        io.puts template( "generate/test_begin", binding )
+        
+        routes.each do |@test_route|
+          io.puts template( "generate/test_views", binding )
+        end
+        
+        io.puts template( "generate/test_end", binding )
+      end
+    end
+    
+    def model( model = nil )
+      # Model options
+      argument_options = OptionParser.new do |opts|
+      	opts.banner = ""
+        opts.separator "model generator options:"
+      	opts.on_tail("-h", "--help", "Show this message") do
+      	  help
+      	  puts opts
+      	  exit
+      	end
+      end
+      
+      # parse options
+      if model.nil?
+        argument_options.parse! @script_arguments
+        if @script_arguments.length < 1
+          help
+          puts argument_options
+          exit
+        end
+        model_list = @script_arguments
+      else
+        model_list = [ model ]
+      end
+        
+      model_list.each do |model_name|
+        # Model class name, passed to the template
+        @model_class_name = model_name.classify
+      
+        destination_file = File.dirname( $0 ) + "/../app/models/" + @model_class_name.underscore + ".rb"
+        createFile( destination_file ) do |io|
+          io.puts template( "generate/model", binding )
+        end
+      
+        migration( model_name )
+      end
+    end
+    
+    def migration( model = nil )
+      # Test options
+      argument_options = OptionParser.new do |opts|
+      	opts.banner = ""
+        opts.separator "migration generator options:"
+      	opts.on_tail("-h", "--help", "Show this message") do
+      	  help
+      	  puts opts
+      	  exit
+      	end
+      end
+      
+      # parse options if view name is not passed
+      if model.nil?
+        argument_options.parse! @script_arguments
+        if @script_arguments.length < 1
+          help
+          puts argument_options
+          exit
+        end
+        
+        model = @script_arguments
+        from_model = false
+      else
+        model = [ model ]
+        from_model = true
+      end
+      
+      # Get old and new version
+      old_version = 0.0
+      begin
+        ActiveRecord::Base.establish_connection @database_configuration
+        conn = ActiveRecord::Base.connection
+        table = nil
+        conn.tables.each { |t| table = t if t =~ /_schema_infos$/ }
+        version_info = conn.select_all( "select * from #{table}" )
+        old_version = version_info[0]['version'].to_f
+      rescue
+      end
+      @new_version = old_version + 1
+      
+      # Get prefix for file
+      files = []
+      Find.find( File.dirname( $0 ) + "/../db/migrate/" ) do |f|
+        fn = File.basename( f )
+        files << fn if fn =~ /^\d\d\d/
+      end
+      file_prefix = "001"
+      if files.size > 0
+        files = files.sort {|x,y| y[0,3] <=> x[0,3]}
+        file_prefix = sprintf( "%03d", (files[0][0,3].to_i + 1) )
+      end
+      
+      puts "\t* Migration from version #{old_version} to version #{@new_version}" if old_version > 0.0
+      
+      model.each do |model_name|
+        # Model class name
+        @model_class_name = model_name.classify
+        
+        # Model class name
+        @model_table_name = (@app.environment.appname.downcase + "_" + model_name).tableize
+      
+        destination_file = File.dirname( $0 ) + "/../db/migrate/" + file_prefix + "_" + model_name.underscore + ".rb"
+        createFile( destination_file ) do |io|
+          if from_model
+            io.puts template( "generate/migrate", binding )
+          else
+            io.puts template( "generate/migration", binding )
+          end
+        end
+      end
+      
+      destination_file = File.dirname( $0 ) + "/../db/create.rb"
+      createFile( destination_file, false, false ) do |io|
+        io.puts template( "generate/create", binding )
+      end
+    end
+  end
+end
+
+Bivouac::Generate.new( ARGV ).run( )

data/lib/bivouac/helpers/view/goh/form.rb

@@ -16,17 +16,41 @@ module BivouacHelpers
       javascript_tag "new Ajax.Autocompleter( '#{field_id}', '#{choises_id}', '#{url}', #{options_for_javascript(options)} );"
     end
     
+    # http://blog.codahale.com/2006/01/14/a-rails-howto-simplify-in-place-editing-with-scriptaculous/
+    def editable_content(options)
+       options[:content] = { :element => 'span' }.merge(options[:content])
+       # options[:url] = {}.merge(options[:url])
+       options[:ajax] = { :okText => "'Save'", :cancelText => "'Cancel'"}.merge(options[:ajax] || {})
+       script = Array.new
+       script << "new Ajax.InPlaceEditor("
+       script << "  '#{options[:content][:options][:id]}',"
+       script << "  '#{options[:url]}',"
+       script << "  {"
+       script << options[:ajax].map{ |key, value| "#{key.to_s}: #{value}" }.join(", ")
+       script << "  }"
+       script << ")"
+
+       send(
+         options[:content][:element],
+         options[:content][:text],
+         options[:content][:options]
+       )
+       
+       javascript_tag( script.join("\n") )
+     end
+     
+     
     # Autocomplete options :
     # 
-    # +:url+:                 URL to call for autocompletion results
-    # +:tokens+:              
-    # +:frequency+:
-    # +:minChars+:
-    # +:indicator+:           When sending the Ajax request Autocompleter shows this
-    # +:updateElement+:       Hook for a custom function called after the element has been updated (i.e. when the user has selected an entry). 
-    # +:afterUpdateElement+:  Hook for a custom function called after the element has been updated (i.e. when the user has selected an entry).
-    # +:callback+:            This function is called just before the Request is actually made, allowing you to modify the querystring that is sent to the server.
-    # +:parameters+:          If you need to send any additional parameters through your search form, add them here, in the usual {field: 'value',another: 'value'} or 'field=value&another=value' manner.
+    #   :url :                 URL to call for autocompletion results
+    #   :tokens:              
+    #   :frequency :
+    #   :minChars :
+    #   :indicator :           When sending the Ajax request Autocompleter shows this
+    #   :updateElement :       Hook for a custom function called after the element has been updated (i.e. when the user has selected an entry). 
+    #   :afterUpdateElement :  Hook for a custom function called after the element has been updated (i.e. when the user has selected an entry).
+    #   :callback :            This function is called just before the Request is actually made, allowing you to modify the querystring that is sent to the server.
+    #   :parameters :          If you need to send any additional parameters through your search form, add them here, in the usual {field: 'value',another: 'value'} or 'field=value&another=value' manner.
     def text_field(field_name, value = "", options = {})
       autocomplete_options = nil
       

data/lib/bivouac/helpers/view/goh/javascript.rb

@@ -218,7 +218,7 @@ module BivouacHelpers
     def javascript_tag( content, options = {} )
       options[:type] = "text/javascript"
       script( options ) do
-        "//<![CDATA[\n" + content + "\n//]]>"
+        "//<![CDATA[\n" + content + "\n//]]>\n"
       end
     end
     

data/lib/bivouac/template/application/postamble.rb

@@ -27,11 +27,11 @@ SimpleDaemon::WORKING_DIRECTORY = DIRNAME + "/../log/"
 class <%= @conf.appname %>Daemon < SimpleDaemon::Base
   begin
     begin
-      require 'thin'
-      @@loaded_server = 'thin'
-    rescue LoadError
       require 'mongrel/camping'
       @@loaded_server = 'mongrel'
+    rescue LoadError
+      require 'thin'
+      @@loaded_server = 'thin'      
     end
   rescue LoadError
     require 'webrick/httpserver'

data/lib/bivouac/template/application_goh.rb

@@ -11,10 +11,22 @@
 #
 require 'rubygems'
 require 'camping'
-require 'camping/session'
 require 'mime/types'
 require 'bivouac'
 
+<% if @conf.session == :db %>
+require 'camping/session'
+module <%= @conf.appname %>
+  include Camping::Session
+end
+<% else %>
+require 'cookies_sessions'
+module <%= @conf.appname %>
+  include Camping::CookieSessions
+  @@state_secret = "You want a really really long string of rubbish nobody could ever ever guess! Don't tell anyone! Not even your girlfriend or dog!"
+end
+<% end %>
+
 include Bivouac
 
 # Load libs
@@ -55,8 +67,14 @@ module <%= @conf.appname %>::Controllers
       else
         type = (MIME::Types.type_for(file)[0] || '/text/plain').to_s
         @headers['Content-Type'] = type
-        @body = open( File.join( PATH, '..', 'public', file ) ).read
-        # @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/lib/bivouac/template/environment.rb

@@ -6,6 +6,7 @@
 #
 
 require 'ostruct'
+require 'yaml'
 
 module Bivouac
   class Environment
@@ -21,7 +22,7 @@ module Bivouac
         :port     => <%= @conf.port %>,
         
         # Database configuration
-        :db       => <%= @conf.db %>,
+        :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!
@@ -33,7 +34,11 @@ module Bivouac
 
         # Organisation type of the application
         # DO NOT CHANGE IT, OR YOU REALLY KNOW WHAT YOU ARE DOING!
-        :orgtype  => "<%= @conf.orgtype %>"
+        :orgtype  => "<%= @conf.orgtype %>",
+        
+        # Session type  
+        # DO NOT CHANGE IT, OR YOU REALLY KNOW WHAT YOU ARE DOING!
+        :session_type  => "<%= @conf.session %>"
       )
     end
   end

data/lib/bivouac/template/generate/create.rb

@@ -5,11 +5,9 @@
 #  Copyright (c) <%= Time.now.year %> __My__. All rights reserved.
 #
 
-module <%= @app.environment.appname %>
-  include Camping::Session
-end
-
 def <%= @app.environment.appname %>.create
-  Camping::Models::Session.create_schema
+  <% if @app.environment.session_type == :db %>
+    Camping::Models::Session.create_schema
+  <% end %>
   <%= @app.environment.appname %>::Models.create_schema 
 end

data/lib/bivouac/template/generate/migrate.rb

@@ -9,8 +9,7 @@ module <%= @app.environment.appname %>::Models
   class Create<%= @model_class_name %> < V <%= @new_version %>
     def self.up
       create_table :<%= @model_table_name %> do |t|
-        t.column :id, :integer, :null => false
-        # ...
+        
       end
     end
     

data/lib/bivouac/template/generate/migrate_begin.rb

@@ -0,0 +1,11 @@
+#
+#  Project <%= @app.environment.appname %>
+#
+#  Created using bivouac on <%= Time.now %>.
+#  Copyright (c) <%= Time.now.year %> __My__. All rights reserved.
+#
+
+module <%= @app.environment.appname %>::Models
+  class Create<%= @model_class_name %> < V <%= @new_version %>
+    def self.up
+      create_table :<%= @model_table_name %> do |t|

data/lib/bivouac/template/generate/migrate_column.rb

@@ -0,0 +1 @@
+        t.<%= @model_data_type %> :<%= @model_data_name %>

data/lib/bivouac/template/generate/migrate_end.rb

@@ -0,0 +1,8 @@
+      end
+    end
+    
+    def self.down
+      drop_table :<%= @model_table_name %>
+    end
+  end
+end

data/lib/bivouac/template/generate/migration_add.rb

@@ -0,0 +1 @@
+      add_column :<%= @model_table_name %>, :<%= @model_data_name %>, :<%= @model_data_type %>

data/lib/bivouac/template/generate/migration_begin.rb

@@ -0,0 +1,10 @@
+#
+#  Project <%= @app.environment.appname %>
+#
+#  Created using bivouac on <%= Time.now %>.
+#  Copyright (c) <%= Time.now.year %> __My__. All rights reserved.
+#
+
+module <%= @app.environment.appname %>::Models
+  class <%= @model_class_name %> < V <%= @new_version %>
+    def self.up

data/lib/bivouac/template/generate/migration_end.rb

@@ -0,0 +1,3 @@
+    end
+  end
+end

data/lib/bivouac/template/generate/migration_middle.rb

@@ -0,0 +1,3 @@
+    end
+
+    def self.down

data/lib/bivouac/template/generate/migration_remove.rb

@@ -0,0 +1 @@
+      remove_column :<%= @model_table_name %>, :<%= @model_data_name %>