futuresinc-attachment_fu 1.0.5 → 1.0.6

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 5
+:patch: 6
 :major: 1
 :minor: 0

data/attachment_fu.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{attachment_fu}
-  s.version = "1.0.5"
+  s.version = "1.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Technoweenie"]
-  s.date = %q{2009-06-24}
+  s.date = %q{2009-08-20}
   s.description = %q{Treat an ActiveRecord model as a file attachment, storing its patch, size, content type, etc.}
   s.email = %q{github@futuresinc.com}
   s.extra_rdoc_files = [

data/lib/attachment_fu.rb

@@ -445,7 +445,13 @@ module AttachmentFu # :nodoc:
         [:size, :content_type].each do |attr_name|
           enum = attachment_options[attr_name]
           if Object.const_defined?(:I18n) # Rails >= 2.2
-            errors.add attr_name, I18n.translate("activerecord.errors.messages.inclusion", attr_name => enum) unless enum.nil? || enum.include?(send(attr_name))
+            unless enum.nil? || enum.include?(send(attr_name))
+              unless attachment_options["#{attr_name.to_s}_validation_message".to_sym].blank?
+                errors.add attr_name, I18n.translate(attachment_options["#{attr_name.to_s}_validation_message".to_sym])
+              else
+                errors.add attr_name, I18n.translate("activerecord.errors.messages.inclusion", attr_name => enum)
+              end
+            end
           else
             errors.add attr_name, ActiveRecord::Errors.default_error_messages[:inclusion] unless enum.nil? || enum.include?(send(attr_name))
           end
@@ -527,11 +533,7 @@ module AttachmentFu # :nodoc:
       end
 
       def detect_mimetype(file_data)
-        if file_data.content_type.strip == "application/octet-stream"
-          return File.mime_type?(file_data.original_filename)
-        else
-          return file_data.content_type
-        end
+        File.mime_type?(file_data.original_filename)
       end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: futuresinc-attachment_fu
 version: !ruby/object:Gem::Version 
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors: 
 - Technoweenie
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-24 00:00:00 -07:00
+date: 2009-08-20 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -75,6 +75,7 @@ files:
 - vendor/red_artisan/core_image/processor.rb
 has_rdoc: true
 homepage: http://github.com/futuresinc/attachment_fu
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -95,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Treat an ActiveRecord model as a file attachment, storing its patch, size, content type, etc.