GeoParser 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e023e9f48eaa53035ba203a6ac8bbf8116f567d
-  data.tar.gz: a8244e32999561c343796764edbe0383c6bb59ad
+  metadata.gz: 3b67d7df669c1229a008afb69ebed5aa31fd739c
+  data.tar.gz: ae9da41ca1960b1e7725aff8781892f7e17a5ba6
 SHA512:
-  metadata.gz: a3be37f01b5d4a3376ad966154a76d5cd7dbbc107fe95c1dcc01201427fa69dafa8f12bc7a4a9c11f39b146de0ae1dd4508bd32d8a34c94757382bf0f5485c76
-  data.tar.gz: 89ef5dc798dd1cba235ca232f5adaab62d7203f571a33588b4ff8b6d4da4511702531198fffe83e87113ddab629bcceb50faa6b3f34ee61de2637daea8a58ad6
+  metadata.gz: 5a2ed08dec1a211c985423b24bd16676a8267f957d763acdf5c034ae0dea7bb0cbb19ed747bf02a3ee564e9dae57ef2f77d46d87a3f7536226b9da23adf92238
+  data.tar.gz: 1950671e7930d328c014acb1c63f24cc04dc95e0b3ff75c09debf6f55d762c6bb88ea4eeff3b0d73ee4975f88f24d9a9c53adfff022d1ce56ce63b67a30edb6a

data/lib/GeoParser.rb

@@ -5,7 +5,7 @@ class GeoParser
 
   def self.getLocation(string)
     words = string.split(/\W+/)
-    result =""
+    cityArray = []
 
     cities = Hash[
 
@@ -598,19 +598,268 @@ class GeoParser
 		"Al-Hudaydah"=>"Al-Hudaydah",
 		"Sana'a'"=>"Sana'a'",
 		"Ta'izz"=>"Ta'izz",
-		"Lusaka"=>"Lusaka"
+		"Lusaka"=>"Lusaka",
+		"Afghanistan"=>"Afghanistan",
+		"Albania"=>"Albania",
+		"Algeria"=>"Algeria",
+		"American Samoa"=>"American Samoa",
+		"Andorra"=>"Andorra",
+		"Angola"=>"Angola",
+		"Anguilla"=>"Anguilla",
+		"Antarctica"=>"Antarctica",
+		"Antigua and Barbuda"=>"Antigua and Barbuda",
+		"Argentina"=>"Argentina",
+		"Armenia"=>"Armenia",
+		"Armenia"=>"Armenia",
+		"Aruba"=>"Aruba",
+		"Australia"=>"Australia",
+		"Austria"=>"Austria",
+		"Azerbaijan"=>"Azerbaijan",
+		"Azerbaijan"=>"Azerbaijan",
+		"Bahamas"=>"Bahamas",
+		"Bahrain"=>"Bahrain",
+		"Bangladesh"=>"Bangladesh",
+		"Barbados"=>"Barbados",
+		"Belarus"=>"Belarus",
+		"Belgium"=>"Belgium",
+		"Belize"=>"Belize",
+		"Benin"=>"Benin",
+		"Bermuda"=>"Bermuda",
+		"Bhutan"=>"Bhutan",
+		"Bolivia"=>"Bolivia",
+		"Bosnia and Herzegovina"=>"Bosnia and Herzegovina",
+		"Botswana"=>"Botswana",
+		"Bouvet Island"=>"Bouvet Island",
+		"Brazil"=>"Brazil",
+		"British Indian Ocean Territory"=>"British Indian Ocean Territory",
+		"Brunei Darussalam"=>"Brunei Darussalam",
+		"Bulgaria"=>"Bulgaria",
+		"Burkina Faso"=>"Burkina Faso",
+		"Burundi"=>"Burundi",
+		"Cambodia"=>"Cambodia",
+		"Cameroon"=>"Cameroon",
+		"Canada"=>"Canada",
+		"Cape Verde"=>"Cape Verde",
+		"Cayman Islands"=>"Cayman Islands",
+		"Central African Republic"=>"Central African Republic",
+		"Chad"=>"Chad",
+		"Chile"=>"Chile",
+		"China"=>"China",
+		"Christmas Island"=>"Christmas Island",
+		"Cocos (Keeling) Islands"=>"Cocos (Keeling) Islands",
+		"Colombia"=>"Colombia",
+		"Comoros"=>"Comoros",
+		"Congo"=>"Congo",
+		"Congo,  The Democratic Republic of The"=>"Congo,  The Democratic Republic of The",
+		"Cook Islands"=>"Cook Islands",
+		"Costa Rica"=>"Costa Rica",
+		"Cote D'ivoire"=>"Cote D'ivoire",
+		"Croatia"=>"Croatia",
+		"Cuba"=>"Cuba",
+		"Cyprus"=>"Cyprus",
+		"Czech Republic"=>"Czech Republic",
+		"Denmark"=>"Denmark",
+		"Djibouti"=>"Djibouti",
+		"Dominica"=>"Dominica",
+		"Dominican Republic"=>"Dominican Republic",
+		"Easter Island"=>"Easter Island",
+		"Ecuador"=>"Ecuador",
+		"Egypt"=>"Egypt",
+		"El Salvador"=>"El Salvador",
+		"Equatorial Guinea"=>"Equatorial Guinea",
+		"Eritrea"=>"Eritrea",
+		"Estonia"=>"Estonia",
+		"Ethiopia"=>"Ethiopia",
+		"Falkland Islands (Malvinas)"=>"Falkland Islands (Malvinas)",
+		"Faroe Islands"=>"Faroe Islands",
+		"Fiji"=>"Fiji",
+		"Finland"=>"Finland",
+		"France"=>"France",
+		"French Guiana"=>"French Guiana",
+		"French Polynesia"=>"French Polynesia",
+		"French Southern Territories"=>"French Southern Territories",
+		"Gabon"=>"Gabon",
+		"Gambia"=>"Gambia",
+		"Georgia"=>"Georgia",
+		"Germany"=>"Germany",
+		"Ghana"=>"Ghana",
+		"Gibraltar"=>"Gibraltar",
+		"Greece"=>"Greece",
+		"Greenland"=>"Greenland",
+		"Grenada"=>"Grenada",
+		"Guadeloupe"=>"Guadeloupe",
+		"Guam"=>"Guam",
+		"Guatemala"=>"Guatemala",
+		"Guinea"=>"Guinea",
+		"Guinea-bissau"=>"Guinea-bissau",
+		"Guyana"=>"Guyana",
+		"Haiti"=>"Haiti",
+		"Heard Island and Mcdonald Islands"=>"Heard Island and Mcdonald Islands",
+		"Honduras"=>"Honduras",
+		"Hong Kong"=>"Hong Kong",
+		"Hungary"=>"Hungary",
+		"Iceland"=>"Iceland",
+		"India"=>"India",
+		"Indonesia"=>"Indonesia",
+		"Indonesia"=>"Indonesia",
+		"Iran"=>"Iran",
+		"Iraq"=>"Iraq",
+		"Ireland"=>"Ireland",
+		"Israel"=>"Israel",
+		"Italy"=>"Italy",
+		"Jamaica"=>"Jamaica",
+		"Japan"=>"Japan",
+		"Jordan"=>"Jordan",
+		"Kazakhstan"=>"Kazakhstan",
+		"Kazakhstan"=>"Kazakhstan",
+		"Kenya"=>"Kenya",
+		"Kiribati"=>"Kiribati",
+		"Korea North"=>"Korea North",
+		"Korea South"=>"Korea South",
+		"Kosovo"=>"Kosovo",
+		"Kuwait"=>"Kuwait",
+		"Kyrgyzstan"=>"Kyrgyzstan",
+		"Laos"=>"Laos",
+		"Latvia"=>"Latvia",
+		"Lebanon"=>"Lebanon",
+		"Lesotho"=>"Lesotho",
+		"Liberia"=>"Liberia",
+		"Libyan Arab Jamahiriya"=>"Libyan Arab Jamahiriya",
+		"Liechtenstein"=>"Liechtenstein",
+		"Lithuania"=>"Lithuania",
+		"Luxembourg"=>"Luxembourg",
+		"Macau"=>"Macau",
+		"Macedonia"=>"Macedonia",
+		"Madagascar"=>"Madagascar",
+		"Malawi"=>"Malawi",
+		"Malaysia"=>"Malaysia",
+		"Maldives"=>"Maldives",
+		"Mali"=>"Mali",
+		"Malta"=>"Malta",
+		"Marshall Islands"=>"Marshall Islands",
+		"Martinique"=>"Martinique",
+		"Mauritania"=>"Mauritania",
+		"Mauritius"=>"Mauritius",
+		"Mayotte"=>"Mayotte",
+		"Mexico"=>"Mexico",
+		"Micronesia,  Federated States of"=>"Micronesia,  Federated States of",
+		"Moldova,  Republic of"=>"Moldova,  Republic of",
+		"Monaco"=>"Monaco",
+		"Mongolia"=>"Mongolia",
+		"Montenegro"=>"Montenegro",
+		"Montserrat"=>"Montserrat",
+		"Morocco"=>"Morocco",
+		"Mozambique"=>"Mozambique",
+		"Myanmar"=>"Myanmar",
+		"Namibia"=>"Namibia",
+		"Nauru"=>"Nauru",
+		"Nepal"=>"Nepal",
+		"Netherlands"=>"Netherlands",
+		"Netherlands Antilles"=>"Netherlands Antilles",
+		"New Caledonia"=>"New Caledonia",
+		"New Zealand"=>"New Zealand",
+		"Nicaragua"=>"Nicaragua",
+		"Niger"=>"Niger",
+		"Nigeria"=>"Nigeria",
+		"Niue"=>"Niue",
+		"Norfolk Island"=>"Norfolk Island",
+		"Northern Mariana Islands"=>"Northern Mariana Islands",
+		"Norway"=>"Norway",
+		"Oman"=>"Oman",
+		"Pakistan"=>"Pakistan",
+		"Palau"=>"Palau",
+		"Palestinian Territory"=>"Palestinian Territory",
+		"Panama"=>"Panama",
+		"Papua New Guinea"=>"Papua New Guinea",
+		"Paraguay"=>"Paraguay",
+		"Peru"=>"Peru",
+		"Philippines"=>"Philippines",
+		"Pitcairn"=>"Pitcairn",
+		"Poland"=>"Poland",
+		"Portugal"=>"Portugal",
+		"Puerto Rico"=>"Puerto Rico",
+		"Qatar"=>"Qatar",
+		"Reunion"=>"Reunion",
+		"Romania"=>"Romania",
+		"Russia"=>"Russia",
+		"Russia"=>"Russia",
+		"Rwanda"=>"Rwanda",
+		"Saint Helena"=>"Saint Helena",
+		"Saint Kitts and Nevis"=>"Saint Kitts and Nevis",
+		"Saint Lucia"=>"Saint Lucia",
+		"Saint Pierre and Miquelon"=>"Saint Pierre and Miquelon",
+		"Saint Vincent and The Grenadines"=>"Saint Vincent and The Grenadines",
+		"Samoa"=>"Samoa",
+		"San Marino"=>"San Marino",
+		"Sao Tome and Principe"=>"Sao Tome and Principe",
+		"Saudi Arabia"=>"Saudi Arabia",
+		"Senegal"=>"Senegal",
+		"Serbia and Montenegro"=>"Serbia and Montenegro",
+		"Seychelles"=>"Seychelles",
+		"Sierra Leone"=>"Sierra Leone",
+		"Singapore"=>"Singapore",
+		"Slovakia"=>"Slovakia",
+		"Slovenia"=>"Slovenia",
+		"Solomon Islands"=>"Solomon Islands",
+		"Somalia"=>"Somalia",
+		"South Africa"=>"South Africa",
+		"South Georgia and The South Sandwich Islands"=>"South Georgia and The South Sandwich Islands",
+		"Spain"=>"Spain",
+		"Sri Lanka"=>"Sri Lanka",
+		"Sudan"=>"Sudan",
+		"Suriname"=>"Suriname",
+		"Svalbard and Jan Mayen"=>"Svalbard and Jan Mayen",
+		"Swaziland"=>"Swaziland",
+		"Sweden"=>"Sweden",
+		"Switzerland"=>"Switzerland",
+		"Syria"=>"Syria",
+		"Taiwan"=>"Taiwan",
+		"Tajikistan"=>"Tajikistan",
+		"Tanzania,  United Republic of"=>"Tanzania,  United Republic of",
+		"Thailand"=>"Thailand",
+		"Timor-leste"=>"Timor-leste",
+		"Togo"=>"Togo",
+		"Tokelau"=>"Tokelau",
+		"Tonga"=>"Tonga",
+		"Trinidad and Tobago"=>"Trinidad and Tobago",
+		"Tunisia"=>"Tunisia",
+		"Turkey"=>"Turkey",
+		"Turkey"=>"Turkey",
+		"Turkmenistan"=>"Turkmenistan",
+		"Turks and Caicos Islands"=>"Turks and Caicos Islands",
+		"Tuvalu"=>"Tuvalu",
+		"Uganda"=>"Uganda",
+		"Ukraine"=>"Ukraine",
+		"United Arab Emirates"=>"United Arab Emirates",
+		"United Kingdom"=>"United Kingdom",
+		"United States"=>"United States",
+		"U.S."=>"United States",
+		"United States Minor Outlying Islands"=>"United States Minor Outlying Islands",
+		"Uruguay"=>"Uruguay",
+		"Uzbekistan"=>"Uzbekistan",
+		"Vanuatu"=>"Vanuatu",
+		"Vatican City"=>"Vatican City",
+		"Venezuela"=>"Venezuela",
+		"Vietnam"=>"Vietnam",
+		"Virgin Islands,  British"=>"Virgin Islands,  British",
+		"Virgin Islands, U.S."=>"Virgin Islands, U.S.",
+		"Wallis and Futuna"=>"Wallis and Futuna",
+		"Western Sahara"=>"Western Sahara",
+		"Yemen"=>"Yemen",
+		"Yemen"=>"Yemen",
+		"Zambia"=>"Zambia",
+		"Zimbabwe"=>"Zimbabwe"
+
 
 	]
 
 
     words.each do |i|
-		temp = "#{cities[i]}"
-			if (temp != "")
-				result = temp
-				break
-			end
-   		end
-   		result
-	end
-
-end
+       temp = "#{cities[i]}"
+       if (temp != "")
+          cityArray.push(temp)
+          end
+       end
+    cityArray.first
+  end
+end

data/test/test_geoParser.rb

@@ -13,6 +13,10 @@ class GeoParserTest < Minitest::Test
     assert_equal "Vancouver", GeoParser.getLocation("Vancouver is different than Boston")
   end
 
-
+  def test_3
+    # Returns nil if no city is found 
+    assert_equal nil, GeoParser.getLocation("This string contains no city names")
+  end
+	  
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: GeoParser
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Michael Hiland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-13 00:00:00.000000000 Z
+date: 2014-11-14 00:00:00.000000000 Z
 dependencies: []
 description: Mine a given string for city names.
 email: g2c9@ugrad.cs.ubc.ca