railsdav 0.0.7 → 0.0.8

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 4fb6b8fa60267d9d8e9b95e30e13241660ab4411
+  data.tar.gz: ce5b83d84a637aae35036dd3e37e46be1a2371ce
+SHA512:
+  metadata.gz: af43e93abe5e6244f74f151ab4f0ea4e270d2298dcab9ce63588a9fbd124cd0bf5cfac7c2b9d5c5fd692402fbc9ca82777237e62c7565ff51ffc8b70bca34d28
+  data.tar.gz: 0f0f09fd4cb561d8f5c8cff56cb1a5348b25948a0321fdad4322d8bfd92eeeb0e37160243e555bb7ee70e4920dce1934b5189fd64b3aafdfee6f4c6496dba450

data/README.md

@@ -1,27 +1,34 @@
 # RailsDAV
 
-Make your Rails 3 resources accessible via WebDAV
+Make your Rails 4 resources accessible via WebDAV.
 
-ProvidesThis gem provides basic Rails 3 extensions for making your business resources accessible via WebDAV. This gem does by no means by no means implement the full WebDAV semantics, but it suffices to access your app with client(-libs) such as Konqueror, cadaver, davfs2 or NetDrive.
+This gem provides basic Rails 3 extensions for making your business
+resources accessible via WebDAV. This gem does by no means by no means
+implement the full WebDAV semantics, but it suffices to access your
+app with client(-libs) such as Konqueror, cadaver, davfs2 or NetDrive.
 
 ## Compatibility
 
-Definitely works with Rails 3.0.9 and 3.2.13, but should also work with versions in between.
-This is due to some hacking done "under the hood" in the Rails routing implementation as well as a simple method override in ActionController.
+Definitely works with Rails 3.0.9 and 3.2.13, but should also work
+with versions in between.  This is due to some hacking done "under the
+hood" in the Rails routing implementation as well as a simple method
+override in ActionController.
 
-f you encounter any problems with other Rails versions, please feel free to report an issue or send me a pull request on github.
+If you encounter any problems with other Rails versions, please feel
+free to report an issue or send me a pull request on github.
 
 ## Installation
 
-Just at the following to your Gemfile
+Ensure that your project has the
+[Rails ActionPack XML Params Parser gem](https://github.com/rails/actionpack-xml_parser)
+installed, and then just add the following to your Gemfile:
 
     gem 'railsdav', :git => 'https://github.com/wvk/railsdav.git'
 
-and then run
+and then run:
 
     bundle install
 
-
 ## Usage
 
 TODO: Context
@@ -175,6 +182,7 @@ is_webdav_request? checks whether an Incoming request is issued by a WebDAV clie
 
 ## Changelog
 
+* 0.0.8: Merge Contributions from naserca, orospakr, and rutgerg
 * 0.0.7: Fix metadata class attribute inheritance problem
 * 0.0.6: Fix update_all for Rails 3.2
 * 0.0.5: Rails 3.2.x compatibility, add encoding hints, fix ResourceDescriptor load error

data/lib/railsdav/renderer/response_collector.rb

@@ -1,5 +1,7 @@
 # encoding: utf-8
 
+require "uri"
+
 module Railsdav
   class Renderer
     class ResponseCollector
@@ -14,7 +16,9 @@ module Railsdav
       end
 
       def resource
-        @resource ||= Renderer::ResourceDescriptor.new(@controller.request.url, @selector.resource_options)
+
+        request_path = URI(@controller.request.url).path
+        @resource ||= Renderer::ResourceDescriptor.new(request_path, @selector.resource_options)
       end
 
       # responds to calls like html, xml, json by ignoring them

data/lib/railsdav/renderer/response_type_selector.rb

@@ -31,7 +31,8 @@ module Railsdav
 
         options = subresources.extract_options!
         subresources.each do |resource_url|
-          route = Rails.application.routes.recognize_path(resource_url)
+          relative_resource_url = resource_url.sub %r(^#{ActionController::Base.relative_url_root}), '' # HACK
+          route = Rails.application.routes.recognize_path(relative_resource_url)
 
           if meta = Renderer.webdav_metadata_for_url(route)
             # show the resource as a collection unless disabled

data/lib/railsdav/renderer.rb

@@ -29,7 +29,9 @@ module Railsdav
     def initialize(controller)
       @controller = controller
       @request    = controller.request
-      @depth      = (@request.headers['Depth'].to_i > 0) ? 1 : 0 # depth "infinite" is not yet supported
+      # @depth      = (@request.headers['Depth'].to_i > 0) ? 1 : 0 # depth "infinite" is not yet supported
+      @depth      = (@request.headers['Depth'].to_i)
+      Rails.logger.debug "Depth:\n#{@request.headers['Depth']}"
     end
 
     # Render the requested response_type.
@@ -60,7 +62,7 @@ module Railsdav
     def render
       @dav = Builder::XmlMarkup.new :indent => 2
       @dav.instruct!
-      @dav.multistatus :xmlns => 'DAV:' do
+      @dav.tag!("D:multistatus", "xmlns:D" => 'DAV:') do
         yield @dav
       end
       @dav.target!
@@ -91,7 +93,15 @@ module Railsdav
     def status_for(status)
       code   = Rack::Utils.status_code(status || :ok)
       status = "HTTP/1.1 #{code} #{Rack::Utils::HTTP_STATUS_CODES[code]}"
-      @dav.status status
+      @dav.tag! "D:status", status
+    end
+
+    # Allows you to `render :webdav => :not_found` and get a 404
+    # status properly embedded inside multi-status
+    def not_found(options = {})
+      render do |dav|
+        status_for 404
+      end
     end
 
     # Render a WebDAV multistatus response with a "response" element per resource
@@ -136,41 +146,88 @@ module Railsdav
           updated_at = Time.now
         end
 
+        # note: all of these are assumed to be from the DAV:
+        # namespace!
         response_hash = {
           :quota_used_bytes      => 0,
           :quota_available_bytes => 10.gigabytes,
-          :creationdate          => updated_at.rfc2822,
+          :creationdate          => updated_at.iso8601,
           :getlastmodified       => updated_at.rfc2822,
           :getcontentlength      => hash[:size],
           :getcontenttype        => hash[:format].to_s
         }
 
         if resource.collection?
-          response_hash[:resourcetype]   = proc { @dav.tag! :collection } # must be block to render <collection></collection> instead of "collection"
+          response_hash[:resourcetype]   = proc { @dav.tag! "D:collection" } # must be block to render <collection></collection> instead of "collection"
           response_hash[:getcontenttype] = nil
         end
 
         requested_properties ||= response_hash.keys
 
+        # as a workaround for another bug in Flycode's WebDAV module,
+        # which expects (because of how it does element name matching)
+        # that the properties are always returned with a specified
+        # namespace prefix.  Now, the original Railsdav makes a
+        # slightly careless assumption of its own; it just directly
+        # matches element names in its fixed list, counting on (and
+        # there are none so far) collisions between property names
+        # from various name spaces.  As such, it just assumes that if
+        # the property name is discrimated by a namespace, the client
+        # has only done so by putting a non-prefixed `xmlns` attribute
+        # on the propfind properties (ie., it did not try to use a
+        # prefix itself).  Railsdav really should track and match
+        # properties by both name *and* namespace, in order to be
+        # properly compliant.
+
+        # So, back to the Flycode WebDAV bug: we work around this here
+        # by collecting all of the requested properties, gathering the
+        # namespaces from them, and defining them *all* as prefixes.
+
+        # all of our built-in properties are in the DAV namespace
+        # anyway:
+        gathered_namespaces = {"xmlns:lp0" => "DAV:"}
+        @namespace_counter ||= 1
+        
+        namespaced_requested_properties = {}
+
+        requested_properties.each do |prop_name, opts|
+          if prop_name.to_s.include?(":")
+            # see first paragraph of big comment above
+            Rails.logger.warn("DAV propfind prop request contains a namespace prefix; we do NOT handle these properly yet!")
+          end
+          if (!opts.nil?) && opts["xmlns"]
+            gathered_namespaces["xmlns:lp#{@namespace_counter}"] = opts["xmlns"]
+            opts.delete("xmlns")
+            namespaced_requested_properties["lp#{@namespace_counter}:#{prop_name}"] = opts
+            @namespace_counter +=1
+          else
+            # just copy it through; however, we'll assume it's in the
+            # DAV namespace (which we hardcoded to the `lp0` prefix).
+            namespaced_requested_properties["lp0:#{prop_name}"] = opts
+          end
+        end
+
         response_for(resource.url) do |dav|
-          dav.propstat do
+          dav.tag! "D:propstat", gathered_namespaces do
             status_for hash[:status]
-            dav.prop do
-              requested_properties.each do |prop_name, opts|
+            dav.tag! "D:prop" do
+              namespaced_requested_properties.each do |both_prop_name, opts|
+                prop_space_and_name_pair = both_prop_name.split(":")
+                prop_name = prop_space_and_name_pair[1] || prop_space_and_name_pair[0]
                 if prop_val = response_hash[prop_name.to_sym]
                   if prop_val.respond_to? :call
                     if opts
-                      dav.tag! prop_name, opts, &prop_val
+                      dav.tag! both_prop_name, opts, &prop_val
                     else
-                      dav.tag! prop_name, &prop_val
+                      dav.tag! both_prop_name, &prop_val
                     end
                   else
-                    dav.tag! prop_name, prop_val, opts
+                    dav.tag! both_prop_name, prop_val, opts
                   end
                 elsif opts
-                  dav.tag! prop_name, opts
+                  dav.tag! both_prop_name, opts
                 else
-                  dav.tag! prop_name
+                  dav.tag! both_prop_name
                 end
               end # requested_properties.each
             end # dav.prop
@@ -180,8 +237,8 @@ module Railsdav
     end # def propstat_for
 
     def response_for(href)
-      @dav.response do
-        @dav.href href
+      @dav.tag! "D:response" do
+        @dav.tag! "D:href", href
         yield @dav
       end
     end

data/lib/railsdav/routing_extensions.rb

@@ -16,36 +16,18 @@ end
 # ATTENTION: adapt this to newer rails version if upgrading the framework!
 class ActionDispatch::Routing::Mapper
   module HttpHelpers
-    def dav_propfind(*args, &block)
-      map_method(:propfind, *args, &block)
-    end
-
-    def dav_options(*args, &block)
-      map_method(:options, *args, &block)
-    end
-
-    def dav_copy(*args, &block)
-      map_method(:copy, *args, &block)
-    end
-
-    def dav_move(*args, &block)
-      map_method(:move, *args, &block)
-    end
 
-    def dav_mkcol(*args, &block)
-      map_method(:mkcol, *args, &block)
-    end
-
-    def dav_lock(*args, &block)
-      map_method(:lock, *args, &block)
-    end
-
-    def dav_unlock(*args, &block)
-      map_method(:unlock, *args, &block)
-    end
-
-    def dav_proppatch(*args, &block)
-      map_method(:proppatch, *args, &block)
+    %w(propfind options copy move mkcol lock unlock proppatch).each do |method_name|
+      define_method "dav_#{method_name}" do |*args, &block|
+        case Rails.version
+        when /^3\./
+          map_method(method_name, *args, &block)
+        when /^4\./
+          map_method(method_name, args, &block)
+        else
+          raise "Your Rails Version (#{Rails.version}) is currently not supported by the RailsDAV gem."
+        end
+      end
     end
   end
 
@@ -95,7 +77,7 @@ class ActionDispatch::Routing::Mapper
     end
 
     def dav_options_response(*allowed_http_verbs)
-      proc { [200, {'Allow' => allowed_http_verbs.flatten.map{|s| s.to_s.upcase}.join(' '), 'DAV' => '1'}, ['']] }
+      proc { [200, {'Allow' => allowed_http_verbs.flatten.map{|s| s.to_s.upcase}.join(' '), 'DAV' => '1'}, [' ']] }
     end
 
     def dav_match(*args)

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: railsdav
 version: !ruby/object:Gem::Version
-  version: 0.0.7
-  prerelease: 
+  version: 0.0.8
 platform: ruby
 authors:
 - Willem van Kerkhof
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-26 00:00:00.000000000 Z
+date: 2015-09-10 00:00:00.000000000 Z
 dependencies: []
 description: Provides basic Rails 3/Rails 4 extensions for making your business resources
   accessible via WebDAV. This gem does by no means by no means implement the full
@@ -23,35 +22,34 @@ files:
 - README.md
 - init.rb
 - lib/railsdav.rb
-- lib/railsdav/routing_extensions.rb
-- lib/railsdav/request_extensions.rb
-- lib/railsdav/renderer/response_collector.rb
-- lib/railsdav/renderer/response_type_selector.rb
 - lib/railsdav/controller_extensions.rb
 - lib/railsdav/renderer.rb
+- lib/railsdav/renderer/response_collector.rb
+- lib/railsdav/renderer/response_type_selector.rb
+- lib/railsdav/request_extensions.rb
+- lib/railsdav/routing_extensions.rb
 homepage: http://github.com/wvk/railsdav
-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.23
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Make your Rails 3/4 resources accessible via WebDAV
 test_files: []
-has_rdoc: