sequel_sexy_validations 0.2.2 → 0.2.3

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/lib/sequel_sexy_validations.rb

@@ -12,14 +12,14 @@ module Sequel
       module ClassMethods
         def validates(attribute = nil, validations = nil, &block)
           if validations
-            case validations[:if]
-              when :new
-                validations[:if] = lambda { |record| record.new? }
+            if validations[:if]
+              validations[:if] = [validations[:if]] unless validations[:if].is_a?(Array)
+              implement_special_validation_conditions!(validations[:if])
             end
 
-            case validations[:unless]
-              when :new
-                validations[:unless] = lambda { |record| record.new? }
+            if validations[:unless]
+              validations[:unless] = [validations[:unless]] unless validations[:unless].is_a?(Array)
+              implement_special_validation_conditions!(validations[:unless])
             end
           end
 
@@ -34,6 +34,23 @@ module Sequel
             super
           end
         end
+        
+        private
+        
+        def implement_special_validation_conditions!(validations)
+          validations.each_with_index do |validation, i|
+            case validation
+              when :new
+                validations[i] = lambda do |record, attribute| 
+                  record.new?
+                end
+              when :changed
+                validations[i] = lambda do |record, attribute| 
+                  record.changed_columns.include?(attribute)
+                end
+            end
+          end
+        end
       end
 
       module InstanceMethods

data/lib/sequel_sexy_validations/validators/presence.rb

@@ -0,0 +1,23 @@
+# encoding: utf-8
+require "sexy_validations/validators/presence"
+
+module Sequel
+  module Plugins
+    module SexyValidations
+      module Validators
+        class Presence < ::SexyValidations::Validators::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
+            super(model, attribute, real_value, options)
+          end
+        end
+      end
+    end
+  end
+end
+

data/lib/sequel_sexy_validations/validators/uniqueness.rb

@@ -7,8 +7,6 @@ module Sequel
           def self.validate(model, attribute, value, options)
             return unless value
 
-            return unless model.changed_columns.include?(attribute)
-
             unless options.is_a?(Hash)
               options = {
                 :scope => options,

data/sequel_sexy_validations.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sequel_sexy_validations}
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   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{Sequel plugin which provides sexy validations for model.}
   s.email = %q{info@netskin.com}
   s.extra_rdoc_files = [
@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION",
      "lib/sequel_sexy_validations.rb",
+     "lib/sequel_sexy_validations/validators/presence.rb",
      "lib/sequel_sexy_validations/validators/uniqueness.rb",
      "sequel_sexy_validations.gemspec",
      "spec/sequel_sexy_validations_spec.rb",

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 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 
@@ -64,6 +64,7 @@ files:
 - Rakefile
 - VERSION
 - lib/sequel_sexy_validations.rb
+- lib/sequel_sexy_validations/validators/presence.rb
 - lib/sequel_sexy_validations/validators/uniqueness.rb
 - sequel_sexy_validations.gemspec
 - spec/sequel_sexy_validations_spec.rb