kangal 1.2.0 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6bd8a15b84a66f86f63627a1d21f00fa8024f3f
-  data.tar.gz: cd4ef8987f3e905d8877b8d5a425b6ac4606e1b8
+  metadata.gz: 451e3bb3d08ea408e4a54fded98b428db3c0cdbf
+  data.tar.gz: 445d0d87de688fd8f2f52c4b897a1a315363834c
 SHA512:
-  metadata.gz: 7794dee17a3dfe11dec2ac7be8db4bc30073ad5aa64af43fdca1df4c5e65465997f7b50276f4aa2b5933724e8a2dfc81b1fb518240143750956727d8f82456aa
-  data.tar.gz: c316de0ddb2a5d48937380faafa23dfcd6cbe8dada74e97245fe3649e82261337630e1b998c19dac00bc3e2ca6e5f11e7f41027a49879d3524c671ee2c1be439
+  metadata.gz: dd2c1ac1fcbceba099f7b06ec480ab3632177f05b63816582cfa9fdcec837423fd314332206acd671618492732ee4aadba534a001ea528f615113debfc276cf0
+  data.tar.gz: 62ca23261a9a961d837fbeed31f6dbf1434b21b521053f8f6006192224f9ad39159e2f80d9214c5006bf5f48786c6fdbfab9df702d5ba26dbfa46c4dc3d515a2

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2013 lab2023 - internet technologies
+Copyright (c) 2013 lab2023 - information technologies
 
 MIT License
 

data/README.md

@@ -80,7 +80,7 @@ p.valid? # => true
 
 **Default reserved names:** www, ftp, mail, pop, smtp, admin, ssl, sftp, http, https
 
-## Turkish Government Identity Number Validator
+### Turkish Government Identity Number Validator
 ```ruby
 require 'kangal'
 class User
@@ -88,7 +88,7 @@ class User
   attr_accessor :identity
 
   # Identity Number validator
-  validates :email, presence: :true, identity_number: :true
+  validates :email, presence: :true, tcno: :true
 end
 
 p = User.new
@@ -104,7 +104,7 @@ p.identity = "83317527040" # (this isn't a real identity number)
 p.valid? # => true
 ```
 
-## Turkish Government Tax Number Validator
+### Turkish Government Tax Number Validator
 ```ruby
 require 'kangal'
 class User
@@ -112,7 +112,7 @@ class User
   attr_accessor :tax_number
 
   # Identity Number validator
-  validates :tax_number, presence: :true, tax_number: :true
+  validates :tax_number, presence: :true, tcvkn: :true
 end
 
 p = User.new
@@ -128,6 +128,34 @@ p.tax_number = "6120069217" # (this isn't a real tax number)
 p.valid? # => true
 ```
 
+### IP Validator
+```ruby
+require 'kangal'
+class Server
+  include ActiveModel::Validations
+  attr_accessor :ip
+
+  # Ip validator
+  validates :ip, presence: :true, ip: :true
+end
+
+p = Server.new
+p.ip = "10.10.10.256"
+p.valid? # => false
+
+p = Server.new
+p.ip = "2222.22.22.22"
+p.valid? # => false
+
+p = Server.new
+p.ip = "255.255.255.255"
+p.valid? # => true
+
+p = Server.new
+p.ip = "132.254.111.10"
+p.valid? # => true
+```
+
 ## Bugs and  Feedback
 
 If you discover any bugs or want to drop a line, feel free to create an issue on GitHub.

data/config/locales/en.yml

@@ -1,6 +1,8 @@
 en:
   kangal:
     validations:
+      common:
+        invalid: 'is invalid'
       email:
         invalid: 'is invalid'
       subdomain:
@@ -10,7 +12,13 @@ en:
         alphanumeric: 'must be alphanumeric; A-Z, 0-9 or hyphen'
       identity_number:
         invalid: 'is invalid.'
-      tax_number:
+      tckn:
         invalid: 'is invalid.'
       tax_number:
-        invalid: 'is invalid.'
+        invalid: 'is invalid.'
+      tcvkn:
+        invalid: 'is invalid.'
+      ip:
+        invalid: 'is invalid.'
+      phone:
+        tr: 'should be start with 90'

data/config/locales/fr.yml

@@ -1,6 +1,8 @@
 en:
   kangal:
     validations:
+      common:
+        invalid: 'est invalide'
       email:
         invalid: 'est invalide'
       subdomain:
@@ -10,7 +12,13 @@ en:
         alphanumeric: 'il faut être alphanumérique; A-Z, 0-9 ou trait'
       identity_number:
         invalid: 'est invalide.'
+      tckn:
+        invalid: 'est invalide.'
       tax_number:
         invalid: 'est invalide.'
+      tcvkn:
+        invalid: 'est invalide.'
       ip:
         invalid: 'est invalide.'
+      phone:
+        tr: '90 ile başlaması lazım.'

data/config/locales/tr.yml

@@ -1,6 +1,8 @@
 tr:
   kangal:
     validations:
+      common:
+        invalid: 'geçersizdir.'
       email:
         invalid: 'geçersizdir.'
       subdomain:
@@ -10,7 +12,13 @@ tr:
         alphanumeric: 'alfanümerik olmalıdır; A-Z, 0-9 veya tire'
       identity_number:
         invalid: 'geçersizdir.'
+      tckn:
+        invalid: 'geçersizdir.'
       tax_number:
         invalid: 'geçersizdir.'
+      tcvkn:
+        invalid: 'geçersizdir.'
       ip:
         invalid: 'geçersizdir.'
+      phone:
+        tr: '90 ile başlaması lazım.'

data/lib/kangal.rb

@@ -2,7 +2,10 @@ require 'kangal/version'
 require 'kangal/email'
 require 'kangal/subdomain'
 require 'kangal/identity_number'
+require 'kangal/tckn'
 require 'kangal/tax_number'
+require 'kangal/tcvkn'
 require 'kangal/ip'
+require 'kangal/phone'
 
 I18n.load_path += Dir.glob(File.expand_path('../../config/locales/**/*',__FILE__))

data/lib/kangal/identity_number.rb

@@ -4,6 +4,8 @@ require 'active_model/validations'
 class IdentityNumberValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
 
+    ActiveSupport::Deprecation.warn "`identity_number: :true` is deprecated and may be removed from future releases, use `tckn: true` instead.", caller
+
     return if options[:allow_nil] && value.nil?
     return if options[:allow_blank] && value.blank?
 

data/lib/kangal/phone.rb

@@ -0,0 +1,17 @@
+require 'active_model'
+require 'active_model/validations'
+
+# All phones number should be store e.164 format standard
+class PhoneValidator < ActiveModel::EachValidator
+  def validate_each(object, attribute, value)
+
+    return if options[:allow_nil] && value.nil?
+    return if options[:allow_blank] && value.blank?
+
+    if options[:tr]
+      object.errors[attribute] << I18n.t('kangal.validations.common.invalid') unless value =~ /^(90)+\d{10}$/i
+    end
+
+    object.errors[attribute] << I18n.t('kangal.validations.phone.tr') unless value =~ /^\d{11,14}$/i
+  end
+end

data/lib/kangal/tax_number.rb

@@ -4,6 +4,8 @@ require 'active_model/validations'
 class TaxNumberValidator < ActiveModel::EachValidator
   def validate_each(object, attribute, value)
 
+    ActiveSupport::Deprecation.warn "`tax_number: :true` is deprecated and may be removed from future releases, use `tcvkn: true` instead.", caller
+
     return if options[:allow_nil] && value.nil?
     return if options[:allow_blank] && value.blank?
 

data/lib/kangal/tckn.rb

@@ -0,0 +1,33 @@
+require 'active_model'
+require 'active_model/validations'
+
+class TcknValidator < ActiveModel::EachValidator
+  def validate_each(record, attribute, value)
+
+    return if options[:allow_nil] && value.nil?
+    return if options[:allow_blank] && value.blank?
+
+    digits = value[0..-3].each_char.map(&:to_i).each_with_index
+    first, last =
+        digits.reduce([0, 0]) do |memo, (digit, idx)|
+          add = digit * (idx.even? ? 7 : -1)
+          [
+              (memo.first + add) % 10,
+              (memo.last + digit + add) % 10
+          ]
+        end
+
+    valid = (!invalid_value?(value, 11) && value[-2] == first.to_s && value[-1] == last.to_s)
+    record.errors.add attribute, (options[:message] || I18n.t(:invalid, :scope => 'kangal.validations.tckn')) unless valid
+  end
+
+  private
+
+  def invalid_value?(str, length)
+    str.nil? || str.length != length || !numeric?(str)
+  end
+
+  def numeric?(str)
+    !!(str =~ /\A[[:digit:]]+\Z/)
+  end
+end

data/lib/kangal/tcvkn.rb

@@ -0,0 +1,40 @@
+require 'active_model'
+require 'active_model/validations'
+
+class TcvknValidator < ActiveModel::EachValidator
+  def validate_each(object, attribute, value)
+
+    return if options[:allow_nil] && value.nil?
+    return if options[:allow_blank] && value.blank?
+
+
+    digits = value[0..-2].each_char.map(&:to_i).each_with_index
+
+    checksum =
+      digits.reduce(0) do |memo, (digit, idx)|
+        rev_idx = 9 - idx
+        coeff = [1, 2, 4, 8, 7, 5][rev_idx % 6]
+        result = (digit + rev_idx) % 10
+
+        if result.nonzero?
+          result = (coeff * result) % 9
+          result = 9 if result.zero?
+        end
+        memo += result
+      end
+
+    valid = !invalid_value?(value, 10) && ((checksum + value[-1].to_i) % 10 == 0)
+
+    object.errors.add attribute, (options[:message] || I18n.t(:invalid, :scope => 'kangal.validations.tax_number')) unless valid
+  end
+
+  private
+
+  def invalid_value?(str, length)
+    str.nil? || str.length != length || !numeric?(str)
+  end
+
+  def numeric?(str)
+    !!(str =~ /\A[[:digit:]]+\Z/)
+  end
+end

data/lib/kangal/version.rb

@@ -1,3 +1,3 @@
 module Kangal
-  VERSION = '1.2.0'
+  VERSION = '1.2.3'.freeze
 end

data/spec/email_spec.rb

@@ -6,13 +6,8 @@ end
 
 describe 'Email format' do
 
-  let(:invalid_emails) do
-    %w(invalid email)
-  end
-
-  let(:valid_emails) do
-    %w(info@lab2023.com abc@ab.com)
-  end
+  let(:invalid_emails) { %w(invalid email) }
+  let(:valid_emails)   { %w(info@lab2023.com abc@ab.com) }
 
   it 'should be invalid' do
     invalid_emails.each { |email|  User.new(email: email).valid?.should be_false }

data/spec/identity_number_spec.rb

@@ -6,13 +6,8 @@ end
 
 describe 'Identity number format' do
 
-  let(:invalid_identity_numbers) do
-    %w(1 3 434542345678)
-  end
-
-  let(:valid_identity_numbers) do
-    %w(21432692144 55679901158 83317527040)
-  end
+  let(:invalid_identity_numbers)  { %w(1 3 434542345678) }
+  let(:valid_identity_numbers)    { %w(21432692144 55679901158 83317527040) }
 
   it 'should be invalid' do
     invalid_identity_numbers.each { |identity|  Profile.new(identity: identity).valid?.should be_false }

data/spec/phone_spec.rb

@@ -0,0 +1,82 @@
+require 'spec_helper'
+
+class Phone < SpecModel
+  validates :number, phone: true
+end
+
+class PhoneTr < SpecModel
+  validates :number, phone: {tr: true}
+end
+
+class PhoneTrMobile < SpecModel
+  validates :number, phone: {tr_and_mobile: true}
+end
+
+class PhoneTrNormal < SpecModel
+  validates :number, phone: {tr_and_normal: true}
+end
+
+describe 'Phone format' do
+
+  let(:valid_phone) do
+    %w(
+      905532620000
+      902122120000
+    )
+  end
+
+  let(:invalid_phone) do
+    %w(
+      abde
+      1234
+      12341234123443434
+    )
+  end
+
+  it 'should be valid' do
+    valid_phone.each { |number| Phone.new(number: number).valid?.should be_true }
+  end
+
+  it 'should be invalid' do
+    invalid_phone.each { |number| Phone.new(number: number).valid?.should be_false }
+  end
+
+  let(:valid_tr) do
+    %w(
+      905326200000
+      908508850000
+    )
+  end
+
+  let(:invalid_tr) do
+    %w(
+      +1231231233200
+      00100000000000
+    )
+  end
+
+  it 'should be valid with tr option' do
+    valid_tr.each { |tr_phone| PhoneTr.new(number: tr_phone).valid?.should be_true }
+  end
+
+  it 'should be invalid with tr option' do
+    invalid_tr.each { |tr_phone| PhoneTr.new(number: tr_phone).valid?.should be_false }
+  end
+
+  it 'should be valid with tr and mobile option' do
+
+  end
+
+  it 'should be invalid with tr and mobile option' do
+
+  end
+
+  it 'should be valid with tr and normal option' do
+
+  end
+
+  it 'should be invalid with tr and normal option' do
+
+  end
+
+end

data/spec/spec_helper.rb

@@ -15,8 +15,4 @@ class SpecModel
     @attributes[key]
   end
 
-end
-
-#RSpec.configure do |config|
-#
-#end
+end

data/spec/subdomain_spec.rb

@@ -4,15 +4,14 @@ class Company < SpecModel
   validates  :subdomain, subdomain: true
 end
 
-describe 'Subdomain format' do
+class Account < SpecModel
+  validates :subdomain, subdomain: {reserved: %w{help reserved_word}}
+end
 
-  let(:invalid_subdomains) do
-    %w(-lab2023 https ab)
-  end
+describe 'Subdomain format' do
 
-  let(:valid_subdomains) do
-    %w(lab2023 lab2023-internet)
-  end
+  let(:invalid_subdomains)  { %w(-lab2023 https ab) }
+  let(:valid_subdomains)    { %w(lab2023 lab2023-internet) }
 
   it 'should be invalid' do
     invalid_subdomains.each { |subdomain|  Company.new(subdomain: subdomain).valid?.should be_false }
@@ -22,4 +21,14 @@ describe 'Subdomain format' do
     valid_subdomains.each { |subdomain|  Company.new(subdomain: subdomain).valid?.should be_true }
   end
 
+  it 'should be invalid because of reserved' do
+    account = Account.new(subdomain: 'reserved_word')
+    account.valid?
+    account.errors.messages[:subdomain].should include(I18n.t(:reserved, scope: 'kangal.validations.subdomain'))
+  end
+
+  it 'should be valid because of reserved' do
+    Account.new(subdomain: 'unreservedword').valid?.should be_true
+  end
+
 end

data/spec/tax_number_spec.rb

@@ -6,13 +6,8 @@ end
 
 describe 'tax number format' do
 
-  let(:invalid_tax_numbers) do
-    %w(1 3 434542345678 43454234567)
-  end
-
-  let(:valid_tax_numbers) do
-    %w(2640020928 6120069217)
-  end
+  let(:invalid_tax_numbers) { %w(1 3 434542345678 43454234567) }
+  let('valid_tax_numbers')  { %w(2640020928 6120069217) }
 
   it 'should be invalid' do
     invalid_tax_numbers.each { |tax|  CompanyDetail.new(tax: tax).valid?.should be_false }

data/spec/tckn_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+class Profile < SpecModel
+  validates :identity, tckn: true
+end
+
+describe 'Tckn number format' do
+
+  let(:invalid_tckn)  { %w(1 3 434542345678) }
+  let(:valid_tckn)    { %w(21432692144 55679901158 83317527040) }
+
+  it 'should be invalid' do
+    invalid_tckn.each { |identity|  Profile.new(identity: identity).valid?.should be_false }
+  end
+
+  it 'should be valid' do
+    valid_tckn.each { |identity| Profile.new(identity: identity).valid?.should be_true }
+  end
+end

data/spec/tcvkn_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+class CompanyDetail < SpecModel
+  validates :tax, tcvkn: true
+end
+
+describe 'tax number format' do
+
+  let(:invalid_tcvkn) { %w(1 3 434542345678 43454234567) }
+  let(:valid_tcvkn)  { %w(2640020928 6120069217) }
+
+  it 'should be invalid' do
+    invalid_tcvkn.each { |tax|  CompanyDetail.new(tax: tax).valid?.should be_false }
+  end
+
+  it 'should be valid' do
+    valid_tcvkn.each { |tax| CompanyDetail.new(tax: tax).valid?.should be_true }
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kangal
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.3
 platform: ruby
 authors:
 - lab2023
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-08 00:00:00.000000000 Z
+date: 2014-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -105,15 +105,21 @@ files:
 - lib/kangal/email.rb
 - lib/kangal/identity_number.rb
 - lib/kangal/ip.rb
+- lib/kangal/phone.rb
 - lib/kangal/subdomain.rb
 - lib/kangal/tax_number.rb
+- lib/kangal/tckn.rb
+- lib/kangal/tcvkn.rb
 - lib/kangal/version.rb
 - spec/email_spec.rb
 - spec/identity_number_spec.rb
 - spec/ip_spec.rb
+- spec/phone_spec.rb
 - spec/spec_helper.rb
 - spec/subdomain_spec.rb
 - spec/tax_number_spec.rb
+- spec/tckn_spec.rb
+- spec/tcvkn_spec.rb
 homepage: https://github.com/kebab-project/kangal
 licenses:
 - MIT