rack_dav 0.3.1 → 0.4.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: e79ae582f10f164cfcd53a6a2b5a48aaad203635
+  data.tar.gz: e385c0976e3a93eecac509509c53ca7e304b44b8
+SHA512:
+  metadata.gz: 0a3e8849bbed3be0100b1978a52d77510c1ccf4801079a2df9647155de3142dfd51911486f13c00a602cbb4db8fa4a46fbf953dbb091599c958ee1a57b42031c
+  data.tar.gz: 01d765203ece91396cf9eb80584c4cfd14f99a8f356d0f5fa1a8fa9539905589d9919ca297a06a08e341a1fb52a96b8959ea1e2291c38cd8516443cb99c5f2ed

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 2.0.0
+  - 1.9.3
+  - 1.9.2

data/Gemfile.lock

@@ -1,25 +1,26 @@
 PATH
   remote: .
   specs:
-    rack_dav (0.3.0)
+    rack_dav (0.3.1)
       nokogiri
-      rack (~> 1.4.0)
+      rack (>= 1.4.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    diff-lcs (1.1.3)
-    nokogiri (1.5.5)
-    rack (1.4.1)
-    rake (0.9.2.2)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.2)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.1)
+    diff-lcs (1.2.1)
+    nokogiri (1.5.8)
+    nokogiri (1.5.8-java)
+    rack (1.5.2)
+    rake (10.0.3)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.0)
 
 PLATFORMS
   java
@@ -27,5 +28,5 @@ PLATFORMS
 
 DEPENDENCIES
   rack_dav!
-  rake (~> 0.9.0)
-  rspec (~> 2.11.0)
+  rake (>= 0.9.0)
+  rspec (>= 2.11.0)

data/README.md

@@ -85,7 +85,7 @@ to retrieve and change the resources:
 
 * __make\_collection__: Create this resource as collection.
 
-* __lock(token, timeout, scope, type, owner)__: Lock this resource.
+* __lock(locktoken, timeout, lockscope=nil, locktype=nil, owner=nil)__: Lock this resource.
   If scope, type and owner are nil, refresh the given lock.
 
 * __unlock(token)__: Unlock this resource

data/lib/rack_dav/controller.rb

@@ -13,7 +13,7 @@ module RackDAV
       @request  = request
       @response = response
       @options  = options
-      @resource = resource_class.new(url_unescape(request.path_info), @options)
+      @resource = resource_class.new(url_unescape(request.path_info), @request, @response, @options)
       raise Forbidden if request.path_info.include?('../')
     end
 
@@ -52,20 +52,20 @@ module RackDAV
       response['Content-Length'] = resource.content_length.to_s
       response['Last-Modified'] = resource.last_modified.httpdate
       map_exceptions do
-        resource.get(request, response)
+        resource.get
       end
     end
 
     def put
       raise Forbidden if resource.collection?
       map_exceptions do
-        resource.put(request, response)
+        resource.put
       end
     end
 
     def post
       map_exceptions do
-        resource.post(request, response)
+        resource.post
       end
     end
 
@@ -97,7 +97,7 @@ module RackDAV
       raise BadGateway if dest_uri.host and dest_uri.host != request.host
       raise Forbidden if destination == resource.path
 
-      dest = resource_class.new(destination, @options)
+      dest = resource_class.new(destination, @request, @response, @options)
       dest = dest.child(resource.name) if dest.collection?
 
       dest_existed = dest.exist?
@@ -124,7 +124,7 @@ module RackDAV
       raise BadGateway if dest_uri.host and dest_uri.host != request.host
       raise Forbidden if destination == resource.path
 
-      dest = resource_class.new(destination, @options)
+      dest = resource_class.new(destination, @request, @response, @options)
       dest = dest.child(resource.name) if dest.collection?
 
       dest_existed = dest.exist?
@@ -296,8 +296,13 @@ module RackDAV
       end
 
       def request_document
-        @request_document ||= Nokogiri::XML(request.body.read) {|config| config.strict }
-      rescue Nokogiri::XML::SyntaxError
+        @request_document ||= if (body = request.body.read).empty?
+          Nokogiri::XML::Document.new
+        else
+          Nokogiri::XML(body, &:strict)
+        end
+
+      rescue Nokogiri::XML::SyntaxError, RuntimeError # Nokogiri raise RuntimeError :-(
         raise BadRequest
       end
 

data/lib/rack_dav/file_resource.rb

@@ -68,33 +68,33 @@ module RackDAV
     # HTTP GET request.
     #
     # Write the content of the resource to the response.body.
-    def get(request, response)
+    def get
       if stat.directory?
         content = ""
-        Rack::Directory.new(root).call(request.env)[2].each { |line| content << line }
-        response.body = [content]
-        response['Content-Length'] = (content.respond_to?(:bytesize) ? content.bytesize : content.size).to_s
+        Rack::Directory.new(root).call(@request.env)[2].each { |line| content << line }
+        @response.body = [content]
+        @response['Content-Length'] = (content.respond_to?(:bytesize) ? content.bytesize : content.size).to_s
       else
         file = File.open(file_path)
-        response.body = file
+        @response.body = file
       end
     end
 
     # HTTP PUT request.
     #
     # Save the content of the request.body.
-    def put(request, response)
-      if request.env['HTTP_CONTENT_MD5']
-        content_md5_pass?(request.env) or raise HTTPStatus::BadRequest.new('Content-MD5 mismatch')
+    def put
+      if @request.env['HTTP_CONTENT_MD5']
+        content_md5_pass?(@request.env) or raise HTTPStatus::BadRequest.new('Content-MD5 mismatch')
       end
 
-      write(request.body)
+      write(@request.body)
     end
 
     # HTTP POST request.
     #
     # Usually forbidden.
-    def post(request, response)
+    def post
       raise HTTPStatus::Forbidden
     end
 

data/lib/rack_dav/resource.rb

@@ -4,8 +4,10 @@ module RackDAV
 
     attr_reader :path, :options
 
-    def initialize(path, options)
+    def initialize(path, request, response, options)
       @path = path
+      @request = request
+      @response = response
       @options = options
     end
 
@@ -66,21 +68,21 @@ module RackDAV
     # HTTP GET request.
     #
     # Write the content of the resource to the response.body.
-    def get(request, response)
+    def get
       raise NotImplementedError
     end
 
     # HTTP PUT request.
     #
     # Save the content of the request.body.
-    def put(request, response)
+    def put
       raise NotImplementedError
     end
 
     # HTTP POST request.
     #
     # Usually forbidden.
-    def post(request, response)
+    def post
       raise NotImplementedError
     end
 
@@ -126,7 +128,7 @@ module RackDAV
     end
 
     def child(name, option={})
-      self.class.new(path + '/' + name, options)
+      self.class.new(path + '/' + name, @request, @response, options)
     end
 
     def lockable?

data/lib/rack_dav/version.rb

@@ -3,8 +3,8 @@ module RackDAV
   # Holds information about library version.
   module Version
     MAJOR = 0
-    MINOR = 3
-    PATCH = 1
+    MINOR = 4
+    PATCH = 0
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join(".")

data/rack_dav.gemspec

@@ -10,6 +10,7 @@ Gem::Specification.new do |s|
   s.homepage      = "http://georgi.github.com/rack_dav"
   s.summary       = "WebDAV handler for Rack."
   s.description   = "WebDAV handler for Rack."
+  s.license       = "MIT"
 
   s.files         = `git ls-files`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
@@ -17,8 +18,8 @@ Gem::Specification.new do |s|
 
   s.extra_rdoc_files = ["README.md"]
 
-  s.add_dependency("rack", "~> 1.4.0")
-  s.add_dependency('nokogiri')
-  s.add_development_dependency("rspec", "~> 2.11.0")
-  s.add_development_dependency("rake","~> 0.9.0")
+  s.add_dependency("rack", "~> 1.4")
+  s.add_dependency('nokogiri', "~> 1.5")
+  s.add_development_dependency("rspec", "~> 2.11")
+  s.add_development_dependency("rake","~> 0.9")
 end

metadata

@@ -1,80 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: rack_dav
 version: !ruby/object:Gem::Version
-  version: 0.3.1
-  prerelease: 
+  version: 0.4.0
 platform: ruby
 authors:
 - Matthias Georgi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-24 00:00:00.000000000 Z
+date: 2015-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: '2.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: '2.11'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '0.9'
 description: WebDAV handler for Rack.
 email: matti.georgi@gmail.com
 executables:
@@ -83,7 +74,8 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
-- .gitignore
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -109,28 +101,27 @@ files:
 - spec/spec_helper.rb
 - spec/support/lockable_file_resource.rb
 homepage: http://georgi.github.com/rack_dav
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.4.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: WebDAV handler for Rack.
 test_files: []
-has_rdoc: