camping 1.4.2 → 1.5

data/CHANGELOG

@@ -1,8 +1,51 @@
+= 1.5
+=== 3rd Oct, 2006
+
+* Camping::Apps stores an array of classes for all loaded apps. 
+* bin/camping can be given a directory. Like: <tt>camping examples/</tt>
+* Console mode -- thank zimbatm. Use: camping -C yourapp.rb 
+* Call controllers with Camping.method_missing.
+
+    Tepee.get(:Index) #=> (Response)
+    Blog.post(:Delete, id) #=> (Response) 
+
+    Blog.post(:Login, :input => {'username' => 'admin', 'password' => 'camping'}) 
+      #=> #<Blog::Controllers::Login @user=... > 
+
+    Blog.get(:Info, :env => {:HTTP_HOST => 'wagon'}) 
+      #=> #<Blog::Controllers::Info @env={'HTTP_HOST'=>'wagon'} ...> 
+
+* Using \r\n instead of \n on output. FastCGI has these needs. 
+* ActiveRecord no longer required or installed. 
+* If you refer to Models::Base, however, ActiveRecord will be loaded with autoload. (see lib/camping/db.rb) 
+* new Camping::FastCGI.serve which will serve a whole directory of apps
+  (see http://code.whytheluckystiff.net/camping/wiki/TheCampingServer) 
+* ~/.campingrc can contain database connection info if you want your default to be something other than SQLite. 
+
+    database: 
+      adapter: mysql 
+      username: camping 
+      socket: /tmp/mysql.sock 
+      password: NOFORESTFIRES 
+      database: camping 
+
+* controllers are now *ordered*. uses the inherited hook to keep track of all 
+  classes created with R. those classes are scanned, in order, when a request is 
+  made. any other controllers are handled first. so if you plan on overriding the 
+  urls method, be sure to subclass from R(). 
+* Console mode will load .irbrc in the working directory, if present. 
+  (for example, in my ~/git/balloon directory, i have this in the .irbrc: 
+  include Balloon::Models 
+  when camping -C balloon.rb gets run, the models all get included in main.) 
+* And, of course, many other bugfixes from myself and the loyal+kind zimbatm...
+* Markaby updated to 0.5. (See its CHANGELOG.)
+
 = 1.4.2
-=== 10th May, 2006
+=== 18th May, 2006
 
 * Efficient file uploads for multipart/form-data POSTs.
 * Camping tool now uses Mongrel, if available.  If not, sticks with WEBrick.
+* Multiple apps can be loaded with the camping tool, each mounted according to their file name.
 
 = 1.4.1
 === 3rd May, 2006

data/README

@@ -47,13 +47,6 @@ A skeletal Camping blog could look like this:
     end
   end
 
-  if __FILE__ == $0
-    Blog::Models::Base.establish_connection :adapter => 'sqlite3', 
-        :database => 'blog3.db'
-    Blog::Models::Base.logger = Logger.new('camping.log')
-    puts Blog.run
-  end
-
 Some things you might have noticed:
 
 * Camping::Models uses ActiveRecord to do its work.  We love ActiveRecord!
@@ -100,9 +93,9 @@ If you run them from the commandline, you'll probably just see a pile of HTML.
 Camping comes with an tool for launching apps from the commandline:
 
 * Run: <tt>camping blog.rb</tt>
-* Visit http://localhost:3301/ to use the app.
+* Visit http://localhost:3301/blog/ to use the app.
 
-== Debugging Camping Apps
+== How the Camping Tool Works
 
 If your application isn't working with the <tt>camping</tt> tool, keep in mind
 that the tool expects the following conventions to be used:
@@ -111,7 +104,7 @@ that the tool expects the following conventions to be used:
    http://code.whytheluckystiff.net/camping/wiki/BeAlertWhenOnSqlite3 for instructions.)
 2. If your script is called <tt>test.rb</tt>, Camping expects your application to
    be stored in a module called <tt>Test</tt>.  Case is not imporant, though.  The
-   module can be called <tt>TeSt</tt> or any other permuation.
+   module can be called <tt>TeSt</tt> or any other permutation.
 3. Your script's postamble (anything enclosed in <tt>if __FILE__ == $0</tt>) will be
    ignored by the tool, since the tool will create an SQLite3 database at 
    <tt>~/.camping.db</tt>.  Or, on Windows, <tt>$USER/Application Data/Camping.db</tt>.
@@ -120,7 +113,7 @@ that the tool expects the following conventions to be used:
 
 == The Rules of Thumb
 
-Once you've started writing your own Camping app, I'd highly recommend becoming familiar
+Once you've started writing your own Camping app, I'd highly recommend that you become familiar
 with the Camping Rules of Thumb which are listed on the wiki: 
 http://code.whytheluckystiff.net/camping/wiki/CampingRulesOfThumb
 

data/Rakefile

@@ -6,10 +6,10 @@ require 'fileutils'
 include FileUtils
 
 NAME = "camping"
-VERS = "1.4.2"
+REV = File.read(".svn/entries")[/committed-rev="(\d+)"/, 1] rescue nil
+VERS = ENV['VERSION'] || ("1.5" + (REV ? ".#{REV}" : ""))
 CLEAN.include ['**/.*.sw?', '*.gem', '.config']
 RDOC_OPTS = ['--quiet', '--title', "Camping, the Documentation",
-    "--template", "extras/flipbook_rdoc.rb",
     "--opname", "index.html",
     "--line-numbers", 
     "--main", "README",
@@ -27,20 +27,20 @@ task :before_doc do
 end
 
 Rake::RDocTask.new do |rdoc|
-    rdoc.rdoc_dir = 'doc'
+    rdoc.rdoc_dir = 'doc/rdoc'
     rdoc.options += RDOC_OPTS
     rdoc.template = "extras/flipbook_rdoc.rb"
     rdoc.main = "README"
     rdoc.title = "Camping, the Documentation"
-    rdoc.rdoc_files.add ['README', 'CHANGELOG', 'COPYING', 'lib/camping.rb']
+    rdoc.rdoc_files.add ['README', 'CHANGELOG', 'COPYING', 'lib/camping.rb', 'lib/camping/*.rb']
 end
 
 task :after_doc do
     mv "lib/camping.rb", "lib/camping-unabridged.rb"
     mv "lib/camping-mural.rb", "lib/camping.rb"
-    cp "extras/Camping.gif", "doc/"
-    cp "extras/permalink.gif", "doc/"
-    sh %{scp -r doc/* #{ENV['USER']}@rubyforge.org:/var/www/gforge-projects/camping/}
+    cp "extras/Camping.gif", "doc/rdoc/"
+    cp "extras/permalink.gif", "doc/rdoc/"
+    sh %{scp -r doc/rdoc/* #{ENV['USER']}@rubyforge.org:/var/www/gforge-projects/camping/}
 end
 
 spec =
@@ -58,13 +58,13 @@ spec =
         s.homepage = 'http://code.whytheluckystiff.net/camping/'
         s.executables = ['camping']
 
-        s.add_dependency('activerecord', '>=1.14.2')
-        s.add_dependency('markaby', '>=0.4')
+        s.add_dependency('activesupport', '>=1.3.1')
+        s.add_dependency('markaby', '>=0.5')
         s.add_dependency('metaid')
         s.required_ruby_version = '>= 1.8.2'
 
         s.files = %w(COPYING README Rakefile) +
-          Dir.glob("{bin,doc/rdoc,test,lib,extras}/**/*") + 
+          Dir.glob("{bin,doc,test,lib,extras}/**/*") + 
           Dir.glob("ext/**/*.{h,c,rb}") +
           Dir.glob("examples/**/*.rb") +
           Dir.glob("tools/*.rb")

data/bin/camping

@@ -1,60 +1,58 @@
 #!/usr/bin/env ruby
 
-# this line prevents other db adapters from being loaded (oci8 was
-# causing some pain.)
-unless Object.const_defined? :RAILS_CONNECTION_ADAPTERS
-    RAILS_CONNECTION_ADAPTERS = []
-end
-RAILS_CONNECTION_ADAPTERS.replace %w[sqlite]
-
 require 'delegate'
 require 'optparse'
+require 'ostruct'
+
 require 'stringio'
-require 'rubygems'
 require 'camping'
+require 'camping/reloader'
+require 'yaml'
 
-host = '0.0.0.0'
-port = 3301
+conf = OpenStruct.new(:host => '0.0.0.0', :port => 3301)
 
-db = nil
-homes = []
-homes << File.join( ENV['HOME'], '.camping.db' ) if ENV['HOME']
-homes << File.join( ENV['APPDATA'], 'Camping.db' ) if ENV['APPDATA']
-homes.each do |db|
-    break if File.exists?( db )
+# Setup paths
+if home = ENV['HOME'] # POSIX
+  conf.db = File.join(home, '.camping.db')
+  conf.rc = File.join(home, '.campingrc')
+elsif home = ENV['APPDATA'] # MSWIN
+  conf.db = File.join(home, 'Camping.db')
+  conf.rc = File.join(home, 'Campingrc')
 end
 
+# Load configuration if any
+if conf.rc and File.exists?( conf.rc )
+  YAML.load_file(conf.rc).each do |k,v|
+    conf.send("#{k}=", v)
+  end 
+end
 
+# Parse options
 opts = OptionParser.new do |opts|
     opts.banner = "Usage: camping app1.rb, app2.rb..."
     opts.define_head "#{File.basename($0)}, the microframework ON-button for ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
     opts.separator ""
     opts.separator "Specific options:"
 
-    opts.on("-h", "--host HOSTNAME", "Host for web server to bind to (default is all IPs)") do |h|
-        host = h
-    end
-
-    opts.on("-p", "--port NUM", "Port for web server (defaults to #{port})") do |p|
-        port = p
-    end
-
-    opts.on("-d", "--database FILE", "Database file (defaults to #{db})") do |d|
-        db = d
-    end
+    opts.on("-h", "--host HOSTNAME", "Host for web server to bind to (default is all IPs)") { |conf.host| }
+    opts.on("-p", "--port NUM", "Port for web server (defaults to #{conf.port})") { |conf.port| }
+    opts.on("-d", "--database FILE", "Database file (defaults to #{conf.db})") { |conf.db| }
+    opts.on("-l", "--log FILE", "Start a database log ('-' for STDOUT)") { |conf.log| }
+    opts.on("-C", "--console", "Run in console mode with IRB") { conf.server = :console }
+    opts.on("-s", "--server NAME", "Server to force (mongrel, webrick, console)") { |s| conf.server = s.to_sym }
 
     opts.separator ""
     opts.separator "Common options:"
   
     # No argument, shows at tail.  This will print an options summary.
     # Try it and see!
-    opts.on_tail("-h", "--help", "Show this message") do
+    opts.on_tail("-?", "--help", "Show this message") do
         puts opts
         exit
     end
   
     # Another typical switch to print the version.
-    opts.on_tail("--version", "Show version") do
+    opts.on_tail("-v", "--version", "Show version") do
         class << Gem; attr_accessor :loaded_specs; end
         puts Gem.loaded_specs['camping'].version
         exit
@@ -67,63 +65,47 @@ if ARGV.length < 1
     exit
 end
 
-Camping::Models::Base.establish_connection :adapter => 'sqlite3', :database => db
-
-class CampingReloader
-    attr_accessor :klass, :mtime, :mount
+# Default database
+unless conf.database
+  unless conf.db
+    puts "!! No home directory found.  Please specify a database file, see --help."; exit
+  end
+  conf.database = {:adapter => 'sqlite3', :database => conf.db}
+end
 
-    def initialize(script)
-        @script = script
-        @mount = File.basename(script, '.rb')
-        load_app
+# Load apps
+PATHS = ARGV.dup
+apps = PATHS.inject([]) do |apps, script|
+    if File.directory? script
+        apps.push(*Dir[File.join(script, '*.rb')])
+    else
+        apps << script
     end
+end
 
-    def load_app
-        @mtime = File.mtime(@script)
-        title = File.basename(@script)[/^(\w+)/,1]
-        begin
-            load @script
-        rescue Exception => e
-            puts "!! trouble loading #{title}: [#{e.class}] #{e.message}"
-            @klass = nil
-            return
-        end
+Camping::Reloader.database = conf.database
+Camping::Reloader.log = conf.log
+apps.map! { |script| Camping::Reloader.new(script) }
+abort("** No apps successfully loaded") unless apps.detect { |app| app.klass }
 
-        @klass = Object.const_get(Object.constants.grep(/^#{title}$/i)[0]) rescue nil
-        unless @klass.const_defined? :C
-            puts "!! trouble loading #{title}: not a Camping app"
-            @klass = nil
-            return
-        end
-        @klass.create if @klass.respond_to? :create
-        @klass
-    end
-
-    # Load the script, locate the module
-    def reload_app 
-        newtime = File.mtime( @script )
-        return if @klass and @mtime and newtime <= @mtime
+def apps.find_new_scripts
+    each { |app| app.reload_app }
+    PATHS.each do |path|
+        Dir[File.join(path, '*.rb')].each do |script|
+            smount = File.basename(script, '.rb')
+            next if detect { |x| x.mount == smount }
 
-        k = @klass
-        Object.instance_eval { remove_const k.name } if k
-        load_app
-    end
+            puts "** Discovered new #{script}"
+            app = Camping::Reloader.new(script)
+            next unless app
 
-    def run(*a)
-        reload_app
-        if @klass
-            @klass.run(*a) 
-        else
-            Camping.run(*a)
+            yield app
+            self << app
         end
     end
-
-    def view_source
-        File.read(@script)
-    end
+    self.sort! { |x, y| x.mount <=> y.mount }
 end
 
-apps = ARGV.map { |script| CampingReloader.new(script) }
 def apps.index_page
     welcome = "You are Camping"
     apps = self
@@ -161,15 +143,34 @@ def apps.index_page
     b.to_s
 end
 
-begin
+# Check that mongrel exists 
+unless conf.server 
+    begin
+        require 'mongrel'
+        require 'mongrel/camping'
+        conf.server = :mongrel
+    rescue LoadError 
+        conf.server = :webrick 
+    end
+end
+
+# Running the selected server
+case conf.server.to_s
+when 'mongrel'
     require 'mongrel'
     require 'mongrel/camping'
+
     class IndexHandler < Mongrel::HttpHandler
-        def initialize(apps)
+        def initialize(apps, server)
             @apps = apps
+            @server = server
         end
         def process(req, res)
             res.start(200) do |head, out|
+                @apps.find_new_scripts do |app|
+                    @server.register "/#{app.mount}", Mongrel::Camping::CampingHandler.new(app)
+                    @server.register "/code/#{app.mount}", ViewSource.new(app)
+                end
                 out << @apps.index_page
             end
         end
@@ -185,37 +186,94 @@ begin
             end
         end
     end
-    config = Mongrel::Configurator.new :host => host do
-        listener :port => port do
-            apps.each do |app|
-                uri "/#{app.mount}", :handler => Mongrel::Camping::CampingHandler.new(app)
-                uri "/code/#{app.mount}", :handler => ViewSource.new(app)
+    begin
+        config = Mongrel::Configurator.new :host => conf.host do
+            listener :port => conf.port do
+                if apps.length > 1
+                    apps.each do |app|
+                        uri "/#{app.mount}", :handler => Mongrel::Camping::CampingHandler.new(app)
+                        uri "/code/#{app.mount}", :handler => ViewSource.new(app)
+                    end
+                    uri "/", :handler => IndexHandler.new(apps, @listener)
+                else
+                    uri "/", :handler => Mongrel::Camping::CampingHandler.new(apps.first)
+                end
+                uri "/favicon.ico", :handler => Mongrel::Error404Handler.new("")
+                trap("INT") { stop }
+                run
             end
-            uri "/", :handler => IndexHandler.new(apps)
-            uri "/favicon.ico", :handler => Mongrel::Error404Handler.new("")
-            trap("INT") { stop }
-            run
-        end
+        end 
+
+        puts "** Camping running on #{conf.host}:#{conf.port}."
+        config.join
+    rescue Errno::EADDRINUSE
+        puts "** ERROR : address #{conf.host}:#{conf.port} already in use."
     end
-    config.join
-rescue LoadError
+when 'webrick'
     require 'webrick/httpserver'
     require 'camping/webrick'
 
     # Mount the root
-    s = WEBrick::HTTPServer.new(:BindAddress => host, :Port => port)
-    apps.each do |app|
-        s.mount "/#{app.mount}", WEBrick::CampingHandler, app
-        s.mount_proc("/code/#{app.mount}") do |req, resp|
-            resp['Content-Type'] = 'text/plain'
-            resp.body = app.view_source
+    s = WEBrick::HTTPServer.new(:BindAddress => conf.host, :Port => conf.port)
+    if apps.length > 1
+        apps.each do |app|
+            s.mount "/#{app.mount}", WEBrick::CampingHandler, app
+            s.mount_proc("/code/#{app.mount}") do |req, resp|
+                resp['Content-Type'] = 'text/plain'
+                resp.body = app.view_source
+            end
+        end
+        s.mount_proc("/") do |req, resp|
+            apps.find_new_scripts do |app|
+                s.mount "/#{app.mount}", WEBrick::CampingHandler, app
+                s.mount_proc("/code/#{app.mount}") do |req, resp|
+                    resp['Content-Type'] = 'text/plain'
+                    resp.body = app.view_source
+                end
+            end
+            resp.body = apps.index_page
         end
+    else
+        s.mount "/", WEBrick::CampingHandler, apps.first
     end
-    s.mount_proc("/") { |req, resp| resp.body = apps.index_page }
 
     # Server up
     trap(:INT) do
         s.shutdown
     end
     s.start
+when 'lighttpd'
+    require 'rbconfig'
+    ruby = File.join(Config::CONFIG['bindir'], Config::CONFIG['RUBY_INSTALL_NAME'])
+    dispatcher =<<SCRIPT
+#!#{ruby}
+require 'rubygems'
+require 'camping/fastcgi'
+Camping::Models::Base.establish_connection(Marshal.load(#{Marshal.dump(conf.database).dump})) 
+Camping::FastCGI.serve("")
+SCRIPT
+    lighttpd_conf =<<CONF
+server.port                 = #{conf.port}
+server.bind                 = "#{conf.host}"
+server.modules              = ( "mod_fastcgi" )
+server.document-root        = "/dont/need/one" 
+
+#### fastcgi module
+fastcgi.server = ( "/" => ( 
+  "localhost" => ( 
+    "socket" => "/tmp/camping-blog.socket",
+    "bin-path" => "#{conf.dispatcher}",
+    "check-local" => "disable",
+    "max-procs" => 1 ) ) )
+CONF
+ 
+when 'console'
+    ARGV.clear # Avoid passing args to IRB 
+
+    require 'irb' 
+    require 'irb/completion' 
+    if File.exists? ".irbrc"
+        ENV['IRBRC'] = ".irbrc"
+    end
+    IRB.start 
 end