dm-paperclip 2.1.2 → 2.1.2.1

data/init.rb

@@ -1,2 +1 @@
-require File.join(File.dirname(__FILE__), 'lib', 'dm-paperclip')
-File.send :include, Paperclip::Upfile
+require File.join(File.dirname(__FILE__), 'lib', 'dm-paperclip')

data/lib/dm-paperclip.rb

@@ -37,7 +37,7 @@ require File.join(File.dirname(__FILE__), 'dm-paperclip', 'attachment')
 require File.join(File.dirname(__FILE__), 'dm-paperclip', 'validations') unless defined?(DataMapper::Validate).nil?
 
 module Paperclip
-  VERSION = "2.1.2"
+  VERSION = "2.1.2.1"
   class << self
     # Provides configurability to Paperclip. There are a number of options available, such as:
     # * whiny_thumbnails: Will raise an error if Paperclip cannot process thumbnails of 
@@ -214,16 +214,12 @@ module Paperclip
 
     def destroy_attached_files
       each_attachment do |name, attachment|
-        attachment.queue_existing_for_delete
-        attachment.flush_deletes
+        attachment.send(:queue_existing_for_delete)
+        attachment.send(:flush_deletes)
       end
     end
   end
 
 end
 
-# Set it all up.
-if Object.const_defined?("ActiveRecord")
-  ActiveRecord::Base.send(:include, Paperclip)
-  File.send(:include, Paperclip::Upfile)
-end
+File.send(:include, Paperclip::Upfile)

data/lib/dm-paperclip/attachment.rb

@@ -57,11 +57,19 @@ module Paperclip
 
       return nil if uploaded_file.nil?
 
-      @queued_for_write[:original]        = uploaded_file.to_tempfile
-      newvals = { :"#{@name}_file_name"    => uploaded_file.original_filename,
-                  :"#{@name}_content_type" => uploaded_file.content_type,
-                  :"#{@name}_file_size"    => uploaded_file.size }
-      @instance.update_attributes(newvals)
+      if uploaded_file.is_a?(Mash)
+        @queued_for_write[:original]          = uploaded_file['tempfile']
+        newvals = { :"#{@name}_file_name"    => uploaded_file['filename'],
+                    :"#{@name}_content_type" => uploaded_file['content_type'],
+                    :"#{@name}_file_size"    => uploaded_file['size'] }
+        @instance.update_attributes(newvals)
+      else
+        @queued_for_write[:original]          = uploaded_file.to_tempfile
+        newvals = { :"#{@name}_file_name"    => uploaded_file.original_filename,
+                    :"#{@name}_content_type" => uploaded_file.content_type,
+                    :"#{@name}_file_size"    => uploaded_file.size }
+        @instance.update_attributes(newvals)
+      end
 
       @dirty = true
 
@@ -181,7 +189,12 @@ module Paperclip
     end
 
     def valid_assignment? file #:nodoc:
-      file.nil? || (file.respond_to?(:original_filename) && file.respond_to?(:content_type))
+      return true if file.nil?
+      if(file.is_a?(File))
+        (file.respond_to?(:original_filename) && file.respond_to?(:content_type))
+      elsif(file.is_a?(Mash))
+        (file.include?('tempfile') && file.include?('content_type') && file.include?('size') && file.include?('filename'))
+      end
     end
 
     def validate #:nodoc:

data/test/helper.rb

@@ -36,6 +36,11 @@ ENV['RAILS_ENV'] ||= 'test'
 FIXTURES_DIR = File.join(File.dirname(__FILE__), "fixtures") 
 DataMapper.setup(:default, 'sqlite3::memory:')
 
+unless defined?(Mash)
+  class Mash < Hash
+  end
+end
+
 def rebuild_model options = {}
   DataMapper::Migration.new( 1, :drop_dummies_table ) do
     up do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-paperclip
 version: !ruby/object:Gem::Version 
-  version: 2.1.2
+  version: 2.1.2.1
 platform: ruby
 authors: 
 - Ken Robertson