dragonfly 0.6.1 → 0.6.2

data/History.md

@@ -1,3 +1,15 @@
+0.6.2 (2010-06-24)
+==================
+Features
+-----
+- Added ability for custom error messages in validations
+
+0.6.1 (2010-05-16)
+==================
+Fixes
+-----
+- STI was breaking when the model had a mixin too
+
 0.6.0 (2010-05-11)
 ==================
 

data/VERSION

@@ -1 +1 @@
-0.6.1
+0.6.2

data/dragonfly.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dragonfly}
-  s.version = "0.6.1"
+  s.version = "0.6.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mark Evans"]
-  s.date = %q{2010-05-16}
+  s.date = %q{2010-06-24}
   s.email = %q{mark@new-bamboo.co.uk}
   s.extra_rdoc_files = [
     "LICENSE",

data/lib/dragonfly/active_record_extensions/validations.rb

@@ -15,8 +15,10 @@ module Dragonfly
         validates_each(*args) do |record, attr, attachment|
           if attachment
             property = attachment.send(property_name)
-            record.errors.add attr, "#{property_name.to_s.humanize.downcase} is incorrect. It needs to be #{expected_values_string(allowed_values)}," +
-                                    " but was '#{property}'" unless allowed_values.include?(property)
+            record.errors.add(attr,
+                              opts[:message] ||
+                                "#{property_name.to_s.humanize.downcase} is incorrect. It needs to be #{expected_values_string(allowed_values)}, but was '#{property}'"
+                              ) unless allowed_values.include?(property)
           end
         end
 

data/lib/dragonfly/data_storage/s3data_store.rb

@@ -29,6 +29,7 @@ module Dragonfly
         ensure_initialized
         object = use_filesystem ? temp_object.file : temp_object.data
         S3Object.store(uid, object, bucket_name)
+        object.close if use_filesystem
         uid
       end
 

data/spec/dragonfly/active_record_extensions/migration.rb

@@ -18,6 +18,7 @@ class MigrationForTest < ActiveRecord::Migration
       t.string  :preview_image_blah_blah
       t.string  :other_image_uid
       t.string  :yet_another_image_uid
+      t.string  :otra_imagen_uid
       t.string  :trailer_video_uid
       t.timestamps
     end

data/spec/dragonfly/active_record_extensions/model_spec.rb

@@ -326,10 +326,12 @@ describe Item do
           validates_property :mime_type, :of => :preview_image, :in => ['how/special', 'how/crazy'], :if => :its_friday
           validates_property :mime_type, :of => [:other_image, :yet_another_image], :as => 'how/special'
           validates_property :number_of_Gs, :of => :preview_image, :in => (0..2)
+          validates_property :mime_type, :of => :otra_imagen, :in => ['que/pasa', 'illo/tio'], :message => "tipo de contenido incorrecto. Que chungo tio"
 
           image_accessor :preview_image
           image_accessor :other_image
           image_accessor :yet_another_image
+          image_accessor :otra_imagen
 
           def its_friday
             true
@@ -391,6 +393,12 @@ describe Item do
         }.should raise_error(ArgumentError)
       end
 
+      it "should allow for custom messages" do
+        @item.otra_imagen = "WRONG TYPE"
+        @item.should_not be_valid
+        @item.errors[:otra_imagen].should match_ar_error("tipo de contenido incorrecto. Que chungo tio")
+      end
+
     end
 
     describe "validates_mime_type_of" do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 6
-  - 1
-  version: 0.6.1
+  - 2
+  version: 0.6.2
 platform: ruby
 authors: 
 - Mark Evans
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-16 00:00:00 +01:00
+date: 2010-06-24 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency