kangal 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9c6e5ebc471b05747256ef6bf399bc81793402c
-  data.tar.gz: 765f8597f5d52b33fac03ba7b9ac8bc61ed6e50c
+  metadata.gz: f6bd8a15b84a66f86f63627a1d21f00fa8024f3f
+  data.tar.gz: cd4ef8987f3e905d8877b8d5a425b6ac4606e1b8
 SHA512:
-  metadata.gz: 12b1ec5cf986cf59062ed32380d5305e3ed578839ce2052cecd7701310c8bd5bb15152b75aba0b7556c2ff53644a03c250bdfd99a22817c22f363176b981916d
-  data.tar.gz: c9d637cf15a46316fc8944ba2f5e1d7892209ab2a4c51e77d3f38b00d434d522c9aaac4b4ab2f1dd940549ee564a20c5e08693ca4019b362b7cb555f04cd797f
+  metadata.gz: 7794dee17a3dfe11dec2ac7be8db4bc30073ad5aa64af43fdca1df4c5e65465997f7b50276f4aa2b5933724e8a2dfc81b1fb518240143750956727d8f82456aa
+  data.tar.gz: c316de0ddb2a5d48937380faafa23dfcd6cbe8dada74e97245fe3649e82261337630e1b998c19dac00bc3e2ca6e5f11e7f41027a49879d3524c671ee2c1be439

data/SECURITY.md

@@ -0,0 +1,7 @@
+# Reporting Security Issues
+
+If you discover a security issue in Kangel, please report it by sending an email to info@lab2023.com
+
+This will allow us to assess the risk, and make a fix available before we add a bug report to the Github repo.
+
+Thanks for helping make Kangal safe for everyone.

data/config/locales/en.yml

@@ -10,5 +10,7 @@ en:
         alphanumeric: 'must be alphanumeric; A-Z, 0-9 or hyphen'
       identity_number:
         invalid: 'is invalid.'
+      tax_number:
+        invalid: 'is invalid.'
       tax_number:
         invalid: 'is invalid.'

data/config/locales/fr.yml

@@ -12,3 +12,5 @@ en:
         invalid: 'est invalide.'
       tax_number:
         invalid: 'est invalide.'
+      ip:
+        invalid: 'est invalide.'

data/config/locales/tr.yml

@@ -11,4 +11,6 @@ tr:
       identity_number:
         invalid: 'geçersizdir.'
       tax_number:
-        invalid: 'geçersizdir.'
+        invalid: 'geçersizdir.'
+      ip:
+        invalid: 'geçersizdir.'

data/lib/kangal.rb

@@ -3,5 +3,6 @@ require 'kangal/email'
 require 'kangal/subdomain'
 require 'kangal/identity_number'
 require 'kangal/tax_number'
+require 'kangal/ip'
 
 I18n.load_path += Dir.glob(File.expand_path('../../config/locales/**/*',__FILE__))

data/lib/kangal/email.rb

@@ -4,24 +4,20 @@ require 'mail'
 
 class EmailValidator < ActiveModel::EachValidator
 
-  def validate_each(record, attribute, value)
-    # takes from https://github.com/hallelujah/valid_email/blob/master/lib/valid_email/email_validator.rb
+  def validate_each(object, attribute, value)
+
+    return if options[:allow_nil] && value.nil?
+    return if options[:allow_blank] && value.blank?
+
     begin
       m = Mail::Address.new(value)
-      # We must check that value contains a domain and that value is an email address
       r = m.domain && m.address == value
       t = m.__send__(:tree)
-      # We need to dig into treetop
-      # A valid domain must have dot_atom_text elements size > 1
-      # user@localhost is excluded
-      # treetop must respond to domain
-      # We exclude valid email values like <user@localhost.com>
-      # Hence we use m.__send__(tree).domain
       r &&= (t.domain.dot_atom_text.elements.size > 1)
     rescue Exception => e
       r = false
     end
-    record.errors.add attribute, (options[:message] || I18n.t(:invalid, :scope => 'kangal.validations.email')) unless r
+    object.errors.add attribute, (options[:message] || I18n.t(:invalid, :scope => 'kangal.validations.email')) unless r
   end
 
 end

data/lib/kangal/identity_number.rb

@@ -2,16 +2,18 @@ require 'active_model'
 require 'active_model/validations'
 
 class IdentityNumberValidator < ActiveModel::EachValidator
-
   def validate_each(record, attribute, value)
-    valid = true
+
+    return if options[:allow_nil] && value.nil?
+    return if options[:allow_blank] && value.blank?
+
+    valid = false
     val = value.to_s
+
     if val.size == 11 && val[0].to_i != 0
       valid = check_tenth_character(val)
       valid = check_eleventh_character(val)
       valid = double_check_eleventh_character(val)
-    else
-      valid = false
     end
 
     record.errors.add attribute, (options[:message] || I18n.t(:invalid, :scope => 'kangal.validations.identity_number')) unless valid

data/lib/kangal/ip.rb

@@ -0,0 +1,12 @@
+require 'active_model'
+require 'active_model/validations'
+
+class IpValidator < ActiveModel::EachValidator
+  def validate_each(object, attribute, value)
+
+    return if options[:allow_nil] && value.nil?
+    return if options[:allow_blank] && value.blank?
+
+    object.errors[attribute] << I18n.t(:invalid, scope: 'kangal.validations.ip') unless value =~ /^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$/i
+  end
+end

data/lib/kangal/subdomain.rb

@@ -3,9 +3,14 @@ require 'active_model/validations'
 
 class SubdomainValidator < ActiveModel::EachValidator
   def validate_each(object, attribute, value)
+
+    return if options[:allow_nil] && value.nil?
+    return if options[:allow_blank] && value.blank?
     return unless value.present?
+
     reserved_names = %w(www ftp mail pop smtp admin ssl sftp http https)
     reserved_names = options[:reserved] if options[:reserved]
+
     if reserved_names.include?(value)
       object.errors[attribute] << I18n.t(:reserved, scope: 'kangal.validations.subdomain')
     end

data/lib/kangal/tax_number.rb

@@ -2,9 +2,12 @@ require 'active_model'
 require 'active_model/validations'
 
 class TaxNumberValidator < ActiveModel::EachValidator
+  def validate_each(object, attribute, value)
 
-  def validate_each(record, attribute, value)
-    valid = true
+    return if options[:allow_nil] && value.nil?
+    return if options[:allow_blank] && value.blank?
+
+    valid = false
     val = value.to_s
     if val.size == 10
       val1 = Array.new
@@ -37,9 +40,8 @@ class TaxNumberValidator < ActiveModel::EachValidator
 
       valid = (sum == last_digit)
 
-    else
-      valid = false
     end
-    record.errors.add attribute, (options[:message] || I18n.t(:invalid, :scope => 'kangal.validations.tax_number')) unless valid
+
+    object.errors.add attribute, (options[:message] || I18n.t(:invalid, :scope => 'kangal.validations.tax_number')) unless valid
   end
 end

data/lib/kangal/version.rb

@@ -1,3 +1,3 @@
 module Kangal
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

data/spec/ip_spec.rb

@@ -0,0 +1,44 @@
+require 'spec_helper'
+
+class Server < SpecModel
+  validates  :ip, ip: true
+end
+
+describe 'Ip format' do
+
+  let(:invalid_ips) do
+    %w(
+      10.10.10
+      10.10
+      10
+      a.a.a.a
+      10.0.0.a
+      10.10.10.256
+      10.10.10.256
+      999.10.10.20
+      2222.22.22.22
+      22.2222.22.2
+    )
+  end
+
+  let(:valid_ips) do
+    %w(
+      1.1.1.1
+      255.255.255.255
+      192.168.1.1
+      10.10.1.1
+      132.254.111.10
+      26.10.2.10
+      127.0.0.1
+    )
+  end
+
+  it 'should be invalid' do
+    invalid_ips.each { |ip|  Server.new(ip: ip).valid?.should be_false }
+  end
+
+  it 'should be valid' do
+    valid_ips.each { |ip|  Server.new(ip: ip).valid?.should be_true }
+  end
+
+end

data/spec/subdomain_spec.rb

@@ -7,7 +7,7 @@ end
 describe 'Subdomain format' do
 
   let(:invalid_subdomains) do
-    %w(-lab2023 https, ab)
+    %w(-lab2023 https ab)
   end
 
   let(:valid_subdomains) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kangal
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - lab2023
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-22 00:00:00.000000000 Z
+date: 2014-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -96,6 +96,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- SECURITY.md
 - config/locales/en.yml
 - config/locales/fr.yml
 - config/locales/tr.yml
@@ -103,11 +104,13 @@ files:
 - lib/kangal.rb
 - lib/kangal/email.rb
 - lib/kangal/identity_number.rb
+- lib/kangal/ip.rb
 - lib/kangal/subdomain.rb
 - lib/kangal/tax_number.rb
 - lib/kangal/version.rb
 - spec/email_spec.rb
 - spec/identity_number_spec.rb
+- spec/ip_spec.rb
 - spec/spec_helper.rb
 - spec/subdomain_spec.rb
 - spec/tax_number_spec.rb
@@ -131,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Kangal brings you a nice set of custom validators for Rails 4.