paperclip 2.3.2 → 2.3.3

data/lib/paperclip/processor.rb

@@ -43,7 +43,7 @@ module Paperclip
     # 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)
+      sprintf("%s,%d,%d%s", File.basename(basename, extension), $$, n.to_i, extension)
     end
   end
 end

data/lib/paperclip/railtie.rb

@@ -4,8 +4,10 @@ module Paperclip
   if defined? Rails::Railtie
     require 'rails'
     class Railtie < Rails::Railtie
-      ActiveSupport.on_load :active_record do
-        Paperclip::Railtie.insert
+      initializer 'paperclip.insert_into_active_record' do
+        ActiveSupport.on_load :active_record do
+          Paperclip::Railtie.insert
+        end
       end
       rake_tasks do
         load "tasks/paperclip.rake"

data/lib/paperclip/version.rb

@@ -1,3 +1,3 @@
 module Paperclip
-  VERSION = "2.3.2" unless defined? Paperclip::VERSION
+  VERSION = "2.3.3" unless defined? Paperclip::VERSION
 end

data/test/paperclip_test.rb

@@ -308,7 +308,7 @@ class PaperclipTest < Test::Unit::TestCase
         end
 
         should "have a file size min/max error message" do
-          assert @dummy.errors[:avatar_file_size] =~ %r/between 0 and 10240 bytes/
+          assert [@dummy.errors[:avatar_file_size]].flatten.any?{|error| error =~ %r/between 0 and 10240 bytes/ }
         end
       end
     end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 2
   - 3
-  - 2
-  version: 2.3.2
+  - 3
+  version: 2.3.3
 platform: ruby
 authors: 
 - Jon Yurek
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-08 00:00:00 -04:00
+date: 2010-06-09 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency