sexy_validations 0.2.2 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.3.0

data/lib/sexy_validations.rb

@@ -1,6 +1,11 @@
 require 'sexy_validations/errors'
 
 module SexyValidations
+  def self.load_validator(name)
+    require "sexy_validations/validators/#{name}"
+    "SexyValidations::Validators::#{name.to_s.capitalize}".constantize
+  end
+
   def self.included(klass)
     klass.instance_eval do
       class_inheritable_array :validations
@@ -30,10 +35,9 @@ module SexyValidations
 
   module ClassMethods
     def load_validator(name)
-      require "sexy_validations/validators/#{name}"
-      "SexyValidations::Validators::#{name.to_s.capitalize}".constantize
+      SexyValidations.load_validator(name)
     end
-
+    
     def validates(attribute = nil, validations = nil, &block)
       if validations
         condition = nil
@@ -74,7 +78,7 @@ module SexyValidations
     def validate!
       errors.clear     
       validations.each do |validation|
-        valid = case
+        case
           when validation[:validator]
             if validation[:condition]
               next unless validation[:condition].call(self) 

data/lib/sexy_validations/validators/file.rb

@@ -9,6 +9,17 @@ module SexyValidations
         end
       end
 
+      def self.file_from_value(value)
+        case value.class.name
+          when "File", "Tempfile"
+            value
+          when "Sequel::Plugins::Paperclip::Attachment"
+            value.queued_file
+          else
+            raise ArgumentError, "#{value} is not a valid input"
+        end
+      end
+
       def self.validate(model, attribute, value, options)
         return unless value
 
@@ -18,18 +29,17 @@ module SexyValidations
           }
         end
 
-        unless value.is_a?(File) || value.is_a?(Tempfile)
-          raise ArgumentError, "#{value} is not a File"
-        end
+        file = file_from_value(value)
+        return unless file
 
         if options[:size]
           min = options[:size].min
-          if value.size < min
+          if file.size < min
             model.errors.add(attribute, "zu klein (mindestes #{humanized_size(min)})")
           end
 
           max = options[:size].max
-          if value.size > max
+          if file.size > max
             model.errors.add(attribute, "zu groß (maximal #{humanized_size(max)})")
           end
         end

data/lib/sexy_validations/validators/image.rb

@@ -11,13 +11,12 @@ module SexyValidations
           }
         end
 
-        unless value.is_a?(File) || value.is_a?(Tempfile)
-          raise ArgumentError, "#{value} is not a File"
-        end
+        file = SexyValidations.load_validator(:file).file_from_value(value)
+        return unless file
 
         if options[:geometry]
           geo1 = Sequel::Plugins::Paperclip::Processors::Image::Geometry.from_s(options[:geometry])
-          geo2 = Sequel::Plugins::Paperclip::Processors::Image::Geometry.from_file(value)
+          geo2 = Sequel::Plugins::Paperclip::Processors::Image::Geometry.from_file(file)
           if geo2
             if geo2.width < geo1.width
               model.errors.add(attribute, "zu klein (weniger als %d Pixel breit)"%[geo1.width])

data/sexy_validations.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sexy_validations}
-  s.version = "0.2.2"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Corin Langosch"]
-  s.date = %q{2010-09-17}
+  s.date = %q{2010-09-21}
   s.description = %q{Module which provides sexy validations for models.}
   s.email = %q{info@netskin.com}
   s.extra_rdoc_files = [

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 2
-  version: 0.2.2
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Corin Langosch
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-17 00:00:00 +01:00
+date: 2010-09-21 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency