countries 0.9.2 → 0.9.3

data/lib/data/subdivisions/TH.yaml

@@ -5,8 +5,7 @@
   names:
     - "Krung Thep"
     - Bangkok
-    - Bangkok
-    - Bangkok
+    - "BKK"
 ? "11"
 :
   name: "Samut Prakan"

data/lib/data/subdivisions/UG.yaml

@@ -51,6 +51,18 @@
 :
   name: Wakiso
   names: Wakiso
+? "114"
+:
+  name: Mityana
+  names: Mityana
+? "115"
+:
+  name: Nakaseke
+  names: Nakaseke
+? "116"
+:
+  name: Lyantonde
+  names: Lyantonde
 ? "201"
 :
   name: Bugiri
@@ -111,6 +123,42 @@
 :
   name: Sironko
   names: Sironko
+? "216"
+:
+  name: Amuria
+  names: Amuria
+? "217"
+:
+  name: Budaka
+  names: Budaka
+? "218"
+:
+  name: Bukwa
+  names: Bukwa
+? "219"
+:
+  name: Butaleja
+  names: Butaleja
+? "220"
+:
+  name: Kaliro
+  names: Kaliro
+? "221"
+:
+  name: Manafwa
+  names: Manafwa
+? "222"
+:
+  name: Namutumba
+  names: Namutumba
+? "223"
+:
+  name: Bududa
+  names: Bududa
+? "224"
+:
+  name: Bukedea
+  names: Bukedea
 ? "301"
 :
   name: Adjumani
@@ -163,6 +211,38 @@
 :
   name: Yumbe
   names: Yumbe
+? "314"
+:
+  name: Amolatar
+  names: Amolatar
+? "315"
+:
+  name: Kaabong
+  names: Kaabong
+? "316"
+:
+  name: Koboko
+  names: Koboko
+? "317"
+:
+  name: Abim
+  names: Abim
+? "318"
+:
+  name: Dokolo
+  names: Dokolo
+? "319"
+:
+  name: Amuru
+  names: Amuru
+? "320"
+:
+  name: Maracha
+  names: Maracha
+? "321"
+:
+  name: Oyam
+  names: Oyam
 ? "401"
 :
   name: Bundibugyo
@@ -223,3 +303,19 @@
 :
   name: Kyenjojo
   names: Kyenjojo
+? "416"
+:
+  name: Ibanda
+  names: Ibanda
+? "417"
+:
+  name: Isingiro
+  names: Isingiro
+? "418"
+:
+  name: Kiruhura
+  names: Kiruhura
+? "419"
+:
+  name: Buliisa
+  names: Buliisa

data/lib/data/subdivisions/US.yaml

@@ -1,10 +1,19 @@
 ---
+AA:
+  name: "Armed Forces Americas"
+  names: "Armed Forces Americas"
+AE:
+  name: "Armed Forces Europe"
+  names: "Armed Forces Europe"
 AK:
   name: Alaska
   names: Alaska
 AL:
   name: Alabama
   names: Alabama
+AP:
+  name: "Armed Forces Pacific"
+  names: "Armed Forces Pacific"
 AR:
   name: Arkansas
   names: Arkansas

data/lib/iso3166.rb

@@ -1,5 +1,8 @@
 require 'yaml'
 require 'iso4217'
 
-require 'countries/select_helper'
 require 'countries/country'
+
+if defined?(ActionView::Helpers::FormOptionsHelper)
+  ActionView::Helpers::FormOptionsHelper::COUNTRIES = ISO3166::Country::Names.map{ |(name,alpha2)| [name.html_safe,alpha2] }
+end

data/spec/country_spec.rb

@@ -6,6 +6,16 @@ describe ISO3166::Country do
 
   let(:country) { ISO3166::Country.search('US') }
 
+  it 'allows to create a country object from a symbol representation of the alpha2 code' do
+    country = described_class.new(:us)
+    country.data.should_not be_nil
+  end
+
+  it 'allows to create a country object from a lowercase alpha2 code' do
+    country = described_class.new("us")
+    country.data.should_not be_nil
+  end
+
   it 'should return 3166 number' do
     country.number.should == '840'
   end
@@ -23,7 +33,12 @@ describe ISO3166::Country do
   end
 
   it 'should return alternate names' do
-    country.names.should == ["United States of America", "Vereinigte Staaten von Amerika", "États-Unis", "Estados Unidos"]
+    country.names.should == ["United States of America", "Vereinigte Staaten von Amerika", "États-Unis", "Estados Unidos", "アメリカ合衆国", "Verenigde Staten"]
+  end
+
+  it 'should return translations' do
+    country.translations.should be
+    country.translations["en"].should == "United States of America"
   end
 
   it 'should return latitude' do
@@ -90,11 +105,11 @@ describe ISO3166::Country do
     end
 
     it 'should return a hash with all sub divisions' do
-      country.subdivisions.should have(57).states
+      country.subdivisions.should have(60).states
     end
 
     it 'should be available through states' do
-      country.states.should have(57).states
+      country.states.should have(60).states
     end
   end
 
@@ -104,7 +119,25 @@ describe ISO3166::Country do
     end
 
     it 'should return false if country is invalid' do
-      ISO3166::Country.new('fubar').should_not be_valid
+      ISO3166::Country.new({}).should_not be_valid
+    end
+  end
+
+  describe 'new' do
+    it 'should return new country object when a valid alpha2 string is passed' do
+      ISO3166::Country.new('US').should be_a(ISO3166::Country)
+    end
+
+    it 'should return nil when an invalid alpha2 string is passed' do
+      ISO3166::Country.new('fubar').should be_nil
+    end
+
+    it 'should return new country object when a valid alpha2 symbol is passed' do
+      ISO3166::Country.new(:us).should be_a(ISO3166::Country)
+    end
+
+    it 'should return nil when an invalid alpha2 symbol is passed' do
+      ISO3166::Country.new(:fubar).should be_nil
     end
   end
 
@@ -113,7 +146,7 @@ describe ISO3166::Country do
       countries = ISO3166::Country.all
       countries.should be_an(Array)
       countries.first.should be_an(Array)
-      countries.should have(247).countries
+      countries.should have(250).countries
     end
 
     it "should allow to customize each country representation passing a block to the method" do
@@ -121,7 +154,7 @@ describe ISO3166::Country do
       countries.should be_an(Array)
       countries.first.should be_an(Array)
       countries.first.should have(3).fields
-      countries.should have(247).countries
+      countries.should have(250).countries
     end
   end
 
@@ -136,16 +169,16 @@ describe ISO3166::Country do
       ISO3166::Country.search('US').should be_a(ISO3166::Country)
     end
 
-    it 'should return false when an invalid alpha2 string is passed' do
-      ISO3166::Country.search('fubar').should be_false
+    it 'should return nil when an invalid alpha2 string is passed' do
+      ISO3166::Country.search('fubar').should be_nil
     end
 
     it 'should return new country object when a valid alpha2 symbol is passed' do
       ISO3166::Country.search(:us).should be_a(ISO3166::Country)
     end
 
-    it 'should return false when an invalid alpha2 symbol is passed' do
-      ISO3166::Country.search(:fubar).should be_false
+    it 'should return nil when an invalid alpha2 symbol is passed' do
+      ISO3166::Country.search(:fubar).should be_nil
     end
   end
 
@@ -180,6 +213,12 @@ describe ISO3166::Country do
 
         it { should == ISO3166::Country }
       end
+
+      describe 'to_s' do
+        it 'should return the country name' do
+          Country.new('GB').to_s.should == 'United Kingdom'
+        end
+      end
     end
   end
 
@@ -346,4 +385,23 @@ describe ISO3166::Country do
       german_speaking_countries.size.should == 6
     end
   end
+
+  describe 'in_eu?' do
+    let(:netherlands) { ISO3166::Country.search('NL') }
+
+    it 'should return false for countries without eu_member flag' do
+      country.in_eu?.should be_false
+    end
+
+    it 'should return true for countries with eu_member flag set to true' do
+      netherlands.in_eu?.should be_true
+    end
+  end
+
+  describe 'to_s' do
+    it 'should return the country name' do
+      ISO3166::Country.new('GB').to_s.should == 'United Kingdom'
+    end
+  end
+
 end

data/spec/mongoid_spec.rb

@@ -0,0 +1,67 @@
+# encoding: utf-8
+
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require File.expand_path('../../lib/countries/mongoid', __FILE__)
+
+describe 'Mongoid support' do
+
+  let(:britain) { ISO3166::Country.new('GB') }
+  context 'instance methods' do
+    describe 'mongoize' do
+      it 'should delegate mongoization to the class method' do
+        britain.mongoize.should eql ISO3166::Country.mongoize(britain)
+      end
+    end
+  end
+
+  context 'class methods' do
+    describe 'mongoize' do
+      it 'should store the alpha2 given a country object' do
+        ISO3166::Country.mongoize(britain).should eql britain.alpha2
+      end
+
+      it 'should store the alpha2 given a valid alpha2' do
+        ISO3166::Country.mongoize('GB').should eql britain.alpha2
+      end
+
+      it 'should raise BadMongoidTypeError given an invalid object' do
+        bad_types = [[], Time.now, {}, Date.today]
+        bad_types.each do |type|
+          expect { ISO3166::Country.mongoize(type) }
+          .to raise_error(ISO3166::Country::BadMongoidTypeError, /neither/)
+        end
+      end
+
+      it 'should raise BadMongoidTypeError given an empty country object' do
+        expect { ISO3166::Country.mongoize(ISO3166::Country.new('')) }
+        .to raise_error(ISO3166::Country::BadMongoidTypeError, /neither/)
+      end
+
+      it 'should raise BadMongoidTypeError given a bad alpha2' do
+        expect { ISO3166::Country.mongoize('bad_alpha_2') }
+        .to raise_error(ISO3166::Country::BadMongoidTypeError,
+                        /not a valid alpha2/)
+      end
+
+    end
+
+    describe 'demongoize' do
+      it 'should instantiate an equivalent object from stored alpha2 code' do
+        ISO3166::Country.demongoize(britain.mongoize).data
+          .should eql britain.data
+      end
+
+      it 'should be indifferent to storage by alpha2' do
+        ISO3166::Country.demongoize(ISO3166::Country.mongoize('GB'))
+        .data.should eql britain.data
+      end
+    end
+
+    describe 'evolve' do
+      it 'should delegate to self.mongoize and return the mongoized object' do
+        ISO3166::Country.should_receive(:mongoize).with(britain)
+        ISO3166::Country.evolve(britain)
+      end
+    end
+  end
+end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: countries
 version: !ruby/object:Gem::Version
-  version: 0.9.2
-  prerelease: 
+  version: 0.9.3
 platform: ruby
 authors:
 - Josh Robinson
@@ -10,28 +9,25 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-02 00:00:00.000000000 Z
+date: 2013-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: currencies
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -39,7 +35,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -47,7 +42,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -55,7 +49,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +63,7 @@ extra_rdoc_files: []
 files:
 - .document
 - .gitignore
-- .rvmrc
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -79,7 +72,7 @@ files:
 - countries.gemspec
 - lib/countries.rb
 - lib/countries/country.rb
-- lib/countries/select_helper.rb
+- lib/countries/mongoid.rb
 - lib/countries/version.rb
 - lib/data/countries.yaml
 - lib/data/subdivisions/AD.yaml
@@ -104,6 +97,7 @@ files:
 - lib/data/subdivisions/BJ.yaml
 - lib/data/subdivisions/BN.yaml
 - lib/data/subdivisions/BO.yaml
+- lib/data/subdivisions/BQ.yaml
 - lib/data/subdivisions/BR.yaml
 - lib/data/subdivisions/BS.yaml
 - lib/data/subdivisions/BT.yaml
@@ -200,6 +194,7 @@ files:
 - lib/data/subdivisions/MM.yaml
 - lib/data/subdivisions/MN.yaml
 - lib/data/subdivisions/MR.yaml
+- lib/data/subdivisions/MT.yaml
 - lib/data/subdivisions/MU.yaml
 - lib/data/subdivisions/MV.yaml
 - lib/data/subdivisions/MW.yaml
@@ -279,31 +274,32 @@ files:
 - lib/data/subdivisions/ZW.yaml
 - lib/iso3166.rb
 - spec/country_spec.rb
+- spec/mongoid_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/hexorx/countries
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Gives you a country object full of all sorts of useful information.
 test_files:
 - spec/country_spec.rb
+- spec/mongoid_spec.rb
 - spec/spec_helper.rb