itu_codes 0.3.6 → 0.4.1

data/lib/itu_codes/helpers.rb

@@ -1,13 +1,15 @@
-require 'carmen'
+require 'yaml'
 
 module ItuCodes
   module Helpers
+    ISO2ITU = YAML.load_file(  File.expand_path(File.dirname(__FILE__)) + '/../data/iso_code_to_itu_country_names.yml')
+
     def self.country_code_lookup(country_name)
-      Carmen::country_code(country_name)
+      ISO2ITU.key(country_name)
     end
 
     def self.country_name_lookup(iso_code)
-      Carmen::country_name(iso_code)
+      ISO2ITU[iso_code]
     end
   end
 end

data/lib/itu_codes/version.rb

@@ -1,3 +1,3 @@
 module ItuCodes
-  VERSION = "0.3.6"
+  VERSION = "0.4.1"
 end

data/lib/itu_codes.rb

@@ -1,7 +1,6 @@
 # to-do: deal with headache codes:
 # 1 --> Non-US need to be separated by area code
 # 7 --> Kazakhstan!
-require 'carmen'
 
 require 'itu_codes/constants'
 require 'itu_codes/helpers'
@@ -10,123 +9,110 @@ require 'itu_codes/helpers'
 
 module ItuCodes
   class << self
+    def find_by_itu_code(code)
+      returner = lookup(code)
 
-    def list
-      Constants::ASSIGNED_COUNTRY_CODES
-    end
-
-    def lookup(code)
-      cleaned = clean(code)
-      list.find_all{ |hsh| hsh.keys.first == cleaned }.map do |k|
-        k.values.first
-      end.uniq
-    end
-
-    def find (code_or_name)
-      if code_or_name.to_s.match /[^0-9]/  # non-numeric string passed
-        find_by_name(code_or_name)
+      if returner.size <= 1
+        returner.first
       else
-        cleaned = self.clean(code_or_name)
-        find_by_itu_code(cleaned)
+        returner
       end
     end
 
-    def find_by_itu_code(code)
-      if american?(code) and code.length > 1
-        returner = 'United States'
+    def find_by_name(name)
+      matching = country_codes.select do |k, v|
+        [*v].include? name
+      end || {}
+
+      returner = matching.keys
+
+      if returner.size <= 1
+        returner.first
       else
-        returner = list.find_all do |record|
-          record.has_key? code
-        end.map { |k| k.values.first }.uniq
+        returner
       end
-      returner.size <= 1 ? returner.shift : returner
     end
 
-    def find_by_name(name)
-      returner = list.find_all do |record|
-        record.has_value? name
-      end.map{ |k| k.keys.first }.uniq
-      returner.size <= 1 ? returner.shift : returner
-    end
-
-    # ie. find_by_country_iso_code('US')
+    # lookup by ISO 3166 country code
+    # e.g. iso2itu('US')
+    # see : http://www.iso.org/iso/country_codes.htm
     def iso2itu(iso_code)
-      [find_by_name( Helpers.country_name_lookup(iso_code) )].flatten.reject do |c|
-        north_american?(c) and c.length > 1
-      end.shift rescue nil
-    end
-
-    # this is tricky for North American destinations: '1' can be the US, Canada or another country
-    def itu2iso(itu_code)
-      lookup(itu_code).map do |country|
-        Helpers.country_code_lookup(country)
-      end.compact
+      country_name = Helpers.country_name_lookup(iso_code)
+      find_by_name(country_name)
     end
 
     # returns true for any valid ITU code
     # valid_code?(1)    => true
     # valid_code?(1818) => false
     def valid_code?(some_code)
-      if north_american?(some_code)
-        some_code.length == 1
-      else
-        self.list.any? { |hsh| hsh.has_key?(some_code) }
-      end
-    end
-
-    def north_america
-      find_by_itu_code '1'
+      country_codes.has_key?(some_code)
     end
 
     def north_american?(some_code)
-      some_code.to_s[0,1] == '1'
+      some_code[0,1] == '1'
     end
 
     # parse a destination code (probably with area code) to find the ITU code
     #   ex:  parse_code(1818) =>  1
-    def parse_code(some_code)
-      some_code = clean(some_code)
-      sub_index = (1..some_code.length).find do |len|
-        valid_code? some_code[0,len]
+    def parse_code(some_number)
+      some_number = clean(some_number)
+      sub_index = (1..some_number.length).find do |len|
+        valid_code? some_number[0,len]
       end
-      some_code[0,sub_index] unless sub_index.nil?
+      some_number[0,sub_index] unless sub_index.nil?
     end
 
     # parse a destination code (probably with area code) to find the number without the ITU code
     #   ex:  parse_number(18184443322) => 8184443322
-    def parse_number(some_code)
-      some_code = clean(some_code)
-      sub_index = (1..some_code.length).find do |len|
-        valid_code? some_code[0,len]
-      end
-      some_code[sub_index,some_code.length - sub_index] unless sub_index.nil?
+    def parse_number(some_number)
+      country_code = parse_code(some_number)
+      some_number.gsub(/^#{country_code}/) unless country_code.nil?
     end
 
     def compatriots?(some, other)
       both_valid = ! ( parse_code(some).nil? or parse_code(other).nil? )
-      both_valid and ( parse_code(some) == parse_code(other) ) rescue nil
-    end
 
-    # def american?(some_code)
-    #   # for non-US North American codes, parse_code will return a 4 digit code
-    #   # for US, '1' will be returned
-    #   some_code = some_code.to_s
-    #   countries = lookup(some_code[0,4])
-    #   north_american?(some_code) and (countries.include?('United States') or countries.empty?)
-    # end
+      if north_american?(some) && north_american?(other)
+        both_valid && !(lookup(some) & lookup(other)).empty?
+      else
+        some  = parse_code(some)
+        other = parse_code(other)
+        both_valid && lookup(some) == lookup(other)
+      end
+    end
 
     def american?(some_code)
       # for non-US North American codes, parse_code will return a 4 digit code
       # for US, '1' will be returned
-      some_code = some_code.to_s
-      countries = lookup(some_code[0,4])
-      north_american?(some_code) and (countries.include?('United States'))
+      countries = lookup(some_code[0,4]) || []
+      countries.include?('United States of America')
     end
 
     def canadian?(some_code)
-      some_code = some_code.to_s
       countries = lookup(some_code[0,4])
-      north_american?(some_code) and (countries.include?('Canada'))
+      north_american?(some_code) && (countries.include?('Canada'))
+    end
+
+
+    private
+
+    def north_american_codes
+      Constants::NORTH_AMERICAN_AREA_CODES
+    end
+
+    def country_codes
+      Constants::ASSIGNED_COUNTRY_CODES
+    end
+
+    def lookup(code)
+      cleaned = clean(code)
+      matching_countries = country_codes[cleaned] || []
+
+      matching_north_americans = north_american_codes.select do |k, v|
+        [*v].include?(code)
+      end || {}
+
+      [*matching_countries] + matching_north_americans.keys.compact
     end
 
     # converts input to string, then strips any non-numeric characters
@@ -134,5 +120,8 @@ module ItuCodes
       input.to_s.gsub(/[^0-9]/, '')
     end
 
+    def north_america
+      find_by_itu_code '1'
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: itu_codes
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,40 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-01 00:00:00.000000000 Z
+date: 2013-03-17 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: i18n
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: carmen
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -67,6 +35,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/data/assigned_country_codes.yml
+- lib/data/iso_code_to_itu_country_names.yml
+- lib/data/north_american_area_codes.yml
 - lib/itu_codes/constants.rb
 - lib/itu_codes/helpers.rb
 - lib/itu_codes/version.rb