validates_as_hostname_label 1.1.1 → 1.1.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: a1c12b78dd8d83a1392c1442dbe02f9a917ebd40
+  data.tar.gz: b718bf9495cd78c293bddd406aee06eb7c52e849
+SHA512:
+  metadata.gz: e195b3dc83ef7499c9eb8fc1565096ffe856ca46df784f0dc4842c1b4fa75e084000a2012009dc65305b3fb724b6f8d3bbe5b634d57ffe4e09e21d75e9fa4d06
+  data.tar.gz: 8fc1daeb566ad0b7b26ab63f4064ad7ffcc29af4434f9700aaedbc899f77ca378759572245de713ce2652331bd6550567430802c2cf5b45e8afd434a7dafb2b2

data/Gemfile

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gemspec

data/Gemfile.lock

@@ -0,0 +1,41 @@
+PATH
+  remote: .
+  specs:
+    validates_as_hostname_label (1.1.1)
+      activerecord
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (4.0.3)
+      activesupport (= 4.0.3)
+      builder (~> 3.1.0)
+    activerecord (4.0.3)
+      activemodel (= 4.0.3)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.3)
+      arel (~> 4.0.0)
+    activerecord-deprecated_finders (1.0.3)
+    activesupport (4.0.3)
+      i18n (~> 0.6, >= 0.6.4)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    arel (4.0.2)
+    atomic (1.1.15)
+    builder (3.1.4)
+    i18n (0.6.9)
+    minitest (4.7.5)
+    multi_json (1.9.0)
+    sqlite3 (1.3.9)
+    thread_safe (0.2.0)
+      atomic (>= 1.1.7, < 2)
+    tzinfo (0.3.38)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  sqlite3
+  validates_as_hostname_label!

data/Rakefile

@@ -1,6 +1,6 @@
 require 'rake'
 require 'rake/testtask'
-require 'rake/rdoctask'
+require 'rdoc/task'
 
 desc 'Default: run the validates_as_hostname_label tests'
 task :default => :test
@@ -19,4 +19,4 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.options << '--line-numbers' << '--inline-source'
   rdoc.rdoc_files.include('README.*')
   rdoc.rdoc_files.include('lib/**/*.rb')
-end
+end

data/lib/validates_as_hostname_label.rb

@@ -1,6 +1,8 @@
+require 'active_record'
+require 'active_support/core_ext/object/with_options'
+
 # Adds ActiveRecord validation for hostname labels
 module ValidatesAsHostnameLabel
-
   # A hash of default options to use when calling <tt>validates_as_hostname_label</tt>.
   #
   # Defaults:
@@ -15,7 +17,7 @@ module ValidatesAsHostnameLabel
       :reserved => %w(admin blog dev development ftp help imap mail pop pop3 sftp smtp staging stats status support www)
     }
   end
-  
+
   # Validates hostname labels by checking for:
   #
   #   * Length between 1 and 63 characters long
@@ -27,7 +29,7 @@ module ValidatesAsHostnameLabel
   #
   #   :allow_blank        -  Skip validation of the attribute is blank. Defaults to false.
   #   :allow_underscores  -  Allows underscores in hostname labels. Defaults to false.
-  #   :reserved           -  Contains an array of reserved hostname labels to validate exclusion of. 
+  #   :reserved           -  Contains an array of reserved hostname labels to validate exclusion of.
   #                          Defaults to ValidatesAsHostnameLabel.default_options[:reserved].
   #
   # I18n keys:
@@ -44,21 +46,21 @@ module ValidatesAsHostnameLabel
 
     I18n.with_options :scope => 'validates_as_hostname_label' do |i18n|
       validates_presence_of *attrs + [options] unless options.delete(:allow_blank) || options.delete(:allow_nil)
-      
+
       validates_exclusion_of *attrs + [{
         :in => options.delete(:reserved),
         :message => i18n.t('reserved', :default => 'is reserved'),
         :allow_blank => true
       }.merge(options)]
 
-      validates_format_of *attrs + [{ 
-        :with => /^[#{format}]*$/i,
+      validates_format_of *attrs + [{
+        :with => /\A[#{format}]*\z/i,
         :message => i18n.t('invalid_format', :default => "may only contain #{characters.to_sentence} characters"),
         :allow_blank => true
       }.merge(options)]
 
       validates_format_of *attrs + [{
-        :with => /^[^-_].*[^-_]$/i,
+        :with => /\A[^-_].*[^-_]\z/i,
         :message => i18n.t('invalid_prefix_or_suffix', :default => 'may not start or end with a hyphen or underscore'),
         :allow_blank => true
       }.merge(options)]
@@ -72,4 +74,4 @@ module ValidatesAsHostnameLabel
   end
 end
 
-ActiveRecord::Base.extend ValidatesAsHostnameLabel
+ActiveRecord::Base.extend ValidatesAsHostnameLabel

data/test/validates_as_hostname_label_test.rb

@@ -1,8 +1,10 @@
 require 'rubygems'
-require 'active_record'
+require 'sqlite3'
 require 'test/unit'
 require File.dirname(__FILE__) + '/../lib/validates_as_hostname_label'
 
+I18n.enforce_available_locales = false
+
 ActiveRecord::Base.establish_connection :adapter => 'sqlite3', :database => ':memory:'
 
 class Account < ActiveRecord::Base
@@ -43,11 +45,11 @@ class ValidatesAsHostnameLabelTest < Test::Unit::TestCase
   def test_should_not_save_with_blank_subdomain_if_allow_option_is_not_specified
     @account = Account.new :subdomain => nil
     assert !@account.save
-    assert @account.errors.on(:subdomain)
+    assert !@account.errors[:subdomain].empty?
 
     @account.subdomain = ''
     assert !@account.save
-    assert @account.errors.on(:subdomain)
+    assert !@account.errors[:subdomain].empty?
   end
 
   def test_should_save_with_blank_subdomain
@@ -63,35 +65,35 @@ class ValidatesAsHostnameLabelTest < Test::Unit::TestCase
   def test_should_not_save_with_too_long_of_a_subdomain
     @account = Account.new :subdomain => ('t' * 64)
     assert !@account.save
-    assert @account.errors.on(:subdomain)
+    assert !@account.errors[:subdomain].empty?
   end
 
   def test_should_not_save_with_invalid_characters
     @account = Account.new :subdomain => '!@#$%^&*'
     assert !@account.save
-    assert @account.errors.on(:subdomain)
+    assert !@account.errors[:subdomain].empty?
   end
 
   def test_should_not_save_with_subdomains_beginning_with_a_hyphen_or_underscore
     @account = Account.new :subdomain => '-testing'
     @account.subdomain_with_underscores = '_testing'
     assert !@account.save
-    assert @account.errors.on(:subdomain)
-    assert @account.errors.on(:subdomain_with_underscores)
+    assert !@account.errors[:subdomain].empty?
+    assert !@account.errors[:subdomain_with_underscores].empty?
   end
 
   def test_should_not_save_with_subdomains_ending_with_a_hyphen_or_underscore
     @account = Account.new :subdomain => 'testing-'
     @account.subdomain_with_underscores = 'testing_'
     assert !@account.save
-    assert @account.errors.on(:subdomain)
-    assert @account.errors.on(:subdomain_with_underscores)
+    assert !@account.errors[:subdomain].empty?
+    assert !@account.errors[:subdomain_with_underscores].empty?
   end
 
   def test_should_not_save_subdomains_with_an_underscore_if_allow_underscores_option_is_false
     @account = Account.new :subdomain => 'test_ing'
     assert !@account.save
-    assert @account.errors.on(:subdomain)
+    assert !@account.errors[:subdomain].empty?
   end
 
   def test_should_save_subdomains_with_an_underscore_if_allow_underscores_option_is_true
@@ -103,20 +105,19 @@ class ValidatesAsHostnameLabelTest < Test::Unit::TestCase
     ValidatesAsHostnameLabel::default_options[:reserved].each do |hostname|
       @account = Account.new :subdomain => hostname
       assert !@account.save
-      assert @account.errors.on(:subdomain)
+      assert !@account.errors[:subdomain].empty?
     end
   end
 
   def test_should_not_save_with_a_reserved_subdomain_from_a_list
     @account = Account.new :subdomain_with_reserved => 'funky'
     assert !@account.save
-    assert @account.errors.on(:subdomain_with_reserved)
+    assert !@account.errors[:subdomain_with_reserved].empty?
   end
 
   def test_should_not_be_valid_with_a_subdomain_not_from_the_list
     @account = Account.new :subdomain_with_reserved => 'qqqfds'
     assert !@account.save
-    assert !@account.errors.on(:subdomain_with_reserved)
+    assert @account.errors[:subdomain_with_reserved].empty?
   end
-
-end
+end

metadata

@@ -1,60 +1,79 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: validates_as_hostname_label
-version: !ruby/object:Gem::Version 
-  version: 1.1.1
+version: !ruby/object:Gem::Version
+  version: 1.1.2
 platform: ruby
-authors: 
+authors:
 - Sean Huber
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-03-16 00:00:00 -07:00
-default_executable: 
-dependencies: []
-
+date: 2014-03-05 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Checks for valid hostname labels
 email: shuber@huberry.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - init.rb
 - lib/validates_as_hostname_label.rb
+- Gemfile
+- Gemfile.lock
 - MIT-LICENSE
 - Rakefile
 - README.rdoc
 - test/validates_as_hostname_label_test.rb
-has_rdoc: true
 homepage: http://github.com/shuber/validates_as_hostname_label
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Checks for valid hostname labels
-test_files: 
+test_files:
 - test/validates_as_hostname_label_test.rb