railsdav 0.0.9 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb61b0fb86c9d65ce305542027125a26262ab593
-  data.tar.gz: 27f5e8f4eef0c690dede3294ec36ef79edb6fb79
+  metadata.gz: d9214f02f0ddee87b623b108da44fa372465f909
+  data.tar.gz: c73f172965f4594434f2913ad64213042f9f54a3
 SHA512:
-  metadata.gz: 537139d46c53214aa85a9332be4e39ea3cd34c8ee3f1d017b0798d291c7176eefd392111466a2bd89ca339e3859b8c2034d474fb03321624e6578a32ce30236c
-  data.tar.gz: 3c737a0af8f936bab56082f5d63b751a8ffc84a76a87c7321aedd61cd54a6abf2be18b98a8dead8d229d3802545f65d65f0f06650aeac24bb8abb9274405f083
+  metadata.gz: d6fb995d3fb0853b5abfa31d81328e7d4075988c583658bc5d03474080672702dc6399581cad8e08ae27d9283106723716ac63624af83536678532372c1ff17d
+  data.tar.gz: 605323afd1e7029366a719e56ac2867bbecf9086d3b3babcd82c1324e4033095aeb9ac97b8d207af55180664048eadbda3c3cad4cda7dee52149e84bf48f84c3

data/README.md

@@ -1,15 +1,15 @@
 # RailsDAV
 
-Make your Rails 4 resources accessible via WebDAV.
+Make your Rails 3/4 resources accessible via WebDAV.
 
-This gem provides basic Rails 3 extensions for making your business
+This gem provides basic Rails 3/4 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
+Definitely works with Rails 3.0.9, 3.2.13 and 4.2.4, 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.
@@ -23,7 +23,7 @@ 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'
+    gem 'railsdav'
 
 and then run:
 
@@ -182,6 +182,8 @@ is_webdav_request? checks whether an Incoming request is issued by a WebDAV clie
 
 ## Changelog
 
+* 0.1.0: Rails 4.2 compatibility
+* 0.0.9: Add missing file to gemspec
 * 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

data/lib/railsdav/renderer.rb

@@ -2,6 +2,12 @@
 
 require 'builder'
 
+if Rails.version > '4.0'
+  require 'active_support'
+  require 'active_support/core_ext/hash/conversions'
+end
+
+
 module Railsdav
   class Renderer
     autoload :ResourceDescriptor,   'railsdav/renderer/resource_descriptor'
@@ -29,9 +35,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']}"
+      Rails.logger.debug "Depth:#{@request.headers['Depth']}"
     end
 
     # Render the requested response_type.
@@ -118,15 +124,22 @@ module Railsdav
 
       render do |dav|
         propstat_for response_collector.resource
-        propstat_for response_collector.subresources if @depth > 0
+        propstat_for response_collector.subresources if @depth >= 0
       end
     end
 
     private
 
     def propstat_for(*resources)
-      params = @controller.params
-      params[:propfind] ||= {:prop => []}
+      params = @controller.params.dup
+      if params[:propfind]
+        # OK
+      elsif @controller.request.body.size > 0 # rails version without automatic XML body params parsing, so do it by hand here:
+        @controller.request.body.rewind
+        params.merge! Hash.from_xml(@controller.request.body.read)
+      else
+        params[:propfind] ||= {:prop => []}
+      end
 
       if params[:propfind].has_key? 'allprop'
         requested_properties = nil # fill it later, see below.
@@ -185,25 +198,27 @@ module Railsdav
 
         # all of our built-in properties are in the DAV namespace
         # anyway:
-        gathered_namespaces = {"xmlns:lp0" => "DAV:"}
+        gathered_namespaces = {}
         @namespace_counter ||= 1
-        
+
         namespaced_requested_properties = {}
 
+        Rails.logger.debug requested_properties.inspect
         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"]
+
+          if (!opts.nil?) and 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
+            # DAV namespace (which we hardcoded to the `D` prefix).
+            namespaced_requested_properties["D:#{prop_name}"] = opts
           end
         end
 

data/lib/railsdav/routing_extensions.rb

@@ -4,10 +4,12 @@
 # userinfo is not a standard webdav verb, bur davfs2 uses it
 # and we want to be prepared to ignore it gracefully (e.g.
 # by sending a :not_implemented response)
-verbs = %w(propfind proppatch mkcol copy move lock unlock userinfo)
-verbs.each do |method|
-  ActionDispatch::Request::HTTP_METHODS << method.upcase
-  ActionDispatch::Request::HTTP_METHOD_LOOKUP[method.upcase] = method.to_sym
+if Rails.version < '3.2'
+  verbs = %w(propfind proppatch mkcol copy move lock unlock userinfo)
+  verbs.each do |method|
+    ActionDispatch::Request::HTTP_METHODS << method.upcase
+    ActionDispatch::Request::HTTP_METHOD_LOOKUP[method.upcase] = method.to_sym
+  end
 end
 
 # Extend routing s.t. webdav_resource and webdav_resources can be used,
@@ -50,11 +52,11 @@ class ActionDispatch::Routing::Mapper
       end
     end
 
-    def resource_scope?
-      [:webdav_resource, :webdav_resources, :resource, :resources].include?(@scope[:scope_level])
-    end
-
-    if Rails.version < '3.2'
+    if Rails.version >= '4.2'
+      def resource_scope? #:nodoc:
+        @scope.resource_scope?
+      end
+    elsif Rails.version < '3.2'
       # Rails versions after 3.1 expect two arguments here, the first being :resource, :resources,
       # :webdav_resource etc.so we don't need the inferring logic anymore in newer versions.
       def resource_scope(resource)
@@ -74,14 +76,24 @@ class ActionDispatch::Routing::Mapper
           end
         end
       end
+    else
+      def resource_scope?
+        [:webdav_resource, :webdav_resources, :resource, :resources].include?(@scope[:scope_level])
+      end
     end
 
     def dav_options_response(*allowed_http_verbs)
+      Rails.logger.info "responding to OPTIONS with Allow: #{allowed_http_verbs.flatten.map{|s| s.to_s.upcase}.join(' ')}"
       proc { [200, {'Allow' => allowed_http_verbs.flatten.map{|s| s.to_s.upcase}.join(' '), 'DAV' => '1'}, [' ']] }
     end
 
     def dav_match(*args)
       get *args
+      if args.last.is_a? Hash
+        # prevents `Invalid route name, already in use`
+        args.last.delete(:as)
+        args.last.delete('as')
+      end
       dav_propfind *args
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: railsdav
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors:
 - Willem van Kerkhof
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-11 00:00:00.000000000 Z
+date: 2016-11-24 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