validates_host 0.3.0 → 1.3.0

data/lib/validates_host/{shoulda-matchers/host_name_matcher.rb → require_a_valid_host_name_matcher.rb}

@@ -1,17 +1,15 @@
-require "shoulda-matchers"
+# frozen_string_literal: true
+
+require 'shoulda-matchers'
 
 module Shoulda
   module Matchers
     module ActiveModel
       def require_a_valid_host_name(attribute = :host_name)
-        HostNameMatcher.new(attribute)
+        RequireAValidHostNameMatcher.new(attribute)
       end
 
-      class HostNameMatcher < ValidationMatcher
-        def initialize(attribute)
-          @attribute = attribute
-        end
-
+      class RequireAValidHostNameMatcher < ValidationMatcher
         def description
           "require #{@attribute} to be a valid host name"
         end
@@ -19,19 +17,19 @@ module Shoulda
         def matches?(subject)
           super(subject)
 
-          disallows_invalid_value and allows_valid_value
+          disallows_invalid_value && allows_valid_value
         end
 
         private
 
         def disallows_invalid_value
-          disallows_value_of("1bd")
+          disallows_value_of('1bd')
         end
 
         def allows_valid_value
-          allows_value_of("bd01")
+          allows_value_of('bd01')
         end
       end
     end
   end
-end
+end

data/lib/validates_host/{shoulda-matchers/ip_matcher.rb → require_a_valid_ip_matcher.rb}

@@ -1,17 +1,15 @@
-require "shoulda-matchers"
+# frozen_string_literal: true
+
+require 'shoulda-matchers'
 
 module Shoulda
   module Matchers
     module ActiveModel
       def require_a_valid_ip(attribute = :ip)
-        IpMatcher.new(attribute)
+        RequireAValidIpMatcher.new(attribute)
       end
 
-      class IpMatcher < ValidationMatcher
-        def initialize(attribute)
-          @attribute = attribute
-        end
-
+      class RequireAValidIpMatcher < ValidationMatcher
         def description
           "require #{@attribute} to be a valid ip"
         end
@@ -19,19 +17,19 @@ module Shoulda
         def matches?(subject)
           super(subject)
 
-          disallows_invalid_value and allows_valid_value
+          disallows_invalid_value && allows_valid_value
         end
 
         private
 
         def disallows_invalid_value
-          disallows_value_of("10.0.0")
+          disallows_value_of('10.0.0')
         end
 
         def allows_valid_value
-          allows_value_of("10.10.10.1")
+          allows_value_of('10.10.10.1')
         end
       end
     end
   end
-end
+end

data/lib/validates_host/{shoulda-matchers/subnet_matcher.rb → require_a_valid_subnet_matcher.rb}

@@ -1,17 +1,15 @@
-require "shoulda-matchers"
+# frozen_string_literal: true
+
+require 'shoulda-matchers'
 
 module Shoulda
   module Matchers
     module ActiveModel
       def require_a_valid_subnet(attribute = :value)
-        SubnetMatcher.new(attribute)
+        RequireAValidSubnetMatcher.new(attribute)
       end
 
-      class SubnetMatcher < ValidationMatcher
-        def initialize(attribute)
-          @attribute = attribute
-        end
-
+      class RequireAValidSubnetMatcher < ValidationMatcher
         def description
           "require #{@attribute} to be a valid subnet"
         end
@@ -19,19 +17,19 @@ module Shoulda
         def matches?(subject)
           super(subject)
 
-          disallows_invalid_value and allows_valid_value
+          disallows_invalid_value && allows_valid_value
         end
 
         private
 
         def disallows_invalid_value
-          disallows_value_of("10.0.0")
+          disallows_value_of('10.0.0')
         end
 
         def allows_valid_value
-          allows_value_of("10.10.10.1/28")
+          allows_value_of('10.10.10.1/28')
         end
       end
     end
   end
-end
+end

data/lib/validates_host/subnet.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module ValidatesHost
+  class Subnet
+    def initialize(subnet)
+      @subnet = subnet
+    end
+
+    def valid?
+      return true if @subnet.blank?
+
+      @subnet =~ %r{^([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
+  end
+end

data/lib/validates_host/subnet_validator.rb

@@ -1,23 +1,16 @@
+# frozen_string_literal: true
+
 class SubnetValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
-    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::Subnet.new(value).valid?
-  end
-end
+    return if ValidatesHost::Subnet.new(value).valid?
 
-module ValidatesHost
-  class Subnet
-    def initialize(subnet)
-      @subnet = subnet
-    end
+    ruby_prior_version_three =
+      Gem::Version.new(RUBY_VERSION) < Gem::Version.new('3.0.0')
 
-    def valid?
-      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
+    if ruby_prior_version_three
+      record.errors.add(attribute, :invalid, options)
+    else
+      record.errors.add(attribute, :invalid, **options)
     end
   end
-end
+end

data/lib/validates_host/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ValidatesHost
-  VERSION = "0.3.0"
+  VERSION = '1.3.0'.freeze
 end

data/spec/fake_app/server.rb

@@ -1,5 +1,19 @@
-class Server < ActiveRecord::Base
-  validates :domain_name, :domain_name => true
-  validates :host_name, :host_name => true
-  validates :ip, :ip => true
-end
+# frozen_string_literal: true
+
+class Server
+  include ActiveModel::Validations
+  include ActiveModel::Conversion
+  extend ActiveModel::Naming
+
+  attr_accessor :domain_name, :host_name, :ip
+
+  validates :domain_name, domain_name: true
+  validates :host_name, host_name: true
+  validates :ip, ip: true
+
+  def initialize(attributes = {})
+    attributes.each do |name, value|
+      send("#{name}=", value)
+    end
+  end
+end

data/spec/fake_app/subnet.rb

@@ -1,3 +1,11 @@
-class Subnet < ActiveRecord::Base
-  validates :value, :subnet => true
-end
+# frozen_string_literal: true
+
+class Subnet
+  include ActiveModel::Validations
+  include ActiveModel::Conversion
+  extend ActiveModel::Naming
+
+  attr_accessor :id, :value
+
+  validates :value, subnet: true
+end

data/spec/shoulda/matchers/active_model/require_a_valid_domain_name_matcher_spec.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Shoulda::Matchers::ActiveModel::RequireAValidDomainNameMatcher do
+  let(:server) { Server.new }
+
+  it 'accepts on domain_name' do
+    expect(server).to require_a_valid_domain_name(:domain_name)
+  end
+
+  it 'accepts without a specified attribute' do
+    expect(server).to require_a_valid_domain_name
+  end
+
+  it 'rejects on host_name' do
+    expect(server).not_to require_a_valid_domain_name(:host_name)
+  end
+
+  it 'has 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/shoulda/matchers/active_model/require_a_valid_host_name_matcher_spec.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Shoulda::Matchers::ActiveModel::RequireAValidHostNameMatcher do
+  let(:server) { Server.new }
+
+  it 'accepts on host_name' do
+    expect(server).to require_a_valid_host_name(:host_name)
+  end
+
+  it 'accepts without a specified attribute' do
+    expect(server).to require_a_valid_host_name
+  end
+
+  it 'rejects on domain_name' do
+    expect(server).not_to require_a_valid_host_name(:domain_name)
+  end
+
+  it 'has 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/shoulda/matchers/active_model/require_a_valid_ip_matcher_spec.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Shoulda::Matchers::ActiveModel::RequireAValidIpMatcher do
+  let(:server) { Server.new }
+
+  it 'accepts on ip' do
+    expect(server).to require_a_valid_ip(:ip)
+  end
+
+  it 'accepts without a specified attribute' do
+    expect(server).to require_a_valid_ip
+  end
+
+  it 'rejects on domain_name' do
+    expect(server).not_to require_a_valid_ip(:domain_name)
+  end
+
+  it 'has a description message' do
+    expect(require_a_valid_ip.description).to eq('require ip to be a valid ip')
+  end
+end

data/spec/shoulda/matchers/active_model/require_a_valid_subnet_matcher_spec.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Shoulda::Matchers::ActiveModel::RequireAValidSubnetMatcher do
+  let(:subnet) { Subnet.new }
+
+  it 'accepts on value' do
+    expect(subnet).to require_a_valid_subnet(:value)
+  end
+
+  it 'accepts without a specified attribute' do
+    expect(subnet).to require_a_valid_subnet
+  end
+
+  it 'rejects on id' do
+    expect(subnet).not_to require_a_valid_subnet(:id)
+  end
+
+  it 'has a description message' do
+    expect(require_a_valid_subnet.description).to eq('require value to be a valid subnet')
+  end
+end

data/spec/spec_helper.rb

@@ -1,11 +1,14 @@
-require "rubygems"
-require "rspec"
-require "active_record"
+# frozen_string_literal: true
 
-Dir.glob(File.dirname(__FILE__) + "/../lib/**/*.rb").each { |file| require file }
-Dir.glob(File.dirname(__FILE__) + "/fake_app/**/*.rb").each { |file| require file }
+require 'rspec'
+require 'active_model'
+require 'coveralls'
+require 'shoulda-matchers'
 
-ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
+Coveralls.wear!
 
-CreateServers.migrate(:up)
-CreateSubnets.migrate(:up)
+require 'validates_host'
+require 'fake_app/server'
+require 'fake_app/subnet'
+
+include Shoulda::Matchers::ActiveModel

data/spec/validates_host/domain_name_validator_spec.rb

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

data/spec/validates_host/host_name_validator_spec.rb

@@ -1,40 +1,41 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 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")
+  let(:server) { Server.new }
+
+  context 'when host_name is invalid' do
+    before do
+      server.host_name = 'http://'
+      server.valid?
     end
 
-    it "should set object as invalid" do
-      @server.valid?.should be_false
+    it 'sets object as invalid' do
+      expect(server).not_to be_valid
     end
 
-    it "should set an error" do
-      @server.valid?
-      @server.errors[:host_name].should == ['is invalid']
+    it 'sets an error' do
+      expect(server.errors[:host_name]).to eq(['is invalid'])
     end
   end
 
-  context "when host_name is valid" do
-    before :each do
-      @server = Server.new(:host_name => "bd01")
+  context 'when host_name is valid' do
+    before do
+      server.host_name = 'bd01'
+      server.valid?
     end
 
-    it "should set object as valid" do
-      @server.valid?.should be_true
+    it 'sets object as valid' do
+      expect(server).to be_valid
     end
 
-    it "should not set an error on attribute" do
-      @server.valid?
-      @server.errors[:host_name].should be_blank
+    it 'does not set an error on attribute' do
+      expect(server.errors[:host_name]).to be_blank
     end
   end
 
-  it "should be valid with a nil value" do
-    @server = Server.new(:host_name => nil)
-    @server.valid?.should be_true
+  it 'is valid with a nil value' do
+    expect(server).to be_valid
   end
-end
+end