validates_host 0.1.0 → 0.2.0

data/lib/validates_host/domain_name_validator.rb

@@ -1,20 +1,23 @@
 class DomainNameValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
-    record.errors[attribute] << I18n.t("errors.messages.invalid") unless DomainName.new(value).valid?
+    key = :"activerecord.errors.models.#{record.class.name.downcase}.attributes.#{attribute.to_s}.invalid"
+    record.errors[attribute] << I18n.t(key, :default => :"activerecord.errors.messages.invalid") unless ValidatesHost::DomainName.new(value).valid?
   end
 end
 
-class DomainName
-  def initialize(domain_name)
-    @domain_name = domain_name
-  end
+module ValidatesHost
+  class DomainName
+    def initialize(domain_name)
+      @domain_name = domain_name
+    end
 
-  def valid?
-    return true if @domain_name.nil?
-    @domain_name =~ /^[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(:[0-9]{1,5})?(\/.*)?$/
-  end
+    def valid?
+      return true if @domain_name.nil?
+      @domain_name =~ /^[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(:[0-9]{1,5})?(\/.*)?$/
+    end
 
-  def domain_name
-    @domain_name
+    def domain_name
+      @domain_name
+    end
   end
 end

data/lib/validates_host/host_name_validator.rb

@@ -1,20 +1,23 @@
 class HostNameValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
-    record.errors[attribute] << I18n.t("errors.messages.invalid") unless HostName.new(value).valid?
+    key = :"activerecord.errors.models.#{record.class.name.downcase}.attributes.#{attribute.to_s}.invalid"
+    record.errors[attribute] << I18n.t(key, :default => :"activerecord.errors.messages.invalid") unless ValidatesHost::HostName.new(value).valid?
   end
 end
 
-class HostName
-  def initialize(host_name)
-    @host_name = host_name
-  end
+module ValidatesHost
+  class HostName
+    def initialize(host_name)
+      @host_name = host_name
+    end
 
-  def valid?
-    return true if @host_name.blank?
-    @host_name =~ /^[a-z][a-z0-9-]+$/
-  end
+    def valid?
+      return true if @host_name.blank?
+      @host_name =~ /^[a-z][a-z0-9-]+$/
+    end
 
-  def host_name
-    @host_name
+    def host_name
+      @host_name
+    end
   end
 end

data/lib/validates_host/ip_validator.rb

@@ -1,20 +1,23 @@
 class IpValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
-    record.errors[attribute] << I18n.t("errors.messages.invalid") unless Ip.new(value).valid?
+    key = :"activerecord.errors.models.#{record.class.name.downcase}.attributes.#{attribute.to_s}.invalid"
+    record.errors[attribute] << I18n.t(key, :default => :"activerecord.errors.messages.invalid") unless ValidatesHost::Ip.new(value).valid?
   end
 end
 
-class Ip
-  def initialize(ip)
-    @ip = ip
-  end
+module ValidatesHost
+  class Ip
+    def initialize(ip)
+      @ip = ip
+    end
 
-  def valid?
-    return true if @ip.blank?
-    @ip =~ /^([1-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])(\.([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])){3}$/
-  end
+    def valid?
+      return true if @ip.blank?
+      @ip =~ /^([1-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])(\.([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])){3}$/
+    end
 
-  def ip
-    @ip
+    def ip
+      @ip
+    end
   end
 end

data/lib/validates_host/version.rb

@@ -1,3 +1,3 @@
 module ValidatesHost
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/spec/validates_host.rb/domain_name_validator_spec.rb

@@ -4,6 +4,8 @@ describe DomainNameValidator do
   context "when domain_name is invalid" do
     before :each do
       @server = Server.new(:domain_name => "http://")
+      I18n.stub(:t).with(:"activerecord.errors.models.server.attributes.domain_name.invalid",
+                         :default => :"activerecord.errors.messages.invalid").and_return("is invalid")
     end
 
     it "should set object as invalid" do

data/spec/validates_host.rb/host_name_validator_spec.rb

@@ -4,6 +4,8 @@ describe HostNameValidator do
   context "when host_name is invalid" do
     before :each do
       @server = Server.new(:host_name => "http://")
+      I18n.stub(:t).with(:"activerecord.errors.models.server.attributes.host_name.invalid",
+                         :default => :"activerecord.errors.messages.invalid").and_return("is invalid")
     end
 
     it "should set object as invalid" do

data/spec/validates_host.rb/ip_validator_spec.rb

@@ -4,6 +4,8 @@ describe IpValidator do
   context "when ip is invalid" do
     before :each do
       @server = Server.new(:ip => "127.0.0")
+      I18n.stub(:t).with(:"activerecord.errors.models.server.attributes.ip.invalid",
+                         :default => :"activerecord.errors.messages.invalid").and_return("is invalid")
     end
 
     it "should set object as invalid" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: validates_host
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-19 00:00:00.000000000 Z
+date: 2012-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -158,12 +158,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -391399657668278307
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -391399657668278307
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24