snail 0.5.5 → 0.5.6

data/lib/snail/constants.rb

@@ -234,93 +234,113 @@ class Snail
     'Zambia',
     'Zimbabwe'
   ]
-  
-  # see http://www.columbia.edu/kermit/postal.html#usa
-  # and http://www.usps.com/ncsc/lookups/usps_abbreviations.html
-  USA_STATES = {
-    "Alabama" => "AL",
-    "Alaska" => "AK",
-    "Arizona" => "AZ",
-    "Arkansas" => "AR",
-    "California" => "CA",
-    "Colorado" => "CO",
-    "Connecticut" => "CT",
-    "Delaware" => "DE",
-    "District Of Columbia" => "DC",
-    "Florida" => "FL",
-    "Georgia" => "GA",
-    "Hawaii" => "HI",
-    "Idaho" => "ID",
-    "Illinois" => "IL",
-    "Indiana" => "IN",
-    "Iowa" => "IA",
-    "Kansas" => "KS",
-    "Kentucky" => "KY",
-    "Louisiana" => "LA",
-    "Maine" => "ME",
-    "Maryland" => "MD",
-    "Massachusetts" => "MA",
-    "Michigan" => "MI",
-    "Minnesota" => "MN",
-    "Mississippi" => "MS",
-    "Missouri" => "MO",
-    "Montana" => "MT",
-    "Nebraska" => "NE",
-    "Nevada" => "NV",
-    "New Hampshire" => "NH",
-    "New Jersey" => "NJ",
-    "New Mexico" => "NM",
-    "New York" => "NY",
-    "North Carolina" => "NC",
-    "North Dakota" => "ND",
-    "Ohio" => "OH",
-    "Oklahoma" => "OK",
-    "Oregon" => "OR",
-    "Pennsylvania" => "PA",
-    "Rhode Island" => "RI",
-    "South Carolina" => "SC",
-    "South Dakota" => "SD",
-    "Tennessee" => "TN",
-    "Texas" => "TX",
-    "Utah" => "UT",
-    "Vermont" => "VT",
-    "Virginia" => "VA",
-    "Washington" => "WA",
-    "West Virginia" => "WV",
-    "Wisconsin" => "WI",
-    "Wyoming" => "WY",
 
-    # These are not states exactly, but they are addressed as states through USA
-    "American Samoa" => "AS",
-    "Federated States Of Micronesia" => "FM",
-    "Guam" => "GU",
-    "Marshall Islands" => "MH",
-    "Northern Mariana Islands" => "MP",
-    "Palau" => "PW",
-    "Puerto Rico" => "PR",
-    "Virgin Islands" => "VI",
-    "Armed Forces Africa" => "AE",
-    "Armed Forces Americas (Except Canada)" => "AA",
-    "Armed Forces Canada" => "AE",
-    "Armed Forces Europe" => "AE",
-    "Armed Forces Middle East" => "AE",
-    "Armed Forces Pacific" => "AP",
-  }
+  REGIONS = {
+    # see http://en.wikipedia.org/wiki/Postcodes_in_Australia#Australia_States_and_territories
+    :au => {
+      "Australian Capital Territory" => "ACT",
+      "New South Wales" => "NSW",
+      "Victoria" => "VIC",
+      "Queensland" => "QLD",
+      "South Australia" => "SA",
+      "Western Australia" => "WA",
+      "Tasmania" => "TAS",
+      "Northern Territory" => "NT"
+    },
+    # see http://en.wikipedia.org/wiki/Canadian_subnational_postal_abbreviations
+    :ca => {
+      "Alberta" => "AB",
+      "British Columbia" => "BC",
+      "Manitoba" => "MB",
+      "New Brunswick" => "NB",
+      "Newfoundland and Labrador" => "NL",
+      "Nova Scotia" => "NS",
+      "Northwest Territories" => "NT",
+      "Nunavut" => "NU",
+      "Ontario" => "ON",
+      "Prince Edward Island" => "PE",
+      "Quebec" => "QC",
+      "Saskatchewan" => "SK",
+      "Yukon" => "YT"
+    },
+    # see http://www.columbia.edu/kermit/postal.html#usa
+    # and http://www.usps.com/ncsc/lookups/usps_abbreviations.html
+    :us => {
+      "Alabama" => "AL",
+      "Alaska" => "AK",
+      "Arizona" => "AZ",
+      "Arkansas" => "AR",
+      "California" => "CA",
+      "Colorado" => "CO",
+      "Connecticut" => "CT",
+      "Delaware" => "DE",
+      "District Of Columbia" => "DC",
+      "Florida" => "FL",
+      "Georgia" => "GA",
+      "Hawaii" => "HI",
+      "Idaho" => "ID",
+      "Illinois" => "IL",
+      "Indiana" => "IN",
+      "Iowa" => "IA",
+      "Kansas" => "KS",
+      "Kentucky" => "KY",
+      "Louisiana" => "LA",
+      "Maine" => "ME",
+      "Maryland" => "MD",
+      "Massachusetts" => "MA",
+      "Michigan" => "MI",
+      "Minnesota" => "MN",
+      "Mississippi" => "MS",
+      "Missouri" => "MO",
+      "Montana" => "MT",
+      "Nebraska" => "NE",
+      "Nevada" => "NV",
+      "New Hampshire" => "NH",
+      "New Jersey" => "NJ",
+      "New Mexico" => "NM",
+      "New York" => "NY",
+      "North Carolina" => "NC",
+      "North Dakota" => "ND",
+      "Ohio" => "OH",
+      "Oklahoma" => "OK",
+      "Oregon" => "OR",
+      "Pennsylvania" => "PA",
+      "Rhode Island" => "RI",
+      "South Carolina" => "SC",
+      "South Dakota" => "SD",
+      "Tennessee" => "TN",
+      "Texas" => "TX",
+      "Utah" => "UT",
+      "Vermont" => "VT",
+      "Virginia" => "VA",
+      "Washington" => "WA",
+      "West Virginia" => "WV",
+      "Wisconsin" => "WI",
+      "Wyoming" => "WY",
 
-  # see http://en.wikipedia.org/wiki/Canadian_subnational_postal_abbreviations
-  CA_PROVINCES = {
-    "Alberta" => "AB",
-    "British Columbia" => "BC",
-    "Manitoba" => "MB",
-    "New Brunswick" => "NB",
-    "Newfoundland and Labrador" => "NL",
-    "Nova Scotia" => "NS",
-    "Northwest Territories" => "NT",
-    "Nunavut" => "NU",
-    "Ontario" => "ON",
-    "Prince Edward Island" => "PE",
-    "Quebec" => "QC",
-    "Saskatchewan" => "SK",
-    "Yukon" => "YT"
+      # These are not states exactly, but they are addressed as states through USA
+      "American Samoa" => "AS",
+      "Federated States Of Micronesia" => "FM",
+      "Guam" => "GU",
+      "Marshall Islands" => "MH",
+      "Northern Mariana Islands" => "MP",
+      "Palau" => "PW",
+      "Puerto Rico" => "PR",
+      "Virgin Islands" => "VI",
+      "Armed Forces Africa" => "AE",
+      "Armed Forces Americas (Except Canada)" => "AA",
+      "Armed Forces Canada" => "AE",
+      "Armed Forces Europe" => "AE",
+      "Armed Forces Middle East" => "AE",
+      "Armed Forces Pacific" => "AP",
+    }
   }
+
+
+  # Deprecated
+  USA_STATES   = REGIONS[:us]
+  CA_PROVINCES = REGIONS[:ca]
+  AU_REGIONS   = REGIONS[:au]
+
+
 end

data/lib/snail_helpers.rb

@@ -2,8 +2,15 @@ module SnailHelpers
   def usps_country_options_for_select(selected = nil, default_selected = 'USA')
     options_for_select(Snail::USPS_COUNTRIES, selected || default_selected)
   end
-  
+
+  def region_options_for_select(country = :us, selected = nil)
+    options_for_select(Snail::REGIONS[country], selected)
+  end
+
+  # Deprecated
   def usa_state_options_for_select(selected = nil)
-    options_for_select(Snail::USA_STATES, selected)
+    region_options_for_select(:us, selected)
   end
+
+
 end

data/test/snail_test.rb

@@ -9,50 +9,56 @@ class SnailTest < ActiveSupport::TestCase
   test "provides USPS country names" do
     assert Snail.const_defined?('USPS_COUNTRIES')
   end
-  
+
   test "provides USA state names with abbreviations" do
     assert Snail.const_defined?('USA_STATES')
     assert_equal 'MN', Snail::USA_STATES['Minnesota']
   end
-  
+
   test "USA states include territories and islands" do
     assert Snail::USA_STATES['Guam']
   end
 
+  test "provides region codes via 2-digit iso country code" do
+    assert_equal "WA", Snail::REGIONS[:us]["Washington"]
+    assert_equal "WA", Snail::REGIONS[:au]["Western Australia"]
+    assert_equal "BC", Snail::REGIONS[:ca]["British Columbia"]
+  end
+
   ##
   ## Configuration
   ##
-  
+
   test "initializes from a hash" do
     s = Snail.new(:name => "John Doe", :city => "Somewheres")
     assert_equal 'John Doe', s.name
     assert_equal 'Somewheres', s.city
   end
-  
+
   test "aliases common city synonyms" do
     assert_equal Snail.new(:town => "Somewheres").city, Snail.new(:city => "Somewheres").city
   end
-  
+
   test "aliases common region synonyms" do
     assert_equal Snail.new(:state => "Somewheres").region, Snail.new(:region => "Somewheres").region
     assert_equal Snail.new(:province => "Somewheres").region, Snail.new(:region => "Somewheres").region
   end
-  
+
   test "aliases common postal code synonyms" do
     assert_equal Snail.new(:zip => "12345").postal_code, Snail.new(:postal_code => "12345").postal_code
     assert_equal Snail.new(:zip_code => "12345").postal_code, Snail.new(:postal_code => "12345").postal_code
     assert_equal Snail.new(:postcode => "12345").postal_code, Snail.new(:postal_code => "12345").postal_code
   end
-  
+
   ##
   ## Formatting
   ##
-  
+
   test "includes two spaces between region and zip for domestic mail" do
     s = Snail.new(@us)
     assert /NY  12345/, s.city_line
   end
-  
+
   test "does not include country name for domestic addresses" do
     s = Snail.new(@us)
     assert !s.to_s.match(/United States/i)
@@ -64,7 +70,7 @@ class SnailTest < ActiveSupport::TestCase
     assert !s.to_s.match(/Canada/i)
     Snail.home_country = "USA"
   end
-  
+
   test "includes country name for international addresses" do
     s = Snail.new(@ca)
     assert s.to_s.match(/Canada/i)
@@ -74,22 +80,22 @@ class SnailTest < ActiveSupport::TestCase
     s = Snail.new(@ca.merge(:country => nil))
     assert s.to_s[-5,5] == "12345"
   end
-  
+
   test "country names are uppercased" do
     s = Snail.new(@ca)
     assert s.to_s.match(/CANADA/)
   end
-  
+
   test "empty lines are removed" do
     s = Snail.new(@us.merge(:line_1 => ""))
     assert !s.to_s.match(/^$/)
   end
-  
+
   test "to_s" do
     s = Snail.new(@ca)
     assert_equal "John Doe\n12345 5th St\nSomewheres NY  12345\nCANADA", s.to_s
   end
-  
+
   test "to_html" do
     s = Snail.new(@ca)
     s.name = 'John & Jane Doe'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: snail
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 7
   prerelease: false
   segments: 
   - 0
   - 5
-  - 5
-  version: 0.5.5
+  - 6
+  version: 0.5.6
 platform: ruby
 authors: 
 - Lance Ivy
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-14 00:00:00 -07:00
+date: 2011-08-21 00:00:00 -04:00
 default_executable: 
 dependencies: []