validator 0.0.1 → 0.0.2

data/README.markdown

@@ -3,10 +3,14 @@ Active Model Validator
 
 This is a ActiveModel validators for domains and ip addresses.
 
-Example
+Installation
+------------
+    gem install validator
+
+Usage
 -------
 
-The following model uses `ActiveModel::Validations::PresenceValidator` and `ActiveRecord::Validations::UniquenessValidator` to ensure the presence and uniqueness of the user’s email attribute. The third line uses `EmailValidator` to check that the email address is valid.
+In your models, the gem provides new validators like :domain or :ip_address
 
     class Model < ActiveRecord::Base
       validates :domain_name, :domain => true
@@ -21,6 +25,9 @@ Domain Validator
 
     validates :domain_name, :domain => {:message => 'custom message'}
 
+    # custom full domain length and label length
+    validates :domain_name, :domain => { :length => 200, :label_length => 60 }
+
 
 Ip Address Validator
 --------------------
@@ -39,7 +46,31 @@ Ip Address Validator
 
     validates :ip, :ip_address => { :message => "custom message" }
 
+
+Localization Tricks
+-------------------
+To customize error message, you can use { :message => "your custom message" } or simple use Rails localization en.yml file, for instance:
+
+    en:
+      errors:
+        messages:
+          domain:
+            length: "your custom length error message"
+         ip_address:
+           invalid:
+             general: "your custom invalid ip address error message"
+      activemodel:
+        errors:
+          messages:
+            domain:
+              invalid: "custom error message only for activemodel"
+           models:
+             your_model:
+               domain:
+                 invalid: "custom error message for YourDomain model"
+
+
 Copyright
 ---------
 
-Copyright (c) 2011 Vitaliy Nahaylo. See LICENSE for details.
+Copyright (c) 2011 Vitaliy Nahaylo. See LICENSE for details.

data/lib/active_model/validations/domain_validator.rb

@@ -1,30 +1,27 @@
 module ActiveModel
   module Validations
     class DomainValidator < ActiveModel::EachValidator
-      # Call `#initialize` on the superclass, adding a default
-      # `:allow_nil => false` option.
       def initialize(options)
-        super(options.reverse_merge(:allow_nil => false))
+        options[:length] ||= ::Validator::Domain::LENGTH
+        options[:label_length] ||= ::Validator::Domain::LABEL_LENGTH
+
+        super(options)
       end
 
       def validate_each(record, attr_name, value)
-        return if options[:allow_nil] && value.nil?
-
         # do not validate if value is empty
         return if value.nil?
 
         @validator = ::Validator::Domain.new(value)
 
         # max domain length
-        unless @validator.valid_by_length?
+        unless @validator.valid_by_length?(options[:length])
           record.errors.add(attr_name, :'domain.length', options)
-          #return
         end
 
         # label is limited to between 1 and 63 octets
-        unless @validator.valid_by_label_length?
+        unless @validator.valid_by_label_length?(options[:label_length])
           record.errors.add(attr_name, :'domain.label_length', options)
-          #return
         end
 
         # skip proceeding validation if errors

data/lib/active_model/validations/ip_address_validator.rb

@@ -1,15 +1,7 @@
 module ActiveModel
   module Validations
     class IpAddressValidator < ActiveModel::EachValidator
-      # Call `#initialize` on the superclass, adding a default
-      # `:allow_nil => false` option.
-      def initialize(options)
-        super(options.reverse_merge(:allow_nil => false))
-      end
-
       def validate_each(record, attr_name, value)
-        return if options[:allow_nil] && value.nil?
-
         # do not validate if value is empty
         return if value.nil?
 
@@ -44,7 +36,7 @@ module ActiveModel
     end
 
     module HelperMethods
-      #   class Dns < ActiveRecord::Base
+      #   class Ip < ActiveRecord::Base
       #     validates_ip_address_of :ip
       #   end
       #

data/lib/validator/domain.rb

@@ -7,12 +7,12 @@ module Validator
       @value = value
     end
 
-    def valid_by_length?(length = LENGTH)
-      @value.length <= length
+    def valid_by_length?(length = nil)
+      @value.length <= (length || LENGTH)
     end
 
-    def valid_by_label_length?(label_length = LABEL_LENGTH)
-      !(@value.split(".").find{|f| f.length > label_length and f.length > 1 })
+    def valid_by_label_length?(label_length = nil)
+      !(@value.split(".").find{|f| f.length > (label_length || LABEL_LENGTH) and f.length > 1 })
     end
 
     def valid_by_regexp?

data/lib/validator/locale/en.yml

@@ -3,8 +3,8 @@ en:
     messages:
       domain:
         invalid: "invalid domain name"
-        length: "full domain name is limited to 255 octets"
-        label_length: "length of any one label is limited to between 1 and 63 octets"
+        length: "domain name length is limited to %{length} characters"
+        label_length: "each label length is limited to %{label_length} characters"
       ip_address:
         invalid:
           general: "invalid ip address"

data/lib/validator/version.rb

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

data/spec/domain_validator_spec.rb

@@ -6,6 +6,7 @@ module ActiveModel
     describe DomainValidator do
       let(:domain) { TestDomain.new }
       let(:domain_with_message) { TestDomainWithMessage.new }
+      let(:domain_with_length) { TestDomainWithLength.new }
 
       describe "validations" do
         # for blank domain
@@ -52,22 +53,27 @@ module ActiveModel
             end
           end
 
+          it "should be valid for custom length and label length" do
+            domain_with_length.domain_name = "valid-domain.com"
+            domain_with_length.should be_valid
+          end
+
         end
 
         describe 'invalid' do
           it {
             domain.domain_name = "not_valid_because_of_length_#{'w'*230}.com"
-            domain.should have_errors_on(:domain_name, 2).with_message(I18n.t(:'errors.messages.domain.length'))
+            domain.should have_errors_on(:domain_name, 2).with_message(I18n.t(:'errors.messages.domain.length', :length => 255))
           }
 
           it {
             domain.domain_name = "not_valid_because_of_length_of_label#{'w'*230}.com"
-            domain.should have_errors_on(:domain_name, 2).with_message(I18n.t(:'errors.messages.domain.label_length'))
+            domain.should have_errors_on(:domain_name, 2).with_message(I18n.t(:'errors.messages.domain.label_length', :label_length => 63))
           }
 
           it {
             domain.domain_name = "#{'w'*64}.com"
-            domain.should have_errors_on(:domain_name).with_message(I18n.t(:'errors.messages.domain.label_length'))
+            domain.should have_errors_on(:domain_name).with_message(I18n.t(:'errors.messages.domain.label_length', :label_length => 63))
           }
 
           it "should be invalid if consists of special symbols (&, _, {, ], *, etc)" do
@@ -97,6 +103,18 @@ module ActiveModel
             end
           end
 
+          context 'custom full domain length and label length' do
+            it {
+              domain_with_length.domain_name = "#{'w'*61}.com"
+              domain_with_length.should have_errors_on(:domain_name).with_message(I18n.t(:'errors.messages.domain.label_length', :label_length => 60))
+            }
+
+            it {
+              domain_with_length.domain_name = "not_valid_because_of_length_#{'w'*190}.com"
+              domain_with_length.should have_errors_on(:domain_name, 2).with_message(I18n.t(:'errors.messages.domain.length', :length => 200))
+            }
+          end
+
         end
       end
     end

data/spec/test_classes/domain.rb

@@ -8,6 +8,10 @@ class TestDomain < BaseTestDomain
   validates :domain_name, :domain => true
 end
 
+class TestDomainWithLength < BaseTestDomain
+  validates :domain_name, :domain => { :length => 200, :label_length => 60 }
+end
+
 class TestDomainWithMessage < BaseTestDomain
   validates :domain_name, :domain => { :message => 'invalid' }
-end
+end

metadata

@@ -1,73 +1,109 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: validator
-version: !ruby/object:Gem::Version
-  version: 0.0.1
+version: !ruby/object:Gem::Version 
+  hash: 27
   prerelease: 
+  segments: 
+  - 0
+  - 0
+  - 2
+  version: 0.0.2
 platform: ruby
-authors:
+authors: 
 - Vitaliy Nahaylo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-17 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-01-24 00:00:00 +02:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: ipaddress
-  requirement: &4227880 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *4227880
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: activemodel
-  requirement: &3846480 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        - 0
         version: 3.0.0
     - - <
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 3
+        - 2
+        - 0
         version: 3.2.0
   type: :runtime
-  prerelease: false
-  version_requirements: *3846480
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: activesupport
-  requirement: &3841640 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        - 0
         version: 3.0.0
     - - <
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 3
+        - 2
+        - 0
         version: 3.2.0
   type: :development
-  prerelease: false
-  version_requirements: *3841640
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &3889840 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *3889840
+  version_requirements: *id004
 description: Validators for domains and ip addresses
-email:
+email: 
 - nahaylo@gmail.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - Gemfile
 - LICENSE
@@ -86,31 +122,41 @@ files:
 - spec/test_classes/domain.rb
 - spec/test_classes/ip_address.rb
 - validator.gemspec
-homepage: ''
+has_rdoc: true
+homepage: ""
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: validator
-rubygems_version: 1.8.10
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Validator
-test_files:
+test_files: 
 - spec/domain_validator_spec.rb
 - spec/ip_address_validator_spec.rb
 - spec/spec_helper.rb