demandbase 0.1.0 → 0.1.1

data/CHANGELOG.md

@@ -1,3 +1,16 @@
-# 0.0.1
+# 0.1.1
+
+* Add support for subdomains, email addresses, etc. e.g. the following now work:
+
+```ruby
+  Demandbase::Record.new "www.github.com",
+  Demandbase::Record.new "developer.github.com/",
+  Demandbase::Record.new "http://www.github.com/",
+  Demandbase::Record.new "https://www.github.com",
+  Demandbase::Record.new "https://www.github.com/leereilly/demandbase",
+  Demandbase::Record.new "lee@github.com"
+```
+
+# 0.1.0
 
 * Initial release.

data/Gemfile

@@ -1,7 +1,8 @@
 source "http://rubygems.org"
 
-gem "json",         "~> 1.7.7"
-gem "rest-client",  "~> 1.6.7"
+gem "json",          "~> 1.7.7"
+gem "public_suffix", "~> 1.2.0"
+gem "rest-client",   "~> 1.6.7"
 
 group :development do
   gem "shoulda",  ">= 0"

data/Gemfile.lock

@@ -19,6 +19,7 @@ GEM
     mocha (0.10.5)
       metaclass (~> 0.0.1)
     multi_json (1.6.1)
+    public_suffix (1.2.0)
     rake (10.0.3)
     rdoc (3.12.2)
       json (~> 1.4)
@@ -39,6 +40,7 @@ DEPENDENCIES
   bundler (~> 1.2.1)
   jeweler (~> 1.8.3)
   json (~> 1.7.7)
+  public_suffix (~> 1.2.0)
   rdoc (~> 3.12)
   rest-client (~> 1.6.7)
   shoulda

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/demandbase.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "demandbase"
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Lee Reilly"]
@@ -42,6 +42,7 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<json>, ["~> 1.7.7"])
+      s.add_runtime_dependency(%q<public_suffix>, ["~> 1.2.0"])
       s.add_runtime_dependency(%q<rest-client>, ["~> 1.6.7"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
@@ -49,6 +50,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
     else
       s.add_dependency(%q<json>, ["~> 1.7.7"])
+      s.add_dependency(%q<public_suffix>, ["~> 1.2.0"])
       s.add_dependency(%q<rest-client>, ["~> 1.6.7"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
@@ -57,6 +59,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<json>, ["~> 1.7.7"])
+    s.add_dependency(%q<public_suffix>, ["~> 1.2.0"])
     s.add_dependency(%q<rest-client>, ["~> 1.6.7"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])

data/lib/demandbase.rb

@@ -1,5 +1,7 @@
 require 'json'
+require 'public_suffix'
 require 'rest_client'
+
 require 'demandbase/record'
 
 module Demandbase

data/lib/demandbase/record.rb

@@ -34,7 +34,8 @@ module Demandbase
 
     # Instantiate a new Demandbase Record from a domain name.
     def initialize(domain)
-      url = Demandbase::API_URLS[:domain] + "&query=#{domain}"
+      query = cleanse_domain(domain)
+      url = Demandbase::API_URLS[:domain] + "&query=#{query}"
 
       begin
         response          = JSON.parse(RestClient.get(url))
@@ -68,5 +69,20 @@ module Demandbase
         puts "Problem querying the server: #{e.inspect}"
       end
     end
+
+    # Clean the domain of things like 'http(s)://', 'www',
+    # '?foo=bar', etc.
+    #
+    # Return the domain string.
+    def cleanse_domain(domain)
+      domain.downcase!
+      domain = domain.sub(/^https?\:\/\//, '').sub(/^www./,'')
+      domain = domain.split("/").first
+      domain = domain.split("@").last
+
+      domain = PublicSuffix.parse(domain)
+      domain = "#{domain.sld}.#{domain.tld}"
+      domain
+    end
   end
 end

data/test/test_record.rb

@@ -36,4 +36,22 @@ class TestDemandbaseRecord < Test::Unit::TestCase
     assert_equal false,                   record.fortune_1000 # TODO: fix this test in 2017
     assert_equal false,                   record.forbes_2000  # TODO: fix this test in 2016
   end
+
+  should "initialize a new record with a subdomain" do
+    queries = [
+      "github.com",
+      "www.github.com",
+      "developer.github.com/",
+      "http://www.github.com/",
+      "https://www.github.com",
+      "https://www.github.com/leereilly/demandbase",
+      "lee@github.com"
+    ]
+
+    queries.each do |query|
+      record = Demandbase::Record.new(query)
+      assert_equal "github.com", record.web_site, "with #{query}"
+    end
+
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: demandbase
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -27,6 +27,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.7.7
+- !ruby/object:Gem::Dependency
+  name: public_suffix
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -143,7 +159,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3613502600391467336
+      hash: 2870129740686966598
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: