validates_host 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9119afe646e4f4c22c958cbe83bdbd5a20816d14
-  data.tar.gz: 9c469eff107d97f76f5a5030fcc28023ba404656
+  metadata.gz: 3ccfaaef4bc3d52a9b8fa2ca185639ac9e8eef1b
+  data.tar.gz: 1a847e877ae09a88eb3ef62434a52fb9cb672f4c
 SHA512:
-  metadata.gz: 1246fba586ce19f532bb2d02ac0d26156354d723e612994b717e5b4b18fdd280664722492317ef9a728c996023c4a8886d638ddf39acb967c0e011295c1816a7
-  data.tar.gz: af59833df940100079fb42086ae9cd4503a383ad9cde070446bfd43aa75a360a3560ca8bf2cd49f54cd602b6f6da5638e282331c0277e29fab03f4c0c563fdc0
+  metadata.gz: 6911acf25d66107a291d5883753e1fc1e01565fd2312eedc15c97edc6bd627d959b25fc05ae00306241479ee0b94f682b46b0e8ce310e5a9ad9c682a2b9bf889
+  data.tar.gz: dda6fca0b134fbeda2248a265b627e1b54c6d06944b497089d2ef6593ab7d4e8a51340bc73cfab98e2e67ada6fcc6a3684a8811df60c0a8d3bc4c3e432dde1cd

data/.ruby-version

@@ -1 +1 @@
-2.0.0
+2.3.6

data/.travis.yml

@@ -1,19 +1,22 @@
 rvm:
-  - 1.8.7
-  - 1.9.2
-  - 1.9.3
-  - 2.0.0
-  - 2.1.0
-  - jruby
-  - ree
+  - 2.0
+  - 2.1
+  - 2.2
+  - 2.3
+  - 2.4
 gemfile:
   - gemfiles/Gemfile.rails3
   - gemfiles/Gemfile.rails4
+  - gemfiles/Gemfile.rails5
 matrix:
   exclude:
-    - rvm: 1.8.7
-      gemfile: gemfiles/Gemfile.rails4
-    - rvm: 1.9.2
-      gemfile: gemfiles/Gemfile.rails4
-    - rvm: ree
-      gemfile: gemfiles/Gemfile.rails4
+    - rvm: 2.2
+      gemfile: gemfiles/Gemfile.rails3
+    - rvm: 2.3
+      gemfile: gemfiles/Gemfile.rails3
+    - rvm: 2.4
+      gemfile: gemfiles/Gemfile.rails3
+    - rvm: 2.0
+      gemfile: gemfiles/Gemfile.rails5
+    - rvm: 2.1
+      gemfile: gemfiles/Gemfile.rails5

data/gemfiles/Gemfile.rails4

@@ -1,5 +1,5 @@
 source :rubygems
 
-gem 'activesupport', '>= 4.0.0'
+gem 'activesupport', '>= 4.0.0', '< 5.0.0'
 
 gemspec :path => '../'

data/gemfiles/Gemfile.rails5

@@ -0,0 +1,5 @@
+source :rubygems
+
+gem 'activesupport', '>= 5.0.0'
+
+gemspec :path => '../'

data/lib/validates_host/domain_name.rb

@@ -8,9 +8,5 @@ module ValidatesHost
       return true if @domain_name.blank?
       @domain_name =~ /^[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(:[0-9]{1,5})?(\/.*)?$/
     end
-
-    def domain_name
-      @domain_name
-    end
   end
 end

data/lib/validates_host/host_name.rb

@@ -8,9 +8,5 @@ module ValidatesHost
       return true if @host_name.blank?
       @host_name =~ /^[a-z][a-z0-9-]+$/
     end
-
-    def host_name
-      @host_name
-    end
   end
 end

data/lib/validates_host/ip.rb

@@ -8,9 +8,5 @@ module ValidatesHost
       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
-    end
   end
 end

data/lib/validates_host/require_a_valid_domain_name_matcher.rb

@@ -8,10 +8,6 @@ module Shoulda
       end
 
       class RequireAValidDomainNameMatcher < ValidationMatcher
-        def initialize(attribute)
-          @attribute = attribute
-        end
-
         def description
           "require #{@attribute} to be a valid domain name"
         end

data/lib/validates_host/require_a_valid_host_name_matcher.rb

@@ -8,10 +8,6 @@ module Shoulda
       end
 
       class RequireAValidHostNameMatcher < ValidationMatcher
-        def initialize(attribute)
-          @attribute = attribute
-        end
-
         def description
           "require #{@attribute} to be a valid host name"
         end

data/lib/validates_host/require_a_valid_ip_matcher.rb

@@ -8,10 +8,6 @@ module Shoulda
       end
 
       class RequireAValidIpMatcher < ValidationMatcher
-        def initialize(attribute)
-          @attribute = attribute
-        end
-
         def description
           "require #{@attribute} to be a valid ip"
         end

data/lib/validates_host/require_a_valid_subnet_matcher.rb

@@ -8,10 +8,6 @@ module Shoulda
       end
 
       class RequireAValidSubnetMatcher < ValidationMatcher
-        def initialize(attribute)
-          @attribute = attribute
-        end
-
         def description
           "require #{@attribute} to be a valid subnet"
         end

data/lib/validates_host/subnet.rb

@@ -8,9 +8,5 @@ module ValidatesHost
       return true if @subnet.blank?
       @subnet =~ /^([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}\/(2[4-9]|30)$/
     end
-
-    def subnet
-      @subnet
-    end
   end
 end

data/lib/validates_host/version.rb

@@ -1,3 +1,3 @@
 module ValidatesHost
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

data/spec/spec_helper.rb

@@ -7,4 +7,6 @@ Coveralls.wear!
 
 require 'validates_host'
 require 'fake_app/server'
-require 'fake_app/subnet'
+require 'fake_app/subnet'
+
+include Shoulda::Matchers::ActiveModel

data/spec/validates_host/domain_name_validator_spec.rb

@@ -1,40 +1,38 @@
 require 'spec_helper'
 
 describe DomainNameValidator do
-  context "when domain_name is invalid" 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")
+      @server = Server.new(:domain_name => 'http://')
     end
 
-    it "should set object as invalid" do
-      @server.valid?.should be_false
+    it 'should set object as invalid' do
+      expect(@server.valid?).to be_falsey
     end
 
-    it "should set an error" do
+    it 'should set an error' do
       @server.valid?
-      @server.errors[:domain_name].should == ['is invalid']
+      expect(@server.errors[:domain_name]).to eq(['is invalid'])
     end
   end
 
-  context "when domain_name is valid" do
+  context 'when domain_name is valid' do
     before :each do
-      @server = Server.new(:domain_name => "example.com")
+      @server = Server.new(:domain_name => 'example.com')
     end
 
-    it "should set object as valid" do
-      @server.valid?.should be_true
+    it 'should set object as valid' do
+      expect(@server.valid?).to be_truthy
     end
 
-    it "should not set an error on attribute" do
+    it 'should not set an error on attribute' do
       @server.valid?
-      @server.errors[:domain_name].should be_blank
+      expect(@server.errors[:domain_name]).to be_blank
     end
   end
 
-  it "should be valid with a nil value" do
+  it 'should be valid with a nil value' do
     @server = Server.new(:domain_name => nil)
-    @server.valid?.should be_true
+    expect(@server.valid?).to be_truthy
   end
 end

data/spec/validates_host/host_name_validator_spec.rb

@@ -1,40 +1,38 @@
 require 'spec_helper'
 
 describe HostNameValidator do
-  context "when host_name is invalid" 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")
+      @server = Server.new(:host_name => 'http://')
     end
 
-    it "should set object as invalid" do
-      @server.valid?.should be_false
+    it 'should set object as invalid' do
+      expect(@server.valid?).to be_falsey
     end
 
-    it "should set an error" do
+    it 'should set an error' do
       @server.valid?
-      @server.errors[:host_name].should == ['is invalid']
+      expect(@server.errors[:host_name]).to eq(['is invalid'])
     end
   end
 
-  context "when host_name is valid" do
+  context 'when host_name is valid' do
     before :each do
-      @server = Server.new(:host_name => "bd01")
+      @server = Server.new(:host_name => 'bd01')
     end
 
-    it "should set object as valid" do
-      @server.valid?.should be_true
+    it 'should set object as valid' do
+      expect(@server.valid?).to be_truthy
     end
 
-    it "should not set an error on attribute" do
+    it 'should not set an error on attribute' do
       @server.valid?
-      @server.errors[:host_name].should be_blank
+      expect(@server.errors[:host_name]).to be_blank
     end
   end
 
-  it "should be valid with a nil value" do
+  it 'should be valid with a nil value' do
     @server = Server.new(:host_name => nil)
-    @server.valid?.should be_true
+    expect(@server.valid?).to be_truthy
   end
 end

data/spec/validates_host/ip_validator_spec.rb

@@ -1,40 +1,38 @@
 require 'spec_helper'
 
 describe IpValidator do
-  context "when ip is invalid" 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")
+      @server = Server.new(:ip => '127.0.0')
     end
 
-    it "should set object as invalid" do
-      @server.valid?.should be_false
+    it 'should set object as invalid' do
+      expect(@server.valid?).to be_falsey
     end
 
-    it "should set an error" do
+    it 'should set an error' do
       @server.valid?
-      @server.errors[:ip].should == ['is invalid']
+      expect(@server.errors[:ip]).to eq(['is invalid'])
     end
   end
 
-  context "when ip is valid" do
+  context 'when ip is valid' do
     before :each do
-      @server = Server.new(:ip => "10.10.10.1")
+      @server = Server.new(:ip => '10.10.10.1')
     end
 
-    it "should set object as valid" do
-      @server.valid?.should be_true
+    it 'should set object as valid' do
+      expect(@server.valid?).to be_truthy
     end
 
-    it "should not set an error on attribute" do
+    it 'should not set an error on attribute' do
       @server.valid?
-      @server.errors[:ip].should be_blank
+      expect(@server.errors[:ip]).to be_blank
     end
   end
 
-  it "should be valid with a nil value" do
+  it 'should be valid with a nil value' do
     @server = Server.new(:ip => nil)
-    @server.valid?.should be_true
+    expect(@server.valid?).to be_truthy
   end
 end

data/spec/validates_host/require_a_valid_domain_name_matcher_spec.rb

@@ -5,15 +5,19 @@ describe Shoulda::Matchers::ActiveModel::RequireAValidDomainNameMatcher do
     @server = Server.new
   end
 
-  it "should accept on domain_name" do
-    @server.should require_a_valid_domain_name(:domain_name)
+  it 'should accept on domain_name' do
+    expect(@server).to require_a_valid_domain_name(:domain_name)
   end
 
-  it "should accept without a specified attribute" do
-    @server.should require_a_valid_domain_name
+  it 'should accept without a specified attribute' do
+    expect(@server).to require_a_valid_domain_name
   end
 
-  it "should reject on host_name" do
-    @server.should_not require_a_valid_domain_name(:host_name)
+  it 'should reject on host_name' do
+    expect(@server).not_to require_a_valid_domain_name(:host_name)
+  end
+
+  it 'should have a description message' do
+    expect(require_a_valid_domain_name.description).to eq('require domain_name to be a valid domain name')
   end
 end

data/spec/validates_host/require_a_valid_host_name_matcher_spec.rb

@@ -5,15 +5,19 @@ describe Shoulda::Matchers::ActiveModel::RequireAValidHostNameMatcher do
     @server = Server.new
   end
 
-  it "should accept on host_name" do
-    @server.should require_a_valid_host_name(:host_name)
+  it 'should accept on host_name' do
+    expect(@server).to require_a_valid_host_name(:host_name)
   end
 
-  it "should accept without a specified attribute" do
-    @server.should require_a_valid_host_name
+  it 'should accept without a specified attribute' do
+    expect(@server).to require_a_valid_host_name
   end
 
-  it "should reject on domain_name" do
-    @server.should_not require_a_valid_host_name(:domain_name)
+  it 'should reject on domain_name' do
+    expect(@server).not_to require_a_valid_host_name(:domain_name)
+  end
+
+  it 'should have a description message' do
+    expect(require_a_valid_host_name.description).to eq('require host_name to be a valid host name')
   end
 end

data/spec/validates_host/require_a_valid_ip_matcher_spec.rb

@@ -5,15 +5,19 @@ describe Shoulda::Matchers::ActiveModel::RequireAValidIpMatcher do
     @server = Server.new
   end
 
-  it "should accept on ip" do
-    @server.should require_a_valid_ip(:ip)
+  it 'should accept on ip' do
+    expect(@server).to require_a_valid_ip(:ip)
   end
 
-  it "should accept without a specified attribute" do
-    @server.should require_a_valid_ip
+  it 'should accept without a specified attribute' do
+    expect(@server).to require_a_valid_ip
   end
 
-  it "should reject on domain_name" do
-    @server.should_not require_a_valid_ip(:domain_name)
+  it 'should reject on domain_name' do
+    expect(@server).not_to require_a_valid_ip(:domain_name)
+  end
+
+  it 'should have a description message' do
+    expect(require_a_valid_ip.description).to eq('require ip to be a valid ip')
   end
 end

data/spec/validates_host/require_a_valid_subnet_matcher_spec.rb

@@ -5,15 +5,19 @@ describe Shoulda::Matchers::ActiveModel::RequireAValidSubnetMatcher do
     @subnet = Subnet.new
   end
 
-  it "should accept on value" do
-    @subnet.should require_a_valid_subnet(:value)
+  it 'should accept on value' do
+    expect(@subnet).to require_a_valid_subnet(:value)
   end
 
-  it "should accept without a specified attribute" do
-    @subnet.should require_a_valid_subnet
+  it 'should accept without a specified attribute' do
+    expect(@subnet).to require_a_valid_subnet
   end
 
-  it "should reject on id" do
-    @subnet.should_not require_a_valid_subnet(:id)
+  it 'should reject on id' do
+    expect(@subnet).not_to require_a_valid_subnet(:id)
+  end
+
+  it 'should have a description message' do
+    expect(require_a_valid_subnet.description).to eq('require value to be a valid subnet')
   end
 end

data/spec/validates_host/subnet_validator_spec.rb

@@ -1,40 +1,38 @@
 require 'spec_helper'
 
 describe SubnetValidator do
-  context "when subnet is invalid" do
+  context 'when subnet is invalid' do
     before :each do
-      @subnet = Subnet.new(:value => "127.0.0")
-      I18n.stub(:t).with(:"activerecord.errors.models.subnet.attributes.value.invalid",
-                         :default => :"activerecord.errors.messages.invalid").and_return("is invalid")
+      @subnet = Subnet.new(:value => '127.0.0')
     end
 
-    it "should set object as invalid" do
-      @subnet.valid?.should be_false
+    it 'should set object as invalid' do
+      expect(@subnet.valid?).to be_falsey
     end
 
-    it "should set an error" do
+    it 'should set an error' do
       @subnet.valid?
-      @subnet.errors[:value].should == ['is invalid']
+      expect(@subnet.errors[:value]).to eq(['is invalid'])
     end
   end
 
-  context "when subnet is valid" do
+  context 'when subnet is valid' do
     before :each do
-      @subnet = Subnet.new(:value => "10.10.10.1/28")
+      @subnet = Subnet.new(:value => '10.10.10.1/28')
     end
 
-    it "should set object as valid" do
-      @subnet.valid?.should be_true
+    it 'should set object as valid' do
+      expect(@subnet.valid?).to be_truthy
     end
 
-    it "should not set an error on attribute" do
+    it 'should not set an error on attribute' do
       @subnet.valid?
-      @subnet.errors[:value].should be_blank
+      expect(@subnet.errors[:value]).to be_blank
     end
   end
 
-  it "should be valid with a nil value" do
+  it 'should be valid with a nil value' do
     @subnet = Subnet.new(:value => nil)
-    @subnet.valid?.should be_true
+    expect(@subnet.valid?).to be_truthy
   end
 end

data/validates_host.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec'
-  gem.add_development_dependency 'shoulda-matchers', '2.0.0'
+  gem.add_development_dependency 'shoulda-matchers'
   gem.add_development_dependency 'coveralls'
 
   gem.add_dependency 'activemodel', '>= 3.0.0'

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: validates_host
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Paulo Henrique Lopes Ribeiro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-24 00:00:00.000000000 Z
+date: 2018-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   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'
 - !ruby/object:Gem::Dependency
   name: rspec
   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'
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   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'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
 description: 
@@ -86,17 +86,18 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .ruby-gemset
-- .ruby-version
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".ruby-gemset"
+- ".ruby-version"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - gemfiles/Gemfile.rails3
 - gemfiles/Gemfile.rails4
+- gemfiles/Gemfile.rails5
 - lib/validates_host.rb
 - lib/validates_host/domain_name.rb
 - lib/validates_host/domain_name_validator.rb
@@ -133,23 +134,24 @@ require_paths:
 - lib
 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: 2.1.11
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Validates Host, Domain and IP and test it with matchers in a simple way.
 test_files:
 - gemfiles/Gemfile.rails3
 - gemfiles/Gemfile.rails4
+- gemfiles/Gemfile.rails5
 - spec/fake_app/server.rb
 - spec/fake_app/subnet.rb
 - spec/spec_helper.rb