picnic 0.8.0 → 0.8.1

data/History.txt

@@ -1,3 +1,13 @@
+=== 0.8.1 :: 2009-05-01
+
+* The bundled version of camping has been updated so we are now compatible with 
+  Passenger 2.2.
+* We now attempt to check for app loading errors during startup, rather than
+  waiting for the first request. This should make debugging bad Camping apps
+  a bit easier.
+* Mix bug fixes throughout.
+
+
 === 0.8.0 :: 2009-03-18
 
 * Overhauled for Camping 2.0. Major changes throughout. Some things to

data/Manifest.txt

@@ -17,30 +17,30 @@ picnic.gemspec
 setup.rb
 test/picnic_test.rb
 test/test_helper.rb
-vendor/camping-2.0.20090212/CHANGELOG
-vendor/camping-2.0.20090212/COPYING
-vendor/camping-2.0.20090212/README
-vendor/camping-2.0.20090212/Rakefile
-vendor/camping-2.0.20090212/bin/camping
-vendor/camping-2.0.20090212/doc/camping.1.gz
-vendor/camping-2.0.20090212/examples/README
-vendor/camping-2.0.20090212/examples/blog.rb
-vendor/camping-2.0.20090212/examples/campsh.rb
-vendor/camping-2.0.20090212/examples/tepee.rb
-vendor/camping-2.0.20090212/extras/Camping.gif
-vendor/camping-2.0.20090212/extras/flipbook_rdoc.rb
-vendor/camping-2.0.20090212/extras/permalink.gif
-vendor/camping-2.0.20090212/lib/camping-unabridged.rb
-vendor/camping-2.0.20090212/lib/camping.rb
-vendor/camping-2.0.20090212/lib/camping/ar.rb
-vendor/camping-2.0.20090212/lib/camping/ar/session.rb
-vendor/camping-2.0.20090212/lib/camping/mab.rb
-vendor/camping-2.0.20090212/lib/camping/reloader.rb
-vendor/camping-2.0.20090212/lib/camping/server.rb
-vendor/camping-2.0.20090212/lib/camping/session.rb
-vendor/camping-2.0.20090212/setup.rb
-vendor/camping-2.0.20090212/test/apps/env_debug.rb
-vendor/camping-2.0.20090212/test/apps/forms.rb
-vendor/camping-2.0.20090212/test/apps/misc.rb
-vendor/camping-2.0.20090212/test/apps/sessions.rb
-vendor/camping-2.0.20090212/test/test_camping.rb
+vendor/zuk-camping-2.0.20090429/CHANGELOG
+vendor/zuk-camping-2.0.20090429/COPYING
+vendor/zuk-camping-2.0.20090429/README
+vendor/zuk-camping-2.0.20090429/Rakefile
+vendor/zuk-camping-2.0.20090429/bin/camping
+vendor/zuk-camping-2.0.20090429/doc/camping.1.gz
+vendor/zuk-camping-2.0.20090429/examples/README
+vendor/zuk-camping-2.0.20090429/examples/blog.rb
+vendor/zuk-camping-2.0.20090429/examples/campsh.rb
+vendor/zuk-camping-2.0.20090429/examples/tepee.rb
+vendor/zuk-camping-2.0.20090429/extras/Camping.gif
+vendor/zuk-camping-2.0.20090429/extras/flipbook.rb
+vendor/zuk-camping-2.0.20090429/extras/permalink.gif
+vendor/zuk-camping-2.0.20090429/lib/camping-unabridged.rb
+vendor/zuk-camping-2.0.20090429/lib/camping.rb
+vendor/zuk-camping-2.0.20090429/lib/camping/ar.rb
+vendor/zuk-camping-2.0.20090429/lib/camping/ar/session.rb
+vendor/zuk-camping-2.0.20090429/lib/camping/mab.rb
+vendor/zuk-camping-2.0.20090429/lib/camping/reloader.rb
+vendor/zuk-camping-2.0.20090429/lib/camping/server.rb
+vendor/zuk-camping-2.0.20090429/lib/camping/session.rb
+vendor/zuk-camping-2.0.20090429/setup.rb
+vendor/zuk-camping-2.0.20090429/test/apps/env_debug.rb
+vendor/zuk-camping-2.0.20090429/test/apps/forms.rb
+vendor/zuk-camping-2.0.20090429/test/apps/misc.rb
+vendor/zuk-camping-2.0.20090429/test/apps/sessions.rb
+vendor/zuk-camping-2.0.20090429/test/test_camping.rb

data/lib/picnic.rb

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'activesupport'
 
 $: << File.dirname(__FILE__)
-$: << File.dirname(__FILE__) + "/../vendor/camping-2.0.20090212/lib"
+$: << File.dirname(__FILE__) + "/../vendor/zuk-camping-2.0.20090429/lib"
 
 require "camping"
 

data/lib/picnic/cli.rb

@@ -156,6 +156,8 @@ module Picnic
         at_exit { File.delete($PID_FILE) if File.exist?($PID_FILE) }
       end
       
+      $CONF.database = :unused if $CONF.database.blank?
+      
       server = Picnic::Server::Base.new($CONF, [options[:app_file]])
       server.start
     end

data/lib/picnic/conf.rb

@@ -25,18 +25,34 @@ module Picnic
     # Read a configuration option.
     #
     # For example:
-    #   puts Conf[:server]
+    #   puts conf[:server]
     def [](key)
       @conf[key]
     end
     
-    # Another way of reading a configuration option.
+    # Set a configuration option.
+    #
+    # For example:
+    #   conf[:server] = 'mongrel'
+    def []=(key, value)
+      @conf[key] = value
+    end
+    
+    # Another way of reading or writing a configuration option.
     #
     # The following statements are equivalent:
-    #   puts Conf[:server]
-    #   puts Conf.server
+    #   puts conf[:server]
+    #   puts conf.server
+    #
+    # These are also equivalent:
+    #   conf[:server] = 'mongrel'
+    #   conf.server = 'mongrel'
     def method_missing(method, *args)
-      self[method]
+      if method.to_s =~ /(.*?)=$/
+        self[$~[1]] = args.first
+      else
+        self[method]
+      end
     end
     
     # Needs to be defined when we have a custom method_missing().
@@ -92,6 +108,11 @@ module Picnic
         " suit your needs and then run #{app_name} again.\n"
       exit 1
     end
+
+    # Business logic for deriving the current config file name.
+    def determine_config_filename(app_name, app_root, config_file = nil)
+      config_file || "/etc/#{app_name.to_s.downcase}/config.yml"
+    end
     
     # Loads the configuration from the YAML file for the given app.
     #
@@ -101,7 +122,7 @@ module Picnic
     #
     # By default, the configuration will be loaded from <tt>/etc/<app_name>/config.yml</tt>.
     def load_from_file(app_name, app_root, config_file = nil)
-      conf_file = config_file || "/etc/#{app_name.to_s.downcase}/config.yml"
+      conf_file = determine_config_filename(app_name, app_root, config_file)
       
       puts "Loading configuration for #{app_name.inspect} from #{conf_file.inspect}..."
       
@@ -131,5 +152,8 @@ module Picnic
     def merge_defaults(defaults)
       @conf = HashWithIndifferentAccess.new(HashWithIndifferentAccess.new(defaults).merge(@conf))
     end
+
+    class Error < StandardError
+    end
   end
 end

data/lib/picnic/server.rb

@@ -1,7 +1,7 @@
 require 'camping/server'
 
 module Picnic::Server
-  class Base < Camping::Server::Base
+  class Base < Camping::Server
     def start
       handler, conf = case @conf.server
       when "console"
@@ -13,21 +13,31 @@ module Picnic::Server
       when "webrick"
         prep_webrick
       end
-      
-      rapp =  apps.first
+
+      # preload the apps in order to show any startup errors when
+      # the app is run from the command line (otherwise they would only
+      # show up after the first request to the web server)
+      reload!
+            
+      handler.run(self, conf) 
+    end
+
+
+    def app
+      reload!
+       
+      rapp =  apps.values.first
+
+      rapp = Rack::Static.new(rapp, @conf[:static]) if @conf[:static]
 
       if @conf.uri_path
         rapp = Rack::URLMap.new(@conf.uri_path => rapp)
       end
-      
-      rapp = Rack::Static.new(rapp, @conf[:static]) if @conf[:static]
+
       rapp = Rack::ContentLength.new(rapp)
-      rapp = FixContentLength.new(rapp)
       rapp = Rack::Lint.new(rapp)
       rapp = Camping::Server::XSendfile.new(rapp)
       rapp = Rack::ShowExceptions.new(rapp)
-      
-      handler.run(rapp, conf) 
     end
     
     
@@ -83,17 +93,4 @@ module Picnic::Server
     
   end
   
-  class FixContentLength
-    def initialize(app)
-      @app = app
-    end
-  
-    def call(env)
-      status, headers, body = @app.call(env)
-      if headers.has_key?('Content-Length') && headers['Content-Length'].to_i == 0
-        headers['Content-Length'] = body.body.length.to_s
-      end
-      [status, headers, body]
-    end
-  end
 end

data/lib/picnic/version.rb

@@ -2,7 +2,7 @@ module Picnic #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 8
-    TINY  = 0
+    TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/picnic.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{picnic}
-  s.version = '0.8.0.' + Time.now.strftime('%Y%m%d')
+  s.version = '0.8.1.' + Time.now.strftime('%Y%m%d')
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Zukowski"]
   s.date = Time.now.strftime('%Y-%m-%d')
   s.description = %q{Camping for sissies}
   s.email = %q{matt@roughest.net}
-  s.extra_rdoc_files = ["CHANGELOG.txt", "History.txt", "LICENSE.txt", "Manifest.txt", "README.txt"]
-  s.files = ["CHANGELOG.txt", "History.txt", "LICENSE.txt", "Manifest.txt", "README.txt", "Rakefile", "lib/picnic.rb", "lib/picnic/authentication.rb", "lib/picnic/cli.rb", "lib/picnic/conf.rb", "lib/picnic/controllers.rb", "lib/picnic/logger.rb", "lib/picnic/server.rb", "lib/picnic/service_control.rb", "lib/picnic/version.rb", "setup.rb", "test/picnic_test.rb", "test/test_helper.rb", "vendor/camping-2.0.20090212/CHANGELOG", "vendor/camping-2.0.20090212/COPYING", "vendor/camping-2.0.20090212/README", "vendor/camping-2.0.20090212/Rakefile", "vendor/camping-2.0.20090212/bin/camping", "vendor/camping-2.0.20090212/doc/camping.1.gz", "vendor/camping-2.0.20090212/examples/README", "vendor/camping-2.0.20090212/examples/blog.rb", "vendor/camping-2.0.20090212/examples/campsh.rb", "vendor/camping-2.0.20090212/examples/tepee.rb", "vendor/camping-2.0.20090212/extras/Camping.gif", "vendor/camping-2.0.20090212/extras/flipbook_rdoc.rb", "vendor/camping-2.0.20090212/extras/permalink.gif", "vendor/camping-2.0.20090212/lib/camping-unabridged.rb", "vendor/camping-2.0.20090212/lib/camping.rb", "vendor/camping-2.0.20090212/lib/camping/ar.rb", "vendor/camping-2.0.20090212/lib/camping/ar/session.rb", "vendor/camping-2.0.20090212/lib/camping/mab.rb", "vendor/camping-2.0.20090212/lib/camping/reloader.rb", "vendor/camping-2.0.20090212/lib/camping/server.rb", "vendor/camping-2.0.20090212/lib/camping/session.rb", "vendor/camping-2.0.20090212/setup.rb", "vendor/camping-2.0.20090212/test/apps/env_debug.rb", "vendor/camping-2.0.20090212/test/apps/forms.rb", "vendor/camping-2.0.20090212/test/apps/misc.rb", "vendor/camping-2.0.20090212/test/apps/sessions.rb", "vendor/camping-2.0.20090212/test/test_camping.rb"]
+  s.extra_rdoc_files = ["CHANGELOG.txt", "History.txt", "LICENSE.txt", "Manifest.txt", "README.rdoc"]
+  s.files = ["CHANGELOG.txt", "History.txt", "LICENSE.txt", "Manifest.txt", "README.rdoc", "Rakefile", "lib/picnic.rb", "lib/picnic/authentication.rb", "lib/picnic/cli.rb", "lib/picnic/conf.rb", "lib/picnic/controllers.rb", "lib/picnic/logger.rb", "lib/picnic/server.rb", "lib/picnic/service_control.rb", "lib/picnic/version.rb", "setup.rb", "test/picnic_test.rb", "test/test_helper.rb", "vendor/zuk-camping-2.0.20090429/CHANGELOG", "vendor/zuk-camping-2.0.20090429/COPYING", "vendor/zuk-camping-2.0.20090429/README", "vendor/zuk-camping-2.0.20090429/Rakefile", "vendor/zuk-camping-2.0.20090429/bin/camping", "vendor/zuk-camping-2.0.20090429/doc/camping.1.gz", "vendor/zuk-camping-2.0.20090429/examples/README", "vendor/zuk-camping-2.0.20090429/examples/blog.rb", "vendor/zuk-camping-2.0.20090429/examples/campsh.rb", "vendor/zuk-camping-2.0.20090429/examples/tepee.rb", "vendor/zuk-camping-2.0.20090429/extras/Camping.gif", "vendor/zuk-camping-2.0.20090429/extras/permalink.gif", "vendor/zuk-camping-2.0.20090429/lib/camping-unabridged.rb", "vendor/zuk-camping-2.0.20090429/lib/camping.rb", "vendor/zuk-camping-2.0.20090429/lib/camping/ar.rb", "vendor/zuk-camping-2.0.20090429/lib/camping/ar/session.rb", "vendor/zuk-camping-2.0.20090429/lib/camping/mab.rb", "vendor/zuk-camping-2.0.20090429/lib/camping/reloader.rb", "vendor/zuk-camping-2.0.20090429/lib/camping/server.rb", "vendor/zuk-camping-2.0.20090429/lib/camping/session.rb", "vendor/zuk-camping-2.0.20090429/setup.rb", "vendor/zuk-camping-2.0.20090429/test/apps/env_debug.rb", "vendor/zuk-camping-2.0.20090429/test/apps/forms.rb", "vendor/zuk-camping-2.0.20090429/test/apps/misc.rb", "vendor/zuk-camping-2.0.20090429/test/apps/sessions.rb", "vendor/zuk-camping-2.0.20090429/test/test_camping.rb"]
   s.has_rdoc = true
   s.homepage = %q{http://picnic.rubyforge.org}
   s.rdoc_options = ["--main", "README.txt"]

data/vendor/zuk-camping-2.0.20090429/README

@@ -0,0 +1,82 @@
+== Camping, a Microframework
+
+Camping is a web framework which consistently stays at less than 3kb of code.
+You can probably view the complete source code on a single page. But, you
+know, it's so small that, if you think about it, what can it really do?
+
+The idea here is to store a complete fledgling web application in a single
+file like many small CGIs. But to organize it as a Model-View-Controller
+application like Rails does. You can then easily move it to Rails once you've
+got it going.
+
+== A Camping Skeleton
+
+A skeletal Camping blog could look like this:
+
+  require 'camping'
+  
+  Camping.goes :Blog
+
+  module Blog::Models
+    class Post < Base; belongs_to :user; end
+    class Comment < Base; belongs_to :user; end
+    class User < Base; end
+  end
+
+  module Blog::Controllers
+    class Index < R '/'
+      def get
+        @posts = Post.find :all
+        render :index
+      end
+    end
+  end
+
+  module Blog::Views
+    def layout
+      html do
+        body do
+          self << yield
+        end
+      end
+    end
+
+    def index
+      for post in @posts
+        h1 post.title
+      end
+    end
+  end
+  
+== Installation
+
+Interested yet?  Luckily it's quite easy to install Camping. We'll be using a tool called RubyGems, so if you don't have that installed yet, go grab it! Once that's sorted out, open up a Terminal or Command Line and enter:
+
+* <tt>gem install camping</tt>
+
+Or for the bleeding edge:
+
+* <tt>gem install camping --source http://gems.judofyr.net</tt>
+
+This will download everything you need and get you all set up. If you're installing camping manually, you'll need to make sure you have 'rack' installed as well, the interface Camping uses to talk to your web server. You'll also need 'markaby' for the views, and 'activerecord' if you're going to be using databases.
+
+== Learning
+
+* Start by reading the documentation in {the Camping module}[link:classes/Camping.html]
+  - it should get you started pretty quick.
+* {The wiki}[http://wiki.github.com/why/camping] is the place for all tiny,
+  useful tricks that we've collected over the years.  Don't be afraid to
+  share your own discoveries; the more, the better!
+* Still wondering?  Subscribe to {the mailing list}[http://rubyforge.org/mailman/listinfo/camping-list].
+  This is where it's all happening!  Don't worry, though, the volume is just
+  as micro as Camping itself.  
+  
+== Authors
+
+Camping was originally started by{why the lucky stiff}[http://en.wikipedia.org/wiki/Why_the_lucky_stiff],
+but is now maintained by the _community_.  This simply means that if we like your
+patch, it will be applied.  Everything is managed through {the mailing list}[http://rubyforge.org/mailman/listinfo/camping-list],
+so just subscribe and you'll become a contributor too.  Remember: writing the
+code is just half the job, without some serious thinking from you we won't get
+any further.
+

data/vendor/{camping-2.0.20090212 → zuk-camping-2.0.20090429}/Rakefile

@@ -4,6 +4,14 @@ require 'rake/gempackagetask'
 require 'rake/rdoctask'
 require 'rake/testtask'
 require 'fileutils'
+begin
+  gem 'rdoc', '~> 2.2.0'
+  require 'rdoc'
+  $:.unshift 'extras'
+rescue Gem::LoadError
+  puts "RDoc 2.2 required to build docs"
+  puts "Please run `gem install rdoc --version 2.2`"
+end
 include FileUtils
 
 NAME = "camping"
@@ -30,7 +38,7 @@ end
 Rake::RDocTask.new do |rdoc|
     rdoc.rdoc_dir = 'doc/rdoc'
     rdoc.options += RDOC_OPTS
-    rdoc.template = "extras/flipbook_rdoc.rb"
+    rdoc.template = "flipbook"
     rdoc.main = "README"
     rdoc.title = "Camping, the Documentation"
     rdoc.rdoc_files.add ['README', 'CHANGELOG', 'COPYING', 'lib/camping.rb', 'lib/camping/*.rb']
@@ -41,7 +49,6 @@ task :after_doc do
     mv "lib/camping-mural.rb", "lib/camping.rb"
     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 =
@@ -61,7 +68,6 @@ spec =
 
         s.add_dependency('markaby', '>=0.5')
         s.add_dependency('rack', '>=0.3')
-        s.add_dependency('metaid')
         s.required_ruby_version = '>= 1.8.2'
 
         s.files = %w(COPYING README Rakefile) +

data/vendor/zuk-camping-2.0.20090429/bin/camping

@@ -0,0 +1,97 @@
+#!/usr/bin/env ruby
+
+trap("INT") { exit }
+require 'optparse'
+require 'ostruct'
+require 'stringio'
+require 'yaml'
+
+$:.unshift File.dirname(__FILE__) + "/../lib"
+require 'camping'
+require 'camping/server'
+
+conf = OpenStruct.new(:host => '0.0.0.0', :port => 3301)
+
+# Setup paths
+if home = ENV['HOME'] # POSIX
+  db_path = File.join(home, '.camping.db')
+  rc_path = File.join(home, '.campingrc')
+elsif home = ENV['APPDATA'] # MSWIN
+  db_path = File.join(home, 'Camping.db')
+  rc_path = File.join(home, 'Campingrc')
+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)") { |conf.host| }
+  opts.on("-p", "--port NUM", "Port for web server (defaults to #{conf.port})") { |conf.port| }
+  opts.on("-d", "--database FILE", "SQLite3 database path (defaults to #{db_path ? db_path : '<none>'})") { |db_path| conf.database = {:adapter => 'sqlite3', :database => db_path} }
+  opts.on("-C", "--console", "Run in console mode with IRB") { conf.server = "console" }
+  server_list = ["mongrel", "webrick", "console"]
+  opts.on("-s", "--server NAME", server_list, "Server to force (#{server_list.join(', ')})") { |conf.server| }
+
+  opts.separator ""
+  opts.separator "Common options:"
+
+  # No argument, shows at tail.  This will print an options summary.
+  # Try it and see!
+  opts.on_tail("-?", "--help", "Show this message") do
+    puts opts
+    exit
+  end
+
+  # Another typical switch to print the version.
+  opts.on_tail("-v", "--version", "Show version") do
+    puts Gem.loaded_specs['camping'].version
+    exit
+  end
+end
+
+begin
+  opts.parse! ARGV
+rescue OptionParser::ParseError => ex
+  STDERR.puts "!! #{ex.message}"
+  puts "** use `#{File.basename($0)} --help` for more details..."
+  exit 1
+end
+
+if ARGV.length < 1
+  puts opts
+  exit 1
+end
+
+# Load configuration if any
+if rc_path and File.exists?(rc_path)
+  YAML.load_file(rc_path).each do |k,v|
+    conf.send("#{k}=", v) unless conf.send(k)
+  end 
+  puts "** conf file #{rc_path} loaded"
+end
+
+# Default db
+if conf.database.nil? and db_path
+  conf.database = { :adapter => 'sqlite3', :database => db_path }
+end
+
+
+# get a copy of the paths to pass to the server
+paths = ARGV.dup
+
+# Check that mongrel exists 
+if conf.server.nil? || conf.server == "mongrel"
+  begin
+    require 'mongrel'
+    conf.server = "mongrel"
+  rescue LoadError 
+    puts "!! could not load mongrel. Falling back to webrick."
+    conf.server = "webrick"
+  end
+end
+
+server = Camping::Server.new(conf, paths)
+server.start