alexrabarts-tld 0.2.1 → 0.4.0

data/.gitignore

@@ -0,0 +1 @@
+pkg

data/History.txt

@@ -1,3 +1,12 @@
+=== 0.4.0 / 2009-06-30
+
+* You can now call to_s on a TLD object, which will return the canonical name
+  (i.e. the lowercase extension).  This saves you writing code like
+  "foo.co.#{tld.tld}".  Instead, now you can write "foo.co.#{tld}".
+* Addressable::URI is now used for parsing hostnames instead of custom regexes.
+* Tests now run under Shoulda
+* The gem is now built under Jeweler instead of Hoe
+
 === 0.2.1 / 2009-02-27
 
 * Bugfix: original strings left intact

data/Rakefile

@@ -1,20 +1,56 @@
-# -*- ruby -*-
-
-require 'rubygems'
-require 'hoe'
+require 'rake'
 require './lib/tld.rb'
 
-Hoe.new('tld', TLD::VERSION) do |p|
-  # p.rubyforge_name = 'TLDx' # if different than lowercase project name
-  p.developer('Alex Rabarts', 'alexrabarts@gmail.com')
-  p.extra_deps = [
-    ['alexrabarts-iso_country_codes']
-  ]
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |s|
+    s.name = 'tld'
+    s.summary = %Q{
+      Provides meta information for Internet Top Level Domains (TLDs).
+    }
+    s.email = "alexrabarts@gmail.com"
+    s.homepage = "http://github.com/alexrabarts/tld"
+    s.description = "Top-level domain library"
+    s.authors = ["alex"]
+    s.add_dependency 'alexrabarts-iso_country_codes', ['>=0.2.1']
+    s.add_dependency 'addressable'
+  end
+rescue LoadError
+  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
+end
+
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = 'tld'
+  rdoc.options << '--line-numbers' << '--inline-source'
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end
+
+require 'rake/testtask'
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib' << 'test'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = false
+end
+
+begin
+  require 'rcov/rcovtask'
+  Rcov::RcovTask.new do |t|
+    t.libs << 'test'
+    t.test_files = FileList['test/**/*_test.rb']
+    t.verbose = true
+  end
+rescue LoadError
+  puts "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
 end
 
-# Load extra rake tasks.
-tasks_path = File.join(File.dirname(__FILE__), 'rakelib')
-rake_files = Dir["#{tasks_path}/*.rake"]
-rake_files.each{|rake_file| load rake_file}
+begin
+  require 'cucumber/rake/task'
+  Cucumber::Rake::Task.new(:features)
+rescue LoadError
+  puts "Cucumber is not available. In order to run features, you must: sudo gem install cucumber"
+end
 
-# vim: syntax=Ruby
+task :default => :test

data/VERSION.yml

@@ -0,0 +1,4 @@
+--- 
+:minor: 4
+:patch: 0
+:major: 0

data/lib/tld/tld.rb

@@ -1,8 +1,8 @@
 require 'singleton'
+require 'rubygems'
+require 'addressable/uri'
 
 class TLD
-  VERSION = '0.2.1'
-
   MAP = {
     :ac => 'sh',
     :uk => 'gb',
@@ -15,6 +15,10 @@ class TLD
 
   class UnknownTldError < StandardError; end
 
+  def to_s
+    tld
+  end
+
   def tld
     self.class.tld
   end
@@ -71,12 +75,11 @@ class TLD
 
     alias_method :currency, :main_currency
 
-    def find(orig)
-      str = orig.downcase
-      str.sub!(/^\w+:\/\//, '') # Strip protocol
-      str = str.split('/').first if str.match(/\//) # Throw away anything after a slash
-      str = str.split('.').last if str.match(/\./) # Take the last one of foo.bar.baz
-      instance = all.select { |t| t.tld == str }.first
+    def find(str)
+      host     = Addressable::URI.heuristic_parse(str).normalized_host.to_s
+      host     = str.downcase if host == ''
+      last     = host.match(/\./) ? host.split('.').last : host # Take the last one of foo.bar.baz
+      instance = all.select { |t| t.tld == last }.first
 
       raise UnknownTldError, "TLD '#{str}' unkown." if instance.nil?
 

data/test/{test_tld.rb → tld_test.rb}

@@ -1,52 +1,60 @@
 require 'test/unit'
 require 'tld'
+require 'shoulda'
 
 class TestTld < Test::Unit::TestCase
-  def test_find_tld_by_exact_match
+  should 'find TLD by exact match' do
     assert_equal 'au', TLD.find('au').tld
   end
 
-  def test_find_tld_by_exact_match_with_dot
+  should 'find TLD by exact match with dot' do
     assert_equal 'au', TLD.find('.au').tld
   end
 
-  def test_find_tld_with_case
+  should 'find TLD with case' do
     assert_equal 'au', TLD.find('AU').tld
   end
 
-  def test_find_tld_by_hostname
+  should 'find TLD by hostname' do
     assert_equal 'au', TLD.find('foo.bar.au').tld
   end
 
-  def test_find_tld_by_url
+  should 'find TLD by url' do
     assert_equal 'au', TLD.find('http://foo.bar.au/baz').tld
   end
 
-  def test_get_tld_currency
+  should 'get TLD currency' do
     assert_equal 'AUD', TLD.find('au').currency
   end
 
-  def test_get_mapped_tld_currency
+  should 'get mapped TLD currency' do
     assert_equal 'EUR', TLD.find('eu').currency
     assert_equal 'GBP', TLD.find('uk').currency
   end
 
-  def test_get_tld_name
+  should 'get TLD name' do
     assert_equal 'Australia', TLD.find('au').name
     assert_equal 'Business', TLD.find('biz').name
   end
 
-  def test_get_iso_alpha3_code
+  should 'get iso alpha3 code' do
     assert_equal 'AUS', TLD.find('au').alpha3
     assert_equal 'GBR', TLD.find('uk').alpha3
   end
 
-  def test_com_should_map_to_empty_currency_not_comoros
+  should 'get TLD as a string' do
+    tld = TLD.find('au')
+
+    assert_equal 'au', tld.to_s
+    assert_equal tld.tld, tld.to_s
+  end
+
+  should 'com should map to empty currency (not Comoros)' do
     assert_equal [], TLD.find('com').currencies
     assert_nil TLD.find('com').currency
   end
 
-  def test_unknown_tld
+  should 'raise exception when TLD is unknown' do
     assert_raises TLD::UnknownTldError do
       TLD.find('foo')
     end

data/tld.gemspec

@@ -2,36 +2,64 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tld}
-  s.version = "0.2.1"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Alex Rabarts"]
-  s.date = %q{2009-02-27}
-  s.description = %q{Provides meta information for Internet Top Level Domains (TLDs) such as a descriptive name, associated currency code and the TLD category.}
-  s.email = ["alexrabarts@gmail.com"]
-  s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.txt"]
-  s.files = ["History.txt", "Manifest.txt", "README.txt", "Rakefile", "lib/tld.rb", "lib/tld/alpha3.rb", "lib/tld/cc_tld.rb", "lib/tld/currency.rb", "lib/tld/generic_tld.rb", "lib/tld/infrastructure_tld.rb", "lib/tld/name.rb", "lib/tld/pseudo_tld.rb", "lib/tld/reserved_tld.rb", "lib/tld/retired_tld.rb", "lib/tld/sponsored_tld.rb", "lib/tld/tld.rb", "rakelib/cultivate.rake", "rakelib/tld.rake", "rakelib/tld.rb", "rakelib/tld.rb.erb", "test/test_tld.rb", "tld.gemspec"]
-  s.has_rdoc = true
-  s.rdoc_options = ["--main", "README.txt"]
+  s.authors = ["alex"]
+  s.date = %q{2009-06-30}
+  s.description = %q{Top-level domain library}
+  s.email = %q{alexrabarts@gmail.com}
+  s.extra_rdoc_files = [
+    "README.rdoc"
+  ]
+  s.files = [
+    ".gitignore",
+     "History.txt",
+     "Manifest.txt",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION.yml",
+     "lib/tld.rb",
+     "lib/tld/alpha3.rb",
+     "lib/tld/cc_tld.rb",
+     "lib/tld/currency.rb",
+     "lib/tld/generic_tld.rb",
+     "lib/tld/infrastructure_tld.rb",
+     "lib/tld/name.rb",
+     "lib/tld/pseudo_tld.rb",
+     "lib/tld/reserved_tld.rb",
+     "lib/tld/retired_tld.rb",
+     "lib/tld/sponsored_tld.rb",
+     "lib/tld/tld.rb",
+     "rakelib/cultivate.rake",
+     "rakelib/tld.rake",
+     "rakelib/tld.rb",
+     "rakelib/tld.rb.erb",
+     "test/tld_test.rb",
+     "tld.gemspec"
+  ]
+  s.homepage = %q{http://github.com/alexrabarts/tld}
+  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubyforge_project = %q{tld}
-  s.rubygems_version = %q{1.3.1}
-  s.summary = %q{Provides meta information for Internet Top Level Domains (TLDs) such as a descriptive name, associated currency code and the TLD category.}
-  s.test_files = ["test/test_tld.rb"]
+  s.rubygems_version = %q{1.3.4}
+  s.summary = %q{Provides meta information for Internet Top Level Domains (TLDs).}
+  s.test_files = [
+    "test/tld_test.rb"
+  ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
+    s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<alexrabarts-iso_country_codes>, [">= 0"])
-      s.add_development_dependency(%q<hoe>, [">= 1.8.2"])
+      s.add_runtime_dependency(%q<alexrabarts-iso_country_codes>, [">= 0.2.1"])
+      s.add_runtime_dependency(%q<addressable>, [">= 0"])
     else
-      s.add_dependency(%q<alexrabarts-iso_country_codes>, [">= 0"])
-      s.add_dependency(%q<hoe>, [">= 1.8.2"])
+      s.add_dependency(%q<alexrabarts-iso_country_codes>, [">= 0.2.1"])
+      s.add_dependency(%q<addressable>, [">= 0"])
     end
   else
-    s.add_dependency(%q<alexrabarts-iso_country_codes>, [">= 0"])
-    s.add_dependency(%q<hoe>, [">= 1.8.2"])
+    s.add_dependency(%q<alexrabarts-iso_country_codes>, [">= 0.2.1"])
+    s.add_dependency(%q<addressable>, [">= 0"])
   end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: alexrabarts-tld
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.4.0
 platform: ruby
 authors: 
-- Alex Rabarts
+- alex
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-02-27 00:00:00 -08:00
+date: 2009-06-30 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,34 +20,33 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.2.1
     version: 
 - !ruby/object:Gem::Dependency 
-  name: hoe
-  type: :development
+  name: addressable
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.8.2
+        version: "0"
     version: 
-description: Provides meta information for Internet Top Level Domains (TLDs) such as a descriptive name, associated currency code and the TLD category.
-email: 
-- alexrabarts@gmail.com
+description: Top-level domain library
+email: alexrabarts@gmail.com
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- History.txt
-- Manifest.txt
-- README.txt
+- README.rdoc
 files: 
+- .gitignore
 - History.txt
 - Manifest.txt
-- README.txt
+- README.rdoc
 - Rakefile
+- VERSION.yml
 - lib/tld.rb
 - lib/tld/alpha3.rb
 - lib/tld/cc_tld.rb
@@ -64,14 +63,13 @@ files:
 - rakelib/tld.rake
 - rakelib/tld.rb
 - rakelib/tld.rb.erb
-- test/test_tld.rb
+- test/tld_test.rb
 - tld.gemspec
-has_rdoc: true
-homepage: 
+has_rdoc: false
+homepage: http://github.com/alexrabarts/tld
 post_install_message: 
 rdoc_options: 
-- --main
-- README.txt
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -88,10 +86,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: tld
+rubyforge_project: 
 rubygems_version: 1.2.0
 signing_key: 
-specification_version: 2
-summary: Provides meta information for Internet Top Level Domains (TLDs) such as a descriptive name, associated currency code and the TLD category.
+specification_version: 3
+summary: Provides meta information for Internet Top Level Domains (TLDs).
 test_files: 
-- test/test_tld.rb
+- test/tld_test.rb