picnic 0.6.0 → 0.6.1

data/CHANGELOG.txt

@@ -1,3 +1,11 @@
+=== 0.6.1 :: 2007-02-28
+
+* Fixed bug introduced in 0.6.0 where webrick and mongrel postambles were
+  broken for apps that don't define any public directories.
+* Each public directory mount is now logged during startup. Also resolved
+  some potential issues with the uri_path config option. Multiple /'s
+  in the path are now automatically removed.
+
 === 0.6.0 :: 2007-02-26
 
 * Added support for CAS authentication. See picnic/authentication.rb for 

data/lib/picnic/authentication.rb

@@ -110,9 +110,10 @@ module Picnic #:nodoc:
     #    contents.
     #
     module Cas
-      require 'camping/db'
-      require 'camping/session'
-      
+      def self.include
+        require 'camping/db'
+        require 'camping/session'
+      end
       
       $: << File.dirname(File.expand_path(__FILE__))+"/../../../rubycas-client2/lib" # for development
       require 'rubycas-client'

data/lib/picnic/postambles.rb

@@ -51,12 +51,16 @@ module Picnic
       s.mount "#{Picnic::Conf.uri_path}", WEBrick::CampingHandler, self
       
       public_dirs = Picnic::Conf.public_dirs || Picnic::Conf.public_dir
-      public_dirs = [public_dirs] unless public_dirs.kind_of? Array
-      
-      public_dirs.each do |d|
-        s.mount "#{Picnic::Conf.uri_path}#{d[:path]}", WEBrick::HTTPServlet::FileHandler, d[:dir]
+      if public_dirs
+        public_dirs = [public_dirs] unless public_dirs.kind_of? Array
+        
+        public_dirs.each do |d|
+          dir = d[:dir]
+          path = "#{Picnic::Conf.uri_path}/#{d[:path]}".gsub(/\/\/+/,'/')
+          $LOG.debug("Mounting public directory #{dir.inspect} to path #{path.inspect}.")
+          s.mount(path, WEBrick::HTTPServlet::FileHandler, dir)
+        end
       end
-      
     
       # This lets Ctrl+C shut down your server
       trap(:INT) do
@@ -142,18 +146,26 @@ module Picnic
       $LOG.close if $DAEMONIZE
       
       public_dirs = Picnic::Conf.public_dirs || Picnic::Conf.public_dir
-      public_dirs = [public_dirs] unless public_dirs.kind_of? Array
+      public_dirs = [public_dirs] unless 
+        public_dirs.kind_of? Array || public_dirs.nil?
       
       begin
         app_mod = self
         mongrel = Mongrel::Configurator.new settings  do
           daemonize :log_file => Picnic::Conf.log[:file], :cwd => $APP_PATH if $DAEMONIZE
-          puts Picnic::Conf.uri_path
           listener :port => Picnic::Conf.port do
             uri Picnic::Conf.uri_path, :handler => Mongrel::Camping::CampingHandler.new(app_mod)
-            public_dirs.each do |d|
-              uri "#{Picnic::Conf.uri_path}#{d[:path]}", :handler => Mongrel::DirHandler.new(d[:dir])
+            
+            
+            if public_dirs
+              public_dirs.each do |d|
+                dir = d[:dir]
+                path = "#{Picnic::Conf.uri_path}/#{d[:path]}".gsub(/\/\/+/,'/')
+                $LOG.debug("Mounting public directory #{dir.inspect} to path #{path.inspect}.")
+                uri(path, :handler => Mongrel::DirHandler.new(dir))
+              end
             end
+            
             setup_signals
           end
         end

data/lib/picnic/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: picnic
 version: !ruby/object:Gem::Version 
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors: 
 - Matt Zukowski
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-02-26 00:00:00 -05:00
+date: 2008-02-28 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency