domain_validator_jp 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 703d0df0dce33e429dbf606d1ca23e6053e5251331260fe6fe0d392a7d96b299
-  data.tar.gz: aa08dd03b420dea21484b5afebec87584a902534873c42df7d0f56bf45ca979f
+  metadata.gz: b994793dd271e71492fba726ebb405ef583f8b951f58806659b5528dcfdbd6b2
+  data.tar.gz: 2c657d7f2d250be49b418b6f1790292180670db5e15bdf0f6f2c922acd079b9d
 SHA512:
-  metadata.gz: de4938c681c48a99ae0224b53865d0bf2faff7fdf796033dd446e223f0a6cd3c783d9fea37db3926b343c2c52780c96679c3eb38793e6397f1651c0aad64153a
-  data.tar.gz: e219d06afef340342b61002e1c810b01ae44a4e19117e6a7e9e4dd8fa0ecdb15566b1e593934020ce457443da5bf57401f92caadd8dfb0875b0b7c29a6be63f8
+  metadata.gz: 6c03e1fd78be99e56a69e5a5df3e9a2b816807950637585dfc185736ed32d3d8c087029ad3d6a1f117afcf0831690ca22ef8dfbce1fa22e1524babe8a4c12a0a
+  data.tar.gz: 82e6f0df0cc35140adcbc278397dd00f28e2bd18dfc0df232665823e6b4e7bf5a9702e55cec6436fb8637690bac84d5578df5aa84f65e6f81c709f46d3cfcaf8

data/README.md

@@ -9,11 +9,10 @@ domain name validator includes JP domain
 ## Usage
 
 ```rb
-DomainValidatorJp.new('example.jp').valid?        # => true
-DomainValidatorJp.new('日本語.jp').valid?         # => true
-
-DomainValidatorJp.new('①②③.jp').valid?            # => false
-DomainValidatorJp.new('example.wrongtld').valid?  # => false
+DomainValidatorJp.valid?('example.jp')        # => true
+DomainValidatorJp.valid?('日本語.jp')         # => true
+DomainValidatorJp.valid?('①②③.jp')            # => false
+DomainValidatorJp.valid?('example.wrongtld')  # => false
 ```
 
 ## Installation

data/lib/domain_validator_jp.rb

@@ -1,102 +1,90 @@
 require "domain_validator_jp/version"
 require "public_suffix"
 
-class DomainValidatorJp
-  attr_reader :domain
-
-  def initialize(domain)
-    @domain = domain
-  end
-
-  def valid?
-    return false unless fqdn?
-    return false if include_subdomain?
-    return false unless valid_public_suffix?
-    return false unless valid_sld_not_dotted?
-    return false unless valid_sld_not_start_with_hyphen?
-    return false unless valid_sld_not_end_with_hyphen?
-
-    if sld_multibyte?
-      return false unless valid_length_sld_multibyte?
-      return false unless valid_jisx0208?
-    else
-      return false unless valid_sld_chars?
-      return false unless valid_length_domain?
-      return false unless valid_length_sld?
+module DomainValidatorJp
+  class << self
+    def valid?(domain)
+      return false unless fqdn?(domain)
+      return false if include_subdomain?(domain)
+      return false unless valid_public_suffix?(domain)
+      return false unless valid_sld_not_dotted?(domain)
+      return false unless valid_sld_not_start_with_hyphen?(domain)
+      return false unless valid_sld_not_end_with_hyphen?(domain)
+
+      if sld_multibyte?(domain)
+        return false unless valid_length_sld_multibyte?(domain)
+        return false unless valid_jisx0208?(domain)
+      else
+        return false unless valid_sld_chars?(domain)
+        return false unless valid_length_domain?(domain)
+        return false unless valid_length_sld?(domain)
+      end
+
+      true
     end
 
-    true
-  end
-
-  def fqdn?
-    splitted = domain.split('.')
-    splitted.length >= 2 && splitted.all?{|label| !label.empty? }
-  end
-
-  def parsed
-    @parsed ||= PublicSuffix.parse(domain)
-  end
-
-  def sld
-    parsed.sld
-  end
+    def fqdn?(domain)
+      splitted = domain.split('.')
+      splitted.length >= 2 && splitted.all?{|label| !label.empty? }
+    end
 
-  def tld
-    parsed.tld
-  end
+    def parsed(domain)
+      PublicSuffix.parse(domain)
+    end
 
-  # common
+    # common
 
-  def include_subdomain?
-    !parsed.subdomain.nil?
-  end
+    def include_subdomain?(domain)
+      !parsed(domain).subdomain.nil?
+    end
 
-  def valid_public_suffix?
-    PublicSuffix.valid?(domain, default_rule: nil, ignore_private: true)
-  end
+    def valid_public_suffix?(domain)
+      PublicSuffix.valid?(domain, default_rule: nil, ignore_private: true)
+    end
 
-  def valid_sld_not_dotted?
-    sld !~ /\./
-  end
+    def valid_sld_not_dotted?(domain)
+      parsed(domain).sld !~ /\./
+    end
 
-  def valid_sld_not_start_with_hyphen?
-    sld !~ /^\-/
-  end
+    def valid_sld_not_start_with_hyphen?(domain)
+      parsed(domain).sld !~ /^\-/
+    end
 
-  def valid_sld_not_end_with_hyphen?
-    sld !~ /\-$/
-  end
+    def valid_sld_not_end_with_hyphen?(domain)
+      parsed(domain).sld !~ /\-$/
+    end
 
-  # only multibyte
+    # only multibyte
 
-  def sld_multibyte?
-    sld !~ /^[0-9A-Za-z\-]+$/
-  end
+    def sld_multibyte?(domain)
+      parsed(domain).sld !~ /^[0-9A-Za-z\-]+$/
+    end
 
-  def valid_length_sld_multibyte?
-    1 <= sld.length && sld.length <= 15
-  end
+    def valid_length_sld_multibyte?(domain)
+      1 <= parsed(domain).sld.length && parsed(domain).sld.length <= 15
+    end
 
-  # only multibyte
+    # only multibyte
 
-  def valid_sld_chars?
-    sld =~ /^[0-9A-Za-z\-]+$/
-  end
+    def valid_sld_chars?(domain)
+      parsed(domain).sld =~ /^[0-9A-Za-z\-]+$/
+    end
 
-  def valid_length_domain?
-    domain.length <= 253
-  end
+    def valid_length_domain?(domain)
+      domain.length <= 253
+    end
 
-  def valid_length_sld?
-    sld.length <= 63
-  end
+    def valid_length_sld?(domain)
+      parsed(domain).sld.length <= 63
+    end
 
-  def valid_jisx0208?
-    valid = /^#{utf8_to_sjis("[\-0-9A-Za-zぁ-んァ-ヶ亜-腕弌-熙]")}+$/
-    valid.match(utf8_to_sjis(sld)) if utf8_to_sjis(sld)
-  end
+    def valid_jisx0208?(domain)
+      valid = /^#{utf8_to_sjis("[\-0-9A-Za-zぁ-んァ-ヶ亜-腕弌-熙]")}+$/
+      valid.match(utf8_to_sjis(parsed(domain).sld)) if utf8_to_sjis(parsed(domain).sld)
+    end
 
-  def utf8_to_sjis(str)
-    str.encode('Windows-31J') rescue nil
+    def utf8_to_sjis(str)
+      str.encode('Windows-31J') rescue nil
+    end
   end
 end

data/lib/domain_validator_jp/version.rb

@@ -1,3 +1,3 @@
-class DomainValidatorJp
-  VERSION = "0.1.4"
+module DomainValidatorJp
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: domain_validator_jp
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - kimromi