sequel_sexy_validations 0.2.1 → 0.2.2

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/lib/sequel_sexy_validations/validators/uniqueness.rb

@@ -9,8 +9,30 @@ module Sequel
 
             return unless model.changed_columns.include?(attribute)
 
-            unless model.class.filter(~:id => model.id, attribute => value).empty?
-              model.errors.add(attribute, "bereits vergeben")
+            unless options.is_a?(Hash)
+              options = {
+                :scope => options,
+              }
+            end
+            
+            options[:message] ||= "bereits vergeben"
+            
+            dataset = model.class.filter(~:id => model.id, attribute => value)
+            if options[:scope].is_a?(Array)
+              options[:scope].each do |v|
+                case v
+                  when Symbol
+                    dataset = dataset.filter(v => model.send(v))
+                  when Proc
+                    dataset = dataset.filter(v.call(model))
+                  else
+                    dataset = dataset.filter(v)
+                end
+              end
+            end
+
+            unless dataset.empty?
+              model.errors.add(attribute, options[:message])
             end
           end
         end

data/sequel_sexy_validations.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sequel_sexy_validations}
-  s.version = "0.2.1"
+  s.version = "0.2.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-17}
+  s.date = %q{2010-09-28}
   s.description = %q{Sequel plugin which provides sexy validations for model.}
   s.email = %q{info@netskin.com}
   s.extra_rdoc_files = [

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 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-28 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency