href_sanitizer 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b32b934a9123ac89d9c9565b206bbb3aaa74ab8556188fc98011114c0c599f74
-  data.tar.gz: b1c2cedb3d0206e284c9a13ed98d64630f399edd27e4ba0d230ecefad72cf3a8
+  metadata.gz: 00de4b6bbe17f7fc742280bc420a6459d48db06c3256f84e9738b7bc30862017
+  data.tar.gz: c118fdfd859730fe4c440a493764ff3e96d8d155cad88697bee34c8f23579d98
 SHA512:
-  metadata.gz: 3e5937d4b43e8d37af0a08082ebd2c0d3a096560f971e43c37f38a81003c4e19601ae7f578023ae355683ddcbbfc26c619617237e1a49d28a9d2f8160be63725
-  data.tar.gz: c0dbe7a6a7fe7af039ed8326aafe3f40aafe27361e2bee3d5f2d2e7e2aae89852ac0a39a998554606dbbeecf501c0dbde75e12bfd43a4736be5ba1cfb0a3c5c7
+  metadata.gz: d241938c9c7837db70d70eb0fcf08f88451ec16062f30d429ca033c2cd2935180acdc1fc6cdd5dad653650436ecbc70a167812c3f1e196558956489f0c4ad8e4
+  data.tar.gz: 40ad36cc158724566bb0a31a68962f61f59547516d151d1eecd034f9dd80d53c53bf86c498c0c24ca459c82106203c1e8a97e2f1905b02edb6a92462e599facd

data/lib/href_sanitizer/url_validator.rb

@@ -17,50 +17,49 @@ require "href_sanitizer/url_sanitizer"
 # Class name is UrlValidator, but we also alias as URLValidator
 # to support apps with `inflect.acronym 'URL'` (which makes Rails
 # resolve `validates :field, url: true` to URLValidator).
-class UrlValidator < ActiveModel::EachValidator
-  EMAIL_REGEXP = /\A[^@\s]+@[^@\s]+\z/
+module HrefSanitizer
+  class UrlValidator < ActiveModel::EachValidator
+    EMAIL_REGEXP = /\A[^@\s]+@[^@\s]+\z/
 
-  def validate_each(record, attribute, value)
-    stripped = value.to_s.strip
+    def validate_each(record, attribute, value)
+      stripped = value.to_s.strip
 
-    # Accept bare email addresses when accept_email: true
-    if options.fetch(:accept_email, false) && stripped.match?(EMAIL_REGEXP)
-      return
-    end
+      # Accept bare email addresses when accept_email: true
+      if options.fetch(:accept_email, false) && stripped.match?(EMAIL_REGEXP)
+        return
+      end
 
-    uri = parse(stripped)
-    unless uri
-      record.errors.add(attribute, options.fetch(:message, :url))
-      return
-    end
+      uri = parse(stripped)
+      unless uri
+        record.errors.add(attribute, options.fetch(:message, :url))
+        return
+      end
 
-    allowed_schemes = options.fetch(:schemes, %w[http https])
-    unless uri.scheme&.downcase&.in?(allowed_schemes)
-      record.errors.add(attribute, options.fetch(:message, :url))
-      return
-    end
+      allowed_schemes = options.fetch(:schemes, %w[http https])
+      unless uri.scheme&.downcase&.in?(allowed_schemes)
+        record.errors.add(attribute, options.fetch(:message, :url))
+        return
+      end
 
-    unless HrefSanitizer::UrlSanitizer.allowed_uri?(stripped)
-      record.errors.add(attribute, options.fetch(:message, :url))
-      return
-    end
+      unless HrefSanitizer::UrlSanitizer.allowed_uri?(stripped)
+        record.errors.add(attribute, options.fetch(:message, :url))
+        return
+      end
 
-    if options.fetch(:no_local, false)
-      unless HrefSanitizer::UrlSanitizer.public_url?(stripped)
-        record.errors.add(attribute, options.fetch(:message, :private_ip_url))
+      if options.fetch(:no_local, false)
+        unless HrefSanitizer::UrlSanitizer.public_url?(stripped)
+          record.errors.add(attribute, options.fetch(:message, :private_ip_url))
+        end
       end
     end
-  end
 
-  private
+    private
 
-  def parse(value)
-    uri = Addressable::URI.parse(value)
-    uri if uri.host.present?
-  rescue Addressable::URI::InvalidURIError
-    nil
+    def parse(value)
+      uri = Addressable::URI.parse(value)
+      uri if uri.host.present?
+    rescue Addressable::URI::InvalidURIError
+      nil
+    end
   end
 end
-
-# Alias for apps using `inflect.acronym 'URL'`
-URLValidator = UrlValidator

data/lib/href_sanitizer/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module HrefSanitizer
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/href_sanitizer.rb

@@ -3,7 +3,6 @@
 require "href_sanitizer/version"
 require "href_sanitizer/url_sanitizer"
 require "href_sanitizer/url_validator"
-require "href_sanitizer/safe_url_validator"
 require "href_sanitizer/railtie" if defined?(Rails::Railtie)
 
 module HrefSanitizer

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: href_sanitizer
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - mfo
@@ -63,7 +63,6 @@ files:
 - lib/href_sanitizer.rb
 - lib/href_sanitizer/link_to_patch.rb
 - lib/href_sanitizer/railtie.rb
-- lib/href_sanitizer/safe_url_validator.rb
 - lib/href_sanitizer/url_sanitizer.rb
 - lib/href_sanitizer/url_validator.rb
 - lib/href_sanitizer/version.rb

data/lib/href_sanitizer/safe_url_validator.rb

@@ -1,5 +0,0 @@
-# frozen_string_literal: true
-
-# Backwards compatibility — safe_url: is an alias for url:
-require "href_sanitizer/url_validator"
-SafeUrlValidator = UrlValidator