enom 1.1.0 → 1.1.1

data/lib/enom/domain.rb

@@ -1,3 +1,5 @@
+require "public_suffix"
+
 module Enom
 
   class Domain
@@ -16,7 +18,7 @@ module Enom
 
     def initialize(attributes)
       @name = attributes["DomainName"] || attributes["domainname"]
-      @sld, @tld = @name.split(".")
+      @sld, @tld = Domain.parse_sld_and_tld(@name)
 
       expiration_date_string = attributes["expiration_date"] || attributes["status"]["expiration"]
       @expiration_date = Date.strptime(expiration_date_string.split(" ").first, "%m/%d/%Y")
@@ -31,7 +33,7 @@ module Enom
 
     # Find the domain (must be in your account) on Enom
     def self.find(name)
-      sld, tld = name.split(".")
+      sld, tld = parse_sld_and_tld(name)
       response = Client.request("Command" => "GetDomainInfo", "SLD" => sld, "TLD" => tld)["interface_response"]["GetDomainInfo"]
       Domain.new(response)
     end
@@ -43,7 +45,7 @@ module Enom
 
     # Boolean helper method to determine if the domain is available for purchase
     def self.available?(name)
-      sld, tld = name.split(".")
+      sld, tld = parse_sld_and_tld(name)
       response = Client.request("Command" => "Check", "SLD" => sld, "TLD" => tld)["interface_response"]["RRPCode"]
       response == "210"
     end
@@ -76,7 +78,7 @@ module Enom
       response["interface_response"].each do |k, v|
         if v == "210" #&& k[0,6] == "RRPCode"
           pos = k[7..k.size]
-          result << response["interface_response"]["Domain#{pos}"] unless k.blank?
+          result << response["interface_response"]["Domain#{pos}"] unless k.nil? || k.empty?
         end
       end
 
@@ -94,7 +96,7 @@ module Enom
 
     # Purchase the domain
     def self.register!(name, options = {})
-      sld, tld = name.split(".")
+      sld, tld = parse_sld_and_tld(name)
       opts = {}
       if options[:nameservers]
         count = 1
@@ -114,7 +116,7 @@ module Enom
     # Transfer domain from another registrar to Enom, charges the account when successful
     # Returns true if successful, false if failed
     def self.transfer!(name, auth, options = {})
-      sld, tld = name.split(".")
+      sld, tld = parse_sld_and_tld(name)
 
       # Default options
       opts = {
@@ -136,7 +138,7 @@ module Enom
 
     # Renew the domain
     def self.renew!(name, options = {})
-      sld, tld = name.split(".")
+      sld, tld = parse_sld_and_tld(name)
       opts = {}
       opts.merge!("NumYears" => options[:years]) if options[:years]
       response = Client.request({"Command" => "Extend", "SLD" => sld, "TLD" => tld}.merge(opts))
@@ -146,20 +148,26 @@ module Enom
     # Suggest available domains using the namespinner
     # Returns an array of available domain names that match
     def self.suggest(name, options ={})
-      sld, tld = name.split(".")
+      sld, tld = parse_sld_and_tld(name)
       opts = {}
       opts.merge!("MaxResults" => options[:max_results] || 8, "Similar" => options[:similar] || "High")
       response = Client.request({"Command" => "namespinner", "SLD" => sld, "TLD" => tld}.merge(opts))
 
       suggestions = []
       response["interface_response"]["namespin"]["domains"]["domain"].map do |d|
-        %w(com net tv cc).each do |toplevel|
+        (options[:tlds] || %w(com net tv cc)).each do |toplevel|
           suggestions << [d["name"].downcase, toplevel].join(".") if d[toplevel] == "y"
         end
       end
       return suggestions
     end
 
+    # Parse out domain name tld and sld from the PublicSuffix lib
+    def self.parse_sld_and_tld(domain_name)
+      d = PublicSuffix.parse(domain_name)
+      [d.sld, d.tld]
+    end
+
     # Lock the domain at the registrar so it can"t be transferred
     def lock
       Client.request("Command" => "SetRegLock", "SLD" => sld, "TLD" => tld, "UnlockRegistrar" => "0")

data/test/domain_test.rb

@@ -59,11 +59,13 @@ class DomainTest < Test::Unit::TestCase
 
     context "checking for suggested domains" do
       setup do
-        @suggestions = Enom::Domain.suggest("hand.com")
+
       end
       should "return an array of suggestions matching the supplied term" do
+        @suggestions = Enom::Domain.suggest("hand.com")
         assert !@suggestions.empty?
-        suggestions = %w(
+
+        results = %w(
           handsewncurtains.net
           handsewncurtains.tv
           handsewncurtains.cc
@@ -90,7 +92,27 @@ class DomainTest < Test::Unit::TestCase
           handloser.tv
           handloser.cc
         )
-        assert_equal suggestions, @suggestions
+
+        assert_equal results, @suggestions
+      end
+
+      should "only return the results matching specified tlds" do
+        @suggestions = Enom::Domain.suggest("hand.com", :tlds => %w(com net))
+        assert !@suggestions.empty?
+
+        results = %w(
+          handsewncurtains.net
+          handicappingclub.net
+          handingok.com
+          handingok.net
+          handoki.net
+          handinghand.com
+          handinghand.net
+          handcrafthouselogs.com
+          handcrafthouselogs.net
+        )
+
+        assert_equal results, @suggestions
       end
     end
 
@@ -162,7 +184,7 @@ class DomainTest < Test::Unit::TestCase
         should "update nameservers if there are 2 or more provided" do
           new_nameservers = ["ns1.foo.com", "ns2.foo.com"]
           @domain.update_nameservers(new_nameservers)
-          assert_equal new_nameservers, @domain.nameservers
+          assert_equal new_nameservers, @domain.nameservers.sort
         end
         should "not update nameservers if less than 2 or more than 12 are provided" do
           not_enough = ["ns1.foo.com"]

metadata

@@ -1,68 +1,106 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: enom
-version: !ruby/object:Gem::Version
-  version: 1.1.0
+version: !ruby/object:Gem::Version 
+  hash: 17
   prerelease: 
+  segments: 
+  - 1
+  - 1
+  - 1
+  version: 1.1.1
 platform: ruby
-authors:
+authors: 
 - James Miller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-11 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-02-02 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: httparty
-  requirement: &70314757598780 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 0
+        - 7
+        - 8
         version: 0.7.8
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: public_suffix
   prerelease: false
-  version_requirements: *70314757598780
-- !ruby/object:Gem::Dependency
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: shoulda
-  requirement: &70314757598380 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *70314757598380
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: fakeweb
-  requirement: &70314757597920 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *70314757597920
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: &70314757597420 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.9'
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 9
+        version: "0.9"
   type: :development
-  prerelease: false
-  version_requirements: *70314757597420
-description: Enom is a Ruby wrapper and command line interface for portions of the
-  Enom domain reseller API.
+  version_requirements: *id005
+description: Enom is a Ruby wrapper and command line interface for portions of the Enom domain reseller API.
 email: bensie@gmail.com
-executables:
+executables: 
 - enom
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - README.md
 - Rakefile
 - LICENSE
@@ -89,26 +127,36 @@ files:
 - bin/enom.rb
 homepage: http://github.com/bensie/enom
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Ruby wrapper for the Enom API
 test_files: []
+