zuk-picnic 0.8.0.20090427 → 0.8.0.20090430

data/Manifest.txt

@@ -17,29 +17,29 @@ picnic.gemspec
 setup.rb
 test/picnic_test.rb
 test/test_helper.rb
-vendor/camping-2.0.20090421/CHANGELOG
-vendor/camping-2.0.20090421/COPYING
-vendor/camping-2.0.20090421/README
-vendor/camping-2.0.20090421/Rakefile
-vendor/camping-2.0.20090421/bin/camping
-vendor/camping-2.0.20090421/doc/camping.1.gz
-vendor/camping-2.0.20090421/examples/README
-vendor/camping-2.0.20090421/examples/blog.rb
-vendor/camping-2.0.20090421/examples/campsh.rb
-vendor/camping-2.0.20090421/examples/tepee.rb
-vendor/camping-2.0.20090421/extras/Camping.gif
-vendor/camping-2.0.20090421/extras/permalink.gif
-vendor/camping-2.0.20090421/lib/camping-unabridged.rb
-vendor/camping-2.0.20090421/lib/camping.rb
-vendor/camping-2.0.20090421/lib/camping/ar.rb
-vendor/camping-2.0.20090421/lib/camping/ar/session.rb
-vendor/camping-2.0.20090421/lib/camping/mab.rb
-vendor/camping-2.0.20090421/lib/camping/reloader.rb
-vendor/camping-2.0.20090421/lib/camping/server.rb
-vendor/camping-2.0.20090421/lib/camping/session.rb
-vendor/camping-2.0.20090421/setup.rb
-vendor/camping-2.0.20090421/test/apps/env_debug.rb
-vendor/camping-2.0.20090421/test/apps/forms.rb
-vendor/camping-2.0.20090421/test/apps/misc.rb
-vendor/camping-2.0.20090421/test/apps/sessions.rb
-vendor/camping-2.0.20090421/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/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/Rakefile

@@ -22,7 +22,7 @@ ENV['NODOT'] = '1'
 
 NAME = "picnic"
 REV = nil
-#REV = Time.now.strftime('%Y%m%d%H%M')
+REV = Time.now.strftime('%Y%m%d%H%M')
 #REV = `svn info`[/Revision: (\d+)/, 1] rescue nil
 VERS = ENV['VERSION'] || (Picnic::VERSION::STRING + (REV ? ".#{REV}" : ""))
                           CLEAN.include ['**/.*.sw?', '*.gem', '.config']

data/lib/picnic/conf.rb

@@ -108,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.
     #
@@ -117,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}..."
       
@@ -147,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.rb

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

data/vendor/{camping-2.0.20090421 → zuk-camping-2.0.20090429}/lib/camping/reloader.rb

@@ -132,8 +132,12 @@ module Camping
       
       # Figures out the full path of a required file. 
       def full_path(req)
-        dir = File.expand_path($LOAD_PATH.detect { |l| File.exists?(File.join(l, req)) })
-        File.join(dir, req)
+        dir = $LOAD_PATH.detect { |l| File.exists?(File.join(l, req)) }
+        if dir 
+          File.join(File.expand_path(dir), req)
+        else
+          req
+        end
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: zuk-picnic
 version: !ruby/object:Gem::Version 
-  version: 0.8.0.20090427
+  version: 0.8.0.20090430
 platform: ruby
 authors: 
 - Matt Zukowski
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-27 00:00:00 -07:00
+date: 2009-04-30 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -63,13 +63,13 @@ extra_rdoc_files:
 - History.txt
 - LICENSE.txt
 - Manifest.txt
-- README.txt
+- README.rdoc
 files: 
 - CHANGELOG.txt
 - History.txt
 - LICENSE.txt
 - Manifest.txt
-- README.txt
+- README.rdoc
 - Rakefile
 - lib/picnic.rb
 - lib/picnic/authentication.rb
@@ -83,32 +83,32 @@ files:
 - setup.rb
 - test/picnic_test.rb
 - test/test_helper.rb
-- vendor/camping-2.0.20090421/CHANGELOG
-- vendor/camping-2.0.20090421/COPYING
-- vendor/camping-2.0.20090421/README
-- vendor/camping-2.0.20090421/Rakefile
-- vendor/camping-2.0.20090421/bin/camping
-- vendor/camping-2.0.20090421/doc/camping.1.gz
-- vendor/camping-2.0.20090421/examples/README
-- vendor/camping-2.0.20090421/examples/blog.rb
-- vendor/camping-2.0.20090421/examples/campsh.rb
-- vendor/camping-2.0.20090421/examples/tepee.rb
-- vendor/camping-2.0.20090421/extras/Camping.gif
-- vendor/camping-2.0.20090421/extras/permalink.gif
-- vendor/camping-2.0.20090421/lib/camping-unabridged.rb
-- vendor/camping-2.0.20090421/lib/camping.rb
-- vendor/camping-2.0.20090421/lib/camping/ar.rb
-- vendor/camping-2.0.20090421/lib/camping/ar/session.rb
-- vendor/camping-2.0.20090421/lib/camping/mab.rb
-- vendor/camping-2.0.20090421/lib/camping/reloader.rb
-- vendor/camping-2.0.20090421/lib/camping/server.rb
-- vendor/camping-2.0.20090421/lib/camping/session.rb
-- vendor/camping-2.0.20090421/setup.rb
-- vendor/camping-2.0.20090421/test/apps/env_debug.rb
-- vendor/camping-2.0.20090421/test/apps/forms.rb
-- vendor/camping-2.0.20090421/test/apps/misc.rb
-- vendor/camping-2.0.20090421/test/apps/sessions.rb
-- vendor/camping-2.0.20090421/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/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
 has_rdoc: true
 homepage: http://picnic.rubyforge.org
 post_install_message: