iso_code 0.0.5 → 0.0.6

data/Rakefile

@@ -46,3 +46,12 @@ YARD::Rake::YardocTask.new
 
 task :test => :spec
 task :default => :spec
+
+namespace :import do
+  desc 'Test countries import'
+  task :countries do
+    IsoCode::Iso3166.new(:de).read.each do |row|
+      puts row.inspect
+    end
+  end
+end

data/iso_code.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "iso_code"
-  s.version = "0.0.5"
+  s.version = "0.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Thomas Boerger"]
-  s.date = "2011-10-12"
+  s.date = "2012-02-27"
   s.description = "Translate many available languages (ISO 639-3) and countries (ISO 3166) into requested languages"
   s.email = "tboerger@tbpro.de"
   s.extra_rdoc_files = [

data/lib/iso_code/base.rb

@@ -32,7 +32,7 @@ module IsoCode
       # Parse all the PO files
       def parse_pofiles
         detectlocales.each do |locale, pofile|
-          open(pofile) do |f|
+          open(pofile, 'r:utf-8') do |f|
             names = scan_names(f)
             i18ns = scan_i18ns(f)
 

data/lib/iso_code/iso3166.rb

@@ -28,12 +28,17 @@ module IsoCode
     protected
       # Parse the base XML file
       def parse_basexml
-        Nokogiri::XML(open(@basexml)).search('//iso_3166_entries/iso_3166_entry').each do |row|
-          en_name = row.attributes['name'].to_s
+        Nokogiri::XML(open(@basexml)).search('//iso_3166_entries/*').each do |row|
+          en_name = if row.has_attribute? 'names'
+            row.attributes['names'].to_s
+          else
+            row.attributes['name'].to_s
+          end
 
           @dataset[en_name] = {
             :alpha2 => row.attributes['alpha_2_code'].to_s || '',
             :alpha3 => row.attributes['alpha_3_code'].to_s || '',
+            :alpha4 => row.attributes['alpha_4_code'].to_s || '',
             :number => row.attributes['numeric_code'].to_s || '',
             :withdrawn => row.attributes['date_withdrawn'].to_s || '',
             :en => en_name

data/lib/iso_code/version.rb

@@ -5,7 +5,7 @@ module IsoCode
   module Version
     MAJOR = 0
     MINOR = 0
-    PATCH = 5
+    PATCH = 6
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iso_code
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-12 00:00:00.000000000Z
+date: 2012-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70284131028360 !ruby/object:Gem::Requirement
+  requirement: &70277119696500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70284131028360
+  version_requirements: *70277119696500
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70284131026940 !ruby/object:Gem::Requirement
+  requirement: &70277119711140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *70284131026940
+  version_requirements: *70277119711140
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70284131026080 !ruby/object:Gem::Requirement
+  requirement: &70277119706420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *70284131026080
+  version_requirements: *70277119706420
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70284131024680 !ruby/object:Gem::Requirement
+  requirement: &70277119714780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70284131024680
+  version_requirements: *70277119714780
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70284131023600 !ruby/object:Gem::Requirement
+  requirement: &70277119724980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70284131023600
+  version_requirements: *70277119724980
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70284131022380 !ruby/object:Gem::Requirement
+  requirement: &70277119735860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70284131022380
+  version_requirements: *70277119735860
 description: Translate many available languages (ISO 639-3) and countries (ISO 3166)
   into requested languages
 email: tboerger@tbpro.de
@@ -117,7 +117,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 889434579029131303
+      hash: -1636655785082562488
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: