carmen 0.1.1 → 0.2.0

data/data/{countries.yml → countries/en.yml}

@@ -233,6 +233,8 @@
   - KP
 - - Korea, Republic of
   - KR
+- - Kosovo
+  - KV
 - - Kuwait
   - KW
 - - Kyrgyzstan
@@ -291,6 +293,8 @@
   - MC
 - - Mongolia
   - MN
+- - Montenegro
+  - ME
 - - Montserrat
   - MS
 - - Morocco
@@ -383,8 +387,8 @@
   - SA
 - - Senegal
   - SN
-- - Serbia and Montenegro
-  - CS
+- - Serbia
+  - RS
 - - Seychelles
   - SC
 - - Sierra Leone

data/data/states/es.yml

@@ -0,0 +1,39 @@
+---
+- - Andalucía
+  - AND
+- - Aragón
+  - ARA  
+- - Canarias
+  - CAN  
+- - Cantabria
+  - CAN  
+- - Castilla-La Mancha
+  - CLM  
+- - Castilla y León
+  - CyL
+- - Cataluña
+  - CAT  
+- - Ceuta
+  - CEU
+- - Comunidad de Madrid
+  - MAD
+- - Comunidad Valenciana
+  - CVA
+- - Extremadura
+  - EXT  
+- - Galicia
+  - GAL
+- - Islas Baleares
+  - IB  
+- - La Rioja
+  - LRJ 
+- - Melilla
+  - MEL   
+- - Navarra
+  - NAV  
+- - País Vasco
+  - PV
+- - Principado de Asturias
+  - AST
+- - Región de Murcia
+  - RMU

data/data/states/hr.yml

@@ -0,0 +1,43 @@
+---
+- - Bjelovarsko-bilogorska
+  - BJ
+- - Brodsko-posavska
+  - SB
+- - Dubrovačko-neretvanska
+  - DU
+- - Grad Zagreb
+  - ZG
+- - Istarska
+  - IS
+- - Karlovačka
+  - KA
+- - Koprivničko-križevačka
+  - KC
+- - Krapinsko-zagorska
+  - KR
+- - Ličko-senjska
+  - GS
+- - Međimurska
+  - CA
+- - Osječko-baranjska
+  - OS
+- - Požeško-slavonska
+  - PZ
+- - Primorsko-goranska
+  - PG
+- - Sisačko-moslavačka
+  - SK
+- - Splitsko-dalmatinska
+  - ST
+- - Šibensko-kninska
+  - SI
+- - Varaždinska
+  - VZ
+- - Virovitičko-podravska
+  - VT
+- - Vukovarsko-srijemska
+  - VU
+- - Zadarska
+  - ZD
+- - Zagrebačka
+  - ZGZ

data/data/states/no.yml

@@ -0,0 +1,39 @@
+---
+- - Akershus
+  - AK
+- - Aust-Agder
+  - AA
+- - Buskerud
+  - BU
+- - Finnmark
+  - FI
+- - Hedmark
+  - HE
+- - Hordaland
+  - HO
+- - Møre og Romsdal
+  - MR
+- - Nord-Trøndelag
+  - NT
+- - Nordland
+  - NO
+- - Oppland
+  - OP
+- - Oslo
+  - OS
+- - Rogaland
+  - RO
+- - Sogn og Fjordane
+  - SF
+- - Sør-Trøndelag
+  - ST
+- - Telemark
+  - TE
+- - Troms
+  - TR
+- - Vest-Agder
+  - VA
+- - Vestfold
+  - VF
+- - Østfold
+  - ØF

data/lib/carmen.rb

@@ -8,65 +8,91 @@ end
 module Carmen
 
   class << self
-    attr_accessor :default_country
+    attr_accessor :default_country, :default_locale
   end
   
   self.default_country = 'US'
+  self.default_locale = :en
   
-  data_path = File.join(File.dirname(__FILE__), '../data')
+  @data_path = File.join(File.dirname(__FILE__), '..', 'data')
   
-  COUNTRIES = YAML.load_file(File.join(data_path, 'countries.yml'))
-  
-  STATES = Dir[data_path + '/states/*.yml'].map do |file_name|
-    [File::basename(file_name, '.yml').upcase, YAML.load_file(file_name)]
+  @states = Dir[File.join(@data_path, '/states/*.yml')].map do |file_name|
+    [File.basename(file_name, '.yml').upcase, YAML.load_file(file_name)]
   end
-
+  
   # Raised when attempting to retrieve states for an unsupported country
   class StatesNotSupported < RuntimeError; end
 
   # Raised when attempting to work with a country not in the data set
   class NonexistentCountry < RuntimeError; end
-
-  # Returns the country name corresponding to the supplied country code
-  #  Carmen::country_name('TV') => 'Tuvalu'
-  def self.country_name(country_code)
-    search_collection(COUNTRIES, country_code, 1, 0)
+  
+  # Raised when attemting to switch to a locale which does not exist
+  class UnavailableLocale < RuntimeError; end
+  
+  # Returns a list of all countries
+  def self.countries(options={})
+    # Use specified locale or fall back to default locale
+    locale = (options.delete(:locale) || @default_locale).to_s
+    
+    # Load the country list for the specified locale
+    @countries ||= {}
+    unless @countries[locale]
+      # Check if data in the specified locale is available
+      localized_data = File.join(@data_path, "countries", "#{locale}.yml")
+      unless File.exists?(localized_data)
+        raise(UnavailableLocale, "Could not load countries for '#{locale}' locale")
+      end
+      
+      # As the data exists, load it
+      @countries[locale] = YAML.load_file(localized_data)
+    end
+    
+    # Return data
+    @countries[locale]
+  end
+  
+  # Returns the country name corresponding to the supplied country code, optionally using the specified locale.
+  #  Carmen::country_name('TR') => 'Turkey'
+  #  Carmen::country_name('TR', :locale => :de) => 'Türkei'
+  def self.country_name(country_code, options={})
+    search_collection(countries(options), country_code, 1, 0)
   end
 
   # Returns the country code corresponding to the supplied country name
   #  Carmen::country_code('Canada') => 'CA'
-  def self.country_code(country_name)
-    search_collection(COUNTRIES, country_name, 0, 1)
+  def self.country_code(country_name, options={})
+    search_collection(countries(options), country_name, 0, 1)
   end
 
   # Returns an array of all country codes
   #  Carmen::country_codes => ['AF', 'AX', 'AL', ... ]
   def self.country_codes
-    COUNTRIES.map {|c| c[1] }
+    countries.map {|c| c[1] }
   end
   
-  # Returns an array of all country codes
-  #  Carmen::country_name => ['Afghanistan', 'Aland Islands', 'Albania', ... ]
-  def self.country_names
-    COUNTRIES.map {|c| c[0] }
+  # Returns an array of all country names, optionally using the specified locale.
+  #  Carmen::country_names => ['Afghanistan', 'Aland Islands', 'Albania', ... ]
+  #  Carmen::country_names(:locale => :de) => ['Afghanistan', 'Åland', 'Albanien', ... ]
+  def self.country_names(options={})
+    countries(options).map {|c| c[0] }
   end
   
-  # Returns the state name corresponding to the supplied state code within the specified country
+  # Returns the state name corresponding to the supplied state code within the default country
   #  Carmen::state_code('New Hampshire') => 'NH'
-  def self.state_name(state_code, country_code = Carmen.default_country)
-    search_collection(self.states(country_code), state_code, 1, 0)
+  def self.state_name(state_code, country_code = Carmen.default_country, options={})
+    search_collection(self.states(country_code, options), state_code, 1, 0)
   end
 
   # Returns the state code corresponding to the supplied state name within the specified country
   #  Carmen::state_code('IL', 'US') => Illinois
-  def self.state_code(state_name, country_code = Carmen.default_country)
-    search_collection(self.states(country_code), state_name, 0, 1)
+  def self.state_code(state_name, country_code = Carmen.default_country, options={})
+    search_collection(self.states(country_code, options), state_name, 0, 1)
   end
 
-  # Returns an array of state names within the specified country code
+  # Returns an array of state names within the default code
   #  Carmen::state_names('US') => ['Alabama', 'Arkansas', ... ]
-  def self.state_names(country_code = Carmen.default_country)
-    self.states(country_code).map{|name, code| name}
+  def self.state_names(country_code = Carmen.default_country, options={})
+    self.states(country_code, options).map{|name, code| name}
   end
 
   # Returns an array of state codes within the specified country code
@@ -75,19 +101,21 @@ module Carmen
     self.states(country_code).map{|name, code| code}
   end
 
-  # Returns an array structure of state names and codes within the specified country code
+  # Returns an array structure of state names and codes within the specified country code, or within the default country
+  # if none is provided.
   #   Carmen::states('US') => [['Alabama', 'AL'], ['Arkansas', 'AR'], ... ]
-  def self.states(country_code = Carmen.default_country)
-    raise NonexistentCountry unless country_codes.include?(country_code)
+  #   Carmen::states => [['Alabama', 'AL'], ['Arkansas', 'AR'], ... ]
+  def self.states(country_code = Carmen.default_country, options={})        
+    raise NonexistentCountry.new("Country not found for code #{country_code}") unless country_codes.include?(country_code)
     raise StatesNotSupported unless states?(country_code)
-    search_collection(STATES, country_code, 0, 1)
+    search_collection(@states, country_code, 0, 1)
   end
 
   # Returns whether states are supported for the given country code
   #   Carmen::states?('US') => true
   #   Carmen::states?('ZZ') => false
-  def self.states?(country_code)
-    STATES.any? do |array| k,v = array
+  def self.states?(country_code, options={})
+    @states.any? do |array| k,v = array
       k == country_code
     end
   end
@@ -97,7 +125,11 @@ module Carmen
   def self.search_collection(collection, value, index_to_match, index_to_retrieve)
     return nil if collection.nil?
     collection.each do |m|
-      return m[index_to_retrieve] if m[index_to_match] == value
+      return m[index_to_retrieve] if m[index_to_match].downcase == value.downcase
+    end
+    # In case we didn't get any results we'll try a broader search (via Regexp)
+    collection.each do |m|
+      return m[index_to_retrieve] if m[index_to_match].downcase.match(value.downcase)
     end
     nil
   end

data/lib/carmen/action_view_helpers.rb

@@ -25,7 +25,7 @@ module ActionView
         country_options = ""
 
         unless priority_country_codes.empty?
-          priority_countries = Carmen::COUNTRIES.select do |pair| name, code = pair
+          priority_countries = Carmen::countries.select do |pair| name, code = pair
             priority_country_codes.include?(code)
           end
           unless priority_countries.empty?
@@ -34,7 +34,7 @@ module ActionView
           end
         end
 
-        return country_options + options_for_select(Carmen::COUNTRIES, priority_country_codes.include?(selected) ? nil : selected)
+        return country_options + options_for_select(Carmen.countries, priority_country_codes.include?(selected) ? nil : selected)
       end
     end
   

data/test/carmen_test.rb

@@ -1,24 +1,63 @@
-require 'test/unit'
-require File.join(File.dirname(__FILE__), '../lib/carmen')
+require File.expand_path('test_helper', File.dirname(__FILE__))
 
 class TestCarmen < Test::Unit::TestCase
   
+  def teardown
+    Carmen.default_locale = :en # restore default
+  end
+  
+  def test_default_countries
+    assert_equal ['Aland Islands', 'AX'], Carmen.countries[1]
+  end
+  
+  def test_localized_countries
+    Carmen.default_locale = :de
+    assert_equal ["Ascension (verwaltet von St. Helena)", 'AC'], Carmen.countries[0]
+  end
+  
+  def test_single_localized_countries_call
+    # Check that we are working with the default
+    assert_equal ['Aland Islands', 'AX'], Carmen.countries[1]
+    
+    # Switch to a different locale for one call
+    assert_equal ["Ascension (verwaltet von St. Helena)", 'AC'], Carmen.countries(:locale => 'de')[0]
+    
+    # Make sure that we are back in the default locale
+    assert_equal ['Aland Islands', 'AX'], Carmen.countries[1]
+  end
+  
   def test_country_name
     assert_equal 'United States', Carmen.country_name('US')
+    assert_equal 'United States', Carmen.country_name('us')
+  end
+  
+  def test_localized_country_name
+    assert_equal 'Germany', Carmen.country_name('DE')
+    assert_equal 'Deutschland', Carmen.country_name('DE', :locale => :de)
+    Carmen.default_locale = :de
+    assert_equal 'Deutschland', Carmen.country_name('DE')
   end
   
   def test_country_code
     assert_equal 'CA', Carmen.country_code('Canada')
+    assert_equal 'CA', Carmen.country_code('canada')
+    assert_equal 'IR', Carmen.country_code('Iran')
+  end
+  
+  def test_localized_country_code
+    assert_equal 'DE', Carmen.country_code('Deutschland', :locale => :de)
+    Carmen.default_locale = :de
+    assert_equal 'DE', Carmen.country_code('Deutschland')
   end
   
   def test_country_codes
     assert_equal 'AF', Carmen.country_codes.first
-    assert_equal 243, Carmen.country_codes.length
+    assert_equal 245, Carmen.country_codes.length
   end
   
   def test_country_names
     assert_equal 'Afghanistan', Carmen.country_names.first
-    assert_equal 243, Carmen.country_names.length
+    assert_equal 245, Carmen.country_names.length
   end
   
   def test_state_name
@@ -69,5 +108,10 @@ class TestCarmen < Test::Unit::TestCase
     end
   end
   
+  def test_unsupported_locale
+    assert_raises Carmen::UnavailableLocale do
+      Carmen.countries(:locale => :latin)
+    end
+  end
   
-end
+end

data/test/carmen_view_helper_test.rb

@@ -1,11 +1,11 @@
-require 'rubygems'
+require File.expand_path('test_helper', File.dirname(__FILE__))
 require 'active_support'
 require 'action_view'
 require 'action_controller'
 require 'action_view/test_case'
 require 'mocha'
-require File.join(File.dirname(__FILE__), '../lib/carmen')
-require File.join(File.dirname(__FILE__), '../lib/carmen/action_view_helpers')
+
+require File.join('./', File.dirname(__FILE__), '../lib/carmen/action_view_helpers')
 
 class CarmenViewHelperTest < ActionView::TestCase
   
@@ -34,10 +34,10 @@ class CarmenViewHelperTest < ActionView::TestCase
     assert_match /<option value="ON" selected="selected">Ontario<\/option>/, state_select(@address, :state, 'CA')
   end
   
-  COUNTRY_SELECT_OPTIONS_HTML = "<option value=\"US\" selected=\"selected\">United States</option>\n<option value=\"\" disabled=\"disabled\">-------------</option>\n<option value=\"AF\">Afghanistan</option>\n<option value=\"AX\">Aland Islands</option>\n<option value=\"AL\">Albania</option>\n<option value=\"DZ\">Algeria</option>\n<option value=\"AS\">American Samoa</option>\n<option value=\"AD\">Andorra</option>\n<option value=\"AO\">Angola</option>\n<option value=\"AI\">Anguilla</option>\n<option value=\"AQ\">Antarctica</option>\n<option value=\"AG\">Antigua and Barbuda</option>\n<option value=\"AR\">Argentina</option>\n<option value=\"AM\">Armenia</option>\n<option value=\"AW\">Aruba</option>\n<option value=\"AU\">Australia</option>\n<option value=\"AT\">Austria</option>\n<option value=\"AZ\">Azerbaijan</option>\n<option value=\"BS\">Bahamas</option>\n<option value=\"BH\">Bahrain</option>\n<option value=\"BD\">Bangladesh</option>\n<option value=\"BB\">Barbados</option>\n<option value=\"BY\">Belarus</option>\n<option value=\"BE\">Belgium</option>\n<option value=\"BZ\">Belize</option>\n<option value=\"BJ\">Benin</option>\n<option value=\"BM\">Bermuda</option>\n<option value=\"BT\">Bhutan</option>\n<option value=\"BO\">Bolivia</option>\n<option value=\"BA\">Bosnia and Herzegovina</option>\n<option value=\"BW\">Botswana</option>\n<option value=\"BV\">Bouvet Island</option>\n<option value=\"BR\">Brazil</option>\n<option value=\"IO\">British Indian Ocean Territory</option>\n<option value=\"BN\">Brunei Darussalam</option>\n<option value=\"BG\">Bulgaria</option>\n<option value=\"BF\">Burkina Faso</option>\n<option value=\"BI\">Burundi</option>\n<option value=\"KH\">Cambodia</option>\n<option value=\"CM\">Cameroon</option>\n<option value=\"CA\">Canada</option>\n<option value=\"CV\">Cape Verde</option>\n<option value=\"KY\">Cayman Islands</option>\n<option value=\"CF\">Central African Republic</option>\n<option value=\"TD\">Chad</option>\n<option value=\"CL\">Chile</option>\n<option value=\"CN\">China</option>\n<option value=\"CX\">Christmas Island</option>\n<option value=\"CC\">Cocos (Keeling) Islands</option>\n<option value=\"CO\">Colombia</option>\n<option value=\"KM\">Comoros</option>\n<option value=\"CG\">Congo</option>\n<option value=\"CD\">Congo, the Democratic Republic of the</option>\n<option value=\"CK\">Cook Islands</option>\n<option value=\"CR\">Costa Rica</option>\n<option value=\"CI\">Cote D'ivoire</option>\n<option value=\"HR\">Croatia</option>\n<option value=\"CU\">Cuba</option>\n<option value=\"CY\">Cyprus</option>\n<option value=\"CZ\">Czech Republic</option>\n<option value=\"DK\">Denmark</option>\n<option value=\"DJ\">Djibouti</option>\n<option value=\"DM\">Dominica</option>\n<option value=\"DO\">Dominican Republic</option>\n<option value=\"EC\">Ecuador</option>\n<option value=\"EG\">Egypt</option>\n<option value=\"SV\">El Salvador</option>\n<option value=\"GQ\">Equatorial Guinea</option>\n<option value=\"ER\">Eritrea</option>\n<option value=\"EE\">Estonia</option>\n<option value=\"ET\">Ethiopia</option>\n<option value=\"FK\">Falkland Islands (Malvinas)</option>\n<option value=\"FO\">Faroe Islands</option>\n<option value=\"FJ\">Fiji</option>\n<option value=\"FI\">Finland</option>\n<option value=\"FR\">France</option>\n<option value=\"GF\">French Guiana</option>\n<option value=\"PF\">French Polynesia</option>\n<option value=\"TF\">French Southern Territories</option>\n<option value=\"GA\">Gabon</option>\n<option value=\"GM\">Gambia</option>\n<option value=\"GE\">Georgia</option>\n<option value=\"DE\">Germany</option>\n<option value=\"GH\">Ghana</option>\n<option value=\"GI\">Gibraltar</option>\n<option value=\"GR\">Greece</option>\n<option value=\"GL\">Greenland</option>\n<option value=\"GD\">Grenada</option>\n<option value=\"GP\">Guadeloupe</option>\n<option value=\"GU\">Guam</option>\n<option value=\"GT\">Guatemala</option>\n<option value=\"GG\">Guernsey</option>\n<option value=\"GN\">Guinea</option>\n<option value=\"GW\">Guinea-Bissau</option>\n<option value=\"GY\">Guyana</option>\n<option value=\"HT\">Haiti</option>\n<option value=\"HM\">Heard Island and Mcdonald Islands</option>\n<option value=\"VA\">Holy See (Vatican City State)</option>\n<option value=\"HN\">Honduras</option>\n<option value=\"HK\">Hong Kong</option>\n<option value=\"HU\">Hungary</option>\n<option value=\"IS\">Iceland</option>\n<option value=\"IN\">India</option>\n<option value=\"ID\">Indonesia</option>\n<option value=\"IR\">Iran, Islamic Republic of</option>\n<option value=\"IQ\">Iraq</option>\n<option value=\"IE\">Ireland</option>\n<option value=\"IM\">Isle of Man</option>\n<option value=\"IL\">Israel</option>\n<option value=\"IT\">Italy</option>\n<option value=\"JM\">Jamaica</option>\n<option value=\"JP\">Japan</option>\n<option value=\"JE\">Jersey</option>\n<option value=\"JO\">Jordan</option>\n<option value=\"KZ\">Kazakhstan</option>\n<option value=\"KE\">Kenya</option>\n<option value=\"KI\">Kiribati</option>\n<option value=\"KP\">Korea, Democratic People's Republic of</option>\n<option value=\"KR\">Korea, Republic of</option>\n<option value=\"KW\">Kuwait</option>\n<option value=\"KG\">Kyrgyzstan</option>\n<option value=\"LA\">Lao People's Democratic Republic</option>\n<option value=\"LV\">Latvia</option>\n<option value=\"LB\">Lebanon</option>\n<option value=\"LS\">Lesotho</option>\n<option value=\"LR\">Liberia</option>\n<option value=\"LY\">Libyan Arab Jamahiriya</option>\n<option value=\"LI\">Liechtenstein</option>\n<option value=\"LT\">Lithuania</option>\n<option value=\"LU\">Luxembourg</option>\n<option value=\"MO\">Macao</option>\n<option value=\"MK\">Macedonia, the Former Yugoslav Republic of</option>\n<option value=\"MG\">Madagascar</option>\n<option value=\"MW\">Malawi</option>\n<option value=\"MY\">Malaysia</option>\n<option value=\"MV\">Maldives</option>\n<option value=\"ML\">Mali</option>\n<option value=\"MT\">Malta</option>\n<option value=\"MH\">Marshall Islands</option>\n<option value=\"MQ\">Martinique</option>\n<option value=\"MR\">Mauritania</option>\n<option value=\"MU\">Mauritius</option>\n<option value=\"YT\">Mayotte</option>\n<option value=\"MX\">Mexico</option>\n<option value=\"FM\">Micronesia, Federated States of</option>\n<option value=\"MD\">Moldova, Republic of</option>\n<option value=\"MC\">Monaco</option>\n<option value=\"MN\">Mongolia</option>\n<option value=\"MS\">Montserrat</option>\n<option value=\"MA\">Morocco</option>\n<option value=\"MZ\">Mozambique</option>\n<option value=\"MM\">Myanmar</option>\n<option value=\"NA\">Namibia</option>\n<option value=\"NR\">Nauru</option>\n<option value=\"NP\">Nepal</option>\n<option value=\"NL\">Netherlands</option>\n<option value=\"AN\">Netherlands Antilles</option>\n<option value=\"NC\">New Caledonia</option>\n<option value=\"NZ\">New Zealand</option>\n<option value=\"NI\">Nicaragua</option>\n<option value=\"NE\">Niger</option>\n<option value=\"NG\">Nigeria</option>\n<option value=\"NU\">Niue</option>\n<option value=\"NF\">Norfolk Island</option>\n<option value=\"MP\">Northern Mariana Islands</option>\n<option value=\"NO\">Norway</option>\n<option value=\"OM\">Oman</option>\n<option value=\"PK\">Pakistan</option>\n<option value=\"PW\">Palau</option>\n<option value=\"PS\">Palestinian Territory, Occupied</option>\n<option value=\"PA\">Panama</option>\n<option value=\"PG\">Papua New Guinea</option>\n<option value=\"PY\">Paraguay</option>\n<option value=\"PE\">Peru</option>\n<option value=\"PH\">Philippines</option>\n<option value=\"PN\">Pitcairn</option>\n<option value=\"PL\">Poland</option>\n<option value=\"PT\">Portugal</option>\n<option value=\"PR\">Puerto Rico</option>\n<option value=\"QA\">Qatar</option>\n<option value=\"RE\">Reunion</option>\n<option value=\"RO\">Romania</option>\n<option value=\"RU\">Russian Federation</option>\n<option value=\"RW\">Rwanda</option>\n<option value=\"SH\">Saint Helena</option>\n<option value=\"KN\">Saint Kitts and Nevis</option>\n<option value=\"LC\">Saint Lucia</option>\n<option value=\"PM\">Saint Pierre and Miquelon</option>\n<option value=\"VC\">Saint Vincent and the Grenadines</option>\n<option value=\"WS\">Samoa</option>\n<option value=\"SM\">San Marino</option>\n<option value=\"ST\">Sao Tome and Principe</option>\n<option value=\"SA\">Saudi Arabia</option>\n<option value=\"SN\">Senegal</option>\n<option value=\"CS\">Serbia and Montenegro</option>\n<option value=\"SC\">Seychelles</option>\n<option value=\"SL\">Sierra Leone</option>\n<option value=\"SG\">Singapore</option>\n<option value=\"SK\">Slovakia</option>\n<option value=\"SI\">Slovenia</option>\n<option value=\"SB\">Solomon Islands</option>\n<option value=\"SO\">Somalia</option>\n<option value=\"ZA\">South Africa</option>\n<option value=\"GS\">South Georgia and the South Sandwich Islands</option>\n<option value=\"ES\">Spain</option>\n<option value=\"LK\">Sri Lanka</option>\n<option value=\"SD\">Sudan</option>\n<option value=\"SR\">Suriname</option>\n<option value=\"SJ\">Svalbard and Jan Mayen</option>\n<option value=\"SZ\">Swaziland</option>\n<option value=\"SE\">Sweden</option>\n<option value=\"CH\">Switzerland</option>\n<option value=\"SY\">Syrian Arab Republic</option>\n<option value=\"TW\">Taiwan, Province of China</option>\n<option value=\"TJ\">Tajikistan</option>\n<option value=\"TZ\">Tanzania, United Republic of</option>\n<option value=\"TH\">Thailand</option>\n<option value=\"TL\">Timor-Leste</option>\n<option value=\"TG\">Togo</option>\n<option value=\"TK\">Tokelau</option>\n<option value=\"TO\">Tonga</option>\n<option value=\"TT\">Trinidad and Tobago</option>\n<option value=\"TN\">Tunisia</option>\n<option value=\"TR\">Turkey</option>\n<option value=\"TM\">Turkmenistan</option>\n<option value=\"TC\">Turks and Caicos Islands</option>\n<option value=\"TV\">Tuvalu</option>\n<option value=\"UG\">Uganda</option>\n<option value=\"UA\">Ukraine</option>\n<option value=\"AE\">United Arab Emirates</option>\n<option value=\"GB\">United Kingdom</option>\n<option value=\"US\">United States</option>\n<option value=\"UM\">United States Minor Outlying Islands</option>\n<option value=\"UY\">Uruguay</option>\n<option value=\"UZ\">Uzbekistan</option>\n<option value=\"VU\">Vanuatu</option>\n<option value=\"VE\">Venezuela</option>\n<option value=\"VN\">Viet Nam</option>\n<option value=\"VG\">Virgin Islands, British</option>\n<option value=\"VI\">Virgin Islands, U.S.</option>\n<option value=\"WF\">Wallis and Futuna</option>\n<option value=\"EH\">Western Sahara</option>\n<option value=\"YE\">Yemen</option>\n<option value=\"ZM\">Zambia</option>\n<option value=\"ZW\">Zimbabwe</option>"
+  COUNTRY_SELECT_OPTIONS_HTML = "<option value=\"US\" selected=\"selected\">United States</option>\n<option value=\"\" disabled=\"disabled\">-------------</option>\n<option value=\"AF\">Afghanistan</option>\n<option value=\"AX\">Aland Islands</option>\n<option value=\"AL\">Albania</option>\n<option value=\"DZ\">Algeria</option>\n<option value=\"AS\">American Samoa</option>\n<option value=\"AD\">Andorra</option>\n<option value=\"AO\">Angola</option>\n<option value=\"AI\">Anguilla</option>\n<option value=\"AQ\">Antarctica</option>\n<option value=\"AG\">Antigua and Barbuda</option>\n<option value=\"AR\">Argentina</option>\n<option value=\"AM\">Armenia</option>\n<option value=\"AW\">Aruba</option>\n<option value=\"AU\">Australia</option>\n<option value=\"AT\">Austria</option>\n<option value=\"AZ\">Azerbaijan</option>\n<option value=\"BS\">Bahamas</option>\n<option value=\"BH\">Bahrain</option>\n<option value=\"BD\">Bangladesh</option>\n<option value=\"BB\">Barbados</option>\n<option value=\"BY\">Belarus</option>\n<option value=\"BE\">Belgium</option>\n<option value=\"BZ\">Belize</option>\n<option value=\"BJ\">Benin</option>\n<option value=\"BM\">Bermuda</option>\n<option value=\"BT\">Bhutan</option>\n<option value=\"BO\">Bolivia</option>\n<option value=\"BA\">Bosnia and Herzegovina</option>\n<option value=\"BW\">Botswana</option>\n<option value=\"BV\">Bouvet Island</option>\n<option value=\"BR\">Brazil</option>\n<option value=\"IO\">British Indian Ocean Territory</option>\n<option value=\"BN\">Brunei Darussalam</option>\n<option value=\"BG\">Bulgaria</option>\n<option value=\"BF\">Burkina Faso</option>\n<option value=\"BI\">Burundi</option>\n<option value=\"KH\">Cambodia</option>\n<option value=\"CM\">Cameroon</option>\n<option value=\"CA\">Canada</option>\n<option value=\"CV\">Cape Verde</option>\n<option value=\"KY\">Cayman Islands</option>\n<option value=\"CF\">Central African Republic</option>\n<option value=\"TD\">Chad</option>\n<option value=\"CL\">Chile</option>\n<option value=\"CN\">China</option>\n<option value=\"CX\">Christmas Island</option>\n<option value=\"CC\">Cocos (Keeling) Islands</option>\n<option value=\"CO\">Colombia</option>\n<option value=\"KM\">Comoros</option>\n<option value=\"CG\">Congo</option>\n<option value=\"CD\">Congo, the Democratic Republic of the</option>\n<option value=\"CK\">Cook Islands</option>\n<option value=\"CR\">Costa Rica</option>\n<option value=\"CI\">Cote D'ivoire</option>\n<option value=\"HR\">Croatia</option>\n<option value=\"CU\">Cuba</option>\n<option value=\"CY\">Cyprus</option>\n<option value=\"CZ\">Czech Republic</option>\n<option value=\"DK\">Denmark</option>\n<option value=\"DJ\">Djibouti</option>\n<option value=\"DM\">Dominica</option>\n<option value=\"DO\">Dominican Republic</option>\n<option value=\"EC\">Ecuador</option>\n<option value=\"EG\">Egypt</option>\n<option value=\"SV\">El Salvador</option>\n<option value=\"GQ\">Equatorial Guinea</option>\n<option value=\"ER\">Eritrea</option>\n<option value=\"EE\">Estonia</option>\n<option value=\"ET\">Ethiopia</option>\n<option value=\"FK\">Falkland Islands (Malvinas)</option>\n<option value=\"FO\">Faroe Islands</option>\n<option value=\"FJ\">Fiji</option>\n<option value=\"FI\">Finland</option>\n<option value=\"FR\">France</option>\n<option value=\"GF\">French Guiana</option>\n<option value=\"PF\">French Polynesia</option>\n<option value=\"TF\">French Southern Territories</option>\n<option value=\"GA\">Gabon</option>\n<option value=\"GM\">Gambia</option>\n<option value=\"GE\">Georgia</option>\n<option value=\"DE\">Germany</option>\n<option value=\"GH\">Ghana</option>\n<option value=\"GI\">Gibraltar</option>\n<option value=\"GR\">Greece</option>\n<option value=\"GL\">Greenland</option>\n<option value=\"GD\">Grenada</option>\n<option value=\"GP\">Guadeloupe</option>\n<option value=\"GU\">Guam</option>\n<option value=\"GT\">Guatemala</option>\n<option value=\"GG\">Guernsey</option>\n<option value=\"GN\">Guinea</option>\n<option value=\"GW\">Guinea-Bissau</option>\n<option value=\"GY\">Guyana</option>\n<option value=\"HT\">Haiti</option>\n<option value=\"HM\">Heard Island and Mcdonald Islands</option>\n<option value=\"VA\">Holy See (Vatican City State)</option>\n<option value=\"HN\">Honduras</option>\n<option value=\"HK\">Hong Kong</option>\n<option value=\"HU\">Hungary</option>\n<option value=\"IS\">Iceland</option>\n<option value=\"IN\">India</option>\n<option value=\"ID\">Indonesia</option>\n<option value=\"IR\">Iran, Islamic Republic of</option>\n<option value=\"IQ\">Iraq</option>\n<option value=\"IE\">Ireland</option>\n<option value=\"IM\">Isle of Man</option>\n<option value=\"IL\">Israel</option>\n<option value=\"IT\">Italy</option>\n<option value=\"JM\">Jamaica</option>\n<option value=\"JP\">Japan</option>\n<option value=\"JE\">Jersey</option>\n<option value=\"JO\">Jordan</option>\n<option value=\"KZ\">Kazakhstan</option>\n<option value=\"KE\">Kenya</option>\n<option value=\"KI\">Kiribati</option>\n<option value=\"KP\">Korea, Democratic People's Republic of</option>\n<option value=\"KR\">Korea, Republic of</option>\n<option value=\"KV\">Kosovo</option>\n<option value=\"KW\">Kuwait</option>\n<option value=\"KG\">Kyrgyzstan</option>\n<option value=\"LA\">Lao People's Democratic Republic</option>\n<option value=\"LV\">Latvia</option>\n<option value=\"LB\">Lebanon</option>\n<option value=\"LS\">Lesotho</option>\n<option value=\"LR\">Liberia</option>\n<option value=\"LY\">Libyan Arab Jamahiriya</option>\n<option value=\"LI\">Liechtenstein</option>\n<option value=\"LT\">Lithuania</option>\n<option value=\"LU\">Luxembourg</option>\n<option value=\"MO\">Macao</option>\n<option value=\"MK\">Macedonia, the Former Yugoslav Republic of</option>\n<option value=\"MG\">Madagascar</option>\n<option value=\"MW\">Malawi</option>\n<option value=\"MY\">Malaysia</option>\n<option value=\"MV\">Maldives</option>\n<option value=\"ML\">Mali</option>\n<option value=\"MT\">Malta</option>\n<option value=\"MH\">Marshall Islands</option>\n<option value=\"MQ\">Martinique</option>\n<option value=\"MR\">Mauritania</option>\n<option value=\"MU\">Mauritius</option>\n<option value=\"YT\">Mayotte</option>\n<option value=\"MX\">Mexico</option>\n<option value=\"FM\">Micronesia, Federated States of</option>\n<option value=\"MD\">Moldova, Republic of</option>\n<option value=\"MC\">Monaco</option>\n<option value=\"MN\">Mongolia</option>\n<option value=\"ME\">Montenegro</option>\n<option value=\"MS\">Montserrat</option>\n<option value=\"MA\">Morocco</option>\n<option value=\"MZ\">Mozambique</option>\n<option value=\"MM\">Myanmar</option>\n<option value=\"NA\">Namibia</option>\n<option value=\"NR\">Nauru</option>\n<option value=\"NP\">Nepal</option>\n<option value=\"NL\">Netherlands</option>\n<option value=\"AN\">Netherlands Antilles</option>\n<option value=\"NC\">New Caledonia</option>\n<option value=\"NZ\">New Zealand</option>\n<option value=\"NI\">Nicaragua</option>\n<option value=\"NE\">Niger</option>\n<option value=\"NG\">Nigeria</option>\n<option value=\"NU\">Niue</option>\n<option value=\"NF\">Norfolk Island</option>\n<option value=\"MP\">Northern Mariana Islands</option>\n<option value=\"NO\">Norway</option>\n<option value=\"OM\">Oman</option>\n<option value=\"PK\">Pakistan</option>\n<option value=\"PW\">Palau</option>\n<option value=\"PS\">Palestinian Territory, Occupied</option>\n<option value=\"PA\">Panama</option>\n<option value=\"PG\">Papua New Guinea</option>\n<option value=\"PY\">Paraguay</option>\n<option value=\"PE\">Peru</option>\n<option value=\"PH\">Philippines</option>\n<option value=\"PN\">Pitcairn</option>\n<option value=\"PL\">Poland</option>\n<option value=\"PT\">Portugal</option>\n<option value=\"PR\">Puerto Rico</option>\n<option value=\"QA\">Qatar</option>\n<option value=\"RE\">Reunion</option>\n<option value=\"RO\">Romania</option>\n<option value=\"RU\">Russian Federation</option>\n<option value=\"RW\">Rwanda</option>\n<option value=\"SH\">Saint Helena</option>\n<option value=\"KN\">Saint Kitts and Nevis</option>\n<option value=\"LC\">Saint Lucia</option>\n<option value=\"PM\">Saint Pierre and Miquelon</option>\n<option value=\"VC\">Saint Vincent and the Grenadines</option>\n<option value=\"WS\">Samoa</option>\n<option value=\"SM\">San Marino</option>\n<option value=\"ST\">Sao Tome and Principe</option>\n<option value=\"SA\">Saudi Arabia</option>\n<option value=\"SN\">Senegal</option>\n<option value=\"RS\">Serbia</option>\n<option value=\"SC\">Seychelles</option>\n<option value=\"SL\">Sierra Leone</option>\n<option value=\"SG\">Singapore</option>\n<option value=\"SK\">Slovakia</option>\n<option value=\"SI\">Slovenia</option>\n<option value=\"SB\">Solomon Islands</option>\n<option value=\"SO\">Somalia</option>\n<option value=\"ZA\">South Africa</option>\n<option value=\"GS\">South Georgia and the South Sandwich Islands</option>\n<option value=\"ES\">Spain</option>\n<option value=\"LK\">Sri Lanka</option>\n<option value=\"SD\">Sudan</option>\n<option value=\"SR\">Suriname</option>\n<option value=\"SJ\">Svalbard and Jan Mayen</option>\n<option value=\"SZ\">Swaziland</option>\n<option value=\"SE\">Sweden</option>\n<option value=\"CH\">Switzerland</option>\n<option value=\"SY\">Syrian Arab Republic</option>\n<option value=\"TW\">Taiwan, Province of China</option>\n<option value=\"TJ\">Tajikistan</option>\n<option value=\"TZ\">Tanzania, United Republic of</option>\n<option value=\"TH\">Thailand</option>\n<option value=\"TL\">Timor-Leste</option>\n<option value=\"TG\">Togo</option>\n<option value=\"TK\">Tokelau</option>\n<option value=\"TO\">Tonga</option>\n<option value=\"TT\">Trinidad and Tobago</option>\n<option value=\"TN\">Tunisia</option>\n<option value=\"TR\">Turkey</option>\n<option value=\"TM\">Turkmenistan</option>\n<option value=\"TC\">Turks and Caicos Islands</option>\n<option value=\"TV\">Tuvalu</option>\n<option value=\"UG\">Uganda</option>\n<option value=\"UA\">Ukraine</option>\n<option value=\"AE\">United Arab Emirates</option>\n<option value=\"GB\">United Kingdom</option>\n<option value=\"US\">United States</option>\n<option value=\"UM\">United States Minor Outlying Islands</option>\n<option value=\"UY\">Uruguay</option>\n<option value=\"UZ\">Uzbekistan</option>\n<option value=\"VU\">Vanuatu</option>\n<option value=\"VE\">Venezuela</option>\n<option value=\"VN\">Viet Nam</option>\n<option value=\"VG\">Virgin Islands, British</option>\n<option value=\"VI\">Virgin Islands, U.S.</option>\n<option value=\"WF\">Wallis and Futuna</option>\n<option value=\"EH\">Western Sahara</option>\n<option value=\"YE\">Yemen</option>\n<option value=\"ZM\">Zambia</option>\n<option value=\"ZW\">Zimbabwe</option>"
   
   US_STATE_SELECT_HTML = "<select id=\"address_state\" name=\"address[state]\"><option value=\"AL\">Alabama</option>\n<option value=\"AK\">Alaska</option>\n<option value=\"AZ\">Arizona</option>\n<option value=\"AR\">Arkansas</option>\n<option value=\"CA\">California</option>\n<option value=\"CO\">Colorado</option>\n<option value=\"CT\">Connecticut</option>\n<option value=\"DE\">Delaware</option>\n<option value=\"DC\">District Of Columbia</option>\n<option value=\"FL\">Florida</option>\n<option value=\"GA\">Georgia</option>\n<option value=\"HI\">Hawaii</option>\n<option value=\"ID\">Idaho</option>\n<option value=\"IL\">Illinois</option>\n<option value=\"IN\">Indiana</option>\n<option value=\"IA\">Iowa</option>\n<option value=\"KS\">Kansas</option>\n<option value=\"KY\">Kentucky</option>\n<option value=\"LA\">Louisiana</option>\n<option value=\"ME\">Maine</option>\n<option value=\"MD\">Maryland</option>\n<option value=\"MA\">Massachusetts</option>\n<option value=\"MI\">Michigan</option>\n<option value=\"MN\">Minnesota</option>\n<option value=\"MS\">Mississippi</option>\n<option value=\"MO\">Missouri</option>\n<option value=\"MT\">Montana</option>\n<option value=\"NE\">Nebraska</option>\n<option value=\"NV\">Nevada</option>\n<option value=\"NH\">New Hampshire</option>\n<option value=\"NJ\">New Jersey</option>\n<option value=\"NM\">New Mexico</option>\n<option value=\"NY\">New York</option>\n<option value=\"NC\">North Carolina</option>\n<option value=\"ND\">North Dakota</option>\n<option value=\"OH\">Ohio</option>\n<option value=\"OK\">Oklahoma</option>\n<option value=\"OR\">Oregon</option>\n<option value=\"PA\">Pennsylvania</option>\n<option value=\"RI\">Rhode Island</option>\n<option value=\"SC\">South Carolina</option>\n<option value=\"SD\">South Dakota</option>\n<option value=\"TN\">Tennessee</option>\n<option value=\"TX\">Texas</option>\n<option value=\"UT\">Utah</option>\n<option value=\"VT\">Vermont</option>\n<option value=\"VA\">Virginia</option>\n<option value=\"WA\">Washington</option>\n<option value=\"WV\">West Virginia</option>\n<option value=\"WI\">Wisconsin</option>\n<option value=\"WY\">Wyoming</option>\n<option value=\"FM\">Federated States of Micronesia</option>\n<option value=\"GU\">Guam</option>\n<option value=\"MH\">Marshall Islands</option>\n<option value=\"MP\">Northern Mariana Islands</option>\n<option value=\"PW\">Palau</option>\n<option value=\"PR\">Puerto Rico</option>\n<option value=\"VI\">Virgin Islands</option>\n<option value=\"AA\">Armed Forces Americas (except Canada)</option>\n<option value=\"AE\">Armed Forces Europe, Armed Forces Canada, Armed Forces Africa, or Armed Forces Middle East</option>\n<option value=\"AP\">Armed Forces Pacific</option></select>"
   
   CANADA_STATE_SELECT_HTML = "<select id=\"address_state\" name=\"address[state]\"><option value=\"AB\">Alberta</option>\n<option value=\"BC\">British Columbia</option>\n<option value=\"MB\">Manitoba</option>\n<option value=\"NB\">New Brunswick</option>\n<option value=\"NL\">Newfoundland and Labrador</option>\n<option value=\"NT\">Northwest Territories</option>\n<option value=\"NS\">Nova Scotia</option>\n<option value=\"NU\">Nunavut</option>\n<option value=\"ON\">Ontario</option>\n<option value=\"PE\">Prince Edward Island</option>\n<option value=\"QC\">Quebec</option>\n<option value=\"SK\">Saskatchewan</option>\n<option value=\"YT\">Yukon</option></select>"
   
-end
+end

data/test/test_helper.rb

@@ -0,0 +1,2 @@
+require 'test/unit'
+require File.expand_path('../lib/carmen', File.dirname(__FILE__))

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: carmen
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  hash: 23
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Jim Benton
@@ -9,10 +15,37 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-09 00:00:00 -06:00
+date: 2010-11-05 00:00:00 -05:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rails
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id002
 description: A collection of geographis country and state names for Ruby. Also includes replacements for Rails' country_select and state_select plugins
 email: jim@autonomousmachine.com
 executables: []
@@ -28,15 +61,19 @@ files:
 - Rakefile
 - VERSION
 - carmen.gemspec
-- data/countries.yml
+- data/countries/de.yml
+- data/countries/en.yml
 - data/states/au.yml
 - data/states/br.yml
 - data/states/ca.yml
 - data/states/cu.yml
 - data/states/de.yml
 - data/states/dk.yml
+- data/states/es.yml
+- data/states/hr.yml
 - data/states/it.yml
 - data/states/mx.yml
+- data/states/no.yml
 - data/states/ua.yml
 - data/states/us.yml
 - lib/carmen.rb
@@ -44,6 +81,7 @@ files:
 - rails/init.rb
 - test/carmen_test.rb
 - test/carmen_view_helper_test.rb
+- test/test_helper.rb
 has_rdoc: true
 homepage: http://github.com/jim/carmen
 licenses: []
@@ -54,24 +92,31 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A collection of geographis country and state names for Ruby
 test_files: 
 - test/carmen_test.rb
 - test/carmen_view_helper_test.rb
+- test/test_helper.rb