naughty_or_nice 2.0.2 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c399a91caa2bee04c314ade13bbd8ffde58c92a
-  data.tar.gz: 87a27c60c85e5d83779d3741cb49e1dedecc95dd
+  metadata.gz: c1f0a6ca903c8a3019b9e566099f6454b1d2b941
+  data.tar.gz: daf9330f225766d7d2bdedee264d6d98a8bcc39f
 SHA512:
-  metadata.gz: 3f870a6c26daea2e31c516197b81db790f0290628d6e0954ed70d0a9b2ef954c80d4607c135277c46bf837b3526b97c960a3e5428ce77299a5529d75c0f62673
-  data.tar.gz: 4e885f710f2cf71b2155a4ecc9b3c46651976938d179b03fde50bde94544c2fd395243f0944d7ad080b55acebf27786ece8059b33799b0d38b0ac132bf958b62
+  metadata.gz: 2e0f1f7f05521e3c08f124f28513e3f8a19c752d84dc96288793a48f58aaa8493876cda29d34a31c1e3acbe3a4c0284a9f77689aa116f880335262a32ae96ba6
+  data.tar.gz: bc06c3ed9f60e07525e016f80bb7ff23f15f0307712b06d6b6142a873311a043e1792b9bc63d7fa66e365569d4f58f88e941daf3d0475da8e054e190fba34f00

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,9 +1,9 @@
 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{
         ^
@@ -43,13 +43,13 @@ module NaughtyOrNice
         $
       }xi
 
+  # 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
@@ -70,9 +70,9 @@ module NaughtyOrNice
   # Returns the domain object or nil, but no errors, never an error
   def domain
     return @domain if defined? @domain
-    
+
     @domain = begin
-      PublicSuffix.parse(domain_text)
+      PublicSuffix.parse(normalized_domain, default_rule: nil)
     rescue PublicSuffix::DomainInvalid, PublicSuffix::DomainNotAllowed
       nil
     end
@@ -82,14 +82,14 @@ module NaughtyOrNice
   #
   # 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
@@ -108,20 +108,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 = text.prepend('http://') unless text =~ %r{\Ahttps?://}
+      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,3 @@
 module NaughtyOrNice
-  VERSION = "2.0.2"
+  VERSION = '2.1.0'.freeze
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: naughty_or_nice
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.1.0
 platform: ruby
 authors:
 - Ben Balter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-08 00:00:00.000000000 Z
+date: 2016-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: public_suffix
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: addressable
   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,19 @@ 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: '10.3'
+        version: '0.40'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.3'
+        version: '0.40'
 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,7 +90,6 @@ 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
@@ -113,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: You've made the list. We'll help you check it twice. Given a domain-like

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