bivouac 0.3.0 → 0.4.0

data/lib/bivouac.rb

@@ -30,11 +30,11 @@ module Bivouac
   end
 
   def addControllerHelperModule( m )
-    @@_plugins_view_helpers << m
+    @@_plugins_controller_helpers << m
   end
   
   def controllerHelperModule
-    @@_plugins_view_helpers
+    @@_plugins_controller_helpers
   end
   
   def filePath( from, *data )

data/lib/bivouac/commands/generate.rb

@@ -47,7 +47,7 @@ module Bivouac
     
     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 )
+      unless ( ["controller", "model", "migration", "view", "test", "helper"] + @@plugins_generators ).include?( @generator_type )
         help
         exit
       end
@@ -62,7 +62,7 @@ module Bivouac
       puts "Usage: script/generate generator [options] [args]"
     	puts ""
       puts "Generators"
-      puts "  Builtin: controller, model, migration, test"
+      puts "  Builtin: controller, view, helper, model, migration, test"
       puts "  Plugins: " + @@plugins_generators.join(", ") if @@plugins_generators.size > 0
       puts ""
     	puts "Commun options:"
@@ -168,11 +168,7 @@ module Bivouac
       end
     end
     
-    # DEPRECATED
     def view( view_name = nil )
-      warn "View generator is deprecated."
-      return
-      
       if @app.environment.orgtype.downcase == "erb"
         raise "ERB applications are no longer supported. Sorry!"
       end
@@ -207,11 +203,55 @@ module Bivouac
         @view_name = view.underscore
         
         # Set destination file, passed to the template
-        @destination_file = File.dirname( $0 ) + "/../app/views/" + @view_name.underscore + ".rb"
+        @view_file = File.dirname( $0 ) + "/../app/views/" + @view_name.underscore + ".rb"
       
         # Create view file
+        createFile( @view_file ) do |io|
+          io.puts template( "generate/view", binding )
+        end
+      end
+    end
+
+    def helper( helper_name = nil )
+      if @app.environment.orgtype.downcase == "erb"
+        raise "ERB applications are no longer supported. Sorry!"
+      end
+      
+      # Helper options
+      argument_options = OptionParser.new do |opts|
+      	opts.banner = ""
+        opts.separator "helper 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 helper_name.nil?
+        argument_options.parse! @script_arguments
+        if @script_arguments.length < 1
+          help
+          puts argument_options
+          exit
+        end
+        
+        helper_name = @script_arguments
+      else 
+        helper_name = [ view_name ]
+      end
+      
+      helper_name.each do |helper|
+        # Set helper name, passed to the template
+        @helper_name = helper.underscore
+        
+        # Set destination file, passed to the template
+        @destination_file = File.dirname( $0 ) + "/../app/helpers/" + @helper_name.underscore + ".rb"
+      
+        # Create helper file
         createFile( @destination_file ) do |io|
-          io.puts template( "generate/view_goh", binding )
+          io.puts template( "generate/helper", binding )
         end
       end
     end

data/lib/bivouac/commands/plugin.rb

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'bivouac/template'
 require 'fileutils'
 require 'open-uri'
-require File.dirname($0) + '/../config/environment.rb'
+require 'open3'
 
 BASE_URL = "http://bivouac.rubyforge.org/svn/trunk/plugins/"
 
@@ -19,7 +19,7 @@ module Bivouac
       #   script/plugin install roo_s_tent will_paginate
       # @script_arguments = ['roo_s_tent', 'will_paginate']
       @script_arguments = argv.dup
-      
+            
       # Application environment
       @app = Bivouac::Environment.new( )
       
@@ -29,8 +29,8 @@ module Bivouac
     def run
       begin
         send( @command.to_sym  )
-      rescue
-        send( :help )
+      rescue => e
+        send :help
       end
     end
     
@@ -51,18 +51,32 @@ module Bivouac
     def install(desc = false)
       return "Install plugin" if desc
  
-      FileUtils::cd( File.dirname($0) + '/../plugins' )
-      
-      r = system "svn", "co", "#{BASE_URL}#{@script_arguments}"
-      if r == false
-        get_with_http( BASE_URL, @script_arguments )
+      @script_arguments.each do |plugin|
+        FileUtils::cd( ENV['BIVOUAC_ROOT'] + '/plugins' )
+        
+        r = true
+        begin
+          # r = system "svn", "co", "#{BASE_URL}#{plugin}"
+          cmdin, cmdout, cmderr = Open3.popen3( "svn co #{BASE_URL}#{plugin}" )
+          if cmderr.read.size > 0
+            r = false
+          else
+            puts cmdout.read
+          end
+        rescue => e
+          r = false
+        end
+        
+        if r == false
+          get_with_http( BASE_URL, plugin )
+        end
       end
     end
     
     def list(desc = false)
       return "List available plugins" if desc
       
-      plugins_path = File.dirname($0) + "/../plugins/"
+      plugins_path = ENV['BIVOUAC_ROOT'] + "/plugins/"
       installed_plugins = Dir.glob( plugins_path + "*" ).map { |p| p.gsub!( plugins_path, "" ) }
 
       open(BASE_URL).read.each do |l|
@@ -77,9 +91,12 @@ module Bivouac
 
     private 
     def get_with_http( root, dir_name )
-      FileUtils::mkdir( dir_name )
+      begin
+        FileUtils::mkdir( dir_name )
+      rescue Errno::EEXIST
+      end
       FileUtils::cd( dir_name )
-
+      
       open( root + dir_name ).read.each do |l|
         if m = /<li><a href="([^"]*)">(\1)<\/a><\/li>/.match( l )
           file_name = m[1]
@@ -99,6 +116,4 @@ module Bivouac
       FileUtils::cd( ".." )
     end
   end
-end
-
-Bivouac::Plugin.new( ARGV ).run( )
+end

data/lib/bivouac/ext/filtering_camping.rb

@@ -0,0 +1,46 @@
+# Magnus Holm
+# See http://github.com/judofyr/filtering_camping/tree/master
+
+module CampingFilters
+  module ClassMethods
+    def filters
+      @filters ||= {:before => [], :after => []}
+    end
+    
+    def before(actions, &blk)
+      actions = [actions] unless actions.is_a?(Array)
+      actions.each do |action|
+        filters[:before] << [action, blk]
+      end
+    end
+    
+    def after(actions, &blk)
+      actions = [actions] unless actions.is_a?(Array)
+      actions.each do |action|
+        filters[:after] << [action, blk]
+      end
+    end
+  end
+  
+  def self.included(mod)
+    mod.extend(ClassMethods)
+  end
+  
+  def run_filters(type)
+    o = self.class.to_s.split("::")
+    filters = Object.const_get(o.first).filters
+    filters[type].each do |filter|
+      if (filter[0].is_a?(Symbol) && (filter[0] == o.last.to_sym || filter[0] == :all)) ||
+         (filter[0].is_a?(String) && /^#{filter[0]}\/?$/ =~ @env.REQUEST_URI)
+         self.instance_eval(&filter[1])
+      end
+    end
+  end
+  
+  def service(*a)
+    run_filters(:before)
+    ret = super(*a)
+    run_filters(:after)
+    self
+  end
+end

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

@@ -43,6 +43,7 @@ module BivouacHelpers
     def javascript_include_tag( *sources )
       options = sources.last.is_a?(Hash) ? sources.pop : { }
       options[:type] = "text/javascript"
+      ie_only = options.delete( :ieOnly ) || []
       
       if sources.include?(:defaults) 
         sources = sources[0..(sources.index(:defaults))] + 
@@ -57,6 +58,14 @@ module BivouacHelpers
         options[:src] = "/public/javascripts/#{file}"
         script( options ) {}
       end
+      ie_only.collect do |file|
+        file = file.to_s
+        file << ".js" if File.extname(file).blank?
+        options[:src] = "/public/javascripts/#{file}"
+        text "<!--[if IE]>"
+        script( options ) {}
+        text "<![endif]-->"
+      end
     end
     
     # Returns an html image tag for the +source+. The +source+ must be a file 

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

@@ -34,16 +34,20 @@ module BivouacHelpers
     # If you wan't to use +onChange+ and/or +onUpdate+ you can pass a javascript string
     # or a Hash, if you want to call a remote function.
     #
+    # Important: For this to work, the elements contained in your Sortable must have id 
+    # attributes in the following form:
+    #   id="string_identifier"
+    #
     # Example:
     #   ul( :id => 'my_list' ) do
-    #     li "Google"
-    #     li "Yahoo"
-    #     li "Accoona"
-    #     li "Ask.com"
-    #     li "Baidu"
-    #     li "Exalead"
-    #     li "Voila"
-    #     li "Lycos"
+    #     li "Google", :id => "crawler_1"
+    #     li "Yahoo", :id => "crawler_2"
+    #     li "Accoona", :id => "crawler_3"
+    #     li "Ask.com", :id => "crawler_4"
+    #     li "Baidu", :id => "crawler_5"
+    #     li "Exalead", :id => "crawler_6"
+    #     li "Voila", :id => "crawler_7"
+    #     li "Lycos", :id => "crawler_8"
     #   end
     #   sortable_element( 'my_list', 
     #     :onChange => { 

data/lib/bivouac/tasks/bivouac.rb

@@ -22,6 +22,7 @@ config = Bivouac::Environment.new( )
 @conf = config.environment
 @conf.versions = @app_versions
 @conf.session = config.environment.session_type if config.environment.session_type
+@conf.host ||= @conf.address
 
 def update_version( opts )
   @conf.versions << opts

data/lib/bivouac/tasks/framework.rake

@@ -76,7 +76,7 @@ namespace :bivouac do
       end
     end
     
-    desc "Update app/#{@conf.appfile}.rb, config/postamble.rb and helpers/_helpers.rb"
+    desc "Update app/#{@conf.appfile}.rb, helpers/_helpers.rb and controllers/not_found.rb"
     task :app => [ "do_app", "configs" ]
     task :do_app do
       if @app_versions[:app] != BIVOUAC_VERSION or ["true", "1"].include?(ENV['FORCE'])
@@ -84,19 +84,19 @@ namespace :bivouac do
         @conf.versions << { :app => BIVOUAC_VERSION }
         @force = true
         
-        # Create Application Postamble file
-        createFile( "config/postamble.rb", false, true ) { |io|
-          io.puts template( "application/postamble" )
-        }
-
         # Create Application file
         createFile( "app/#{@conf.appfile}.rb", false, true ) { |io|
-          io.puts template( "application_#{@conf.orgtype.downcase}" ) 
+          io.puts template( "application" ) 
         }
 
         # Create Application Helpers Loader file
         createFile( "app/helpers/_helpers.rb", false, true ) { |io|
-          io.puts template( "application/helpers_#{@conf.orgtype.downcase}" )
+          io.puts template( "application/helpers" )
+        }
+        
+        # Create not_found controller
+        createFile( "app/controllers/not_found.rb" ) { |io|
+          io.puts template( "static/not_found_controller" )
         }
       end
     end

data/lib/bivouac/tasks/plugins.rake

@@ -1,10 +1,26 @@
+require 'bivouac/commands/plugin'
+
 namespace :plugin do
   desc "List installed plugins"
   task :list do
     Dir.glob( BIVOUAC_ROOT + '/plugins/**' ).each do |p|
       pn = p.gsub( /.*\//, "" )
-      print "  - #{pn} : "
+      puts "#{pn} : "
       Rake::Task["plugin:#{pn}:desc"].invoke
+      puts
+    end
+  end
+  
+  desc "Update installed plugins"
+  task :update do
+    Dir.glob( BIVOUAC_ROOT + '/plugins/**' ).each do |p|
+      pn = p.gsub( /.*\//, "" )
+      puts "** Update plugin #{pn}"
+      Bivouac::Plugin.new( ['install', pn] ).run( )
+      begin
+        Rake::Task["plugin:#{pn}:install"].invoke
+      rescue
+      end
     end
   end
   

data/lib/bivouac/template/{application_goh.rb → application.rb}

@@ -10,22 +10,30 @@
 #  USE script/generate helper my_helper
 #
 require 'rubygems'
+
 require 'camping'
+require 'camping/ar'
+require 'markaby'
+
 require 'mime/types'
+
 require 'bivouac'
-require 'bivouac/filter'
+require 'bivouac/ext/filtering_camping'
+# require 'bivouac/filter'
 
 <% if @conf.session == :db %>
-require 'camping/session'
+require 'camping/ar/session'
 module <%= @conf.appname %>
-  include Bivouac::Filters
-  include Camping::Session
+#  include Bivouac::Filters
+  include CampingFilters
+  include Camping::ARSession
 end
 <% else %>
-require 'camping/cookies_sessions'
+require 'camping/session'
 module <%= @conf.appname %>
-  include Bivouac::Filters
-  include Camping::CookieSessions
+#  include Bivouac::Filters
+  include CampingFilters
+  include Camping::Session
   @@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 %>
@@ -89,10 +97,31 @@ end
 # If you don't want to use layout add 
 #   layout :none
 # in your controller
+# 
+# use xml|json|js|<none> render :view to render as xml, json, js or html
 module <%= @conf.appname %>::Helpers
   def layout( l )
     @layout = l
   end
+  
+  def xml( r )
+    layout :none
+    @headers['Content-Type'] = 'application/xml'
+    r
+  end
+  
+  def json( r )
+    layout :none
+    @headers['Content-Type'] = 'text/x-json'
+    r
+  end
+  
+  def js( r )
+    layout :none
+    @headers['Content-Type'] = 'text/javascript'
+    r
+  end
+  
 end
 module <%= @conf.appname %>::Views
   def layout
@@ -104,8 +133,3 @@ module <%= @conf.appname %>::Views
     end
   end
 end
-
-# Load postamble and configuration
-if __FILE__ == $0
-  files( '../config' ) { |file| require( file ) }
-end

data/lib/bivouac/template/application/{helpers_goh.rb → helpers.rb}

@@ -26,5 +26,5 @@ helpers = [
 <%= @conf.appname %>.module_eval "class Mab < Markaby::Builder; include #{helpers.join(', ')}; end"
 
 if controllerHelperModule.size > 0
-  Camping.class_eval "include #{controllerHelperModule.join(', ')}"
+  <%= @conf.appname %>.class_eval "include #{controllerHelperModule.join(', ')}"
 end