sexy_validations 0.4.1 → 0.4.2

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/lib/sexy_validations/validators/presence.rb

@@ -3,14 +3,7 @@ module SexyValidations
   module Validators
     class Presence
       def self.validate(model, attribute, value, options)
-        real_value = case value.class.name
-          when "Sequel::Plugins::Paperclip::Attachment"
-            value.queued_file
-          else
-            value
-        end
-
-        return unless real_value.blank?
+        return unless value.blank?
 
         model.errors.add(attribute, "muss ausgefüllt werden")
       end

data/lib/sexy_validations.rb

@@ -39,18 +39,22 @@ module SexyValidations
     end
     
     def validates(attribute = nil, validations = nil, &block)
-      condition = nil
+      conditions = nil
+      conditions_if = nil
 
       if validations
         if validations[:if]
-          condition = validations.delete(:if)
+          conditions = validations.delete(:if)
+          conditions_if = true
         end
 
         if validations[:unless]
-          raise ArgumentError, "if and unless condition given" if condition
-          ref = validations.delete(:unless)
-          condition = lambda { |model| !ref.call(model) }
+          raise ArgumentError, "if and unless conditions given" if condition
+          conditions = validations.delete(:unless)
+          conditions_if = false
         end
+        
+        conditions = [conditions] if conditions && !conditions.is_a?(Array)
       end
 
       unless validations.blank?
@@ -60,20 +64,23 @@ module SexyValidations
             :attribute => attribute,
             :validator => klass,
             :options => options,
-            :condition => condition,
+            :conditions => conditions,
+            :conditions_if => conditions_if,
           }
         end
       else
         if attribute
           self.validations << {
             :method => "#{attribute}_validation",
-            :condition => condition,
+            :conditions => conditions,
+            :conditions_if => conditions_if,
           }
         else
           raise ArgumentError, "at least a block has to be given" unless block_given?
           self.validations << {
             :block => block,
-            :condition => condition,
+            :conditions => conditions,
+            :conditions_if => conditions_if,
           }
         end
       end
@@ -84,21 +91,30 @@ module SexyValidations
     def validate!
       errors.clear     
       validations.each do |validation|
-        if validation[:condition]
-          next unless validation[:condition].call(self) 
-        end
-
-        case
-          when validation[:validator]
-            if errors[validation[:attribute]].empty?
-              validation[:validator].validate(self, validation[:attribute], send(validation[:attribute]), validation[:options])
+        catch (:skip_validation) do
+          if validation[:conditions]
+            validation[:conditions].each do |condition|
+              success = condition.call(self, validation[:attribute])
+              if validation[:conditions_if] 
+                throw :skip_validation unless success
+              else
+                throw :skip_validation if success
+              end
             end
-          when validation[:method]
-            send(validation[:method])
-          when validation[:block]
-            validation[:block].call
-          else
-            raise ArgumentError, "invalid validation (internal error)"
+          end
+
+          case
+            when validation[:validator]
+              if errors[validation[:attribute]].empty?
+                validation[:validator].validate(self, validation[:attribute], send(validation[:attribute]), validation[:options])
+              end
+            when validation[:method]
+              send(validation[:method])
+            when validation[:block]
+              validation[:block].call
+            else
+              raise ArgumentError, "invalid validation (internal error)"
+          end
         end
       end
     end

data/sexy_validations.gemspec

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

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 1
-  version: 0.4.1
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - Corin Langosch
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-28 00:00:00 +01:00
+date: 2010-09-29 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency