ripta-dm-paperclip 2.6.1 → 2.6.2.1

data/lib/dm-paperclip.rb

@@ -43,7 +43,7 @@ require 'dm-paperclip/attachment'
 # documentation for Paperclip::ClassMethods for more useful information.
 module Paperclip
 
-  VERSION = "2.6.1"
+  VERSION = "2.6.2.1"
 
   # To configure Paperclip, put this code in an initializer, Rake task, or wherever:
   #

data/lib/dm-paperclip/attachment.rb

@@ -84,12 +84,20 @@ module Paperclip
         instance_write(:content_type,    uploaded_file['content_type'] ? uploaded_file['content_type'].strip : uploaded_file['tempfile'].content_type.to_s.strip)
         instance_write(:file_size,       uploaded_file['size'] ? uploaded_file['size'].to_i : uploaded_file['tempfile'].size.to_i)
         instance_write(:updated_at,      Time.now)
-      else
+      elsif uploaded_file.respond_to?(:to_tempfile)
         @queued_for_write[:original]   = uploaded_file.to_tempfile
         instance_write(:file_name,       uploaded_file.original_filename.strip.gsub(/[^\w\d\.\-]+/, '_'))
         instance_write(:content_type,    uploaded_file.content_type.to_s.strip)
         instance_write(:file_size,       uploaded_file.size.to_i)
         instance_write(:updated_at,      Time.now)
+      elsif uploaded_file.respond_to?(:tempfile)
+        @queued_for_write[:original]   = uploaded_file.tempfile
+        instance_write(:file_name,       uploaded_file.original_filename.strip.gsub(/[^\w\d\.\-]+/, '_'))
+        instance_write(:content_type,    uploaded_file.content_type.to_s.strip)
+        instance_write(:file_size,       uploaded_file.size.to_i)
+        instance_write(:updated_at,      Time.now)
+      else
+        raise ArgumentError, "The +uploaded_file+ (#{uploaded_file.class.name}) must respond to one of: [], to_tempfile, or tempfile"
       end
 
       @dirty = true

data/test/paperclip_test.rb

@@ -62,6 +62,7 @@ class PaperclipTest < Test::Unit::TestCase
     context "with a subclass" do
       setup do
         class ::SubDummy < Dummy; end
+        SubDummy.finalize
       end
 
       should "be able to use the attachment from the subclass" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ripta-dm-paperclip
 version: !ruby/object:Gem::Version
-  version: 2.6.1
+  version: 2.6.2.1
   prerelease: 
 platform: ruby
 authors: