korobkov-paperclip 2.3.1.20090921 → 2.3.1.200909221442

data/README.rdoc

@@ -30,7 +30,7 @@ In your migrations:
       add_column :users, :avatar_file_name,    :string
       add_column :users, :avatar_content_type, :string
       add_column :users, :avatar_file_size,    :integer
-      add_column :users, :avatar_file_hash,    :string
+      add_column :users, :avatar_file_hexdigest, :string
       add_column :users, :avatar_updated_at,   :datetime
     end
 
@@ -38,7 +38,7 @@ In your migrations:
       remove_column :users, :avatar_file_name
       remove_column :users, :avatar_content_type
       remove_column :users, :avatar_file_size
-      remove_column :users, :avatar_file_hash
+      remove_column :users, :avatar_file_hexdigest
       remove_column :users, :avatar_updated_at
     end
   end
@@ -68,7 +68,7 @@ attachment with the has_attached_file method, and give it a name. Paperclip
 will wrap up up to four attributes (all prefixed with that attachment's name,
 so you can have multiple attachments per model if you wish) and give the a
 friendly front end. The attributes are <attachment>_file_name,
-<attachment>_file_size, <attachment>_file_hash, <attachment>_content_type,
+<attachment>_file_size, <attachment>_file_hexdigest, <attachment>_content_type,
 and <attachment>_updated_at.
 Only <attachment>_file_name is required for paperclip to operate. More
 information about the options to has_attached_file is available in the

data/Rakefile

@@ -61,7 +61,7 @@ exclude_file_globs = ["test/s3.yml",
                       "test/tmp/*"]
 spec = Gem::Specification.new do |s| 
   s.name              = "paperclip"
-  s.version           = Paperclip::VERSION
+  s.version           = Paperclip::VERSION + "." + Time.now.strftime("%Y%m%d%H%M")
   s.author            = "Jon Yurek"
   s.email             = "jyurek@thoughtbot.com"
   s.homepage          = "http://www.thoughtbot.com/projects/paperclip"
@@ -77,6 +77,7 @@ spec = Gem::Specification.new do |s|
   s.requirements << "ImageMagick"
   s.add_development_dependency 'thoughtbot-shoulda'
   s.add_development_dependency 'mocha'
+  s.add_dependency 'minad-mimemagic'
 end
 
 desc "Print a list of the files to be put into the gem"

data/generators/paperclip/templates/paperclip_migration.rb.erb

@@ -4,7 +4,7 @@ class <%= migration_name %> < ActiveRecord::Migration
     add_column :<%= class_name.underscore.camelize.tableize %>, :<%= attachment %>_file_name, :string
     add_column :<%= class_name.underscore.camelize.tableize %>, :<%= attachment %>_content_type, :string
     add_column :<%= class_name.underscore.camelize.tableize %>, :<%= attachment %>_file_size, :integer
-    add_column :<%= class_name.underscore.camelize.tableize %>, :<%= attachment %>_file_hash, :string
+    add_column :<%= class_name.underscore.camelize.tableize %>, :<%= attachment %>_file_hexdigest, :string
     add_column :<%= class_name.underscore.camelize.tableize %>, :<%= attachment %>_updated_at, :datetime
 <% end -%>
   end
@@ -14,7 +14,7 @@ class <%= migration_name %> < ActiveRecord::Migration
     remove_column :<%= class_name.underscore.camelize.tableize %>, :<%= attachment %>_file_name
     remove_column :<%= class_name.underscore.camelize.tableize %>, :<%= attachment %>_content_type
     remove_column :<%= class_name.underscore.camelize.tableize %>, :<%= attachment %>_file_size
-    remove_column :<%= class_name.underscore.camelize.tableize %>, :<%= attachment %>_file_hash
+    remove_column :<%= class_name.underscore.camelize.tableize %>, :<%= attachment %>_file_hexdigest
     remove_column :<%= class_name.underscore.camelize.tableize %>, :<%= attachment %>_updated_at
 <% end -%>
   end

data/init.rb

@@ -1,15 +1 @@
-if config.respond_to?(:gems)
-  config.gem 'minad-mimemagic', :lib => 'mimemagic'
-else
-  begin
-    require 'mimemagic'
-  rescue LoadError
-    begin
-      gem 'mimemagic'
-    rescue Gem::LoadError
-      puts "Please install the mimemagic gem"
-    end
-  end
-end
-
 require File.join(File.dirname(__FILE__), "lib", "paperclip")

data/lib/paperclip/attachment.rb

@@ -15,7 +15,7 @@ module Paperclip
         :validations   => [],
         :storage       => :filesystem,
         :whiny         => Paperclip.options[:whiny] || Paperclip.options[:whiny_thumbnails],
-        :hash_length   => 512
+        :digest_bitlength   => 512
       }
     end
 
@@ -41,7 +41,7 @@ module Paperclip
       @validations       = options[:validations]
       @storage           = options[:storage]
       @whiny             = options[:whiny_thumbnails] || options[:whiny]
-      @hash_length       = options[:hash_length]
+      @digest_bitlength  = options[:digest_bitlength]
       @convert_options   = options[:convert_options] || {}
       @processors        = options[:processors] || [:thumbnail]
       @options           = options
@@ -80,18 +80,18 @@ module Paperclip
 
       @queued_for_write[:original]   = uploaded_file.to_tempfile
       instance_write(:file_name,       uploaded_file.original_filename.strip.gsub(/[^A-Za-z\d\.\-_]+/, '_'))
-      instance_write(:content_type,    uploaded_file.content_type.to_s.strip)
+      instance_write(:content_type,    uploaded_file.content_type.strip)
       instance_write(:file_size,       uploaded_file.size.to_i)
-      instance_write(:file_hash,       uploaded_file.hash)
+      instance_write(:file_hexdigest,  uploaded_file.hexdigest)
       instance_write(:updated_at,      Time.now)
 
       @dirty = true
 
       post_process if valid?
  
-      # Reset the file size and hash if the original file was reprocessed.
+      # Reset the file size and hexdigest if the original file was reprocessed.
       instance_write(:file_size, @queued_for_write[:original].size.to_i)
-      instance_write(:file_hash, @queued_for_write[:original].hash)
+      instance_write(:file_hexdigest, @queued_for_write[:original].hexdigest)
     ensure
       uploaded_file.close if close_uploaded_file
       validate
@@ -181,10 +181,10 @@ module Paperclip
       instance_read(:file_size) || (@queued_for_write[:original] && @queued_for_write[:original].size)
     end
 
-    # Returns the hash of the file as originally assigned, and lives in the
-    # <attachment>_file_hash attribute of the model.
-    def hash
-      instance_read(:file_hash) || (@queued_for_write[:original] && @queued_for_write[:original].hash)
+    # Returns the hexdigest of the file as originally assigned, and lives in the
+    # <attachment>_file_hexdigest attribute of the model.
+    def hexdigest
+      instance_read(:file_hexdigest) || (@queued_for_write[:original] && @queued_for_write[:original].hexdigest)
     end
 
     # Returns the content_type of the file as originally assigned, and lives
@@ -410,7 +410,7 @@ module Paperclip
       instance_write(:file_name, nil)
       instance_write(:content_type, nil)
       instance_write(:file_size, nil)
-      instance_write(:file_hash, nil)
+      instance_write(:file_hexdigest, nil)
       instance_write(:updated_at, nil)
     end
 

data/lib/paperclip/interpolations.rb

@@ -35,7 +35,11 @@ module Paperclip
 
     # Returns the filename, the same way as ":basename.:extension" would.
     def filename attachment, style
-      "#{basename(attachment, style)}.#{extension(attachment, style)}"
+      unless extension(attachment, style).strip.empty?
+      	"#{basename(attachment, style)}.#{extension(attachment, style)}"
+      else
+      	basename(attachment, style)
+      end
     end
 
     # Returns the interpolated URL. Will raise an error if the url itself

data/lib/paperclip/upfile.rb

@@ -9,7 +9,7 @@ module Paperclip
 
     # Infer the MIME-type of the file from the magic.
     def content_type
-       MimeMagic.by_magic(File.open(self.path))
+       MimeMagic.by_magic(self).type
     end
 
     # Returns the file's normal name.
@@ -22,9 +22,9 @@ module Paperclip
       File.size(self)
     end
 
-    # Returns the hash of the file.
-    def hash
-      Digest::SHA2.new(512).file(self.path).hexdigest # FIXME needed actual hash_length from Attachment class instead of "512" constant
+    # Returns the hexdigest of the file.
+    def hexdigest
+      Digest::SHA2.new(512).hexdigest(self.read) # FIXME needed actual digest_bitlength from Attachment class instead of "512" constant
     end
   end
 end

data/tasks/paperclip_tasks.rake

@@ -49,14 +49,14 @@ namespace :paperclip do
       errors.each{|e| puts "#{e.first}: #{e.last.full_messages.inspect}" }
     end
 
-    desc "Regenerates content_type/size/hash metadata for a given CLASS (and optional ATTACHMENT)."
+    desc "Regenerates content_type/size/hexdigest 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.send("#{name}_file_hash=", file.hash) if instance.respond_to?("#{name}_file_hash")
+          instance.send("#{name}_file_hexdigest=", file.hexdigest) if instance.respond_to?("#{name}_file_hexdigest")
           instance.save(false)
         else
           true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: korobkov-paperclip
 version: !ruby/object:Gem::Version 
-  version: 2.3.1.20090921
+  version: 2.3.1.200909221442
 platform: ruby
 authors: 
 - Jon Yurek
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-21 00:00:00 -07:00
+date: 2009-09-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,6 +32,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: minad-mimemagic
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: 
 email: jyurek@thoughtbot.com
 executables: []
@@ -46,54 +56,54 @@ files:
 - Rakefile
 - init.rb
 - generators/paperclip
+- generators/paperclip/USAGE
 - generators/paperclip/paperclip_generator.rb
 - generators/paperclip/templates
 - generators/paperclip/templates/paperclip_migration.rb.erb
-- generators/paperclip/USAGE
 - lib/paperclip
-- lib/paperclip/attachment.rb
-- lib/paperclip/callback_compatability.rb
-- lib/paperclip/geometry.rb
+- lib/paperclip/matchers.rb
+- lib/paperclip/upfile.rb
+- lib/paperclip/processor.rb
 - lib/paperclip/interpolations.rb
-- lib/paperclip/iostream.rb
+- lib/paperclip/geometry.rb
 - lib/paperclip/matchers
-- lib/paperclip/matchers/have_attached_file_matcher.rb
-- lib/paperclip/matchers/validate_attachment_content_type_matcher.rb
-- lib/paperclip/matchers/validate_attachment_presence_matcher.rb
 - lib/paperclip/matchers/validate_attachment_size_matcher.rb
-- lib/paperclip/matchers.rb
-- lib/paperclip/processor.rb
+- lib/paperclip/matchers/validate_attachment_presence_matcher.rb
+- lib/paperclip/matchers/validate_attachment_content_type_matcher.rb
+- lib/paperclip/matchers/have_attached_file_matcher.rb
 - lib/paperclip/storage.rb
+- lib/paperclip/iostream.rb
+- lib/paperclip/callback_compatability.rb
+- lib/paperclip/attachment.rb
 - lib/paperclip/thumbnail.rb
-- lib/paperclip/upfile.rb
 - lib/paperclip.rb
 - tasks/paperclip_tasks.rake
-- test/attachment_test.rb
-- test/database.yml
-- test/fixtures
-- test/fixtures/12k.png
-- test/fixtures/50x50.png
-- test/fixtures/5k.png
-- test/fixtures/bad.png
-- test/fixtures/s3.yml
-- test/fixtures/text.txt
-- test/fixtures/twopage.pdf
-- test/geometry_test.rb
-- test/helper.rb
-- test/integration_test.rb
-- test/interpolations_test.rb
+- test/processor_test.rb
 - test/iostream_test.rb
 - test/matchers
 - test/matchers/have_attached_file_matcher_test.rb
-- test/matchers/validate_attachment_content_type_matcher_test.rb
 - test/matchers/validate_attachment_presence_matcher_test.rb
 - test/matchers/validate_attachment_size_matcher_test.rb
+- test/matchers/validate_attachment_content_type_matcher_test.rb
+- test/interpolations_test.rb
+- test/fixtures
+- test/fixtures/text.txt
+- test/fixtures/twopage.pdf
+- test/fixtures/s3.yml
+- test/fixtures/50x50.png
+- test/fixtures/bad.png
+- test/fixtures/5k.png
+- test/fixtures/12k.png
+- test/attachment_test.rb
 - test/paperclip_test.rb
-- test/processor_test.rb
+- test/database.yml
 - test/storage_test.rb
 - test/thumbnail_test.rb
+- test/integration_test.rb
+- test/helper.rb
+- test/geometry_test.rb
 - shoulda_macros/paperclip.rb
-has_rdoc: true
+has_rdoc: false
 homepage: http://www.thoughtbot.com/projects/paperclip
 licenses: 
 post_install_message: 
@@ -119,7 +129,7 @@ requirements:
 rubyforge_project: paperclip
 rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: File attachments as attributes for ActiveRecord
 test_files: []