naughty_or_nice 2.0.0 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ffbdc7af85eed5f4b34c437590c4c0d38eed1dd6
-  data.tar.gz: 5285a0ae47a4908efb6d6582b02a78c02cbe27a2
+SHA256:
+  metadata.gz: 76bf0044478e435776c91bdb769f30517f71832a44d6c5091ac9ef5b4f76823c
+  data.tar.gz: a426c8e77324a8fd72e652c2f9fc0ace6b35e3bc60d901edd049c241c150f226
 SHA512:
-  metadata.gz: 6a4f84828325d89c6fc187be7c489ea31f00a88ef4529aa03b3874a2acf1faad97650650c75821d145da0c5ad34dbd62f227a1922e08ed5ae3c5128eb703a172
-  data.tar.gz: 312f9b00bbeb629521f470ce4e7f5adaa1f6297794113b73424e1d6fbad2bc8c9be473d38c83958416facab22bf00b36206147c89bf2eb8ad149de3e9d31ff38
+  metadata.gz: 65e4e117e1b6cf2a0825ef65c11807b1e238b02894ab8a6f07065bc2dc7410a863cb7b10021702cec8ed33f644db0ebce89997a773036573af33c8ee7e052216
+  data.tar.gz: 4ed85b6546a1d2520759a2d5e4c35f7de6e4fc2c448dbf452cb1ade23d6ca2491c809908cb00ec5866b2cbd9bd5e88ab1679dadbb4faea78290e75ace8968759

data/README.md

@@ -36,7 +36,7 @@ class Checker
   include NaughtyOrNice
 
   def valid?
-    domain.tld == ".gov"
+    domain.tld == "gov"
   end
 end
 ```

data/lib/naughty_or_nice.rb

@@ -1,18 +1,20 @@
+# frozen_string_literal: true
+
 require 'public_suffix'
-require "addressable/uri"
+require 'addressable/uri'
 require_relative './naughty_or_nice/version'
 
+# Primary module to be mixed into the child class
 module NaughtyOrNice
-
   # Source: http://bit.ly/1n2X9iv
   EMAIL_REGEX = %r{
         ^
         (
-          [\w\!\#\$\%\&\'\*\+\-\/\=\?\^\`\{\|\}\~]+
+          [\w!\#$%&'*+\-/=?\^`\{|\}~]+
           \.
         )
         *
-        [\w\!\#\$\%\&\'\*\+\-\/\=\?\^\`\{\|\}\~]+
+        [\w!\#$%&'*+\-/=?\^`\{|\}~]+
         @
         (
           (
@@ -37,19 +39,19 @@ module NaughtyOrNice
           ){3}
           \d{1,3}
           (
-            \:\d{1,5}
+            :\d{1,5}
           )?
         )
         $
-      }xi
+      }xi.freeze
 
+  # Ruby idiom that allows `include` to create class methods
   module ClassMethods
     def valid?(text)
-      self.new(text).valid?
+      new(text).valid?
     end
   end
 
-  # Ruby idiom that allows `include` to create class methods
   def self.included(base)
     base.extend(ClassMethods)
   end
@@ -69,28 +71,32 @@ module NaughtyOrNice
   #
   # Returns the domain object or nil, but no errors, never an error
   def domain
-    @domain ||= PublicSuffix.parse(domain_text)
-  rescue PublicSuffix::DomainInvalid, PublicSuffix::DomainNotAllowed
-    nil
+    return @domain if defined? @domain
+
+    @domain = begin
+      PublicSuffix.parse(normalized_domain, default_rule: nil)
+    rescue PublicSuffix::DomainInvalid, PublicSuffix::DomainNotAllowed
+      nil
+    end
   end
 
   # Checks if the input string represents a valid domain
   #
   # Returns boolean true if a valid domain, otherwise false
   def valid?
-    !!(domain && domain.valid?)
+    !domain.nil?
   end
 
   # Is the input text in the form of a valid email address?
   #
   # Returns true if email, otherwise false
   def email?
-    !!(@text =~ EMAIL_REGEX)
+    !(@text =~ EMAIL_REGEX).nil?
   end
 
   # Return the parsed domain as a string
   def to_s
-    domain.to_s if domain
+    @to_s ||= domain.to_s if domain
   end
 
   def inspect
@@ -104,20 +110,22 @@ module NaughtyOrNice
   # Can handle urls, domains, or emails
   #
   # Returns the domain string
-  def domain_text
-    return nil if @text.empty?
-
-    uri = Addressable::URI.parse(@text)
+  def normalized_domain
+    if @text.empty?
+      nil
+    elsif parsed_domain
+      parsed_domain.host
+    end
+  end
 
-    if uri.host # valid https?://* URI
-      uri.host
-    elsif email?
-      @text.match(/@([\w\.\-]+)\Z/i)[1]
-    else # url sans http://
-      uri = Addressable::URI.parse("http://#{@text}")
+  def parsed_domain
+    @parsed_domain ||= begin
+      text = @text.dup
+      text.prepend('http://') unless %r{\Ahttps?://}.match?(text)
+      uri = Addressable::URI.parse(text)
       # properly parse http://foo edge cases
       # see https://github.com/sporkmonger/addressable/issues/145
-      uri.host if uri.host =~ /\./
+      uri if uri.host.include?('.')
     end
   rescue Addressable::URI::InvalidURIError
     nil

data/lib/naughty_or_nice/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module NaughtyOrNice
-  VERSION = "2.0.0"
+  VERSION = '2.1.2'
 end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: naughty_or_nice
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.2
 platform: ruby
 authors:
 - Ben Balter
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-07-09 00:00:00.000000000 Z
+date: 2020-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: public_suffix
+  name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
-  name: addressable
+  name: public_suffix
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
-  name: shoulda
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -67,19 +67,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.5'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.3'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.3'
+        version: '2.0'
 description: Naughty or Nice simplifies the process of extracting domain information
   from a domain-like string (an email, a URL, etc.) and checking whether it meets
   criteria you specify.
@@ -90,14 +118,13 @@ extra_rdoc_files: []
 files:
 - LICENSE.md
 - README.md
-- Rakefile
 - lib/naughty_or_nice.rb
 - lib/naughty_or_nice/version.rb
 homepage: http://github.com/benbalter/naughty_or_nice
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -112,9 +139,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: You've made the list. We'll help you check it twice. Given a domain-like
   string, verifies inclusion in a list you provide.

data/Rakefile

@@ -1,13 +0,0 @@
-require 'rake'
-require 'rake/testtask'
-
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_naughty_or_nice*.rb'
-  test.verbose = true
-end
-
-desc "Open console with Naughty Or Nice loaded"
-task :console do
-  exec "pry -r ./lib/naughty_or_nice.rb"
-end