dav4rack 0.1.0 → 0.1.1

data/README.rdoc

@@ -80,7 +80,7 @@ lets continue with the last example but this time include the interceptor:
     end
     map '/' do
       use DAV4Rack::Interceptor, :mappings => {
-                                                '/webdav/share/' => {:resource_class => FileResource, :options => {:custom => 'option'}},
+                                                '/webdav/share/' => {:resource_class => FileResource, :custom => 'option'},
                                                 '/webdav/share2/' => {:resource_class => CustomResource}
                                               }
       use Rails::Rack::Static
@@ -96,6 +96,16 @@ resources have been reached, authentication will be enforced based on the requir
 note in the root map you can see we are running a Rails application. This is how you can easily enable DAV4Rack with your Rails
 application.
 
+=== Enabling Logging
+
+DAV4Rack provides some simple logging in a Rails style format (simply for consistency) so the output should look some what familiar.
+
+  DAV4Rack::Handler.new(:resource_class => CustomResource, :log_to => '/my/log/file')
+  
+You can even specify the level of logging:
+
+  DAV4Rack::Handler.new(:resource_class => CustomResource, :log_to => ['/my/log/file', Logger::DEBUG])
+
 == Custom Resources
 
 Creating your own resource is easy. Simply inherit the DAV4Rack::Resource class, and start redefining all the methods

data/dav4rack.gemspec

@@ -29,6 +29,7 @@ lib/dav4rack/interceptor_resource.rb
 lib/dav4rack/remote_file.rb
 lib/dav4rack/lock.rb
 lib/dav4rack/lock_store.rb
+lib/dav4rack/logger.rb
 bin/dav4rack
 spec/handler_spec.rb
 README.rdoc

data/lib/dav4rack.rb

@@ -9,5 +9,5 @@ require 'dav4rack/handler'
 require 'dav4rack/controller'
 
 module DAV4Rack
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/lib/dav4rack/handler.rb

@@ -1,3 +1,5 @@
+require 'dav4rack/logger'
+
 module DAV4Rack
   
   class Handler
@@ -9,10 +11,11 @@ module DAV4Rack
         @options[:resource_class] = FileResource
         @options[:root] ||= Dir.pwd
       end
+      Logger.set(*@options[:log_to])
     end
 
     def call(env)
-      
+      start = Time.now
       request = Rack::Request.new(env)
       response = Rack::Response.new
 
@@ -28,6 +31,9 @@ module DAV4Rack
         response.status = status.code
       rescue HTTPStatus::Status => status
         response.status = status.code
+      rescue Exception => e
+        Logger.error "WebDAV Error: #{e}\n#{e.backtrace.join("\n")}"
+        raise e
       end
 
       # Strings in Ruby 1.9 are no longer enumerable.  Rack still expects the response.body to be
@@ -42,6 +48,9 @@ module DAV4Rack
       buf = true
       buf = request.body.read(8192) while buf
 
+      Logger.info "Processing WebDAV request: #{request.path} (for #{request.ip} at #{Time.now}) [#{request.request_method}]"
+      Logger.info "Completed in: #{((Time.now.to_f - start.to_f) * 1000).to_i} ms | #{response.status} [#{request.url}]"
+      
       response.finish
     end
     

data/lib/dav4rack/interceptor.rb

@@ -12,7 +12,7 @@ module DAV4Rack
       method = env['REQUEST_METHOD'].upcase
       app = nil
       if(@roots.detect{|x| path =~ /^#{Regexp.escape(x.downcase)}\/?/}.nil? && %w(OPTIONS PUT PROPFIND PROPPATCH MKCOL COPY MOVE LOCK UNLOCK).include?(method))
-        app = DAV4Rack::Handler.new(:resource_class => InterceptorResource, :mappings => @args[:mappings])
+        app = DAV4Rack::Handler.new(:resource_class => InterceptorResource, :mappings => @args[:mappings], :log_to => @args[:log_to])
       end
       app ? app.call(env) : @app.call(env)
     end

data/lib/dav4rack/interceptor_resource.rb

@@ -99,7 +99,7 @@ module DAV4Rack
       new_public.slice!(-1) if new_public[-1,1] == '/'
       new_public = "#{new_public}#{name}"
       if(key = @root_paths.find{|x| new_path =~ /^#{Regexp.escape(x.downcase)}\/?/})
-        @mappings[key][:resource_class].new(new_public, new_path.gsub(key, ''), request, response, {:root_uri_path => key, :user => @user}.merge(@mappings[key][:options] ? @mappings[key][:options] : options))
+        @mappings[key][:resource_class].new(new_public, new_path.gsub(key, ''), request, response, {:root_uri_path => key, :user => @user}.merge(options).merge(@mappings[key]))
       else
         self.class.new(new_public, new_path, request, response, {:user => @user}.merge(options))
       end

data/lib/dav4rack/logger.rb

@@ -0,0 +1,24 @@
+require 'logger'
+
+module DAV4Rack
+  # This is a simple wrapper for the Logger class. It allows easy access 
+  # to log messages from the library.
+  class Logger
+    class << self
+      # args:: Arguments for Logger -> [path, level] (level is optional)
+      # Set the path to the log file.
+      def set(*args)
+        @@logger = ::Logger.new(args.first, 'weekly')
+        if(args.size > 1)
+          @@logger.level = args[1]
+        end
+      end
+      
+      def method_missing(*args)
+        if(defined? @@logger)
+          @@logger.send *args
+        end
+      end
+    end
+  end
+end

data/lib/dav4rack/resource.rb

@@ -402,7 +402,7 @@ module DAV4Rack
     # TODO: Add support for digest
     def auth_credentials
       auth = Rack::Auth::Basic::Request.new(request.env)
-      auth.basic? && auth.credentials ? auth.credentials : [nil,nil]
+      auth.provided? && auth.basic? ? auth.credentials : [nil,nil]
     end
     
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dav4rack
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Chris Roberts
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-10 00:00:00 -07:00
+date: 2010-08-11 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -73,6 +73,7 @@ files:
 - lib/dav4rack/remote_file.rb
 - lib/dav4rack/lock.rb
 - lib/dav4rack/lock_store.rb
+- lib/dav4rack/logger.rb
 - bin/dav4rack
 - spec/handler_spec.rb
 - README.rdoc