camping 1.4 → 1.4.2

data/CHANGELOG

@@ -1,5 +1,16 @@
+= 1.4.2
+=== 10th May, 2006
+
+* Efficient file uploads for multipart/form-data POSTs.
+* Camping tool now uses Mongrel, if available.  If not, sticks with WEBrick.
+
+= 1.4.1
+=== 3rd May, 2006
+
+* Streaming HTTP support.  If body is IO, will simply pass to the controller.  Mongrel, in particular, supports this nicely.
+
 = 1.4
-=== 17th February, 2006
+=== 11th April, 2006
 
 * Moved Camping::Controllers::Base to Camping::Base.
 * Moved Camping::Controllers::R to Camping::R.

data/COPYING

@@ -0,0 +1,18 @@
+Copyright (c) 2006 why the lucky stiff
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+  
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+   
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER 
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -0,0 +1,89 @@
+require 'rake'
+require 'rake/clean'
+require 'rake/gempackagetask'
+require 'rake/rdoctask'
+require 'fileutils'
+include FileUtils
+
+NAME = "camping"
+VERS = "1.4.2"
+CLEAN.include ['**/.*.sw?', '*.gem', '.config']
+RDOC_OPTS = ['--quiet', '--title', "Camping, the Documentation",
+    "--template", "extras/flipbook_rdoc.rb",
+    "--opname", "index.html",
+    "--line-numbers", 
+    "--main", "README",
+    "--inline-source"]
+
+desc "Packages up Camping."
+task :default => [:package]
+task :package => [:clean]
+
+task :doc => [:before_doc, :rdoc, :after_doc]
+
+task :before_doc do 
+    mv "lib/camping.rb", "lib/camping-mural.rb"
+    mv "lib/camping-unabridged.rb", "lib/camping.rb"
+end
+
+Rake::RDocTask.new do |rdoc|
+    rdoc.rdoc_dir = 'doc'
+    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']
+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/}
+end
+
+spec =
+    Gem::Specification.new do |s|
+        s.name = NAME
+        s.version = VERS
+        s.platform = Gem::Platform::RUBY
+        s.has_rdoc = true
+        s.extra_rdoc_files = ["README", "CHANGELOG", "COPYING"]
+        s.rdoc_options += RDOC_OPTS + ['--exclude', '^(examples|extras)\/', '--exclude', 'lib/camping.rb']
+        s.summary = "minature rails for stay-at-home moms"
+        s.description = s.summary
+        s.author = "why the lucky stiff"
+        s.email = 'why@ruby-lang.org'
+        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('metaid')
+        s.required_ruby_version = '>= 1.8.2'
+
+        s.files = %w(COPYING README Rakefile) +
+          Dir.glob("{bin,doc/rdoc,test,lib,extras}/**/*") + 
+          Dir.glob("ext/**/*.{h,c,rb}") +
+          Dir.glob("examples/**/*.rb") +
+          Dir.glob("tools/*.rb")
+        
+        s.require_path = "lib"
+        # s.extensions = FileList["ext/**/extconf.rb"].to_a
+        s.bindir = "bin"
+    end
+
+Rake::GemPackageTask.new(spec) do |p|
+    p.need_tar = true
+    p.gem_spec = spec
+end
+
+task :install do
+  sh %{rake package}
+  sh %{sudo gem install pkg/#{NAME}-#{VERS}}
+end
+
+task :uninstall => [:clean] do
+  sh %{sudo gem uninstall #{NAME}}
+end

data/bin/camping

@@ -2,62 +2,220 @@
 
 # this line prevents other db adapters from being loaded (oci8 was
 # causing some pain.)
-RAILS_CONNECTION_ADAPTERS = %w[sqlite]
+unless Object.const_defined? :RAILS_CONNECTION_ADAPTERS
+    RAILS_CONNECTION_ADAPTERS = []
+end
+RAILS_CONNECTION_ADAPTERS.replace %w[sqlite]
 
+require 'delegate'
+require 'optparse'
 require 'stringio'
-require 'webrick/httpserver'
-require 'camping/webrick'
+require 'rubygems'
+require 'camping'
+
+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 )
+end
+
+
+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
 
-(puts <<USAGE; exit) if ARGV.length == 0
-#{File.basename($0)}, the microframework ON-button for ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]
-Usage: #{File.basename($0)} your.camping.rb [your.camping.db]
-USAGE
+    opts.on("-p", "--port NUM", "Port for web server (defaults to #{port})") do |p|
+        port = p
+    end
 
-script, db = ARGV[0..-1]
+    opts.on("-d", "--database FILE", "Database file (defaults to #{db})") do |d|
+        db = d
+    end
 
-unless db
-    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 )
+    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
+        puts opts
+        exit
     end
+  
+    # Another typical switch to print the version.
+    opts.on_tail("--version", "Show version") do
+        class << Gem; attr_accessor :loaded_specs; end
+        puts Gem.loaded_specs['camping'].version
+        exit
+    end
+end
+
+opts.parse! ARGV
+if ARGV.length < 1
+    puts opts
+    exit
 end
 
 Camping::Models::Base.establish_connection :adapter => 'sqlite3', :database => db
 
-class WEBrick::CampingHandler
-    attr_accessor :klass, :mtime
-end
+class CampingReloader
+    attr_accessor :klass, :mtime, :mount
+
+    def initialize(script)
+        @script = script
+        @mount = File.basename(script, '.rb')
+        load_app
+    end
 
-# Load the script, locate the module
-def camp_load(server, script, klass = nil)
-    Object.instance_eval { remove_const klass.name } if klass
-    mtime = File.mtime(script)
-    load script
-    klass = Object.const_get(Object.constants.grep(/^#{File.basename(script)[/^(\w+)/,1]}$/i)[0]) rescue nil
-    klass ||= Camping
-    klass.create if klass.respond_to? :create
-
-    brick = WEBrick::CampingHandler.new(server, klass)
-    brick.mtime = mtime
-    brick
+    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
+
+        @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
+
+        k = @klass
+        Object.instance_eval { remove_const k.name } if k
+        load_app
+    end
+
+    def run(*a)
+        reload_app
+        if @klass
+            @klass.run(*a) 
+        else
+            Camping.run(*a)
+        end
+    end
+
+    def view_source
+        File.read(@script)
+    end
 end
 
-# Mount the root
-s = WEBrick::HTTPServer.new(:BindAddress => '0.0.0.0', :Port => 3301)
-brick = camp_load( s, script )
-s.mount_proc("/") do |req, resp|
-    newtime = File.mtime( script )
-    if newtime > brick.mtime
-        brick = camp_load( s, script, brick.klass )
+apps = ARGV.map { |script| CampingReloader.new(script) }
+def apps.index_page
+    welcome = "You are Camping"
+    apps = self
+    b = Markaby::Builder.new({}, {})
+    b = b.instance_eval do
+        html do
+            head do
+                title welcome
+                style <<-END, :type => 'text/css'
+                    body { 
+                        font-family: verdana, arial, sans-serif; 
+                        padding: 10px 40px; 
+                        margin: 0; 
+                    }
+                    h1, h2, h3, h4, h5, h6 {
+                        font-family: utopia, georgia, serif;
+                    }
+                END
+            end
+            body do
+                h1 welcome
+                p %{Good day.  These are the Camping apps you've mounted.}
+                ul do
+                    apps.each do |app|
+                        next unless app.klass
+                        li do
+                            h3(:style => "display: inline") { a app.klass.name, :href => "/#{app.mount}" }
+                            small { text " / " ; a "View Source", :href => "/code/#{app.mount}" }
+                        end
+                    end
+                end
+            end
+        end
     end
-    brick.do_GET(req, resp)
-    nil
+    b.to_s
 end
 
-# Server up
-trap(:INT) do
-    s.shutdown
+begin
+    require 'mongrel'
+    require 'mongrel/camping'
+    class IndexHandler < Mongrel::HttpHandler
+        def initialize(apps)
+            @apps = apps
+        end
+        def process(req, res)
+            res.start(200) do |head, out|
+                out << @apps.index_page
+            end
+        end
+    end
+    class ViewSource < Mongrel::HttpHandler
+        def initialize(app)
+            @app = app
+        end
+        def process(req, res)
+            res.start(200) do |head, out|
+                head['Content-Type'] = 'text/plain'
+                out << @app.view_source
+            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)
+            end
+            uri "/", :handler => IndexHandler.new(apps)
+            uri "/favicon.ico", :handler => Mongrel::Error404Handler.new("")
+            trap("INT") { stop }
+            run
+        end
+    end
+    config.join
+rescue LoadError
+    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
+        end
+    end
+    s.mount_proc("/") { |req, resp| resp.body = apps.index_page }
+
+    # Server up
+    trap(:INT) do
+        s.shutdown
+    end
+    s.start
 end
-s.start

data/lib/camping-unabridged.rb

@@ -123,6 +123,7 @@ module Camping
             raise NoMethodError, "#{m}"
         end
     end
+    alias_method :u, :regular_update
   end
 
   # Helpers contains methods available in your controllers and views.  You may add
@@ -252,7 +253,7 @@ module Camping
     def URL c='/',*a
       c = R(c, *a) if c.respond_to? :urls
       c = self/c
-      c = "http://"+@env.HTTP_HOST+c if c[/^\//]
+      c = "//"+@env.HTTP_HOST+c if c[/^\//]
       URI(c)
     end
   end
@@ -356,21 +357,37 @@ module Camping
       qs = C.qs_parse(e.QUERY_STRING)
       @in = r
       if %r|\Amultipart/form-data.*boundary=\"?([^\";,]+)|n.match(e.CONTENT_TYPE)
-        b = "--#$1"
-        @in.read.split(/(?:\r?\n|\A)#{ Regexp::quote( b ) }(?:--)?\r\n/m).each { |pt|
-          h,v=pt.split("\r\n\r\n",2);fh={}
-          [:name, :filename].each { |x|
-            fh[x] = $1 if h =~ /^Content-Disposition: form-data;.*(?:\s#{x}="([^"]+)")/m
-          }
-          fn = fh[:name]
-          if fh[:filename]
-            fh[:type]=$1 if h =~ /^Content-Type: (.+?)(\r\n|\Z)/m
-            fh[:tempfile]=Tempfile.new(:C).instance_eval {binmode;write v;rewind;self}
+        b = /(?:\r?\n|\A)#{Regexp::quote("--#$1")}(?:--)?\r$/
+        until @in.eof?
+          fh=H[]
+          for l in @in
+            case l
+            when "\r\n": break
+            when /^Content-Disposition: form-data;/
+              fh.u H[*$'.scan(/(?:\s(\w+)="([^"]+)")/).flatten]
+            when /^Content-Type: (.+?)(\r$|\Z)/m
+              puts "=> fh[type] = #$1"
+              fh[:type] = $1
+            end
+          end
+          fn=fh[:name]
+          o=if fh[:filename]
+            o=fh[:tempfile]=Tempfile.new(:C)
+            o.binmode
           else
-            fh=v
+            fh=""
+          end
+          while l=@in.read(16384)
+            if l=~b
+              o<<$`.chomp
+              @in.seek(-$'.size,IO::SEEK_CUR)
+              break
+            end
+            o<<l
           end
           qs[fn]=fh if fn
-        }
+          fh[:tempfile].rewind if fh.is_a?H
+        end
       elsif @method == "post"
         qs.merge!(C.qs_parse(@in.read))
       end
@@ -540,11 +557,11 @@ module Camping
     #     #=> {'post' => {'id' => '1', 'user' => '_why'}}
     #
     def qs_parse(qs, d = '&;')
-        m = proc {|_,o,n|o.merge(n,&m)rescue([*o]<<n)}
+        m = proc {|_,o,n|o.u(n,&m)rescue([*o]<<n)}
         (qs||'').
             split(/[#{d}] */n).
             inject(H[]) { |h,p| k, v=un(p).split('=',2)
-                h.merge(k.split(/[\]\[]+/).reverse.
+                h.u(k.split(/[\]\[]+/).reverse.
                     inject(v) { |x,i| H[i,x] },&m)
             } 
     end