dav4rack 0.1.3 → 0.1.4

data/bin/dav4rack

@@ -12,6 +12,8 @@ def print_help_msg
   puts " --username name      Set username"
   puts " --password pass      Set password"
   puts " --root /share/path   Set path to share directory"
+  puts " --log /path/to/log   Set path for logging file"
+  puts " --verbosity opt      Set logging verbosity. (Valid: debug,info,warn,fatal)"
 end
 
 def print_version_info
@@ -23,7 +25,9 @@ opts = GetoptLong.new(
   ['--password', '-p', GetoptLong::REQUIRED_ARGUMENT],
   ['--help', '-h', GetoptLong::NO_ARGUMENT],
   ['--version', '-v', GetoptLong::NO_ARGUMENT],
-  ['--root', '-r', GetoptLong::REQUIRED_ARGUMENT]
+  ['--root', '-r', GetoptLong::REQUIRED_ARGUMENT],
+  ['--log', '-l', GetoptLong::OPTIONAL_ARGUMENT],
+  ['--verbosity', '-V', GetoptLong::REQUIRED_ARGUMENT]
 )
 
 credentials = {}
@@ -46,6 +50,30 @@ opts.each do |opt,arg|
   when '--version'
     print_version_info
     exit(0)
+  when '--log'
+    require 'pathname'
+    require 'logger'
+    credentials[:log_to] = [nil, Logger::FATAL] unless credentials[:log_to]
+    if(arg && !arg.empty?)
+      dirname = Pathname.new(arg).dirname
+      if((File.exists?(arg) && File.writable?(arg)) || (File.exists?(dirname) && File.writable?(dirname)))
+        credentials[:log_to][0] = arg
+      else
+        puts "ERROR: Log file is not writable: #{arg}"
+        exit(-1)
+      end
+    else
+      credentials[:log_to][0] = $stdout
+    end
+  when '--verbosity'
+    require 'logger'
+    begin
+      credentials[:log_to] = [] unless credentials[:log_to]
+      credentials[:log_to][1] = Logger.const_get(arg.upcase)
+    rescue NameError
+      puts "ERROR: Unknown verbosity level given: #{arg}"
+      exit(-1)
+    end
   else
     puts "ERROR: Unknown option provided"
     exit(-1)

data/lib/dav4rack/controller.rb

@@ -362,9 +362,10 @@
     # Render XML and set Rack::Response#body= to final XML
     def render_xml(root_type)
       raise ArgumentError.new 'Expecting block' unless block_given?
-      doc = Nokogiri::XML::Builder.new do |xml|
-        xml.send(root_type.to_s, 'xmlns' => 'DAV:') do
-#           xml.parent.namespace = xml.parent.namespace_definitions.first
+      doc = Nokogiri::XML::Builder.new do |xml_base|
+        xml_base.send(root_type.to_s, 'xmlns:D' => 'DAV:') do
+          xml_base.parent.namespace = xml_base.parent.namespace_definitions.first
+          xml = xml_base['D']
           yield xml
         end
       end
@@ -402,7 +403,7 @@
       for name in names
         begin
           val = resource.get_property(name)
-          stats[OK].push [name, val] if val
+          stats[OK].push [name, val]
         rescue Unauthorized => u
           raise u
         rescue Status

data/lib/dav4rack/file_resource.rb

@@ -73,8 +73,7 @@ module DAV4Rack
         end
         response['Content-Length'] = response.body.size.to_s
       else
-        file = Rack::File.new(nil)
-        file.path = file_path
+        file = Rack::File.new(root)
         response.body = file
       end
       OK

data/lib/dav4rack/handler.rb

@@ -19,6 +19,8 @@ module DAV4Rack
       request = Rack::Request.new(env)
       response = Rack::Response.new
 
+      Logger.info "Processing WebDAV request: #{request.path} (for #{request.ip} at #{Time.now}) [#{request.request_method}]"
+      
       controller = nil
       begin
         controller = Controller.new(request, response, @options.dup)
@@ -48,7 +50,7 @@ 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.debug "Response in string form. Outputting contents: \n#{response.body}" if response.body.is_a?(String)
       Logger.info "Completed in: #{((Time.now.to_f - start.to_f) * 1000).to_i} ms | #{response.status} [#{request.url}]"
       
       response.body.is_a?(Rack::File) ? response.body.call(env) : response.finish

data/lib/dav4rack/version.rb

@@ -1,3 +1,3 @@
 module DAV4Rack
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dav4rack
 version: !ruby/object:Gem::Version 
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Chris Roberts
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-30 00:00:00 -07:00
+date: 2010-10-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,6 +26,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 1
         - 4
@@ -40,6 +42,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 9
         segments: 
         - 2
         - 1
@@ -55,6 +58,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
         - 1
         - 1
@@ -104,6 +108,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -112,6 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"