uncharted 0.0.9 → 0.0.10

data/lib/uncharted/{data → config}/br.rb

@@ -31,3 +31,4 @@ module Uncharted
   Territory.new('BR-SP', :state, 'São Paulo')
   Territory.new('BR-TO', :state, 'Tocantins')
 end
+

data/lib/uncharted/{data → config}/countries.rb

@@ -254,3 +254,4 @@ module Uncharted
   Country.new('ZW', 'ZWE', 'Zimbabwe')
 
 end
+

data/lib/uncharted/country.rb

@@ -1,4 +1,3 @@
-require 'i18n'
 
 module Uncharted
 
@@ -48,7 +47,7 @@ module Uncharted
     def self.data
       @data ||= {}
     end
-    
+        
   end
 
 end

data/lib/uncharted/extensions/mongoid.rb

@@ -6,7 +6,7 @@ module Uncharted
     include Mongoid::Fields::Serializable if defined? Mongoid
 
     def deserialize(code)
-      code && Uncharted::Country.find(code)
+      code && Country.find(code)
     end
 
     def serialize(country)
@@ -18,7 +18,7 @@ module Uncharted
     include Mongoid::Fields::Serializable if defined? Mongoid
 
     def deserialize(code)
-      code && Uncharted::Territory.find(code)
+      code && Territory.find(code)
     end
 
     def serialize(territory)

data/lib/uncharted/territory.rb

@@ -1,4 +1,3 @@
-require 'uncharted/country'
 
 module Uncharted
 

data/lib/uncharted/version.rb

@@ -1,4 +1,4 @@
 
 module Uncharted
-  VERSION = '0.0.9'
+  VERSION = '0.0.10'
 end

data/lib/uncharted.rb

@@ -1,15 +1,21 @@
 # encoding: utf-8
 
-require 'uncharted/i18n'
+require 'i18n'
 
 require 'uncharted/country'
 require 'uncharted/territory'
 
-require 'uncharted/data/countries'
-require 'uncharted/data/br'
-
 require 'uncharted/extensions/mongoid'
 require 'uncharted/extensions/rails'
 
-Country = Uncharted::Country
-Territory = Uncharted::Territory
+
+# Load ISO 3166 country and territory lists
+require 'uncharted/config/countries'
+require 'uncharted/config/br'
+
+# Load default locales
+I18n.load_path += Dir["#{File.dirname(__FILE__)}/uncharted/config/locales/*.yml"]
+
+# Use shortcut if classes are not already defined 
+Country = Uncharted::Country unless defined?(Country)
+Territory = Uncharted::Territory unless defined?(Territory)

data/test/test_helper.rb

@@ -7,7 +7,6 @@ require 'minitest/autorun'
 require 'purdytest'
 require 'simplecov-rcov'
 
-require 'i18n'
 require 'uncharted'
 
 class SimpleCov::Formatter::MergedFormatter

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uncharted
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-10 00:00:00.000000000 Z
+date: 2011-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2160716480 !ruby/object:Gem::Requirement
+  requirement: &2160633940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160716480
+  version_requirements: *2160633940
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &2160737840 !ruby/object:Gem::Requirement
+  requirement: &2160632820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160737840
+  version_requirements: *2160632820
 - !ruby/object:Gem::Dependency
   name: purdytest
-  requirement: &2160737180 !ruby/object:Gem::Requirement
+  requirement: &2160631820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160737180
+  version_requirements: *2160631820
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2160736080 !ruby/object:Gem::Requirement
+  requirement: &2160647380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160736080
+  version_requirements: *2160647380
 - !ruby/object:Gem::Dependency
   name: simplecov-rcov
-  requirement: &2160734700 !ruby/object:Gem::Requirement
+  requirement: &2160646440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160734700
+  version_requirements: *2160646440
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2160733560 !ruby/object:Gem::Requirement
+  requirement: &2160645880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160733560
+  version_requirements: *2160645880
 description: Provide ISO 3166 codes and english name for countries and their political
   divisions
 email:
@@ -93,20 +93,18 @@ files:
 - README.md
 - Rakefile
 - lib/uncharted.rb
+- lib/uncharted/config/br.rb
+- lib/uncharted/config/countries.rb
+- lib/uncharted/config/locales/en.yml
+- lib/uncharted/config/locales/pt-BR.yml
 - lib/uncharted/country.rb
-- lib/uncharted/data/br.rb
-- lib/uncharted/data/countries.rb
 - lib/uncharted/extensions/mongoid.rb
 - lib/uncharted/extensions/rails.rb
-- lib/uncharted/i18n.rb
-- lib/uncharted/locales/en.yml
-- lib/uncharted/locales/pt-BR.yml
 - lib/uncharted/territory.rb
 - lib/uncharted/version.rb
 - test/country_test.rb
 - test/mongoid_test.rb
 - test/test_helper.rb
-- test/uncharted_test.rb
 - uncharted.gemspec
 homepage: http://github.com/cenize/uncharted
 licenses: []
@@ -136,5 +134,4 @@ test_files:
 - test/country_test.rb
 - test/mongoid_test.rb
 - test/test_helper.rb
-- test/uncharted_test.rb
 has_rdoc: 

data/lib/uncharted/i18n.rb

@@ -1,4 +0,0 @@
-
-require 'i18n'
-
-I18n.load_path += Dir['lib/uncharted/locales/*.yml']

data/test/uncharted_test.rb

@@ -1,8 +0,0 @@
-# encoding: utf-8
-require 'test_helper'
-require 'uncharted'
-
-class TestUncharted < MiniTest::Unit::TestCase
-
-
-end