jeremydurham-merb_paperclip 0.9.12 → 0.9.13

data/Rakefile

@@ -5,7 +5,7 @@ require 'merb-core'
 require 'merb-core/tasks/merb'
 
 GEM_NAME = "merb_paperclip"
-GEM_VERSION = "0.9.12"
+GEM_VERSION = "0.9.13"
 AUTHOR = "Jeremy Durham"
 EMAIL = "jeremydurham@gmail.com"
 HOMEPAGE = "http://www.thoughtbot.com/projects/paperclip/"
@@ -23,10 +23,9 @@ spec = Gem::Specification.new do |s|
   s.author = AUTHOR
   s.email = EMAIL
   s.homepage = HOMEPAGE
-  s.add_dependency('merb', '>= 1.0')
+  s.add_dependency('merb-core', '>= 0.9.4')
   s.require_path = 'lib'
   s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,spec}/**/*")
-  
 end
 
 Rake::GemPackageTask.new(spec) do |pkg|

data/lib/paperclip/attachment.rb

@@ -74,8 +74,8 @@ module Paperclip
 
       logger.info("[paperclip] Writing attributes for #{name}")
       @queued_for_write[:original]        = uploaded_file['tempfile']
-      @instance[:"#{@name}_file_name"]    = uploaded_file['tempfile'].original_filename.strip.gsub /[^\w\d\.\-]+/, '_'
-      @instance[:"#{@name}_content_type"] = uploaded_file['tempfile'].content_type.strip
+      @instance[:"#{@name}_file_name"]    = uploaded_file['filename'].strip.gsub /[^\w\d\.\-]+/, '_'
+      @instance[:"#{@name}_content_type"] = uploaded_file['content_type'].strip
       @instance[:"#{@name}_file_size"]    = uploaded_file['tempfile'].size.to_i
       @instance[:"#{@name}_updated_at"]   = Time.now
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jeremydurham-merb_paperclip
 version: !ruby/object:Gem::Version 
-  version: 0.9.12
+  version: 0.9.13
 platform: ruby
 authors: 
 - Jeremy Durham
@@ -9,11 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-01 00:00:00 -07:00
+date: 2009-01-29 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: merb
+  name: merb-core
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: