iso_countries_plus 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: faa2f7433799a275c18184dada0b69f60c0f1005
-  data.tar.gz: 719433ae967dd712b5dd0c0b3c3080151195702c
+  metadata.gz: a7d5d8be9c97da572630eb3e7e1790b43874f808
+  data.tar.gz: 06abff4d590fa59b68f5db4dce21f9f205d0fb32
 SHA512:
-  metadata.gz: 075e0e25459fc5435e93e3c8bd600b966fa3790ad39f060807c80d65b3385605181d50c9cd1d8722970c917171d5c47a06d8d4acdda482f918f79f7b595164d7
-  data.tar.gz: 3523ee421716da122c21cbf8ebb4c24b6e494cf4f7040087efb77fdd5a325f1211820c911125571a9a9a72399b3b82a91e05ac8455348fdf6ea6971aad7afb69
+  metadata.gz: 539354866df0d19497b9973210cf840ad273c7d27e4155ed3c2dba0fceebcd5f214df081b95d8a0eb993dab881086662e43f7144c8d8b100075c8678d0b18c56
+  data.tar.gz: 9584666c1c0514155ea6f74ad5d455cb87aa1a0efa0d308d354948f8714fc656a2b59d238b890c24118b5ce488adb4bec41ceb5dbd16de272e489eeef4f71a3d

data/.document

@@ -0,0 +1,5 @@
+lib/**/*.rb
+bin/*
+- 
+features/**/*.feature
+LICENSE.txt

data/Gemfile

@@ -1,4 +1,14 @@
 source "http://rubygems.org"
+# Add dependencies required to use your gem here.
+# Example:
+#   gem "activesupport", ">= 2.3.5"
 
-# Specify your gem's dependencies in iso_countries_plus.gemspec
-gemspec
+# Add dependencies to develop your gem here.
+# Include everything needed to run rake, tests, features, etc.
+group :development do
+  gem "shoulda", ">= 0"
+  gem "rdoc", "~> 3.12"
+  gem "bundler", "~> 1.0"
+  gem "jeweler", "~> 2.0.1"
+  gem "simplecov", ">= 0"
+end

data/Gemfile.lock

@@ -0,0 +1,83 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activesupport (4.2.4)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    addressable (2.3.8)
+    builder (3.2.2)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    docile (1.1.5)
+    faraday (0.9.1)
+      multipart-post (>= 1.2, < 3)
+    git (1.2.9.1)
+    github_api (0.12.4)
+      addressable (~> 2.3)
+      descendants_tracker (~> 0.0.4)
+      faraday (~> 0.8, < 0.10)
+      hashie (>= 3.4)
+      multi_json (>= 1.7.5, < 2.0)
+      nokogiri (~> 1.6.6)
+      oauth2
+    hashie (3.4.2)
+    highline (1.7.7)
+    i18n (0.7.0)
+    jeweler (2.0.1)
+      builder
+      bundler (>= 1.0)
+      git (>= 1.2.5)
+      github_api
+      highline (>= 1.6.15)
+      nokogiri (>= 1.5.10)
+      rake
+      rdoc
+    json (1.8.3)
+    jwt (1.5.1)
+    mini_portile (0.6.2)
+    minitest (5.8.1)
+    multi_json (1.11.2)
+    multi_xml (0.5.5)
+    multipart-post (2.0.0)
+    nokogiri (1.6.6.2)
+      mini_portile (~> 0.6.0)
+    oauth2 (1.0.0)
+      faraday (>= 0.8, < 0.10)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (~> 1.2)
+    rack (1.6.4)
+    rake (10.4.2)
+    rdoc (3.12.2)
+      json (~> 1.4)
+    shoulda (3.5.0)
+      shoulda-context (~> 1.0, >= 1.0.1)
+      shoulda-matchers (>= 1.4.1, < 3.0)
+    shoulda-context (1.2.1)
+    shoulda-matchers (2.8.0)
+      activesupport (>= 3.0.0)
+    simplecov (0.10.0)
+      docile (~> 1.1.0)
+      json (~> 1.8)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
+    thread_safe (0.3.5)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.0)
+  jeweler (~> 2.0.1)
+  rdoc (~> 3.12)
+  shoulda
+  simplecov
+
+BUNDLED WITH
+   1.10.6

data/Rakefile

@@ -1,2 +1,74 @@
+# # require 'bundler'
+# # Bundler::GemHelper.install_tasks
+
+# require 'jeweler'
+# Jeweler::Taskgemspec.new do |gemspec|
+#   gemspec.name        = "iso_countries_plus"
+#   gemspec.version     = "0.2.0"
+#   gemspec.platform    = Gem::Platform::RUBY
+#   gemspec.authors       = ["Mark Dickson"]
+#   gemspec.email         = ["mark@sitesteadergemspec.com"]
+#   gemspec.description   = %q{This gem differs from other ISO country gems in that it allows VERY flexible name lookups, so country names like 'South Korea' will work properly.}
+#   gemspec.summary       = %q{ISO Countries, including all standard name variations, alpha2, and alpha3}
+#   gemspec.homepage    = "https://github.com/ideaoforder/iso_countries_plus"
+
+#   gemspec.rubyforge_project = "iso_countries_plus"
+
+#   gemspec.files         = `git ls-files`.split("\n")
+#   gemspec.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+#   gemspec.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+#   gemspec.require_paths = ["lib"]
+# end
+
+# encoding: utf-8
+
+require 'rubygems'
 require 'bundler'
-Bundler::GemHelper.install_tasks
+begin
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
+end
+require 'rake'
+
+require 'jeweler'
+Jeweler::Tasks.new do |gem|
+  # gem is a Gem::Specification... see http://guides.rubygems.org/specification-reference/ for more options
+  gem.name = "iso_countries_plus"
+  gem.version = "0.2.0"
+  gem.homepage = "http://github.com/ideaoforder/iso_countries_plus"
+  gem.license = "MIT"
+  gem.description = %q{This gem differs from other ISO country gems in that it allows VERY flexible name lookups, so country names like 'South Korea' will work properly.}
+  gem.summary = %q{ISO Countries, including all standard name variations, alpha2, and alpha3}
+  gem.email = "mark@sitesteaders.com"
+  gem.authors = ["Mark Dickson"]
+  # dependencies defined in Gemfile
+end
+Jeweler::RubygemsDotOrgTasks.new
+
+require 'rake/testtask'
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'lib' << 'test'
+  test.pattern = 'test/**/test_*.rb'
+  test.verbose = true
+end
+
+desc "Code coverage detail"
+task :simplecov do
+  ENV['COVERAGE'] = "true"
+  Rake::Task['test'].execute
+end
+
+task :default => :test
+
+require 'rdoc/task'
+Rake::RDocTask.new do |rdoc|
+  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "iso_countries_plus #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end

data/lib/iso_countries_plus.rb

@@ -1,7 +1,6 @@
 require 'csv'
 require 'yaml'
 
-require "iso_countries_plus/version"
 require 'iso_countries_plus/init'
 require 'iso_countries_plus/iso_country'
 require 'iso_countries_plus/assign'

data/lib/iso_countries_plus/country_continents.csv

@@ -0,0 +1,253 @@
+"iso 3166 country","continent code"
+A1,--
+A2,--
+AD,EU
+AE,AS
+AF,AS
+AG,NA
+AI,NA
+AL,EU
+AM,AS
+AN,NA
+AO,AF
+AP,AS
+AQ,AN
+AR,SA
+AS,OC
+AT,EU
+AU,OC
+AW,NA
+AX,EU
+AZ,AS
+BA,EU
+BB,NA
+BD,AS
+BE,EU
+BF,AF
+BG,EU
+BH,AS
+BI,AF
+BJ,AF
+BL,NA
+BM,NA
+BN,AS
+BO,SA
+BR,SA
+BS,NA
+BT,AS
+BV,AN
+BW,AF
+BY,EU
+BZ,NA
+CA,NA
+CC,AS
+CD,AF
+CF,AF
+CG,AF
+CH,EU
+CI,AF
+CK,OC
+CL,SA
+CM,AF
+CN,AS
+CO,SA
+CR,NA
+CU,NA
+CV,AF
+CX,AS
+CY,AS
+CZ,EU
+DE,EU
+DJ,AF
+DK,EU
+DM,NA
+DO,NA
+DZ,AF
+EC,SA
+EE,EU
+EG,AF
+EH,AF
+ER,AF
+ES,EU
+ET,AF
+EU,EU
+FI,EU
+FJ,OC
+FK,SA
+FM,OC
+FO,EU
+FR,EU
+FX,EU
+GA,AF
+GB,EU
+GD,NA
+GE,AS
+GF,SA
+GG,EU
+GH,AF
+GI,EU
+GL,NA
+GM,AF
+GN,AF
+GP,NA
+GQ,AF
+GR,EU
+GS,AN
+GT,NA
+GU,OC
+GW,AF
+GY,SA
+HK,AS
+HM,AN
+HN,NA
+HR,EU
+HT,NA
+HU,EU
+ID,AS
+IE,EU
+IL,AS
+IM,EU
+IN,AS
+IO,AS
+IQ,AS
+IR,AS
+IS,EU
+IT,EU
+JE,EU
+JM,NA
+JO,AS
+JP,AS
+KE,AF
+KG,AS
+KH,AS
+KI,OC
+KM,AF
+KN,NA
+KP,AS
+KR,AS
+KW,AS
+KY,NA
+KZ,AS
+LA,AS
+LB,AS
+LC,NA
+LI,EU
+LK,AS
+LR,AF
+LS,AF
+LT,EU
+LU,EU
+LV,EU
+LY,AF
+MA,AF
+MC,EU
+MD,EU
+ME,EU
+MF,NA
+MG,AF
+MH,OC
+MK,EU
+ML,AF
+MM,AS
+MN,AS
+MO,AS
+MP,OC
+MQ,NA
+MR,AF
+MS,NA
+MT,EU
+MU,AF
+MV,AS
+MW,AF
+MX,NA
+MY,AS
+MZ,AF
+NA,AF
+NC,OC
+NE,AF
+NF,OC
+NG,AF
+NI,NA
+NL,EU
+NO,EU
+NP,AS
+NR,OC
+NU,OC
+NZ,OC
+O1,--
+OM,AS
+PA,NA
+PE,SA
+PF,OC
+PG,OC
+PH,AS
+PK,AS
+PL,EU
+PM,NA
+PN,OC
+PR,NA
+PS,AS
+PT,EU
+PW,OC
+PY,SA
+QA,AS
+RE,AF
+RO,EU
+RS,EU
+RU,EU
+RW,AF
+SA,AS
+SB,OC
+SC,AF
+SD,AF
+SE,EU
+SG,AS
+SH,AF
+SI,EU
+SJ,EU
+SK,EU
+SL,AF
+SM,EU
+SN,AF
+SO,AF
+SR,SA
+ST,AF
+SV,NA
+SY,AS
+SZ,AF
+TC,NA
+TD,AF
+TF,AN
+TG,AF
+TH,AS
+TJ,AS
+TK,OC
+TL,AS
+TM,AS
+TN,AF
+TO,OC
+TR,EU
+TT,NA
+TV,OC
+TW,AS
+TZ,AF
+UA,EU
+UG,AF
+UM,OC
+US,NA
+UY,SA
+UZ,AS
+VA,EU
+VC,NA
+VE,SA
+VG,NA
+VI,NA
+VN,AS
+VU,OC
+WF,OC
+WS,OC
+YE,AS
+YT,AF
+ZA,AF
+ZM,AF
+ZW,AF

data/lib/iso_countries_plus/init.rb

@@ -3,6 +3,15 @@ ADDITIONS_FILE = File.expand_path(File.join(File.dirname(__FILE__), 'additions.y
 COUNTRY_HASH = {:name => {}, :alpha2 => {}, :alpha3 => {}, :guess => []}
 COUNTRIES = {:name => {}, :alpha2 => {}, :alpha3 => {}, :guess => []}
 
+# SETUP Continents
+CONTINENTS_FILE = File.expand_path(File.join(File.dirname(__FILE__), 'country_continents.csv'))
+CONTINENTS_HASH = {}
+CSV.foreach(CONTINENTS_FILE, :col_sep => ",") do |row|
+	if row[1] != '--'
+		CONTINENTS_HASH[row[0]] = row[1]
+	end
+end
+
 # We download the file from here:
 # http://opengeocode.org/download/countrynames.txt
 
@@ -13,36 +22,38 @@ CSV.foreach(ISO_FILE, :col_sep => ";") do |row|
 	alpha3 = row[1].strip
 	official_name = row[3].strip
 
+	country_data = {:name => official_name, :alpha3 => alpha3, :alpha2 => alpha2, :continent => CONTINENTS_HASH[alpha2]}
+
 	# We set the 2- and 3-digit keys to use the first (official) name
-	COUNTRY_HASH[:alpha2][alpha2] = {:name => official_name, :alpha3 => alpha3, :alpha2 => alpha2}
-	COUNTRY_HASH[:alpha3][alpha3] = {:name => official_name, :alpha3 => alpha3, :alpha2 => alpha2}
+	COUNTRY_HASH[:alpha2][alpha2] = country_data
+	COUNTRY_HASH[:alpha3][alpha3] = country_data
 
 	# Then we create an entry for each additional country name
 	for i in 3...row.length
 		unless (row[i].nil? or row[i] == '')
 			# NOTE: We still set the name to our official name
 			cname = row[i].strip.force_encoding("UTF-8")
-			COUNTRY_HASH[:name][cname] = {:name => official_name, :alpha3 => alpha3, :alpha2 => alpha2}
-			COUNTRY_HASH[:name][cname.downcase] = {:name => official_name, :alpha3 => alpha3, :alpha2 => alpha2}
+			COUNTRY_HASH[:name][cname] = country_data
+			COUNTRY_HASH[:name][cname.downcase] = country_data
 
 			# Check for "and", and grab both country names, to be more exhaustive
 			if cname =~ /\sand\s/
 				narray = cname.split(/\s*,\s*and\s+|\s*,\s*|\s+and\s+/)
 				for name in narray
-					COUNTRY_HASH[:name][name] = {:name => official_name, :alpha3 => alpha3, :alpha2 => alpha2}
-					COUNTRY_HASH[:name][name.downcase] = {:name => official_name, :alpha3 => alpha3, :alpha2 => alpha2}
+					COUNTRY_HASH[:name][name] = country_data
+					COUNTRY_HASH[:name][name.downcase] = country_data
 					COUNTRY_HASH[:guess] << name
 
 					if narray.last[/islands?/i]
 						iname = name.gsub(/islands?/i, '').strip + ' Island'
-						COUNTRY_HASH[:name][iname] = {:name => official_name, :alpha3 => alpha3, :alpha2 => alpha2}
-						COUNTRY_HASH[:name][iname.downcase] = {:name => official_name, :alpha3 => alpha3, :alpha2 => alpha2}
+						COUNTRY_HASH[:name][iname] = country_data
+						COUNTRY_HASH[:name][iname.downcase] = country_data
 						COUNTRY_HASH[:guess] << iname
 
 						# grab the plural too
 						iname += 's'
-						COUNTRY_HASH[:name][iname] = {:name => official_name, :alpha3 => alpha3, :alpha2 => alpha2}
-						COUNTRY_HASH[:name][iname.downcase] = {:name => official_name, :alpha3 => alpha3, :alpha2 => alpha2}
+						COUNTRY_HASH[:name][iname] = country_data
+						COUNTRY_HASH[:name][iname.downcase] = country_data
 						COUNTRY_HASH[:guess] << iname
 					end
 				end

data/lib/iso_countries_plus/iso_country.rb

@@ -1,6 +1,6 @@
 class IsoCountry
 
-	attr_accessor :name, :alpha2, :alpha3
+	attr_accessor :name, :alpha2, :alpha3, :continent
     
   def initialize(data={})
   	if data and !data.nil?

data/test/helper.rb

@@ -0,0 +1,34 @@
+require 'simplecov'
+
+module SimpleCov::Configuration
+  def clean_filters
+    @filters = []
+  end
+end
+
+SimpleCov.configure do
+  clean_filters
+  load_adapter 'test_frameworks'
+end
+
+ENV["COVERAGE"] && SimpleCov.start do
+  add_filter "/.rvm/"
+end
+require 'rubygems'
+require 'bundler'
+begin
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
+end
+require 'test/unit'
+require 'shoulda'
+
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+require 'iso_countries_plus'
+
+class Test::Unit::TestCase
+end

data/test/test_iso_countries_plus.rb

@@ -0,0 +1,7 @@
+require 'helper'
+
+class TestIsoCountriesPlus < Test::Unit::TestCase
+  should "probably rename this file and start testing for real" do
+    flunk "hey buddy, you should probably rename this file and start testing for real"
+  end
+end

metadata

@@ -1,39 +1,113 @@
 --- !ruby/object:Gem::Specification
 name: iso_countries_plus
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Mark Dickson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-13 00:00:00.000000000 Z
-dependencies: []
+date: 2015-10-01 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: shoulda
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.12'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.12'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  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: jeweler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.1
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: This gem differs from other ISO country gems in that it allows VERY flexible
   name lookups, so country names like 'South Korea' will work properly.
-email:
-- mark@sitesteaders.com
+email: mark@sitesteaders.com
 executables: []
 extensions: []
-extra_rdoc_files: []
+extra_rdoc_files:
+- LICENSE.txt
+- README.md
 files:
-- .gitignore
+- ".document"
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
-- iso_countries_plus.gemspec
 - lib/iso_countries_plus.rb
 - lib/iso_countries_plus/additions.yml
 - lib/iso_countries_plus/assign.rb
 - lib/iso_countries_plus/country.rb
+- lib/iso_countries_plus/country_continents.csv
 - lib/iso_countries_plus/countrynames.txt
 - lib/iso_countries_plus/init.rb
 - lib/iso_countries_plus/iso_country.rb
-- lib/iso_countries_plus/version.rb
-homepage: https://github.com/ideaoforder/iso_countries_plus
-licenses: []
+- test/helper.rb
+- test/test_iso_countries_plus.rb
+homepage: http://github.com/ideaoforder/iso_countries_plus
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -41,17 +115,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: iso_countries_plus
-rubygems_version: 2.1.11
+rubyforge_project: 
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: ISO Countries, including all standard name variations, alpha2, and alpha3

data/.gitignore

@@ -1,4 +0,0 @@
-pkg/*
-*.gem
-.bundle
-.DS_Store

data/iso_countries_plus.gemspec

@@ -1,21 +0,0 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "iso_countries_plus/version"
-
-Gem::Specification.new do |s|
-  s.name        = "iso_countries_plus"
-  s.version     = IsoCountriesPlus::VERSION
-  s.platform    = Gem::Platform::RUBY
-  s.authors       = ["Mark Dickson"]
-  s.email         = ["mark@sitesteaders.com"]
-  s.description   = %q{This gem differs from other ISO country gems in that it allows VERY flexible name lookups, so country names like 'South Korea' will work properly.}
-  s.summary       = %q{ISO Countries, including all standard name variations, alpha2, and alpha3}
-  s.homepage    = "https://github.com/ideaoforder/iso_countries_plus"
-
-  s.rubyforge_project = "iso_countries_plus"
-
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
-end

data/lib/iso_countries_plus/version.rb

@@ -1,3 +0,0 @@
-module IsoCountriesPlus
-  VERSION = "0.1.0"
-end