bcms_webdav 1.0.2 → 1.0.4

data/README.rdoc

@@ -14,6 +14,8 @@ For more information on WebDAV see: http://en.wikipedia.org/wiki/WebDAV
 * Users must have 'Administer CMS' permissions in order to access resources via WebDAV.
 * Users can use their normal cms username and password.
 
+Note: Currently this module is tested to work on Passenger and Mongrel. Other rack servers may work, but implementations for file upload differ slightly.
+
 === Clients
 
 In order to take advantage of this module, users will need a WebDAV client. Many FTP clients will support this, including:

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.0.4

data/lib/bcms_webdav/resource.rb

@@ -125,13 +125,13 @@ module Bcms
 
       # Handle uploading file.
       def put(request, response)
+        temp_file = extract_tempfile(request)
 
-        temp_file = request.body
         add_rails_like_methods(temp_file)
 
         section = find_section_for(path)
 
-        file_block = FileBlock.new(:name=>path, :attachment_file=>request.body, :attachment_section => section, :attachment_file_path=>path, :publish_on_save=>true)
+        file_block = FileBlock.new(:name=>path, :attachment_file=>temp_file, :attachment_section => section, :attachment_file_path=>path, :publish_on_save=>true)
         unless file_block.save
           log "Couldn't save file."
           file_block.errors.each do |error|
@@ -154,6 +154,28 @@ module Bcms
 
       private
 
+      # Different webservers have slightly different behavior for uploaded files.
+      #   1. Webrick/mongrel - body is a TempFile
+      #   2. Passenger - body is a PhusionPassenger::Utils::RewindableInput
+      #
+      # Until Rails 3, which may have a consistent middleware for extracting a Tempfile, we have to do it this way.
+      def extract_tempfile(request)
+        input = request.body
+        if input
+          # Handle Mongrel
+          return input if input.is_a?(Tempfile)
+
+          # Handle Passenger
+          # This is highly brittle and terrible.
+          if input.respond_to?(:make_rewindable, true)
+            input.size # Force creation of Tempfile
+            return input.instance_variable_get(:@rewindable_io)
+          end
+        end
+
+
+      end
+
       def log_exists(type, path)
         log "Resource of type '#{type}' with path '#{path}' exists."
       end

data/test/unit/web_dav_resource_test.rb

@@ -15,6 +15,7 @@ class WebDavSectionResourceTest < ActiveSupport::TestCase
 
   end
 
+  
   test 'users with administrate permissions can access resources' do
     mock_user = mock()
     User.expects(:authenticate).with("abc", "123").returns(mock_user)
@@ -292,9 +293,35 @@ class FileResourceTest < ActiveSupport::TestCase
   test "parse missing slash section" do
     path = Bcms::WebDAV::Path.new('test.jpg')
     assert_equal "test.jpg", path.file_name
+  end
+  
+  test "extract tempfile from mongrel style requests" do
+    tempfile = Tempfile.new("testing")
+    @request.expects(:body).returns(tempfile)
+
+    assert_equal tempfile, @resource.send(:extract_tempfile, @request)
+    
+  end
+
+  test "extract tempfile from passenger style requests" do
+    class FakeRewindable
+      def size
+        @rewindable_io = 'EXPECTED'
+      end
+      private
 
+      # Matches passengers rewindable input signature
+      def make_rewindable
+        'do nothing'
+      end
+    end
 
+    rewindable_input = FakeRewindable.new
+    @request.expects(:body).returns(rewindable_input)
+
+    assert_equal 'EXPECTED', @resource.send(:extract_tempfile, @request)
   end
+
   private
   def resource_for(path)
     Bcms::WebDAV::Resource.new(path, path, @request, @response, {})

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bcms_webdav
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 31
   prerelease: false
   segments: 
   - 1
   - 0
-  - 2
-  version: 1.0.2
+  - 4
+  version: 1.0.4
 platform: ruby
 authors: 
 - BrowserMedia