zuk-picnic 0.7.999.20090212 → 0.8.0.20090318

data/History.txt

@@ -1,3 +1,13 @@
+=== 0.8.0 :: 2009-03-18
+
+* Overhauled for Camping 2.0. Major changes throughout. Some things to
+  watch out for:
+  * Your app's bin script should now specify :app_file instead of :app_path,
+    and :app_file should point to your Camping app's main .rb file.
+  * Postamples for Mongrel and WEBrick are gone, since everything is now
+    handled by Rack. It is also now possible to run Picnic apps on Phusion
+    Passenger (mod_rails/mod_rack).
+
 === 0.7.1 :: 2008-11-10
 
 * Fixed config file loading problems rooted in $APP_PATH inconsistencies.

data/Manifest.txt

@@ -9,21 +9,38 @@ lib/picnic/authentication.rb
 lib/picnic/cli.rb
 lib/picnic/conf.rb
 lib/picnic/controllers.rb
-lib/picnic/postambles.rb
+lib/picnic/logger.rb
+lib/picnic/server.rb
 lib/picnic/service_control.rb
-lib/picnic/utils.rb
 lib/picnic/version.rb
+picnic.gemspec
 setup.rb
 test/picnic_test.rb
 test/test_helper.rb
-vendor/camping-1.5.180/CHANGELOG
-vendor/camping-1.5.180/COPYING
-vendor/camping-1.5.180/README
-vendor/camping-1.5.180/Rakefile
-vendor/camping-1.5.180/lib/camping-unabridged.rb
-vendor/camping-1.5.180/lib/camping.rb
-vendor/camping-1.5.180/lib/camping/db.rb
-vendor/camping-1.5.180/lib/camping/fastcgi.rb
-vendor/camping-1.5.180/lib/camping/reloader.rb
-vendor/camping-1.5.180/lib/camping/session.rb
-vendor/camping-1.5.180/lib/camping/webrick.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

data/Rakefile

@@ -22,6 +22,7 @@ ENV['NODOT'] = '1'
 
 NAME = "picnic"
 REV = nil
+#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']
@@ -56,6 +57,7 @@ hoe = Hoe.new(GEM_NAME, VERS) do |p|
   
   # note that camping-1.5.0.180 is now bundled with picnic in the vendor directory. 
   p.extra_deps = [
+    'rack',
     'markaby',
     'activesupport'
   ]

data/lib/picnic/authentication.rb

@@ -3,6 +3,42 @@ module Picnic #:nodoc:
   # for your Camping app. 
   #
   module Authentication
+    
+    def self.included(base)
+      base.module_eval do
+        # Enable authentication for your app.
+        #
+        # For example:
+        #
+        #   Camping.goes :Blog
+        #   Blog.picnic!
+        #
+        #   $CONF[:authentication] ||= {:username => 'admin', :password => 'picnic'}
+        #   Blog.authenticate_using :basic
+        #
+        #   module Blog
+        #     def self.authenticate(credentials)
+        #       credentials[:username] == Taskr::Conf[:authentication][:username] &&
+        #         credentials[:password] == Taskr::Conf[:authentication][:password]
+        #     end
+        #   end
+        #
+        # Note that in the above example we use the authentication configuration from
+        # your app's conf file.
+        #
+        def authenticate_using(mod)
+          mod = Picnic::Authentication.const_get(mod.to_s.camelize) unless mod.kind_of? Module
+          
+          $LOG.info("Enabling authentication for all requests using #{mod.inspect}.")
+          
+          module_eval do
+            include mod
+          end
+        end
+        module_function :authenticate_using
+      end
+    end
+    
     # Picnic::Authentication::Basic provides Basic HTTP Authentication for your Camping app. 
     # The module defines a <tt>service</tt> method that only continues the request chain when 
     # proper credentials are provided by the client (browser).
@@ -50,7 +86,7 @@ module Picnic #:nodoc:
       # Reads the username and password from the headers and returns them.
       def read_credentials
         if d = %w{REDIRECT_X_HTTP_AUTHORIZATION X-HTTP_AUTHORIZATION HTTP_AUTHORIZATION}.inject([]) \
-          { |d,h| env.has_key?(h) ? env[h].to_s.split : d }
+          { |d,h| @env.has_key?(h) ? @env[h].to_s.split : d }
           u,p = ::Base64.decode64(d[1]).split(':')[0..1] if d[0] == 'Basic'
           return {:username => u, :password => p}
         end
@@ -68,9 +104,9 @@ module Picnic #:nodoc:
           s = super(*a)
         else
           @status = 401
-          @headers['Content-type'] = @headers['Content-type'] || 'text/plain'
-          @headers['Status'] = 'Unauthorized'
-          @headers['WWW-Authenticate'] = "Basic realm=\"#{app}\""
+          headers['Content-type'] = @headers['Content-type'] || 'text/plain'
+          #headers['Status'] = 'Unauthorized'
+          headers['WWW-Authenticate'] = "Basic realm=\"#{app}\""
           @body = 'Unauthorized'
           s = self
         end

data/lib/picnic/cli.rb

@@ -19,7 +19,7 @@ module Picnic
   #
   #   cli = Picnic::Cli.new(
   #     'foo',
-  #     :app_path => "/path/to/foo.br"
+  #     :app_file => "/path/to/foo.br"
   #   )
   #
   #   cli.handle_cli_input   
@@ -44,7 +44,7 @@ module Picnic
       @app = app
       
       @options = options || {}
-      @options[:app_file]   ||= File.expand_path(File.dirname(File.expand_path($0))+"/../lib/#{app}.rb")
+      @options[:app_file]   ||= File.expand_path(File.dirname(File.expand_path(__FILE__))+"/../lib/#{app}.rb")
       @options[:app_name]   ||= app
       @options[:app_module] ||= app.capitalize
       @options[:pid_file]   ||= "/etc/#{app}/#{app}.pid"
@@ -53,22 +53,29 @@ module Picnic
     
     # Parses command line options given to the script.
     def handle_cli_input
-      if File.exists? options[:app_file]
+#      if File.exists? options[:app_file]
         # try to use given app base path
         $APP_ROOT = File.dirname(options[:app_file]).gsub(/\/(lib|bin)\/?$/, '')
-      else
-        require 'rubygems'
-        
-        # fall back to using gem installation
-        matches = Gem::source_index.find_name(app)
-        raise LoadError, "#{app} gem doesn't appear to be installed!" if matches.empty?
-        
-        gem_spec = matches.last
-        $APP_ROOT = gem_spec.full_gem_path
-        
-        gem(app)
+#      else
+#        require 'rubygems'
+#        
+#        # fall back to using gem installation
+#        matches = Gem::source_index.find_name(app)
+#        raise LoadError, "#{app} gem doesn't appear to be installed!" if matches.empty?
+#        
+#        gem_spec = matches.last
+#        $APP_ROOT = gem_spec.full_gem_path
+#        
+#        gem(app)
+#      end
+      
+      unless File.file?(options[:app_file])
+        raise ArgumentError, "options[:app_file] points to #{options[:app_file].inspect} but this does not appear to be a valid Camping application!}"
       end
       
+      
+      puts "Loading #{app.inspect} code from #{$APP_ROOT.inspect}..."
+      
       $: <<  $APP_ROOT+"/lib"
       
       $PID_FILE     = @options[:pid_file]
@@ -76,11 +83,9 @@ module Picnic
       $VERBOSE      = @options[:verbose]
       
       opts = OptionParser.new do |opts|
-        opts.banner = "Usage: #{File.basename($0)} app.rb"
-        opts.define_head "#{File.basename($0)}, the microframework ON-button for ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
-        opts.separator ""
-        opts.separator "Application options:"
-      
+        #opts.banner = ""
+        #opts.define_head ""
+        #opts.separator ""
         opts.on("-d", "--daemonize", "Run daemonized in the background") do
           $DAEMONIZE = true
         end
@@ -106,9 +111,6 @@ module Picnic
           @options[:extra_cli_options].call(opts)
         end   
       
-        opts.separator ""
-        opts.separator "Picnic 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
@@ -146,14 +148,12 @@ module Picnic
         Dir.chdir $APP_ROOT
         File.umask 0000
         
-        STDIN.reopen "/dev/null"
-        STDOUT.reopen "/dev/null", "a"
-        STDERR.reopen "/dev/null", "a"
+        STDIN.reopen  $CONF.log[:file], "a"
+        STDOUT.reopen $CONF.log[:file], "a"
+        STDERR.reopen $CONF.log[:file], "a"
         
-        if $PID_FILE
-          File.open($PID_FILE, 'w'){ |f| f.write("#{Process.pid}") }
-          at_exit { File.delete($PID_FILE) if File.exist?($PID_FILE) }
-        end
+        File.open($PID_FILE, 'w'){ |f| f.write("#{Process.pid}") }
+        at_exit { File.delete($PID_FILE) if File.exist?($PID_FILE) }
       end
       
       server = Picnic::Server::Base.new($CONF, [options[:app_file]])

data/lib/picnic/server.rb

@@ -20,6 +20,7 @@ module Picnic::Server
         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)

data/lib/picnic/version.rb

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

data/lib/picnic.rb

@@ -8,41 +8,4 @@ require "camping"
 
 
 module Picnic
-  
-  def self.included(base)
-    base.mod_eval do
-      # Enable authentication for your app.
-      #
-      # For example:
-      #
-      #   Camping.goes :Blog
-      #   Blog.picnic!
-      #
-      #   $CONF[:authentication] ||= {:username => 'admin', :password => 'picnic'}
-      #   Blog.authenticate_using :basic
-      #
-      #   module Blog
-      #     def self.authenticate(credentials)
-      #       credentials[:username] == Taskr::Conf[:authentication][:username] &&
-      #         credentials[:password] == Taskr::Conf[:authentication][:password]
-      #     end
-      #   end
-      #
-      # Note that in the above example we use the authentication configuration from
-      # your app's conf file.
-      #
-      def authenticate_using(mod)
-        load "picnic/authentication.rb"
-        mod = self::Authentication.const_get(mod.to_s.camelize) unless mod.kind_of? Module
-        
-        $LOG.info("Enabling authentication for all requests using #{mod.inspect}.")
-        
-        module_eval do
-          include mod
-        end
-      end
-      module_function :authenticate_using
-    end
-  end
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: zuk-picnic
 version: !ruby/object:Gem::Version 
-  version: 0.7.999.20090212
+  version: 0.8.0.20090318
 platform: ruby
 authors: 
 - Matt Zukowski
@@ -9,11 +9,22 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-12 00:00:00 -08:00
+date: 2009-03-18 00:00:00 -07:00
 default_executable: 
 dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rack
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 - !ruby/object:Gem::Dependency 
   name: markaby
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -23,6 +34,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -32,6 +44,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
+  type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: