i18n_data 0.4.1 → 0.5.1

data/lib/i18n_data/file_data_provider.rb

@@ -12,10 +12,6 @@ module I18nData
 
     def write_cache(provider)
       languages = provider.codes(:languages, 'EN').keys + ['zh_CN', 'zh_TW', 'zh_HK','bn_IN','pt_BR']
-      unless progress_bar = build_progress_bar(languages.count)
-        $stderr.puts 'i18n_data: Updating file cache, will take about 8 minutes...'
-      end
-
       languages.map do |language_code|
         [:languages, :countries].each do |type|
           begin
@@ -27,25 +23,11 @@ module I18nData
             $stderr.puts "Access denied for #{type} #{language_code}"
           end
         end
-        progress_bar.increment if progress_bar
       end
     end
 
     private
 
-    def build_progress_bar(max_count)
-      return unless $stderr.tty?
-      require 'ruby-progressbar'
-      ProgressBar.create(
-        :format => '%t %E: |%w|',
-        :title => 'writing translation cache data',
-        :total => max_count
-      )
-    rescue LoadError
-      $stderr.puts ':: i18n_data file write cache update ::'
-      $stderr.puts 'for progress install "ruby-progressbar" gem'
-    end
-
     def read_from_file(file)
       return nil unless File.exist?(file)
       data = {}

data/lib/i18n_data/live_data_provider.rb

@@ -2,22 +2,24 @@ require 'open-uri'
 require 'rexml/document'
 
 module I18nData
-  # fetches data online from debian svn
+  # fetches data online from debian git
   module LiveDataProvider
     extend self
 
-    ROOT = "http://git.debian.org/?p=iso-codes/iso-codes.git;a=blob_plain;f="
-
     XML_CODES = {
-      :countries => ROOT + 'iso_3166/iso_3166.xml',
-      :languages => ROOT + 'iso_639/iso_639.xml'
+      :countries => 'iso_3166/iso_3166.xml',
+      :languages => 'iso_639/iso_639.xml'
     }
     TRANSLATIONS = {
-      :countries => ROOT + 'iso_3166/',
-      :languages => ROOT + 'iso_639/'
+      :countries => 'iso_3166/',
+      :languages => 'iso_639/'
     }
+    REPO = "git://anonscm.debian.org/iso-codes/pkg-iso-codes.git"
+    CLONE_DEST = "/tmp/i18n_data_iso_clone"
 
     def codes(type, language_code)
+      ensure_checkout
+
       language_code = language_code.upcase
       if language_code == 'EN'
         send("english_#{type}")
@@ -26,8 +28,20 @@ module I18nData
       end
     end
 
+    def clear_cache
+      `rm -rf #{CLONE_DEST}`
+      raise unless $?.success?
+    end
+
   private
 
+    def ensure_checkout
+      unless File.exist?(CLONE_DEST)
+        `git clone #{REPO} #{CLONE_DEST}`
+        raise unless $?.success?
+      end
+    end
+
     def translate(type, language, to_language_code)
       translated = translations(type, to_language_code)[language]
       translated.to_s.empty? ? nil : translated
@@ -49,18 +63,11 @@ module I18nData
         code[0].downcase!
         code = code.join("_")
 
+        url = TRANSLATIONS[type]+"#{code}.po"
         begin
-          url = TRANSLATIONS[type]+"#{code}.po"
           data = get(url)
-        rescue => e
-          case e.to_s
-          when /\A404 /
-            raise NoTranslationAvailable, "for #{type} and language code = #{code} (#{$!})"
-          when /\A502 /
-            raise AccessDenied, "for #{type} and language code = #{code} (#{$!})"
-          else
-            raise Unknown, "#{e.to_s} for #{type} and language code = #{code} (#{$!})"
-          end
+        rescue Errno::ENOENT
+          raise NoTranslationAvailable, "for #{type} and language code = #{code} (#{$!})"
         end
 
         data = data.force_encoding('utf-8') if data.respond_to?(:force_encoding) # 1.9
@@ -87,6 +94,7 @@ module I18nData
         codes = {}
         xml(:countries).elements.each('*/iso_3166_entry') do |entry|
           name = entry.attributes['name'].to_s.gsub("'", "\\'")
+          name = "Taiwan" if name == "Taiwan, Province of China"
           code = entry.attributes['alpha_2_code'].to_s.upcase
           codes[code] = name
         end
@@ -104,22 +112,11 @@ module I18nData
     end
 
     def get(url)
-      $stderr.puts "GET #{url}" if $DEBUG
-      @@cache ||= {}
-      return @@cache[url] if @@cache.include? url
-      @@cache[url] = open(url).read
+      File.read("#{CLONE_DEST}/#{url}")
     end
 
     def xml(type)
-      xml = get(XML_CODES[type])
-      REXML::Document.new(xml)
-    rescue => e
-      case e.to_s
-      when /\A502 /
-        raise AccessDenied, "for index of #{type} (#{$!})"
-      else
-        raise Unknown, "#{e.to_s} for index of #{type} (#{$!})"
-      end
+      REXML::Document.new(get(XML_CODES[type]))
     end
   end
 end

data/lib/i18n_data/version.rb

@@ -1,3 +1,3 @@
 module I18nData
-  VERSION = Version = "0.4.1"
+  VERSION = Version = "0.5.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: i18n_data
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.1
 platform: ruby
 authors:
 - Michael Grosser
@@ -30,7 +30,7 @@ cert_chain:
   F5etKHZg0j3eHO31/i2HnswY04lqGImUu6aM5EnijFTB7PPW2KwKKM4+kKDYFdlw
   /0WV1Ng2/Y6qsHwmqGg2VlYj2h4=
   -----END CERTIFICATE-----
-date: 2014-03-15 00:00:00.000000000 Z
+date: 2014-06-16 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: michael@grosser.it
@@ -226,17 +226,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: country/language names and 2-letter-code pairs, in 85 languages