carmen 0.2.7 → 0.2.8

data/data/states/in.yml

@@ -12,6 +12,8 @@
   - CT
 - - Goa
   - GA
+- - Gujarat
+  - GJ
 - - Haryana
   - HR
 - - Himachal Pradesh

data/data/states/us.yml

@@ -102,6 +102,8 @@
   - WI
 - - Wyoming
   - WY
+- - American Samoa
+  - AS
 - - Federated States of Micronesia
   - FM
 - - Guam
@@ -118,7 +120,7 @@
   - VI
 - - Armed Forces Americas (except Canada)
   - AA
-- - Armed Forces Europe, Armed Forces Canada, Armed Forces Africa, or Armed Forces Middle East
+- - Armed Forces Europe, Canada, Africa, or Middle East
   - AE
 - - Armed Forces Pacific
-  - AP
+  - AP

data/lib/carmen.rb

@@ -6,7 +6,7 @@ rescue LoadError
 end
 
 # Fix to autoload in Rails 3
-if defined?(Rails) 
+if defined?(Rails)
   if Rails::VERSION::MAJOR > 2
     require 'carmen/railtie'
   else
@@ -15,36 +15,37 @@ if defined?(Rails)
 end
 
 module Carmen
-
   class << self
-    attr_accessor :default_country, :default_locale, :excluded_countries, :excluded_states
+    attr_accessor :default_country, :default_locale, :excluded_countries, :excluded_states,
+                  :priority_countries
   end
-  
+
   self.default_country = 'US'
   self.default_locale = :en
   self.excluded_countries = []
-  self.excluded_states = {} 
-  
+  self.excluded_states = {}
+  self.priority_countries = []
+
   @data_path = File.join(File.dirname(__FILE__), '..', 'data')
-  
+
   @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
-  
+
   # 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]
@@ -53,16 +54,17 @@ module Carmen
       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 after filtering excluded countries
-    @countries[locale].reject { |c| excluded_countries.include?( c[1] ) }
+
+    # Return data after filtering excluded countries and prepending prepended countries
+    result = @countries[locale].reject { |c| excluded_countries.include?( c[1] ) }
+    priority_countries.map { |code| [ search_collection(result, code, 1, 0), code ] } + result
   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'
@@ -81,14 +83,14 @@ module Carmen
   def self.country_codes
     countries.map {|c| c[1] }
   end
-  
+
   # 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 default country
   #  Carmen::state_code('New Hampshire') => 'NH'
   def self.state_name(state_code, country_code = Carmen.default_country, options={})
@@ -117,7 +119,7 @@ module Carmen
   # if none is provided.
   #   Carmen::states('US') => [['Alabama', 'AL'], ['Arkansas', 'AR'], ... ]
   #   Carmen::states => [['Alabama', 'AL'], ['Arkansas', 'AR'], ... ]
-  def self.states(country_code = Carmen.default_country, options={})        
+  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)
 
@@ -138,9 +140,9 @@ module Carmen
       k == country_code
     end
   end
-  
+
   protected
-  
+
   def self.search_collection(collection, value, index_to_match, index_to_retrieve)
     return nil if collection.nil?
     collection.each do |m|
@@ -152,5 +154,4 @@ module Carmen
     end
     nil
   end
-  
 end

data/lib/carmen/action_view_helpers.rb

@@ -1,23 +1,22 @@
 module ActionView
   module Helpers
     module FormOptionsHelper
-    
       # Return select and option tags for the given object and method, using state_options_for_select to generate the list of option tags.
       def state_select(object, method, country = Carmen.default_country, options={}, html_options={})
         InstanceTag.new(object, method, self, options.delete(:object)).to_state_select_tag(country, options, html_options)
       end
-    
+
       # Return select and option tags for the given object and method, using country_options_for_select to generate the list of option tags.
       def country_select(object, method, priority_countries = nil, options = {}, html_options = {})
         InstanceTag.new(object, method, self, options.delete(:object)).to_country_select_tag(priority_countries, options, html_options)
       end
-    
+
       # Returns a string of option tags containing the state names and codes for the specified country code, or nil
       # if the states are not know for that country. Supply a state code as +selected+ to have it marked as the selected option tag.
       def state_options_for_select(selected = nil, country = Carmen.default_country)
         options_for_select(Carmen.states(country), selected)
       end
-    
+
       # Returns a string of option tags for pretty much any country in the world. Supply a country name as +selected+ to
       # have it marked as the selected option tag. You can also supply a list of country codes as additional parameters, so
       # that they will be listed above the rest of the (long) list.
@@ -37,7 +36,7 @@ module ActionView
         return country_options + options_for_select(Carmen.countries, priority_country_codes.include?(selected) ? nil : selected)
       end
     end
-  
+
     class InstanceTag
       def to_country_select_tag(priority_countries, options, html_options)
         html_options = html_options.stringify_keys
@@ -46,7 +45,7 @@ module ActionView
         opts = add_options(country_options_for_select(value, *priority_countries), options, value)
         content_tag("select", opts, html_options)
       end
-    
+
       def to_state_select_tag(country, options, html_options)
         html_options = html_options.stringify_keys
         add_default_name_and_id(html_options)
@@ -55,7 +54,7 @@ module ActionView
         content_tag("select", opts, html_options)
       end
     end
-  
+
     class FormBuilder
       def country_select(method, priority_countries = nil, options = {}, html_options = {})
         @template.country_select(@object_name, method, priority_countries, options.merge(:object => @object), html_options)
@@ -65,4 +64,4 @@ module ActionView
       end
     end
   end
-end
+end

data/lib/carmen/railtie.rb

@@ -1,17 +1,17 @@
 require 'carmen'
 
 module Carmen
-  
+
   class Railtie < Rails::Railtie
     if defined? Rails::Railtie
       require 'rails'
-      
+
       class Railtie < Rails::Railtie
         config.after_initialize do
           require 'carmen/action_view_helpers'
         end
       end
     end
-    
+
   end
-end
+end

data/test/carmen_test.rb

@@ -1,101 +1,101 @@
 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 245, Carmen.country_codes.length
   end
-  
+
   def test_country_names
     assert_equal 'Afghanistan', Carmen.country_names.first
     assert_equal 245, Carmen.country_names.length
   end
-  
+
   def test_state_name
     assert_equal 'IL', Carmen.state_code('Illinois')
     assert_equal 'MB', Carmen.state_code('Manitoba', 'CA')
   end
-  
+
   def test_state_code
     assert_equal 'Arizona', Carmen.state_name('AZ')
     assert_equal 'Prince Edward Island', Carmen.state_name('PE', 'CA')
   end
-  
+
   def test_states
-    assert_equal 61, Carmen.states.length
+    assert_equal 62, Carmen.states.length
     assert_equal ['Alabama', 'AL'], Carmen.states.first
     assert_equal 13, Carmen.states('CA').length
     assert_equal ['Alberta', 'AB'], Carmen.states('CA').first
   end
-  
+
   def test_state_names
-    assert_equal 61, Carmen::state_names.length
+    assert_equal 62, Carmen::state_names.length
     assert_equal 'Alabama', Carmen::state_names.first
     assert_equal 13, Carmen.state_names('CA').length
     assert_equal 'Alberta', Carmen.state_names('CA').first
   end
-  
+
   def test_state_codes
-    assert_equal 61, Carmen::state_codes.length
+    assert_equal 62, Carmen::state_codes.length
     assert_equal 'AL', Carmen::state_codes.first
     assert_equal 13, Carmen.state_codes('CA').length
     assert_equal 'AB', Carmen.state_codes('CA').first
   end
-  
+
   def test_supported_states
     assert Carmen::states?('US')
     assert_equal Carmen::states?('ZZ'), false
   end
-  
+
   def test_excluded_countries
       Carmen.excluded_countries = [ 'US', 'DE' ]
       countries = Carmen.countries
@@ -123,24 +123,34 @@ class TestCarmen < Test::Unit::TestCase
       Carmen.excluded_states = {}
   end
 
+  def test_prepended_countries
+    us_original_index = Carmen.countries.index(['United States', 'US'])
+    Carmen.priority_countries = %w(US CA AU)
+    countries = Carmen.countries
+    assert_equal 0, countries.index(['United States', 'US'])
+    assert_equal 1, countries.index(['Canada', 'CA'])
+    assert_equal 2, countries.index(['Australia', 'AU'])
+
+    assert_equal 3 + us_original_index, countries.rindex(['United States', 'US'])
+
+    Carmen.priority_countries = []
+  end
+
   def test_invalid_country_exception
     assert_raises Carmen::NonexistentCountry do
       Carmen::state_codes('ZZ')
     end
   end
-  
+
   def test_unsupported_states_exception
     assert_raises Carmen::StatesNotSupported do
       Carmen::state_codes('ID')
     end
   end
-  
+
   def test_unsupported_locale
     assert_raises Carmen::UnavailableLocale do
       Carmen.countries(:locale => :latin)
     end
   end
-
-
-  
 end

data/test/carmen_view_helper_test.rb

@@ -8,36 +8,32 @@ require 'mocha'
 require File.join('./', File.dirname(__FILE__), '../lib/carmen/action_view_helpers')
 
 class CarmenViewHelperTest < ActionView::TestCase
-  
   include ActionView::Helpers::FormOptionsHelper
-  
+
   def setup
     @address = stub(:state => 'IL', :country => 'US', :to_s => 'address')
   end
-  
+
   def test_state_select_for_us
     @address.stubs(:state => 'nil')
     assert_equal US_STATE_SELECT_HTML.chomp, state_select(@address, :state, 'US')
   end
-  
+
   def test_state_select_for_canada
     @address.stubs(:state => 'nil')
     assert_equal CANADA_STATE_SELECT_HTML.chomp, state_select(@address, :state, 'CA')
   end
-  
+
   def test_country_options_for_select_with_priorities
     assert_equal COUNTRY_SELECT_OPTIONS_HTML.chomp, country_options_for_select('US', 'US')
   end
-  
+
   def test_selected_option
     @address.stubs(:state => 'ON')
     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=\"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>"
-  
+  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=\"AS\">American Samoa</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, Canada, Africa, or 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

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: carmen
 version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 7
-  version: 0.2.7
+  prerelease: 
+  version: 0.2.8
 platform: ruby
 authors: 
 - Jim Benton
@@ -15,65 +10,52 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-11 00:00:00 -06:00
+date: 2011-06-01 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 4
-        version: "1.4"
+        version: 1.6.2
   type: :development
+  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: mocha
-  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
+  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rails
-  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
+  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: hanna
-  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
+  prerelease: false
   version_requirements: *id004
 description: A collection of geographic country and state names for Ruby. Also includes replacements for Rails' country_select and state_select plugins
 email: jim@autonomousmachine.com
@@ -84,7 +66,6 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 files: 
-- .gitignore
 - Gemfile
 - MIT-LICENSE
 - README.rdoc
@@ -93,6 +74,8 @@ files:
 - carmen.gemspec
 - data/countries/de.yml
 - data/countries/en.yml
+- data/countries/hi.yml
+- data/countries/nl.yml
 - data/states/au.yml
 - data/states/br.yml
 - data/states/ca.yml
@@ -119,8 +102,8 @@ homepage: http://github.com/jim/carmen
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -128,27 +111,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A collection of geographic country and state names for Ruby
-test_files: 
-- test/carmen_test.rb
-- test/carmen_view_helper_test.rb
-- test/test_helper.rb
+test_files: []
+