valideez 0.0.1 → 0.0.2

data/lib/valideez/base.rb

@@ -9,7 +9,8 @@ module Valideez
     end
 
     def valid?
-      validable.map { |var| send("validate_#{var.to_s}") if respond_to?("validate_#{var.to_s}", true) }.compact!.all?
+      p = validable.select{ |var| respond_to?("validate_#{var.to_s}", true) }
+      p.take_while { |var| send("validate_#{var.to_s}") }.size == p.size
     end
 
     private

data/lib/valideez/nip.rb

@@ -6,11 +6,11 @@ module Valideez
       super val
 
       assign({ 
-        :sum_control => true,
         :format => /\A\d{10}\Z/, 
         :length => 10,
         :mask => [6, 5, 7, 2, 3, 4, 5, 6, 7],
         :modulo => 11,
+        :sum_control => true,
       }.merge(options))
 
       @arr = []

data/lib/valideez/nip_validator.rb

@@ -0,0 +1,18 @@
+require 'active_model'
+
+class NipValidator < ActiveModel::EachValidator
+  def validate_each(record, attribute, value)
+    @message = options[:message] || "invalid format"
+    record.errors[attribute] << @message unless Valideez::Nip.new(value).valid?
+  end
+end
+
+module ActiveModel
+  module Validations
+    module HelperMethods
+      def validates_nip_of(*attr_names)
+        validates_with NipValidator, _merge_attributes(attr_names)
+      end
+    end
+  end
+end

data/lib/valideez/pesel.rb

@@ -8,12 +8,12 @@ module Valideez
       super val
 
       assign({ 
-        :sum_control => true,
-        :format => /\A\d{11}\Z/, 
         :length => 11,
+        :format => /\A\d{11}\Z/, 
         :mask => [1, 3, 7, 9, 1, 3, 7, 9, 1, 3],
         :modulo => 10,
         :age => 0,
+        :sum_control => true,
       }.merge(options))
 
       @arr = []
@@ -39,8 +39,8 @@ module Valideez
     private
 
     def checksum
-      @arr = val.split("").collect(&:to_i)
-      mask.inject(0) {|sum, w| sum + w * @arr.shift}
+      @arr = val.split("").collect(&:to_i) 
+      mask.inject(0) {|sum, w| sum + w * @arr.shift} 
     end
 
     def convert_to_date(sample)

data/lib/valideez/pesel_validator.rb

@@ -1,8 +1,9 @@
 require 'active_model'
 
 class PeselValidator < ActiveModel::EachValidator
+
   def validate_each(record, attribute, value)
-    @message = options[:message] || "invalid format"
+    message = options[:message] || "invalid format"
     record.errors.add(attribute,  @message) unless Valideez::Pesel.new(value).valid?
   end
 end

data/lib/valideez/version.rb

@@ -1,3 +1,3 @@
 module Valideez
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/nip_validator_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+require 'rspec'
+require 'active_model'
+
+class NipBastard
+  include ActiveModel::Validations
+
+  attr_accessor :nip
+  validates :nip, :presence => true, :nip => true
+end
+
+describe NipValidator do
+  before :each  do
+    @model = NipBastard.new
+  end
+
+  it "should be valid" do
+    @model.should_not be_valid 
+    @model.nip = '786-000-11-84'
+    @model.should be_valid
+  end
+
+  it "should be invalid" do
+    @model.should_not be_valid 
+    @model.nip = '786-200-11-84'
+    @model.should_not be_valid
+  end
+end

data/spec/{polish/pesel_spec.rb → pesel_spec.rb}

@@ -8,7 +8,7 @@ describe Valideez::Pesel  do
   end
 
   it "should be invalid" do
-    %w[59040501580 870132114508].each do |n|
+    %w[59040501580 870132114508 AABB].each do |n|
       Valideez::Pesel.new(n).should_not be_valid
     end
   end

data/spec/pesel_validator_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+require 'rspec'
+require 'active_model'
+
+class PeselBastard
+  include ActiveModel::Validations
+
+  attr_accessor :pesel
+  validates :pesel, :presence => true, :pesel => true
+end
+
+describe PeselValidator do
+  before :each  do
+    @model = PeselBastard.new
+  end
+
+  it "should be valid" do
+    @model.should_not be_valid 
+    @model.pesel = '68041979693' 
+    @model.should be_valid
+  end
+
+  it "should be invalid" do
+    @model.should_not be_valid 
+    @model.pesel = '69041979693' 
+    @model.should_not be_valid
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: valideez
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70327217773920 !ruby/object:Gem::Requirement
+  requirement: &70186149953800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70327217773920
+  version_requirements: *70186149953800
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70327217773480 !ruby/object:Gem::Requirement
+  requirement: &70186149953360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70327217773480
+  version_requirements: *70186149953360
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70327217772940 !ruby/object:Gem::Requirement
+  requirement: &70186149952840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: *70327217772940
+  version_requirements: *70186149952840
 description: Your favourite validations with Ruby
 email:
 - oh@zaiste.net
@@ -62,13 +62,16 @@ files:
 - lib/valideez/bastard.rb
 - lib/valideez/common.rb
 - lib/valideez/nip.rb
+- lib/valideez/nip_validator.rb
 - lib/valideez/pesel.rb
 - lib/valideez/pesel_validator.rb
 - lib/valideez/phone.rb
 - lib/valideez/version.rb
 - spec/bastard_spec.rb
 - spec/nip_spec.rb
-- spec/polish/pesel_spec.rb
+- spec/nip_validator_spec.rb
+- spec/pesel_spec.rb
+- spec/pesel_validator_spec.rb
 - spec/spec_helper.rb
 - valideez.gemspec
 homepage: http://dev.zaiste.net/gem/valideez
@@ -85,7 +88,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2149050442087088595
+      hash: -1225042820358254434
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -94,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2149050442087088595
+      hash: -1225042820358254434
 requirements: []
 rubyforge_project: valideez
 rubygems_version: 1.8.6
@@ -104,5 +107,7 @@ summary: Let's valideez lousy objects once and forever
 test_files:
 - spec/bastard_spec.rb
 - spec/nip_spec.rb
-- spec/polish/pesel_spec.rb
+- spec/nip_validator_spec.rb
+- spec/pesel_spec.rb
+- spec/pesel_validator_spec.rb
 - spec/spec_helper.rb