bteitelb-paperclip 2.3.1.14 → 2.3.1.15

data/lib/paperclip/attachment.rb

@@ -253,6 +253,16 @@ module Paperclip
         new_original.rewind
 
         @queued_for_write = { :original => new_original }
+        
+        begin
+          geometry = Paperclip::Geometry.from_file(@queued_for_write[:original])
+          instance_write(:width, geometry.width.to_i)
+          instance_write(:height, geometry.height.to_i)
+          instance.save
+        rescue NotIdentifiedByImageMagickError => e
+          log("Couldn't get dimensions for #{name}: #{e}")
+        end
+
         post_process
 
         old_original.close if old_original.respond_to?(:close)

data/lib/paperclip/iostream.rb

@@ -4,7 +4,8 @@ module IOStream
 
   # Returns a Tempfile containing the contents of the readable object.
   def to_tempfile
-    tempfile = Tempfile.new("stream")
+    name = respond_to?(:original_filename) ? original_filename : (respond_to?(:path) ? path : "stream")
+    tempfile = Paperclip::Tempfile.new(File.basename(name))
     tempfile.binmode
     self.stream_to(tempfile)
   end

data/test/attachment_test.rb

@@ -133,7 +133,7 @@ class AttachmentTest < Test::Unit::TestCase
                                :styles => { :default => ["100x100", :png] },
                                :default_style => :default
       @file = StringIO.new("...")
-      @file.expects(:original_filename).returns("file.jpg")
+      @file.stubs(:original_filename).returns("file.jpg")
     end
     should "return the right extension for the path" do
       @attachment.assign(@file)

data/test/helper.rb

@@ -3,7 +3,7 @@ require 'test/unit'
 require 'shoulda'
 require 'tempfile'
 
-gem 'jferris-mocha', '0.9.5.0.1241126838'
+gem 'jferris-mocha'
 require 'mocha'
 
 gem 'sqlite3-ruby'

data/test/iostream_test.rb

@@ -58,8 +58,15 @@ class IOStreamTest < Test::Unit::TestCase
         assert @tempfile = @file.to_tempfile
       end
 
-      should "convert it to a Tempfile" do
-        assert @tempfile.is_a?(Tempfile)
+      should "convert it to a Paperclip Tempfile" do
+        assert @tempfile.is_a?(Paperclip::Tempfile)
+      end
+
+      should "have the name be based on the original_filename" do
+        name = File.basename(@file.path)
+        extension = File.extname(name)
+        basename = File.basename(name, extension)
+        assert_match %r[^#{Regexp.quote(basename)}.*?#{Regexp.quote(extension)}], File.basename(@tempfile.path)
       end
 
       should "have the Tempfile contain the same data as the file" do

metadata

@@ -1,7 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: bteitelb-paperclip
 version: !ruby/object:Gem::Version 
-  version: 2.3.1.14
+  hash: 109
+  prerelease: 
+  segments: 
+  - 2
+  - 3
+  - 1
+  - 15
+  version: 2.3.1.15
 platform: ruby
 authors: 
 - Jon Yurek
@@ -14,64 +21,92 @@ default_executable:
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thoughtbot-shoulda
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: jferris-mocha
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: -906356816
+        segments: 
+        - 0
+        - 9
+        - 5
+        - 0
+        - 1241126838
         version: 0.9.5.0.1241126838
-    version: 
+  type: :development
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: aws-s3
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: sqlite3-ruby
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: activerecord
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id006
 description: 
 email: jyurek@thoughtbot.com
 executables: []
@@ -138,21 +173,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: 
 - ImageMagick
 rubyforge_project: paperclip
-rubygems_version: 1.3.5
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: File attachments as attributes for ActiveRecord