common_numbers_rails 0.1.3 → 0.1.4

data/README.markdown

@@ -24,12 +24,21 @@ For standalone model use [common_numbers](http://github.com/marioosh/common_numb
 For ActiveRecord Models:
 
     class Item < ActiveRecord::Base
-      validates :nip, :presence => true, :nip => true
+      validates :nip, :nip => true
+      validates :pesel, :pesel => true
+      validates :regon, :regon => true
     end
     
+You can also use helpers:
+
+    class Item < ActiveRecord::Base
+      validates_pesel_of :pesel_field
+      validates_pesel_of :pesel_field, :message => "Our custom message"
+    end
+
+
 ###TODO:
 
-- I18n messages
 - validators for other numbers
 
 

data/lib/common_numbers_rails/nip_validator.rb

@@ -4,7 +4,24 @@ require 'active_model'
 class NipValidator < ActiveModel::EachValidator
 
   def validate_each(record, attribute, value)
-    record.errors[attribute] << "invalid format" unless CommonNumbers::Polish::Nip.new(value).valid?
+    @message = options[:message] || "invalid format"
+    record.errors[attribute] << @message unless CommonNumbers::Polish::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/common_numbers_rails/pesel_validator.rb

@@ -4,7 +4,24 @@ require 'active_model'
 class PeselValidator < ActiveModel::EachValidator
 
   def validate_each(record, attribute, value)
-    record.errors[attribute] << "invalid format" unless CommonNumbers::Polish::Pesel.new(value).valid?
+    @message = options[:message] || "invalid format"
+    record.errors.add(attribute,  @message) unless CommonNumbers::Polish::Pesel.new(value).valid?
+  end
+
+end
+
+module ActiveModel
+  
+  module Validations
+
+    module HelperMethods
+
+      def validates_pesel_of(*attr_names)
+        validates_with PeselValidator, _merge_attributes(attr_names)
+      end
+
+    end
+
   end
 
 end

data/lib/common_numbers_rails/regon_validator.rb

@@ -4,7 +4,24 @@ require 'active_model'
 class RegonValidator < ActiveModel::EachValidator
 
   def validate_each(record, attribute, value)
+    @message = options[:message] || "invalid format"
     record.errors[attribute] << "invalid format" unless CommonNumbers::Polish::Regon.new(value).valid?
   end
 
 end
+
+module ActiveModel
+
+  module Validations
+
+    module HelperMethods
+
+      def validates_regon_of(*attr_names)
+        validates_with RegonValidator, _merge_attributes(attr_names)
+      end
+
+    end
+
+  end
+
+end

data/lib/common_numbers_rails/version.rb

@@ -1,3 +1,3 @@
 module CommonNumbersRails
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/spec/nip_validator_spec.rb

@@ -5,25 +5,66 @@ require 'active_model'
 class BasicNipModel
   include ActiveModel::Validations
 
-  attr_accessor :nip
+  attr_accessor :nip, :nip2
 
   validates :nip, :presence => true, :nip => true
+  
+  validates_nip_of :nip2
 end
 
   
   describe "NipValidator" do
     before(:each) do
+      @valid_nip = "123-456-32-18"
+      @invalid_nip = "123-456-32-12"
+      
       @model = BasicNipModel.new
+
     end
 
-    it "should be valid" do
-     @model.should_not be_valid 
-     @model.nip = "123-456-32-18"
-     @model.should be_valid
+    describe "with nip1" do
+      before(:each) do
+        @model.nip2 = @valid_nip
+      end
+
+      it "should be valid" do
+       @model.should_not be_valid 
+       @model.nip = @valid_nip
+       @model.should be_valid
+      end
+      
+      it "should be invalid" do
+        @model.nip = @invalid_nip
+        @model.should_not be_valid
+      end
     end
-    
-    it "should be invalid" do
-      @model.nip = "123-456-32-12"
-      @model.should_not be_valid
+
+    describe "with nip2" do
+      before(:each) do
+        @model.nip = @valid_nip
+      end
+
+      it "should be valid" do
+        @model.should be_invalid
+        @model.nip2 = @valid_nip
+        @model.should be_valid
+      end
+
+      it "should be invalid when nil" do
+        @model.nip2 = nil
+        @model.should be_invalid
+      end
+
+      it "should be invalid when empty" do
+        @model.nip2 = ""
+        @model.should be_invalid
+      end
+
+      it "should be invalid when invalid NIP" do
+        @model.nip2 = @invalid_nip
+        @model.should be_invalid
+      end
+
     end
+
   end

data/spec/pesel_validator_spec.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8  
 require 'spec_helper'
 require 'rspec'
 require 'active_model'
@@ -5,25 +6,69 @@ require 'active_model'
 class BasicPeselModel
   include ActiveModel::Validations
 
-  attr_accessor :pesel
+  attr_accessor :pesel, :pesel2
 
   validates :pesel, :presence => true, :pesel => true
+
+  validates_pesel_of :pesel2
+
 end
 
   
   describe "PeselValidator" do
     before(:each) do
+      @valid_pesel = "44051401359"
+      @invalid_pesel = "44051401353"
+
       @model = BasicPeselModel.new
+
     end
+    describe "with pesel" do
 
-    it "should be valid" do
-     @model.should_not be_valid 
-     @model.pesel = "44051401359"
-     @model.should be_valid
+      before(:each) do
+        @model.pesel2 = @valid_pesel
+      end
+
+      it "should be valid" do
+       @model.should_not be_valid 
+       @model.pesel = @valid_pesel
+       @model.should be_valid
+      end
+      
+      it "should be invalid" do
+        @model.pesel = @invalid_pesel
+        @model.should_not be_valid
+      end
     end
-    
-    it "should be invalid" do
-      @model.pesel = "44051401353"
-      @model.should_not be_valid
+
+    describe "with pesel2" do
+      before(:each) do
+        @model.pesel = @valid_pesel
+      end
+
+      it "should be valid" do
+        @model.should be_invalid
+        @model.pesel2 = @valid_pesel
+        @model.should be_valid
+      end
+
+      it "should be invalid when nil" do
+        @model.pesel2 = nil 
+        @model.should be_invalid
+      end
+      it "should be invalid when empty" do
+        @model.pesel2 = "" 
+        @model.should be_invalid
+      end
+
+      it "should be invalid when invalid number" do
+        @model.pesel2 = @invalid_pesel 
+        @model.should be_invalid
+      end
+
+
     end
+    
+
   end
+

data/spec/regon_validator_spec.rb

@@ -5,25 +5,64 @@ require 'active_model'
 class BasicRegonModel
   include ActiveModel::Validations
 
-  attr_accessor :regon
+  attr_accessor :regon, :regon2
 
   validates :regon, :presence => true, :regon => true
+
+  validates_regon_of :regon2
 end
 
   
   describe "RegonValidator" do
     before(:each) do
+      @valid_regon = "192598184"
+      @invalid_regon = "192598134"
+
       @model = BasicRegonModel.new
     end
 
-    it "should be valid" do
-     @model.should_not be_valid 
-     @model.regon = "192598184"
-     @model.should be_valid
+    describe "with regon 1" do
+      before(:each) do
+        @model.regon2 = @valid_regon
+      end
+        
+      it "should be valid" do
+       @model.should_not be_valid 
+       @model.regon = @valid_regon
+       @model.should be_valid
+      end
+      
+      it "should be invalid" do
+        @model.regon = @invalid_regon
+        @model.should_not be_valid
+      end
     end
-    
-    it "should be invalid" do
-      @model.regon = "192598183"
-      @model.should_not be_valid
+
+    describe "with regon 2" do
+      before(:each) do
+        @model.regon = @valid_regon
+      end
+
+      it "should be valid" do
+        @model.should be_invalid
+        @model.regon2 = @valid_regon
+        @model.should be_valid
+      end
+
+      it "should be invalid when nil" do 
+        @model.regon2 = nil
+        @model.should be_invalid
+      end
+
+      it "should be invalid when empty" do
+        @model.regon2 == ""
+        @model.should be_invalid
+      end
+
+      it "should be invalid when invalid regon" do
+        @model.regon2 == @invalid_regon
+        @model.should be_invalid
+      end
+
     end
   end

metadata

@@ -2,7 +2,7 @@
 name: common_numbers_rails
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Mariusz Nosinski