valideez 0.0.8 → 0.0.9

data/LICENSE.md

@@ -1,4 +1,4 @@
-Copyright (c) 2011 Zaiste! de Grengolada
+Copyright (c) 2011 Zaiste!
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

data/lib/valideez/base.rb

@@ -4,17 +4,20 @@ module Valideez
     attr_accessor :validable
 
     def initialize(val)
-      @val = val.to_s.gsub(/-/, '')
+      @val = val.to_s.gsub(/-/, '').gsub(/\s+/, '')
       @validable = []
     end
 
     def valid?
+      # p - Array of methods (Strings) which can be used for validation
       p = validable.select{ |var| respond_to?("validate_#{var.to_s}", true) }
+      # execute validations, stop and return false if current validations return false
       p.take_while { |var| send("validate_#{var.to_s}") }.size == p.size
     end
 
     private
 
+    # Dynamically assign instance variables using opts Hash
     def assign(opts)
       opts.each do |attr, val|
         # tricky: don't create an instance variable if 

data/lib/valideez/common.rb

@@ -5,7 +5,9 @@ module Valideez
     end
 
     def validate_length
-      length == val.size
+      # length can be a Fixnum or Array of Fixnums
+      lengths = length.kind_of?(Array) ? length : [length]
+      lengths.include? val.size
     end
 
   end

data/lib/valideez/iban.rb

@@ -0,0 +1,36 @@
+module Valideez
+  class Iban < Valideez::Base
+    include Valideez::Common
+
+    def initialize(val, options = {})
+      super val
+
+      assign({ 
+        format: /\A[A-Z][A-Z]\d{26}\Z/, 
+        length: 28,
+        modulo: 97,
+        sum_control: true,
+      }.merge(options))
+
+      @arr = []
+    end
+
+    def validate_sum_control
+      mod = checksum % modulo
+      mod === 1
+    end
+
+    private 
+
+    def checksum
+      @arr = val[4..28] + char_number(val[0..1]) + val[2..3]
+      @arr.to_i
+    end
+
+    def char_number(chars)
+      chars.split("").collect { |e| e.upcase.ord - 55 }.join
+    end
+
+
+  end
+end

data/lib/valideez/regon.rb

@@ -0,0 +1,39 @@
+module Valideez
+  class Regon < Valideez::Base
+    include Valideez::Common
+
+    def initialize(val, options = {})
+      super val
+
+      assign({ 
+        :format => /\A(\d{9}|\d{14})\Z/,
+        :length => [9, 14],
+        :mask => [8, 9, 2, 3, 4, 5, 6, 7],
+        :mask_long => [2, 4, 8, 5, 0, 9, 7, 3, 6, 1, 2, 4, 8],
+        :modulo => 11,
+        :sum_control => true,
+      }.merge(options))
+
+      @arr = []
+    end
+
+    def is_long?
+      val.size === 14
+    end
+
+    def validate_sum_control
+      mod = checksum % modulo
+      mod === @arr.shift
+    end
+
+    private 
+
+    def checksum
+      @arr = val.split("").collect(&:to_i)
+      # there is the other mask for 14 digit regon
+      m = is_long? ? mask_long : mask
+      m.inject(0) {|sum, w| sum + w * @arr.shift}
+    end
+
+  end
+end

data/lib/valideez/regon_validator.rb

@@ -0,0 +1,18 @@
+require 'active_model'
+
+class RegonValidator < ActiveModel::EachValidator
+  def validate_each(record, attribute, value)
+    @message = options[:message] || "invalid format"
+    record.errors[attribute] << @message unless Valideez::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/valideez/siret.rb

@@ -0,0 +1,36 @@
+module Valideez
+  class Siret < Valideez::Base
+    include Valideez::Common
+
+    def initialize(val, options = {})
+      super val
+
+      assign({ 
+        :format => /\A\d{14}\Z/, 
+        :length => 14,
+        :mask => (1..14).to_a.map { |u| u % 2 + 1 },
+        :modulo => 10,
+        :sum_control => true,
+      }.merge(options))
+
+      @arr = []
+    end
+
+    def validate_sum_control
+      mod = checksum % modulo
+      mod === 0 
+    end
+
+    private 
+
+    def checksum
+      @arr = val.split("").collect(&:to_i)
+      mask.inject(0) do |sum, w| 
+        val =  w * @arr.shift
+        val -= 9 if val >= 10
+        sum + val
+      end
+    end
+
+  end
+end

data/lib/valideez/siret_validator.rb

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

data/lib/valideez/version.rb

@@ -1,3 +1,3 @@
 module Valideez
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/spec/iban_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe Valideez::Iban do
+  it "should be valid" do
+    %w[PL89114020040000330247593733].each do |n|
+      Valideez::Iban.new(n).should be_valid
+    end
+  end
+
+  it "should not be valid" do
+    %w[PL89114020040000330247593734].each do |n|
+      Valideez::Iban.new(n).should_not be_valid
+    end
+  end
+end

data/spec/regon_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+describe Valideez::Regon do
+  it "should be valid" do
+    %w[590096454 123456785 732065814].each do |n|
+      Valideez::Regon.new(n).should be_valid
+    end
+  end
+
+  it "should be valid 14-digit regon" do
+    %w[12345678512347 23511332857188].each do |n|
+      Valideez::Regon.new(n).should be_valid
+    end
+  end
+
+  it "should be invalid" do
+    %w[590096453 59009645412 390096454 ag5435 00000000 732065813].each do |n|
+      Valideez::Regon.new(n).should_not be_valid
+    end
+  end
+
+  it "should be invalid 14-digit regon" do
+    %w[12345678512348 12345678512346 1234567851237 23511332857181].each do |n|
+      Valideez::Regon.new(n).should_not be_valid
+    end
+  end
+end

data/spec/regon_validator_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+require 'rspec'
+require 'active_model'
+
+class RegonBastard
+  include ActiveModel::Validations
+
+  attr_accessor :regon
+  validates :regon, :presence => true, :regon => true
+end
+
+describe RegonValidator do
+  before :each  do
+    @model = RegonBastard.new
+  end
+
+  it "should be valid" do
+    @model.should_not be_valid 
+    @model.regon = '590096454'
+    @model.should be_valid
+  end
+
+  it "should be invalid" do
+    @model.should_not be_valid 
+    @model.regon = '590096453'
+    @model.should_not be_valid
+  end
+
+  it "should be valid  14-digit regon" do
+    @model.should_not be_valid
+    @model.regon = '12345678512347'
+    @model.should be_valid
+  end
+
+  it "should be invalid  14-digit regon" do
+    @model.should_not be_valid
+    @model.regon = '12345678512348'
+    @model.should_not be_valid
+  end
+end

data/spec/siret_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe Valideez::Siret do
+  it "should be valid" do
+    %w[73282932000074].each do |n|
+      Valideez::Siret.new(n).should be_valid
+    end
+  end
+end

data/spec/siret_validator_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+require 'rspec'
+require 'active_model'
+
+class SiretBastard
+  include ActiveModel::Validations
+
+  attr_accessor :siret
+  validates :siret, :presence => true, :siret => true
+end
+
+describe SiretValidator do
+  before :each  do
+    @model = SiretBastard.new
+  end
+
+  it "should be valid" do
+    @model.should_not be_valid 
+    @model.siret = '73282932000074'
+    @model.should be_valid
+  end
+
+  it "should be invalid" do
+    @model.should_not be_valid 
+    @model.siret = '7862001184'
+    @model.should_not be_valid
+  end
+end

data/spec/spec_helper.rb

@@ -3,4 +3,8 @@ Bundler.setup
 
 require "rspec"
 
+
+require 'valideez/base'
+require 'valideez/common'
+
 Dir[File.expand_path(File.dirname(__FILE__) + "/../lib/**/*.rb")].each { |f| require f }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: valideez
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-04 00:00:00.000000000 Z
+date: 2012-02-09 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70285140109300 !ruby/object:Gem::Requirement
+  requirement: &2202048880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70285140109300
+  version_requirements: *2202048880
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70285140108700 !ruby/object:Gem::Requirement
+  requirement: &2202047980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70285140108700
+  version_requirements: *2202047980
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70285140108180 !ruby/object:Gem::Requirement
+  requirement: &2202046920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: *70285140108180
+  version_requirements: *2202046920
 description: Your favourite validations with Ruby
 email:
 - oh@zaiste.net
@@ -61,20 +61,30 @@ files:
 - lib/valideez/base.rb
 - lib/valideez/bastard.rb
 - lib/valideez/common.rb
+- lib/valideez/iban.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/phone_validator.rb
+- lib/valideez/regon.rb
+- lib/valideez/regon_validator.rb
+- lib/valideez/siret.rb
+- lib/valideez/siret_validator.rb
 - lib/valideez/version.rb
 - spec/bastard_spec.rb
+- spec/iban_spec.rb
 - spec/nip_spec.rb
 - spec/nip_validator_spec.rb
 - spec/pesel_spec.rb
 - spec/pesel_validator_spec.rb
 - spec/phone_spec.rb
 - spec/phone_validator_spec.rb
+- spec/regon_spec.rb
+- spec/regon_validator_spec.rb
+- spec/siret_spec.rb
+- spec/siret_validator_spec.rb
 - spec/spec_helper.rb
 - valideez.gemspec
 homepage: http://dev.zaiste.net/gem/valideez
@@ -91,7 +101,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2927134417727163018
+      hash: -3669528909321109052
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -100,19 +110,24 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2927134417727163018
+      hash: -3669528909321109052
 requirements: []
 rubyforge_project: valideez
-rubygems_version: 1.8.6
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Let's valideez lousy objects once and forever
 test_files:
 - spec/bastard_spec.rb
+- spec/iban_spec.rb
 - spec/nip_spec.rb
 - spec/nip_validator_spec.rb
 - spec/pesel_spec.rb
 - spec/pesel_validator_spec.rb
 - spec/phone_spec.rb
 - spec/phone_validator_spec.rb
+- spec/regon_spec.rb
+- spec/regon_validator_spec.rb
+- spec/siret_spec.rb
+- spec/siret_validator_spec.rb
 - spec/spec_helper.rb