uncharted 0.0.7.beta1 → 0.0.8

data/lib/uncharted/country.rb

@@ -19,21 +19,24 @@ module Uncharted
       countries.count
     end
 
-    def self.find(codes)
-      if codes.is_a? Array
-        return codes.collect {|c| data[c]}
+    def self.find(objects)
+      case objects
+      when Array
+        objects.collect {|c| data[c]}
+      when Country
+        objects
+      else
+        data[objects]
       end
-      data[codes]
     end
 
     def self.countries
       @data.values
     end
-    
+
     def self.data
       @data ||= {}
     end
-    
 
   end
 

data/lib/uncharted/territory.rb

@@ -48,8 +48,8 @@ module Uncharted
       @abbr
     end
     
-    def self.find(code)
-      data[code]
+    def self.find(object)
+      object.is_a?(Territory) ? object : data[object]
     end
 
     def self.data

data/lib/uncharted/version.rb

@@ -1,4 +1,4 @@
 
 module Uncharted
-  VERSION = '0.0.7.beta1'
+  VERSION = '0.0.8'
 end

data/test/country_test.rb

@@ -19,6 +19,7 @@ class TestCountry < MiniTest::Unit::TestCase
   def test_country_find
     @us = Country.find('US')
     assert_equal [@br, @us], Country.find([@br.alpha2, @us.alpha2])
+    assert_equal @us, Country.find(@us)
   end
 
   def test_to_s

data/test/test_helper.rb

@@ -2,15 +2,15 @@
 gem 'minitest'
 
 require 'simplecov' # Must be included 1st
+
 require 'minitest/autorun'
 require 'purdytest'
-
-require 'simplecov-rcov-text'
+require 'simplecov-rcov'
 
 class SimpleCov::Formatter::MergedFormatter
   def format(result)
      SimpleCov::Formatter::HTMLFormatter.new.format(result)
-     SimpleCov::Formatter::RcovTextFormatter.new.format(result)
+     SimpleCov::Formatter::RcovFormatter.new.format(result)
   end
 end
 

data/uncharted.gemspec

@@ -21,8 +21,10 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 1.9'
 
-  s.add_development_dependency 'minitest'  # minitest latest gem
-  s.add_development_dependency 'purdytest' # colored tests for minitest https://github.com/tenderlove/purdytest
-  s.add_development_dependency 'yard'      # Doc generator
+  s.add_development_dependency 'minitest'       # minitest latest gem
+  s.add_development_dependency 'purdytest'      # colored tests for minitest https://github.com/tenderlove/purdytest
+  s.add_development_dependency 'simplecov' 
+  s.add_development_dependency 'simplecov-rcov'
+  s.add_development_dependency 'yard'           # Doc generator
 
 end

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: uncharted
 version: !ruby/object:Gem::Version
-  version: 0.0.7.beta1
-  prerelease: 6
+  version: 0.0.8
+  prerelease: 
 platform: ruby
 authors:
 - Gilson Ferraz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-05 00:00:00.000000000Z
+date: 2011-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &2160168080 !ruby/object:Gem::Requirement
+  requirement: &2156459540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160168080
+  version_requirements: *2156459540
 - !ruby/object:Gem::Dependency
   name: purdytest
-  requirement: &2160155840 !ruby/object:Gem::Requirement
+  requirement: &2156458620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,32 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160155840
+  version_requirements: *2156458620
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: &2156457820 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2156457820
+- !ruby/object:Gem::Dependency
+  name: simplecov-rcov
+  requirement: &2156716040 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2156716040
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2160143640 !ruby/object:Gem::Requirement
+  requirement: &2156715280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160143640
+  version_requirements: *2156715280
 description: Provide ISO 3166 codes and english name for countries and their political
   divisions
 email:
@@ -87,12 +109,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: ISO 3166 Countries & territories codes (NOT READY FOR USE YET!)
@@ -101,3 +123,4 @@ test_files:
 - test/mongoid_test.rb
 - test/test_helper.rb
 - test/uncharted_test.rb
+has_rdoc: