url_format 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6b078f50cf4d767034c1f5e38ee163e4d49dd9a
-  data.tar.gz: 336ec031f947da651cc04ef7c3ca66c8d3e9f9b1
+  metadata.gz: 1d5dfa1ccbb5f619c64cb28afa566501f4211ffe
+  data.tar.gz: 91d6d09f0c8c612b824a789b76c6a09bb00f553d
 SHA512:
-  metadata.gz: 9b03cd6d1d2b9e252649cd870ab0c70f64f61edc9a320953a9750511832fbb1a4f585d2a1358eecb622ffe37af34b88b1035cb7b3a2566dbee775c5f168dd6e4
-  data.tar.gz: 7ca4d0efaa33b74096d0e019843c80bc50d29dd1c3bdd6a02a929255c42d2df6ecf3af899b0f503d0a146f00f75d830c458b36b5e61f6374aa4f6145381c3c6f
+  metadata.gz: d7548a7be7112d4dd292d9c2e06a25961162f2585d53362c70db57e1de8a0c8783ac4445761de62c035a1fd222aa5afc173591b2f5e468b4b4e0f95af368e8bd
+  data.tar.gz: bdb879d6b050ce9e6c6c898e5e321caa0e5a1c99a4bf61a446713f8b6b5006bdadf2aff59bcae7d1c340a027df1b9b3a06c5f707152dd55ba31ea3b2c5669262

data/lib/url_format.rb

@@ -3,4 +3,10 @@ require "url_format/url_format_validator"
 require "uri"
 
 module UrlFormat
+
+  def self.get_domain(url)
+    host = URI.parse(url).host.downcase
+    host.start_with?('www.') ? host[4..-1] : host
+  rescue URI::InvalidURIError
+  end
 end

data/lib/url_format/url_format_validator.rb

@@ -1,9 +1,20 @@
 class UrlFormatValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
-    unless URI.parse(value).kind_of?(URI::HTTP) && value =~ /\.\w{2,6}/
+    format_value(value)
+    unless URI.parse(value).kind_of?(URI::HTTP) && value =~ url_regexp
       record.errors[attribute] << (options[:message] || "is invalid")
     end
   rescue URI::InvalidURIError
     record.errors[attribute] << (options[:message] || "is invalid")
   end
+
+  def format_value(value)
+    value = "http://#{value}" unless value =~ /\Ahttps?:\/\//
+  end
+
+  # Thanks to Dean Perry and Ryan Bates 
+  # https://github.com/deanperry/url_formatter/blob/master/lib/url_formatter.rb
+  def url_regexp
+    /\Ahttps?:\/\/([\A\s:@]+:[\A\s:@]*@)?[-[[:alnum:]]]+(\.[-[[:alnum:]]]+)+\.?(:\d{1,5})?([\/?]\S*)?\z/iux
+  end
 end

data/lib/url_format/version.rb

@@ -1,3 +1,3 @@
 module UrlFormat
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: url_format
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - John Otander