dav4rack 0.1.2 → 0.1.3

data/README.rdoc

@@ -2,9 +2,19 @@
 
 DAV4Rack is a framework for providing WebDAV via Rack allowing content
 authoring over HTTP. It is based off the {original RackDAV framework}[http://github.com/georgi/rack_dav]
-to provide better Resource support for building customized WebDAV resources
-completely abstracted from the filesystem. Support for authentication and
-locking has been added as well as a move from REXML to Nokogiri. Enjoy!
+adding some useful new features:
+
+* Better resource support for building fully virtualized resource structures
+* Generic locking as well as Resource level specific locking
+* Interceptor middleware to provide virtual mapping to resources
+* Mapped resource paths
+* Authentication support
+* Resource callbacks
+* Remote file proxying (including sendfile support for remote files)
+* Nokogiri based document parsing and building
+
+If you find issues, please create a new issue on github. If you have fixes, please fork the repo and send me
+a pull request with your modifications. If you are just here to use the library, enjoy!
 
 == Install
 
@@ -283,7 +293,7 @@ without getting stuck in a loop.
 
 === Unknown Issues
 
-Please use the issues at github: http://github.com/chrisroberts/dav4rack
+Please use the issues at github: http://github.com/chrisroberts/dav4rack/issues
 
 == License
 

data/bin/dav4rack

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require 'rubygems'
-require 'dav4rack'
+require 'dav4rack/version'
 require 'getoptlong'
 
 def print_help_msg
@@ -52,6 +52,8 @@ opts.each do |opt,arg|
   end
 end
 
+require 'dav4rack'
+
 app = Rack::Builder.new do
   use Rack::ShowExceptions
   use Rack::CommonLogger
@@ -62,14 +64,28 @@ app = Rack::Builder.new do
 
 end.to_app
 
-begin
-  puts 'Attempting to start unicorn...'
+runners = []
+runners << lambda do |x|
+  print 'Looking for unicorn... '
   require 'unicorn'
-  Unicorn.run(app, :listeners => ["0.0.0.0:3000"])
-rescue => e
-  puts "Failed to start unicorn (#{e}). Starting mongrel..."
-  Rack::Handler::Mongrel.run(app, :Port => 3000)
-rescue => e
-  puts "Failed to start mongrel (#{e}). Falling back to WEBrick."
-  Rack::Handler::WEBrick.run(app, :Port => 3000)
+  puts 'OK'
+  Unicorn.run(x, :listeners => ["0.0.0.0:3000"])
+end
+runners << lambda do |x|
+  print 'Looking for mongrel... '
+  require 'mongrel'
+  puts 'OK'
+  Rack::Handler::Mongrel.run(x, :Port => 3000)
+end
+runners << lambda do |x|
+  puts 'Loading WEBrick'
+  Rack::Handler::WEBrick.run(x, :Port => 3000)
+end
+
+begin
+  runner = runners.shift
+  runner.call(app)
+rescue LoadError
+  puts 'FAILED'
+  retry unless runners.empty?
 end

data/dav4rack.gemspec

@@ -14,6 +14,7 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files = ['README.rdoc']
   s.add_dependency 'nokogiri', '~> 1.4.2'
   s.add_dependency 'uuidtools', '~> 2.1.1'
+  s.add_dependency 'rack', '>= 1.1.0'
   s.files = %w{
 .gitignore
 LICENSE

data/lib/dav4rack/file_resource.rb

@@ -6,12 +6,8 @@ module DAV4Rack
     
     include WEBrick::HTTPUtils
     
-    def authenticate(user, pass)
-      if(options[:username])
-        options[:username] == user && options[:password] == pass
-      else
-        true
-      end
+    before do |resource, method_name|
+      resource.send(:check_authentication)
     end
     
     # If this is a collection, return the child resources.
@@ -159,6 +155,29 @@ module DAV4Rack
     
     private
 
+    def check_authentication
+      valid = true
+      if(options[:username])
+        valid = false
+        if(request.env['HTTP_AUTHORIZATION'])
+          auth = Rack::Auth::Basic::Request.new(request.env)
+          if(auth.basic? && auth.credentials)
+            valid = options[:username] == auth.credentials[0] && options[:password] == auth.credentials[1]
+          end
+        end
+      end
+      raise Unauthorized unless valid
+      valid
+    end
+    
+    def authenticate(user, pass)
+      if(options[:username])
+        options[:username] == user && options[:password] == pass
+      else
+        true
+      end
+    end
+    
     def root
       @options[:root]
     end

data/lib/dav4rack/handler.rb

@@ -42,7 +42,7 @@ module DAV4Rack
       response['Content-Length'] = response.body.to_s.length unless response['Content-Length'] || !response.body.is_a?(String)
       response.body = [response.body] if not response.body.respond_to? :each
       response.status = response.status ? response.status.to_i : 200
-      response.headers.each_pair{|k,v| response[k] = v.to_s}
+      response.headers.keys.each{|k| response.headers[k] = response[k].to_s}
       
       # Apache wants the body dealt with, so just read it and junk it
       buf = true

data/lib/dav4rack/version.rb

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

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: dav4rack
 version: !ruby/object:Gem::Version 
-  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Chris Roberts
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-12 00:00:00 -07:00
+date: 2010-09-30 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 1
         - 4
@@ -42,7 +40,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
         segments: 
         - 2
         - 1
@@ -50,6 +47,21 @@ dependencies:
         version: 2.1.1
   type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rack
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 1
+        - 0
+        version: 1.1.0
+  type: :runtime
+  version_requirements: *id003
 description: WebDAV handler for Rack
 email: chrisroberts.code@gmail.com
 executables: 
@@ -92,7 +104,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -101,7 +112,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"