railsdav 0.0.5 → 0.0.6

data/README.md

@@ -175,7 +175,8 @@ is_webdav_request? checks whether an Incoming request is issued by a WebDAV clie
 
 ## Changelog
 
-* 0.0.5: Rails 3.1.x compatibility, add encoding hints, fix ResourceDescriptor load error
+* 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
 * 0.0.4: Basic support for allprop in PROPFIND
 * 0.0.3: Change the API within the responder block to a more concise one
 * 0.0.2: More or less a complete rewrite: Use more sensible API, modularize the renderer code, get rid of controller monkey patching

data/lib/railsdav/routing_extensions.rb

@@ -50,21 +50,29 @@ class ActionDispatch::Routing::Mapper
   end
 
   module Resources
-    CANONICAL_ACTIONS << :update_all
+    CANONICAL_ACTIONS << 'update_all'
 
     class WebDAVResource < Resource
       DEFAULT_ACTIONS = [:index, :create, :new, :show, :update, :destroy, :edit, :update_all]
+
+      def default_actions
+        DEFAULT_ACTIONS
+      end
     end
 
     class WebDAVSingletonResource < SingletonResource
       DEFAULT_ACTIONS = [:show, :create, :update, :destroy, :new, :edit]
+
+      def default_actions
+        DEFAULT_ACTIONS
+      end
     end
 
     def resource_scope?
       [:webdav_resource, :webdav_resources, :resource, :resources].include?(@scope[:scope_level])
     end
 
-    if Rails.version <= '3.1.0'
+    if 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)
@@ -87,7 +95,7 @@ class ActionDispatch::Routing::Mapper
     end
 
     def dav_options_response(*allowed_http_verbs)
-      lambda { [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)
@@ -96,13 +104,13 @@ class ActionDispatch::Routing::Mapper
     end
 
     def webdav_resource(*resources, &block)
-      options = resources.extract_options!
+      options = resources.extract_options!.dup
 
       if apply_common_behavior_for(:webdav_resource, resources, options, &block)
         return self
       end
 
-      sub_block = lambda do
+      sub_block = proc do
         yield if block_given?
 
         if parent_resource.actions.include?(:create)
@@ -127,7 +135,7 @@ class ActionDispatch::Routing::Mapper
         end
       end
 
-      if Rails.version <= '3.1'
+      if Rails.version < '3.2'
         resource_scope(WebDAVSingletonResource.new(resources.pop, options), &sub_block)
       else
         resource_scope(:webdav_resource, WebDAVSingletonResource.new(resources.pop, options), &sub_block)
@@ -143,7 +151,7 @@ class ActionDispatch::Routing::Mapper
         return self
       end
 
-      sub_block = lambda do
+      sub_block = proc do
         yield if block_given?
 
         opts = []
@@ -161,6 +169,8 @@ class ActionDispatch::Routing::Mapper
           if parent_resource.actions.include?(:update_all)
             put :index, :action => :update_all
             opts << :put
+          else
+            puts "parent_resource #{parent_resource.inspect} does not include update_all: #{parent_resource.actions}"
           end
           dav_options :index, :to => dav_options_response(opts)
         end
@@ -200,7 +210,7 @@ class ActionDispatch::Routing::Mapper
         end
       end
 
-      if Rails.version <= '3.1'
+      if Rails.version < '3.2'
         resource_scope(WebDAVResource.new(resources.pop, options), &sub_block)
       else
         resource_scope(:webdav_resources, WebDAVResource.new(resources.pop, options), &sub_block)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: railsdav
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-18 00:00:00.000000000 Z
+date: 2013-06-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