sequel_sexy_validations 0.2.5 → 0.2.6

data/VERSION

@@ -1 +1 @@
-0.2.5
+0.2.6

data/lib/sequel_sexy_validations/validators/uniqueness.rb

@@ -4,6 +4,21 @@ module Sequel
     module SexyValidations
       module Validators
         class Uniqueness
+          def self.apply_scope_filter!(model, dataset, filter)
+            case filter
+              when Array
+                filter.each do |filter1|
+                  apply_scope_filter!(model, dataset, filter1)
+                end
+              when Symbol
+                dataset.filter!(filter => model.send(filter))
+              when Proc
+                dataset.filter!(filter.call(model))
+              else
+                dataset.filter!(filter)
+            end
+          end
+
           def self.validate(model, attribute, value, options)
             return unless value
 
@@ -16,18 +31,7 @@ module Sequel
             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
+            apply_scope_filter!(model, dataset, options[:scope])
 
             unless dataset.empty?
               model.errors.add(attribute, options[:message])

data/sequel_sexy_validations.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sequel_sexy_validations}
-  s.version = "0.2.5"
+  s.version = "0.2.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Corin Langosch"]
-  s.date = %q{2010-10-11}
+  s.date = %q{2010-11-13}
   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
-  - 5
-  version: 0.2.5
+  - 6
+  version: 0.2.6
 platform: ruby
 authors: 
 - Corin Langosch
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-11 00:00:00 +01:00
+date: 2010-11-13 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency