carmen 0.2.5 → 0.2.7

data/.gitignore

@@ -0,0 +1,7 @@
+doc
+pkg
+tags
+tmp
+.DS_Store
+.bundle/*
+Gemfile.lock

data/Gemfile

@@ -0,0 +1,3 @@
+source 'http://rubygems.org'
+
+gemspec

data/README.rdoc

@@ -1,29 +1,30 @@
+
 = Carmen- A simple collection of geographic names and abbreviations for Ruby
 
 This library will work as a drop in replacement for the official Rails country_select and its various forks. The idea is to provide a single library for all geographic naming concerns, and unify them under a consistent API.
 
-States are supported for the following countries: Australia, Brazil, Canada, Cuba, Denmark, Germany, Italy, Mexico, New Zealand, Norway, Spain, Ukraine, and United States.
+States are supported for the following countries: Australia, Brazil, Canada, Cuba, Denmark, Germany, India, Italy, Mexico, New Zealand, Norway, Spain, Ukraine, and United States.
 
 == Installation
 
   gem install carmen
-  
+
 If you're in Rails 2.3 or earlier, place this in your environment.rb:
 
   config.gem 'carmen'
-  
+
 If you're in Rails 3, put this in your Gemfile:
 
   gem "carmen"
 
 
 == Get a list of all countries
-  
+
   Carmen.countries => […, ['Germany', 'DE'], …, ['United States', 'US'], …]
   Carmen.countries(:locale => 'de') => […, ['Deutschland', 'DE'], …, ['Vereinigte Staaten von Amerika', 'US'], …]
 
 == State list retrieval
-  
+
   Carmen::states('US') => [['Alabama', 'AL'], ['Arkansas', 'AR'], ... ]
   Carmen::states => [['Alabama', 'AL'], ['Arkansas', 'AR'], ... ] # uses default country
   Carmen::state_names('US') => ['Alabama', 'Arkansas', ... ]
@@ -36,7 +37,7 @@ If you're in Rails 3, put this in your Gemfile:
   Carmen::state_code('Illinois') => 'IL'
   Carmen::state_code('Manitoba', 'CA') => 'MB'
   Carmen::state_name('AZ') => 'Arizona'
-                   
+
 
 == Default Country
 
@@ -48,7 +49,7 @@ Methods that take a country code argument will use the default country if none i
 
 This fork lets you exclude specific countries and/or states from Carmen. Simply set the appropriate class variables and the exclusion will take effect.
 
-== Excluding Countries 
+== Excluding Countries
 
 Countries to exclude are specified as an array of country codes:
 
@@ -57,7 +58,7 @@ Countries to exclude are specified as an array of country codes:
 == Excluding States
 
 States to exclude are specified via a hash, with keys being the country's code, and values being the states to exclude from that country:
-    
+
   Carmen.excluded_states = { 'US' => [ 'AA', 'AP', 'PW', ... ], 'DE' => [ 'BW', 'TH' ], ... }
 
 == Localization
@@ -65,7 +66,7 @@ States to exclude are specified via a hash, with keys being the country's code,
 You can switch between different localizations of the countries list, by setting the locale value (default is :en):
 
   Carmen.default_locale = :de
-  
+
 Methods that return country names also take an optional options hash as the last argument, which can be use to override the default locale for a single call:
 
   Carmen::country_name('US') => 'United States'
@@ -78,16 +79,27 @@ Currently included localizations are: English (:en), German (:de)
 
 * Many countries, such as Spain, have additional levels beneath 'state' that we would ideally support. Thanks to Alberto Molpeceres for bringing this to my attention.
 * Split the Rails-specific view helpers out into a separate gem (carmen-rails)
+* Move regex matching into an optional module.
 
 == Changelog
-* 0.2.5 Data corrections (mikepinde)
-* 0.2.4 Fixed autoloading under Rails 3
-* 0.2.2 Added state and country exclusion (kalafut)
-* 0.2.1 Added regions for New Zealand (yehezkielbs)
-* 0.2.0 Merge in Maximilian Schulz's locale fork, refactor internals to better support locales, and update documentation.       
-        Remove Carmen::STATES and Carmen::COUNTRIES constants in favor of module instance variables and proper accessors.
-        Add a test_helper and remove dependency on RubyGems.
-* 0.1.3 DEPRECATE Carmen::COUNTRIES in favor of Carmen.countries
+=== 0.2.6
+* Suppress a deprecation warning in Rails 3 (anupamc)
+* Remove init.rb altogether and use requires under Rails
+* Added Indian states and union territories (orthodoc)
+=== 0.2.5
+* Data corrections (mikepinde)
+=== 0.2.4
+* Fixed autoloading under Rails 3
+=== 0.2.2
+* Added state and country exclusion (kalafut)
+=== 0.2.1
+* Added regions for New Zealand (yehezkielbs)
+=== 0.2.0
+* Merge in Maximilian Schulz's locale fork, refactor internals to better support locales, and update documentation.
+* Remove Carmen::STATES and Carmen::COUNTRIES constants in favor of module instance variables and proper accessors.
+* Add a test_helper and remove dependency on RubyGems.
+=== 0.1.3
+* DEPRECATE Carmen::COUNTRIES in favor of Carmen.countries
 
 
 == Development notes
@@ -99,22 +111,25 @@ The plugin does not require rubygems anywhere in the test or libraries, so if yo
 
 These fine characters have contributed state lists, patches, or reported bugs:
 
-Jose Angel Cortinas (jacortinas)
-Domizio Demichelis (ddnexus)
-Thiago Jackiw (railsfreaks)
-Russ Johnson (russjohnson)
-Henrik Hodne (dvyjones)
-Yuval Kordov (uberllama)
-Alberto Molpeceres (molpe)
-Dimas Priyanto (dimaspriyanto)
-Wojtek Ogrodowczyk (sharnik)
-Tobias Schmidt (grobie)
-Maximilian Schulz (namxam)
-Mani Tadayon (bowsersenior)
-Andriy Tyurnikov (andriytyurnikov)
-lonestarsoftware
-mikepinde
-kalafut
-yehezkielbs
+* Jose Angel Cortinas (jacortinas)
+* Domizio Demichelis (ddnexus)
+* Thiago Jackiw (railsfreaks)
+* Russ Johnson (russjohnson)
+* Henrik Hodne (dvyjones)
+* Yuval Kordov (uberllama)
+* Alberto Molpeceres (molpe)
+* Dimas Priyanto (dimaspriyanto)
+* Wojtek Ogrodowczyk (sharnik)
+* Tobias Schmidt (grobie)
+* Maximilian Schulz (namxam)
+* Mani Tadayon (bowsersenior)
+* Andriy Tyurnikov (andriytyurnikov)
+* Anupam Choudhury (anupamc)
+* Biswajit Dutta Baruah (orthodoc)
+* lonestarsoftware
+* mikepinde
+* kalafut
+* yehezkielbs
 
 If I missed your name in this list, please let me know and I will add it. I tried to find everyone that has sent in patches or found bugs, but I may have missed a few folks.
+

data/Rakefile

@@ -11,6 +11,7 @@ begin
     gem.email = "jim@autonomousmachine.com"
     gem.homepage = "http://github.com/jim/carmen"
     gem.authors = ["Jim Benton"]
+    gem.add_development_dependency 'jeweler', '1.4'
     gem.add_development_dependency "mocha"
     gem.add_development_dependency "rails"
     gem.add_development_dependency "hanna"

data/VERSION

@@ -1 +1 @@
-0.2.5
+0.2.7

data/carmen.gemspec

@@ -1,58 +1,61 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{carmen}
-  s.version = "0.2.5"
+  s.version = "0.2.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jim Benton"]
-  s.date = %q{2011-01-28}
+  s.date = %q{2011-03-11}
   s.description = %q{A collection of geographic country and state names for Ruby. Also includes replacements for Rails' country_select and state_select plugins}
   s.email = %q{jim@autonomousmachine.com}
   s.extra_rdoc_files = [
     "README.rdoc"
   ]
   s.files = [
-    "MIT-LICENSE",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "carmen.gemspec",
-    "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/nz.yml",
-    "data/states/ua.yml",
-    "data/states/us.yml",
-    "lib/carmen.rb",
-    "lib/carmen/action_view_helpers.rb",
-    "lib/carmen/railtie.rb",
-    "rails/init.rb",
-    "test/carmen_test.rb",
-    "test/carmen_view_helper_test.rb",
-    "test/test_helper.rb"
+    ".gitignore",
+     "Gemfile",
+     "MIT-LICENSE",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION",
+     "carmen.gemspec",
+     "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/in.yml",
+     "data/states/it.yml",
+     "data/states/mx.yml",
+     "data/states/no.yml",
+     "data/states/nz.yml",
+     "data/states/ua.yml",
+     "data/states/us.yml",
+     "lib/carmen.rb",
+     "lib/carmen/action_view_helpers.rb",
+     "lib/carmen/railtie.rb",
+     "test/carmen_test.rb",
+     "test/carmen_view_helper_test.rb",
+     "test/test_helper.rb"
   ]
   s.homepage = %q{http://github.com/jim/carmen}
+  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{A collection of geographic country and state names for Ruby}
   s.test_files = [
     "test/carmen_test.rb",
-    "test/carmen_view_helper_test.rb",
-    "test/test_helper.rb"
+     "test/carmen_view_helper_test.rb",
+     "test/test_helper.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -60,15 +63,18 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<jeweler>, ["= 1.4"])
       s.add_development_dependency(%q<mocha>, [">= 0"])
       s.add_development_dependency(%q<rails>, [">= 0"])
       s.add_development_dependency(%q<hanna>, [">= 0"])
     else
+      s.add_dependency(%q<jeweler>, ["= 1.4"])
       s.add_dependency(%q<mocha>, [">= 0"])
       s.add_dependency(%q<rails>, [">= 0"])
       s.add_dependency(%q<hanna>, [">= 0"])
     end
   else
+    s.add_dependency(%q<jeweler>, ["= 1.4"])
     s.add_dependency(%q<mocha>, [">= 0"])
     s.add_dependency(%q<rails>, [">= 0"])
     s.add_dependency(%q<hanna>, [">= 0"])

data/data/states/in.yml

@@ -0,0 +1,71 @@
+# from http://en.wikipedia.org/wiki/ISO_3166-2:IN
+---
+- - Andhra Pradesh
+  - AP
+- - Arunachal Pradesh
+  - AR
+- - Assam
+  - AS
+- - Bihar
+  - BR
+- - Chhattisgarh
+  - CT
+- - Goa
+  - GA
+- - Haryana
+  - HR
+- - Himachal Pradesh
+  - HP
+- - Jammu and Kashmir
+  - JK
+- - Jharkhand
+  - JH
+- - Karnataka
+  - KA
+- - Kerala
+  - KL
+- - Madhya Pradesh
+  - MP
+- - Maharashtra
+  - MH
+- - Manipur
+  - MN
+- - Meghalaya
+  - ML
+- - Mizoram
+  - MZ
+- - Nagaland
+  - NL
+- - Orissa
+  - OR
+- - Punjab
+  - PB
+- - Rajasthan
+  - RJ
+- - Sikkim
+  - SK
+- - Tamil Nadu
+  - TN
+- - Tripura
+  - TR
+- - Uttarakhand
+  - UL
+- - Uttar Pradesh
+  - UP
+- - West Bengal
+  - WB
+- - Andaman and Nicobar Islands
+  - AN
+- - Chandigarh
+  - CH
+- - Dadra and Nagar Haveli
+  - DN
+- - Daman and Diu
+  - DD
+- - Delhi
+  - DL
+- - Lakshadweep
+  - LD
+- - Puducherry
+  - PY
+

data/lib/carmen.rb

@@ -6,8 +6,12 @@ rescue LoadError
 end
 
 # Fix to autoload in Rails 3
-if defined?(Rails) && Rails::VERSION::MAJOR > 2
-  require 'carmen/railtie'
+if defined?(Rails) 
+  if Rails::VERSION::MAJOR > 2
+    require 'carmen/railtie'
+  else
+    require 'carmen/action_view_helpers'
+  end
 end
 
 module Carmen

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: carmen
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 2
-  - 5
-  version: 0.2.5
+  - 7
+  version: 0.2.7
 platform: ruby
 authors: 
 - Jim Benton
@@ -15,13 +15,28 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-28 00:00:00 -06:00
+date: 2011-03-11 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: mocha
+  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"
+  type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -31,11 +46,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id001
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rails
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -45,11 +60,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: hanna
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -59,7 +74,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id003
+  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
 executables: []
@@ -69,6 +84,8 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 files: 
+- .gitignore
+- Gemfile
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
@@ -84,6 +101,7 @@ files:
 - data/states/dk.yml
 - data/states/es.yml
 - data/states/hr.yml
+- data/states/in.yml
 - data/states/it.yml
 - data/states/mx.yml
 - data/states/no.yml
@@ -93,7 +111,6 @@ files:
 - lib/carmen.rb
 - lib/carmen/action_view_helpers.rb
 - lib/carmen/railtie.rb
-- rails/init.rb
 - test/carmen_test.rb
 - test/carmen_view_helper_test.rb
 - test/test_helper.rb
@@ -102,8 +119,8 @@ homepage: http://github.com/jim/carmen
 licenses: []
 
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 

data/rails/init.rb

@@ -1,2 +0,0 @@
-require 'carmen'
-require 'carmen/action_view_helpers'