activemodel-url_validator 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e56b625caa120974fe1da3bb4127765ee0bdbb78
-  data.tar.gz: 04be198ffd543a09e07083727f36cb044b927c1f
+  metadata.gz: 6bae84fcd1d6d45196a3c26227939face9d9cfe6
+  data.tar.gz: 92eb6f02caa3c8a11297a5d2cefa4c5caaa97262
 SHA512:
-  metadata.gz: c779f656931620cef240a08614561d369abd842fbab142ff8c8814854dad4f947db59c44961c96f0f53b4683c293a6655c8ab71d75cc9ab3a862d28ba6c1c344
-  data.tar.gz: 07decff500d457a1bf8d9dd1f06bab66d46192c346a0c8de2e6d4330258b39d3c5a78b864ae33c35375f5ef1676e20b9a7fffc91f0104bc6cadee926a4a0cec5
+  metadata.gz: 4166f3b5878a7c02736e8cd776753811a938f883b468715e783167169d31b007f11d621ffdedeac681a0c642db252707faee6156b03ed8b9496bc25d91f84b45
+  data.tar.gz: 07e8f27dc5a60b58c37e26e1efeb0fa3c5111302ab612af9e04663c28ee8562b3102c254a93cb9d243baf2394b3bcf606d88cff19502dba0cdca2199f1a86538

data/README.md

@@ -28,6 +28,7 @@ Name | Value | Default | Desc.
 ----|----|----|----
 `scheme` | Array of String | nil | Specify allowed scheme types.
 `allow_no_scheme` | Boolean | false | Whether scheme less URI is allowed.
+`allow_no_host` | Boolean | false | Whether host less URI is allowed.
 
 ```rb
 validates :my_url_attribute, url: { scheme: ['https'] }

data/lib/url_validator.rb

@@ -3,17 +3,38 @@ class UrlValidator < ActiveModel::EachValidator
     def valid?(value, options = {})
       options = default_options.merge(options)
       uri = URI.parse(value)
-      if uri.scheme.nil?
-        !!options[:allow_no_scheme]
-      else
-        options[:scheme] ? options[:scheme].include?(uri.scheme) : true
+
+      [:scheme_appearance, :host_appearance, :scheme_type].all? do |method|
+        send("validate_#{method}", uri, options)
       end
     rescue URI::Error
       false
     end
 
     def default_options
-      { scheme: nil, allow_no_scheme: false }
+      { scheme: nil, allow_no_scheme: false, allow_no_host: false }
+    end
+
+    private
+
+    def validate_scheme_appearance(uri, options)
+      uri.scheme.nil? ? options[:allow_no_scheme] : true
+    end
+
+    def validate_host_appearance(uri, options)
+      uri.host.nil? ? options[:allow_no_host] : true
+    end
+
+    def validate_scheme_type(uri, options)
+      if options[:scheme]
+        if uri.scheme.nil? && options[:allow_no_scheme]
+          true
+        else
+          options[:scheme].include?(uri.scheme)
+        end
+      else
+        true
+      end
     end
   end
 

data/lib/url_validator/version.rb

@@ -1,3 +1,3 @@
 class UrlValidator
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/spec/url_validator_spec.rb

@@ -14,6 +14,12 @@ shared_examples_for 'scheme less value is given', given: :scheme_less do
   end
 end
 
+shared_examples_for 'host less value is given', given: :host_less do
+  let(:value) do
+    'http:///host/less'
+  end
+end
+
 [:http, :https].each do |scheme|
   shared_examples_for "#{scheme} URI is given", given: scheme do
     let(:value) do
@@ -30,6 +36,12 @@ shared_examples_for 'allow_no_scheme is true', allow_no_scheme: true do
   end
 end
 
+shared_examples_for 'allow_no_host is true', allow_no_host: true do
+  let(:allow_no_host) do
+    true
+  end
+end
+
 shared_examples_for 'scheme includes http', scheme: :http do
   let(:scheme) do
     ['http']
@@ -72,6 +84,14 @@ describe UrlValidator do
       end
     end
 
+    context 'when a host less URI is given', given: :host_less do
+      it { should be_falsey }
+
+      context 'and host less URI is allowed', allow_no_host: true do
+        it { should be_truthy }
+      end
+    end
+
     context 'when a HTTP URI is given', given: :http do
       it { should be_truthy }
 
@@ -109,6 +129,10 @@ describe UrlValidator do
         it { should be_invalid }
       end
 
+      context 'and a valid host less value is given', given: :host_less do
+        it { should be_invalid }
+      end
+
       context 'and a valid http value is given', given: :http do
         it { should be_valid }
       end
@@ -130,6 +154,18 @@ describe UrlValidator do
       end
     end
 
+    context 'when allow_no_host is true' do
+      let(:model_class) do
+        Class.new(TestModel) do
+          validates :attr, url: { allow_no_host: true }
+        end
+      end
+
+      context 'and a valid host less value is given', given: :host_less do
+        it { should be_valid }
+      end
+    end
+
     context 'when http scheme is allowed', scheme: :http do
       let(:model_class) do
         Class.new(TestModel) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activemodel-url_validator
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Yuku Takahashi