mobile-subscriber 1.0.0.alpha4 → 1.0.0.alpha5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 824221695c48e812f55c982abdc9e4ede9333818
-  data.tar.gz: 6339fc5ab174bf1197ff5946001a0c80583a13e7
+  metadata.gz: 762356966c9fe3a51b9189099d1a77cdf2dc8cf2
+  data.tar.gz: b83b4a4ff19ff13732e0488393611e4ec219c076
 SHA512:
-  metadata.gz: 0fa3e242b91af01570b39bd5e26322b57f1037b488330f8f66026a1f04319cb69c96c5e6a90a140acff28c90784f758e0124083b25ecbc14682b1883fdb64647
-  data.tar.gz: 2ae1fb0491f13732cfbf5da8198a37483f9bf32d6801831b7a3bcfa7928d43c33b4d06d44b0366e19aaf9cbdc69f7cad2102ced08c306d3641203de13921de2e
+  metadata.gz: ffafcf7d64b4051d2db1a1a2c4acd52c7c940847f40fdaf54636420fe4e564311388e72f3028763609c85ae5fae8d10ba0626b9ecdb2bdf007e0a97ea7c9d6f5
+  data.tar.gz: 8a5914e8cba72506eb8efa6ea945afd06a53cdb4b66a191b0dd5e6de138ba827098266e7fa3178c0a85a57ae0ed45245fe95c926dbcd601a1a46b4c2abe06d0f

data/lib/mobile-subscriber.rb

@@ -4,9 +4,14 @@ require 'active_support/all'
 module MobileSubscriber
   extend ActiveSupport::Autoload
 
-  autoload :ISDN, "mobile_subscriber/isdn.rb"
+  autoload :Identity
 
-  module Detection
+  module HTTP
+    extend ActiveSupport::Autoload
+    autoload :RequestInfo
+  end
+
+  module MSISDNExtraction
     extend ActiveSupport::Autoload
     autoload :FromMsisdnHttpRequestHeader
     autoload :FromXNokiaMsisdnHttpRequestHeader
@@ -16,6 +21,11 @@ module MobileSubscriber
     autoload :FromXWapMsisdnHttpRequestHeader
     autoload :FromXWapSesiones3gMdnHttpRequestHeader
     autoload :FromXZtgoBeareraddressHttpRequestHeader
-    autoload :HttpRequestInfo
+  end
+
+  module IMSIExtraction
+    extend ActiveSupport::Autoload
+    autoload :FromXImsiHttpRequestHeader
+    autoload :FromXNokiaImsiHttpRequestHeader
   end
 end

data/lib/mobile_subscriber/dictionaries/dialing_and_country_codes.rb

@@ -1,36 +1,476 @@
 module MobileSubscriber
-  # See: http://countrycode.org/
-  # Diccionario de Dialing Country Codes => ISO country codes:
+
+  # Country Dialing => ISO codes:
   DIALING_COUNTRY_CODES = {
-    # WTF???
-    '1' => 'PR', # Puerto Rico "1" country code...
 
-    # Caribbean Islands' country codes are a mess!
+    # Codes collected from http://countrycode.org
+
+    '93' => 'AF', # Afghanistan
+
+    '355' => 'AL', # Albania
+
+    '213' => 'DZ', # Algeria
+
+    '1684' => 'AS', # American Samoa
+
+    '376' => 'AD', # Andorra
+
+    '244' => 'AO', # Angola
+
+    '1264' => 'AI', # Anguilla
+
+    '672' => 'AQ', # Antarctica
+
+    '1268' => 'AG', # Antigua and Barbuda
+
+    '54' => 'AR', # Argentina
+
+    '374' => 'AM', # Armenia
+
+    '297' => 'AW', # Aruba
+
+    '61' => 'AU', # Australia
+
+    '43' => 'AT', # Austria
+
+    '994' => 'AZ', # Azerbaijan
+
+    '1242' => 'BS', # Bahamas
+
+    '973' => 'BH', # Bahrain
+
+    '880' => 'BD', # Bangladesh
+
+    '1246' => 'BB', # Barbados
+
+    '375' => 'BY', # Belarus
+
+    '32' => 'BE', # Belgium
+
+    '501' => 'BZ', # Belize
+
+    '229' => 'BJ', # Benin
+
+    '1441' => 'BM', # Bermuda
+
+    '975' => 'BT', # Bhutan
+
+    '591' => 'BO', # Bolivia
+
+    '387' => 'BA', # Bosnia and Herzegovina
+
+    '267' => 'BW', # Botswana
+
+    '55' => 'BR', # Brazil
+
+    '1284' => 'VG', # British Virgin Islands
+
+    '673' => 'BN', # Brunei
+
+    '359' => 'BG', # Bulgaria
+
+    '226' => 'BF', # Burkina Faso
+
+    '95' => 'MM', # Burma (Myanmar)
+
+    '257' => 'BI', # Burundi
+
+    '855' => 'KH', # Cambodia
+
+    '237' => 'CM', # Cameroon
+
+    '1' => 'CA', # Canada
+
+    '238' => 'CV', # Cape Verde
+
+    '1345' => 'KY', # Cayman Islands
+
+    '236' => 'CF', # Central African Republic
+
+    '235' => 'TD', # Chad
+
+    '56' => 'CL', # Chile
+
+    '86' => 'CN', # China
+
+    '61' => 'CX', # Christmas Island
+
+    '61' => 'CC', # Cocos (Keeling) Islands
+
+    '57' => 'CO', # Colombia
+
+    '269' => 'KM', # Comoros
+
+    '242' => 'CG', # Republic of the Congo
+
+    '243' => 'CD', # Democratic Republic of the Congo
+
+    '682' => 'CK', # Cook Islands
+
+    '506' => 'CR', # Costa Rica
+
+    '385' => 'HR', # Croatia
+
+    '53' => 'CU', # Cuba
+
+    '357' => 'CY', # Cyprus
+
+    '420' => 'CZ', # Czech Republic
+
+    '45' => 'DK', # Denmark
+
+    '253' => 'DJ', # Djibouti
+
+    '1767' => 'DM', # Dominica
+
     '1809' => 'DO', # Dominican Republic
+
+    '670' => 'TL', # Timor-Leste
+
+    '593' => 'EC', # Ecuador
+
+    '20' => 'EG', # Egypt
+
+    '503' => 'SV', # El Salvador
+
+    '240' => 'GQ', # Equatorial Guinea
+
+    '291' => 'ER', # Eritrea
+
+    '372' => 'EE', # Estonia
+
+    '251' => 'ET', # Ethiopia
+
+    '500' => 'FK', # Falkland Islands
+
+    '298' => 'FO', # Faroe Islands
+
+    '679' => 'FJ', # Fiji
+
+    '358' => 'FI', # Finland
+
+    '33' => 'FR', # France
+
+    '689' => 'PF', # French Polynesia
+
+    '241' => 'GA', # Gabon
+
+    '220' => 'GM', # Gambia
+
+    '995' => 'GE', # Georgia
+
+    '49' => 'DE', # Germany
+
+    '233' => 'GH', # Ghana
+
+    '350' => 'GI', # Gibraltar
+
+    '30' => 'GR', # Greece
+
+    '299' => 'GL', # Greenland
+
+    '1473' => 'GD', # Grenada
+
+    '1671' => 'GU', # Guam
+
+    '502' => 'GT', # Guatemala
+
+    '224' => 'GN', # Guinea
+
+    '245' => 'GW', # Guinea-Bissau
+
+    '592' => 'GY', # Guyana
+
+    '509' => 'HT', # Haiti
+
+    '504' => 'HN', # Honduras
+
+    '852' => 'HK', # Hong Kong
+
+    '36' => 'HU', # Hungary
+
+    '354' => 'IS', # Iceland
+
+    '91' => 'IN', # India
+
+    '62' => 'ID', # Indonesia
+
+    '98' => 'IR', # Iran
+
+    '964' => 'IQ', # Iraq
+
+    '353' => 'IE', # Ireland
+
+    '44' => 'IM', # Isle of Man
+
+    '972' => 'IL', # Israel
+
+    '39' => 'IT', # Italy
+
+    '225' => 'CI', # Ivory Coast
+
+    '1876' => 'JM', # Jamaica
+
+    '81' => 'JP', # Japan
+
+    '962' => 'JO', # Jordan
+
+    '7' => 'KZ', # Kazakhstan
+
+    '254' => 'KE', # Kenya
+
+    '686' => 'KI', # Kiribati
+
+    '965' => 'KW', # Kuwait
+
+    '996' => 'KG', # Kyrgyzstan
+
+    '856' => 'LA', # Laos
+
+    '371' => 'LV', # Latvia
+
+    '961' => 'LB', # Lebanon
+
+    '266' => 'LS', # Lesotho
+
+    '231' => 'LR', # Liberia
+
+    '218' => 'LY', # Libya
+
+    '423' => 'LI', # Liechtenstein
+
+    '370' => 'LT', # Lithuania
+
+    '352' => 'LU', # Luxembourg
+
+    '853' => 'MO', # Macau
+
+    '389' => 'MK', # Macedonia
+
+    '261' => 'MG', # Madagascar
+
+    '265' => 'MW', # Malawi
+
+    '60' => 'MY', # Malaysia
+
+    '960' => 'MV', # Maldives
+
+    '223' => 'ML', # Mali
+
+    '356' => 'MT', # Malta
+
+    '692' => 'MH', # Marshall Islands
+
+    '222' => 'MR', # Mauritania
+
+    '230' => 'MU', # Mauritius
+
+    '262' => 'YT', # Mayotte
+
+    '52' => 'MX', # Mexico
+
+    '691' => 'FM', # Micronesia
+
+    '373' => 'MD', # Moldova
+
+    '377' => 'MC', # Monaco
+
+    '976' => 'MN', # Mongolia
+
+    '382' => 'ME', # Montenegro
+
+    '1664' => 'MS', # Montserrat
+
+    '212' => 'MA', # Morocco
+
+    '258' => 'MZ', # Mozambique
+
+    '264' => 'NA', # Namibia
+
+    '674' => 'NR', # Nauru
+
+    '977' => 'NP', # Nepal
+
+    '31' => 'NL', # Netherlands
+
+    '599' => 'AN', # Netherlands Antilles
+
+    '687' => 'NC', # New Caledonia
+
+    '64' => 'NZ', # New Zealand
+
+    '505' => 'NI', # Nicaragua
+
+    '227' => 'NE', # Niger
+
+    '234' => 'NG', # Nigeria
+
+    '683' => 'NU', # Niue
+
+    '1670' => 'MP', # Northern Mariana Islands
+
+    '850' => 'KP', # North Korea
+
+    '47' => 'NO', # Norway
+
+    '968' => 'OM', # Oman
+
+    '92' => 'PK', # Pakistan
+
+    '680' => 'PW', # Palau
+
+    '507' => 'PA', # Panama
+
+    '675' => 'PG', # Papua New Guinea
+
+    '595' => 'PY', # Paraguay
+
+    '51' => 'PE', # Peru
+
+    '63' => 'PH', # Philippines
+
+    '870' => 'PN', # Pitcairn Islands
+
+    '48' => 'PL', # Poland
+
+    '351' => 'PT', # Portugal
+
+    '1' => 'PR', # Puerto Rico
+
+    '974' => 'QA', # Qatar
+
+    '40' => 'RO', # Romania
+
+    '7' => 'RU', # Russia
+
+    '250' => 'RW', # Rwanda
+
+    '590' => 'BL', # Saint Barthelemy
+
+    '685' => 'WS', # Samoa
+
+    '378' => 'SM', # San Marino
+
+    '239' => 'ST', # Sao Tome and Principe
+
+    '966' => 'SA', # Saudi Arabia
+
+    '221' => 'SN', # Senegal
+
+    '381' => 'RS', # Serbia
+
+    '248' => 'SC', # Seychelles
+
+    '232' => 'SL', # Sierra Leone
+
+    '65' => 'SG', # Singapore
+
+    '421' => 'SK', # Slovakia
+
+    '386' => 'SI', # Slovenia
+
+    '677' => 'SB', # Solomon Islands
+
+    '252' => 'SO', # Somalia
+
+    '27' => 'ZA', # South Africa
+
+    '82' => 'KR', # South Korea
+
+    '34' => 'ES', # Spain
+
+    '94' => 'LK', # Sri Lanka
+
+    '290' => 'SH', # Saint Helena
+
+    '1869' => 'KN', # Saint Kitts and Nevis
+
+    '1758' => 'LC', # Saint Lucia
+
+    '1599' => 'MF', # Saint Martin
+
+    '508' => 'PM', # Saint Pierre and Miquelon
+
+    '1784' => 'VC', # Saint Vincent and the Grenadines
+
+    '249' => 'SD', # Sudan
+
+    '597' => 'SR', # Suriname
+
+    '268' => 'SZ', # Swaziland
+
+    '46' => 'SE', # Sweden
+
+    '41' => 'CH', # Switzerland
+
+    '963' => 'SY', # Syria
+
+    '886' => 'TW', # Taiwan
+
+    '992' => 'TJ', # Tajikistan
+
+    '255' => 'TZ', # Tanzania
+
+    '66' => 'TH', # Thailand
+
+    '228' => 'TG', # Togo
+
+    '690' => 'TK', # Tokelau
+
+    '676' => 'TO', # Tonga
+
+    '1868' => 'TT', # Trinidad and Tobago
+
+    '216' => 'TN', # Tunisia
+
+    '90' => 'TR', # Turkey
+
+    '993' => 'TM', # Turkmenistan
+
+    '1649' => 'TC', # Turks and Caicos Islands
+
+    '688' => 'TV', # Tuvalu
+
+    '971' => 'AE', # United Arab Emirates
+
+    '256' => 'UG', # Uganda
+
+    '44' => 'GB', # United Kingdom
+
+    '380' => 'UA', # Ukraine
+
+    '598' => 'UY', # Uruguay
+
+    '1' => 'US', # United States
+
+    '998' => 'UZ', # Uzbekistan
+
+    '678' => 'VU', # Vanuatu
+
+    '39' => 'VA', # Holy See (Vatican City)
+
+    '58' => 'VE', # Venezuela
+
+    '84' => 'VN', # Vietnam
+
+    '1340' => 'VI', # US Virgin Islands
+
+    '681' => 'WF', # Wallis and Futuna
+
+    '967' => 'YE', # Yemen
+
+    '260' => 'ZM', # Zambia
+
+    '263' => 'ZW', # Zimbabwe
+
+
+    # TODO: Block 1 countries:
+    '1787' => 'PR',
+
+    # Special cases:
+    # Boy! Caribbean Islands' codes do get messy!
     '1829' => 'DO', # Dominican Republic Overlay 1
     '1849' => 'DO', # Dominican Republic Overlay 2
 
-    '225' => 'CI',  # Costa de Marfil
-
-    '501'	=> 'BZ',	# Belize
-    '502'	=> 'GT',	# Guatemala
-    '503'	=> 'SV',	# El Salvador
-    '504'	=> 'HN',	# Honduras
-    '505'	=> 'NI',	# Nicaragua
-    '506'	=> 'CR',	# Costa Rica
-    '507'	=> 'PA',	# Panamá
-    '509'	=> 'HT',	# Haití
-    '51'	=> 'PE',	# Perú
-    '52'	=> 'MX',	# México
-    '53'	=> 'CU',	# Cuba
-    '54'	=> 'AR',	# Argentina
-    '55'	=> 'BR',	# Brasil
-    '56'	=> 'CL',	# Chile
-    '57'	=> 'CO',	# Colombia
-    '58'	=> 'VE',	# Venezuela
-    '591'	=> 'BO',	# Bolivia
-    '593'	=> 'EC',	# Ecuador
-    '595'	=> 'PY',	# Paraguay
-    '598'	=> 'UY'		# Uruguay
-  }.with_indifferent_access.freeze
+  }.freeze
 end