dm-paperclip-r3 2.4.4 → 2.4.5

data/lib/dm-paperclip-r3.rb

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

data/lib/dm-paperclip-r3/attachment.rb

@@ -77,21 +77,11 @@ module Paperclip
 
       return nil if uploaded_file.nil?
 
-      if uploaded_file.respond_to?(:[])
-        uploaded_file = uploaded_file.to_mash
-        
-        @queued_for_write[:original]   = to_tempfile(uploaded_file)
-        instance_write(:file_name,       uploaded_file['filename'].strip.gsub(/[^\w\d\.\-]+/, '_'))
-        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
-        @queued_for_write[:original]   = to_tempfile(uploaded_file)
-        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)
-      end
+      @queued_for_write[:original] = to_tempfile(uploaded_file)
+      instance_write(:file_name, uploaded_file.original_filename.strip)
+      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)
 
       @dirty = true
 

data/lib/dm-paperclip-r3/iostream.rb

@@ -6,7 +6,7 @@ module IOStream
   def to_tempfile(object)
     return object.to_tempfile if object.respond_to?(:to_tempfile)
     name = object.respond_to?(:original_filename) ? object.original_filename : (object.respond_to?(:path) ? object.path : "stream")
-    tempfile = Paperclip::Tempfile.new(["stream", File.extname(name)])
+    tempfile = Tempfile.new(File.basename(name))
     tempfile.binmode
     stream_to(object, tempfile)
   end

data/lib/dm-paperclip-r3/processor.rb

@@ -33,17 +33,4 @@ module Paperclip
       new(file, options, attachment).make
     end
   end
-
-  # Due to how ImageMagick handles its image format conversion and how Tempfile
-  # handles its naming scheme, it is necessary to override how Tempfile makes
-  # its names so as to allow for file extensions. Idea taken from the comments
-  # on this blog post:
-  # http://marsorange.com/archives/of-mogrify-ruby-tempfile-dynamic-class-definitions
-  class Tempfile < ::Tempfile
-    # Replaces Tempfile's +make_tmpname+ with one that honors file extensions.
-    def make_tmpname(basename, n)
-      extension = File.extname(basename)
-      sprintf("%s,%d,%d%s", File.basename(basename, extension), $$, n, extension)
-    end
-  end
 end

data/test/iostream_test.rb

@@ -59,7 +59,7 @@ class IOStreamTest < Test::Unit::TestCase
       end
 
       should "convert it to a Paperclip Tempfile" do
-        assert @tempfile.is_a?(Paperclip::Tempfile)
+        assert @tempfile.is_a?(Tempfile)
       end
 
       should "have the name be based on the original_filename" do

data/test/thumbnail_test.rb

@@ -11,7 +11,7 @@ class ThumbnailTest < Test::Unit::TestCase
 
   context "A Paperclip Tempfile" do
     setup do
-      @tempfile = Paperclip::Tempfile.new("file.jpg")
+      @tempfile = Tempfile.new(["file", ".jpg"])
     end
 
     should "have its path contain a real extension" do
@@ -25,7 +25,7 @@ class ThumbnailTest < Test::Unit::TestCase
 
   context "Another Paperclip Tempfile" do
     setup do
-      @tempfile = Paperclip::Tempfile.new("file")
+      @tempfile = Tempfile.new("file")
     end
 
     should "not have an extension if not given one" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dm-paperclip-r3
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
+  hash: 21
+  prerelease: 
   segments: 
   - 2
   - 4
-  - 4
-  version: 2.4.4
+  - 5
+  version: 2.4.5
 platform: ruby
 authors: 
 - Joel Reed
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-21 00:00:00 -04:00
-default_executable: 
+date: 2010-04-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: extlib
@@ -142,7 +141,6 @@ files:
 - test/paperclip_test.rb
 - test/storage_test.rb
 - test/thumbnail_test.rb
-has_rdoc: true
 homepage: http://github.com/joelwreed/dm-paperclip
 licenses: []
 
@@ -173,7 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - ImageMagick
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Ken Robertson's dm-paperclip with patches for rails > 3.0.0