jcnetdev-paperclip 1.0.20080704 → 1.1

data/Rakefile

@@ -12,7 +12,7 @@ task :default => [:clean, :test]
 desc 'Test the paperclip plugin.'
 Rake::TestTask.new(:test) do |t|
   t.libs << 'lib' << 'profile'
-  t.pattern = 'test/**/test_*.rb'
+  t.pattern = 'test/**/*_test.rb'
   t.verbose = true
 end
 
@@ -46,6 +46,7 @@ task :clean do |t|
 end
 
 spec = Gem::Specification.new do |s| 
+  s.rubygems_version  = "1.2.0"
   s.name              = "paperclip"
   s.version           = Paperclip::VERSION
   s.author            = "Jon Yurek"
@@ -65,6 +66,9 @@ spec = Gem::Specification.new do |s|
   s.extra_rdoc_files  = ["README"]
   s.rdoc_options << '--line-numbers' << '--inline-source'
   s.requirements << "ImageMagick"
+  s.add_runtime_dependency 'right_aws'
+  s.add_development_dependency 'Shoulda'
+  s.add_development_dependency 'mocha'
 end
  
 Rake::GemPackageTask.new(spec) do |pkg| 

data/generators/paperclip/USAGE

@@ -1,5 +1,5 @@
 Usage:
 
-  script/generate attachment Class attachment1 attachment2
+  script/generate paperclip Class attachment1 (attachment2 ...)
   
 This will create a migration that will add the proper columns to your class's table.

data/lib/paperclip.rb

@@ -133,7 +133,7 @@ module Paperclip
       end
 
       validates_each(name) do |record, attr, value|
-        value.send(:flush_errors)
+        value.send(:flush_errors) unless value.valid?
       end
     end
 
@@ -190,7 +190,7 @@ module Paperclip
           unless options[:content_type].blank?
             content_type = instance[:"#{name}_content_type"]
             unless valid_types.any?{|t| t === content_type }
-              options[:message] || ActiveRecord::Errors.default_error_messages[:inclusion]
+              options[:message] || "is not one of the allowed file types."
             end
           end
         end

data/lib/paperclip/attachment.rb

@@ -93,6 +93,7 @@ module Paperclip
 
     # Returns true if there are any errors on this attachment.
     def valid?
+      validate
       errors.length == 0
     end
 
@@ -159,14 +160,15 @@ module Paperclip
     # again.
     def reprocess!
       new_original = Tempfile.new("paperclip-reprocess")
-      old_original = to_file(:original)
-      new_original.write( old_original.read )
-      new_original.rewind
+      if old_original = to_file(:original)
+        new_original.write( old_original.read )
+        new_original.rewind
 
-      @queued_for_write = { :original => new_original }
-      post_process
+        @queued_for_write = { :original => new_original }
+        post_process
 
-      old_original.close if old_original.respond_to?(:close)
+        old_original.close if old_original.respond_to?(:close)
+      end
     end
 
     private
@@ -182,6 +184,7 @@ module Paperclip
         end.flatten.compact.uniq
         @errors += @validation_errors
       end
+      @validation_errors
     end
 
     def normalize_style_definition
@@ -202,6 +205,7 @@ module Paperclip
       @styles.each do |name, args|
         begin
           dimensions, format = args
+          dimensions = dimensions.call(instance) if dimensions.respond_to? :call
           @queued_for_write[name] = Thumbnail.make(@queued_for_write[:original], 
                                                    dimensions,
                                                    format, 

data/lib/paperclip/upfile.rb

@@ -6,12 +6,15 @@ module Paperclip
 
     # Infer the MIME-type of the file from the extension.
     def content_type
-      type = self.path.match(/\.(\w+)$/)[1] rescue "octet-stream"
+      type = (self.path.match(/\.(\w+)$/)[1] rescue "octet-stream").downcase
       case type
-      when "jpg", "png", "gif" then "image/#{type}"
-      when "txt" then "text/plain"
-      when "csv", "xml", "html", "htm", "css", "js" then "text/#{type}"
-      else "x-application/#{type}"
+      when %r"jpe?g"                 then "image/jpeg"
+      when %r"tiff?"                 then "image/tiff"
+      when %r"png", "gif", "bmp"     then "image/#{type}"
+      when "txt"                     then "text/plain"
+      when %r"html?"                 then "text/html"
+      when "csv", "xml", "css", "js" then "text/#{type}"
+      else "application/x-#{type}"
       end
     end
 
@@ -31,3 +34,4 @@ end
 class File #:nodoc:
   include Paperclip::Upfile
 end
+

data/paperclip.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name = 'paperclip'
-  s.version = '1.0.20080704'
-  s.date = '2008-07-04'
+  s.version = '1.1'
+  s.date = '2008-07-14'
   
   s.summary = "Allows easy file uploading for Rails"
   s.description = "Paperclip is intended as an easy file attachment library for ActiveRecord. The intent behind it was to keep setup as easy as possible and to treat files as much like other attributes as possible. This means they aren't saved to their final locations on disk, nor are they deleted if set to nil, until ActiveRecord::Base#save is called. It manages validations based on size and presence, if required. It can transform its assigned image into thumbnails if needed, and the prerequisites are as simple as installing ImageMagick (which, for most modern Unix-based systems, is as easy as installing the right packages). Attached files are saved to the filesystem and referenced in the browser by an easily understandable specification, which has sensible and useful defaults."
@@ -35,21 +35,19 @@ Gem::Specification.new do |s|
              "rails/init.rb",
              "tasks/paperclip_tasks.rake"]
   
-  s.test_files = ["test/.gitignore",
+  s.test_files = ["test/attachment_test.rb",
                   "test/database.yml",
                   "test/fixtures/12k.png",
                   "test/fixtures/50x50.png",
                   "test/fixtures/5k.png",
                   "test/fixtures/bad.png",
                   "test/fixtures/text.txt",
+                  "test/geometry_test.rb",
                   "test/helper.rb",
-                  "test/test_attachment.rb",
-                  "test/test_geometry.rb",
-                  "test/test_integration.rb",
-                  "test/test_iostream.rb",
-                  "test/test_paperclip.rb",
-                  "test/test_storage.rb",
-                  "test/test_thumbnail.rb"]
-  
+                  "test/integration_test.rb",
+                  "test/iostream_test.rb",
+                  "test/paperclip_test.rb",
+                  "test/storage_test.rb",
+                  "test/thumbnail_test.rb"]
 end
 

data/tasks/paperclip_tasks.rake

@@ -14,25 +14,62 @@ def obtain_attachments
   end
 end
 
+def for_all_attachments
+  klass = obtain_class
+  names = obtain_attachments
+  ids   = klass.connection.select_values("SELECT id FROM #{klass.table_name}")
+
+  ids.each do |id|
+    instance = klass.find(id)
+    names.each do |name|
+      result = if instance.send("#{ name }?")
+                 yield(instance, name)
+               else
+                 true
+               end
+      print result ? "." : "x"; $stdout.flush
+    end
+  end
+  puts " Done."
+end
+
 namespace :paperclip do
-  desc "Regenerates thumbnails for a given CLASS (and optional ATTACHMENT)"
-  task :refresh => :environment do
-    klass     = obtain_class
-    names     = obtain_attachments
-    instances = klass.find(:all)
-    
-    puts "Regenerating thumbnails for #{instances.length} instances of #{klass.name}:"
-    instances.each do |instance|
-      names.each do |name|
-        result = if instance.send("#{ name }?")
-          instance.send(name).reprocess!
-          instance.send(name).save
+  desc "Refreshes both metadata and thumbnails."
+  task :refresh => ["paperclip:refresh:metadata", "paperclip:refresh:thumbnails"]
+
+  namespace :refresh do
+    desc "Regenerates thumbnails for a given CLASS (and optional ATTACHMENT)."
+    task :thumbnails => :environment do
+      for_all_attachments do |instance, name|
+        instance.send(name).reprocess!
+      end
+    end
+
+    desc "Regenerates content_type/size metadata for a given CLASS (and optional ATTACHMENT)."
+    task :metadata => :environment do
+      for_all_attachments do |instance, name|
+        if file = instance.send(name).to_file
+          instance.send("#{name}_file_name=", instance.send("#{name}_file_name").strip)
+          instance.send("#{name}_content_type=", file.content_type.strip)
+          instance.send("#{name}_file_size=", file.size) if instance.respond_to?("#{name}_file_size")
+          instance.save(false)
         else
           true
         end
-        print result ? "." : "x"; $stdout.flush
       end
     end
-    puts " Done."
+  end
+
+  desc "Cleans out invalid attachments. Useful after you've added new validations."
+  task :clean => :environment do
+    for_all_attachments do |instance, name|
+      instance.send(name).send(:validate)
+      if instance.send(name).valid?
+        true
+      else
+        instance.send("#{name}=", nil)
+        instance.save
+      end
+    end
   end
 end

data/test/{test_paperclip.rb → paperclip_test.rb}

@@ -64,6 +64,38 @@ class PaperclipTest < Test::Unit::TestCase
       assert Dummy.new.respond_to?(:avatar=)
     end
 
+    context "that is valid" do
+      setup do
+        @dummy = Dummy.new
+        @dummy.avatar = @file
+      end
+
+      should "be valid" do
+        assert @dummy.valid?
+      end
+
+      context "then has a validation added that makes it invalid" do
+        setup do
+          assert @dummy.save
+          Dummy.class_eval do
+            validates_attachment_content_type :avatar, :content_type => ["text/plain"]
+          end
+          @dummy2 = Dummy.find(@dummy.id)
+        end
+
+        should "be invalid when reloaded" do
+          assert ! @dummy2.valid?, @dummy2.errors.inspect
+        end
+
+        should "be able to call #valid? twice without having duplicate errors" do
+          @dummy2.avatar.valid?
+          first_errors = @dummy2.avatar.errors
+          @dummy2.avatar.valid?
+          assert_equal first_errors, @dummy2.avatar.errors
+        end
+      end
+    end
+
     [[:presence,      nil,                             "5k.png",   nil],
      [:size,          {:in => 1..10240},               "5k.png",   "12k.png"],
      [:size2,         {:in => 1..10240},               nil,        "12k.png"],
@@ -102,21 +134,6 @@ class PaperclipTest < Test::Unit::TestCase
             assert_equal 1, @dummy.avatar.errors.length
           end
         end
-        
-#        context "and an invalid file with :message" do
-#          setup do
-#            @file = args[3] && File.new(File.join(FIXTURES_DIR, args[3]))
-#          end
-#
-#          should "have errors" do
-#            if args[1] && args[1][:message] && args[4]
-#              @dummy.avatar = @file
-#              assert ! @dummy.avatar.valid?
-#              assert_equal 1, @dummy.avatar.errors.length
-#              assert_equal args[4], @dummy.avatar.errors[0]
-#            end
-#          end
-#        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jcnetdev-paperclip
 version: !ruby/object:Gem::Version 
-  version: 1.0.20080704
+  version: "1.1"
 platform: ruby
 authors: 
 - Jon Yurek
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-04 00:00:00 -07:00
+date: 2008-07-14 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -76,18 +76,17 @@ signing_key:
 specification_version: 2
 summary: Allows easy file uploading for Rails
 test_files: 
-- test/.gitignore
+- test/attachment_test.rb
 - test/database.yml
 - test/fixtures/12k.png
 - test/fixtures/50x50.png
 - test/fixtures/5k.png
 - test/fixtures/bad.png
 - test/fixtures/text.txt
+- test/geometry_test.rb
 - test/helper.rb
-- test/test_attachment.rb
-- test/test_geometry.rb
-- test/test_integration.rb
-- test/test_iostream.rb
-- test/test_paperclip.rb
-- test/test_storage.rb
-- test/test_thumbnail.rb
+- test/integration_test.rb
+- test/iostream_test.rb
+- test/paperclip_test.rb
+- test/storage_test.rb
+- test/thumbnail_test.rb

data/test/.gitignore

@@ -1 +0,0 @@
-debug.log