ruby-cldr 0.0.2 → 0.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 81ab6a59909b72f15381d80ca49053ca46bc54fb
+  data.tar.gz: 32e6c9fcd5291e54460abaeafc0f12189cc541e6
+SHA512:
+  metadata.gz: fd2828beca0c9f5828cfcf9b25c5e973d8183ab17b7b93e5dfab4d6b1e92002fa5706d52f8a8ada8b840b18043bdb5bfb4a14379993753b4c536abd411f2139a
+  data.tar.gz: e51615436d0dfb6718627014defbdeff88093345aa00467e325cad301ac6a5b9c868a85ad8d4c72eacf872f898a4dacfae7e71e81fbf0f2608c47d10e82b3af7

data/Gemfile

@@ -1,7 +1,13 @@
-source :gemcutter
+source "http://rubygems.org"
 
 gem 'thor'
 gem 'i18n'
 gem 'ya2yaml'
 gem 'nokogiri'
-gem 'jeweler', :group => :development
+
+group :development do
+  gem 'rubyzip'
+  gem 'jeweler'
+  gem 'pry'
+  gem 'pry-nav'
+end

data/Gemfile.lock

@@ -1,14 +1,61 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    git (1.2.5)
+    addressable (2.3.5)
+    builder (3.2.2)
+    coderay (1.0.9)
+    descendants_tracker (0.0.3)
+    faraday (0.9.0)
+      multipart-post (>= 1.2, < 3)
+    git (1.2.6)
+    github_api (0.11.2)
+      addressable (~> 2.3)
+      descendants_tracker (~> 0.0.1)
+      faraday (~> 0.8, < 0.10)
+      hashie (>= 1.2)
+      multi_json (>= 1.7.5, < 2.0)
+      nokogiri (~> 1.6.0)
+      oauth2
+    hashie (2.0.5)
+    highline (1.6.20)
     i18n (0.6.0)
-    jeweler (1.6.4)
-      bundler (~> 1.0)
+    jeweler (2.0.1)
+      builder
+      bundler (>= 1.0)
       git (>= 1.2.5)
+      github_api
+      highline (>= 1.6.15)
+      nokogiri (>= 1.5.10)
       rake
-    nokogiri (1.5.0)
-    rake (0.9.2.2)
+      rdoc
+    json (1.8.1)
+    jwt (0.1.11)
+      multi_json (>= 1.5)
+    method_source (0.8.1)
+    mini_portile (0.5.2)
+    multi_json (1.8.4)
+    multi_xml (0.5.5)
+    multipart-post (2.0.0)
+    nokogiri (1.6.1)
+      mini_portile (~> 0.5.0)
+    oauth2 (0.9.3)
+      faraday (>= 0.8, < 0.10)
+      jwt (~> 0.1.8)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (~> 1.2)
+    pry (0.9.12)
+      coderay (~> 1.0.5)
+      method_source (~> 0.8)
+      slop (~> 3.4)
+    pry-nav (0.2.3)
+      pry (~> 0.9.10)
+    rack (1.5.2)
+    rake (10.1.1)
+    rdoc (4.1.1)
+      json (~> 1.4)
+    rubyzip (1.1.0)
+    slop (3.4.3)
     thor (0.14.6)
     ya2yaml (0.30)
 
@@ -19,5 +66,8 @@ DEPENDENCIES
   i18n
   jeweler
   nokogiri
+  pry
+  pry-nav
+  rubyzip
   thor
   ya2yaml

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.1.0

data/lib/cldr/download.rb

@@ -1,20 +1,24 @@
-require 'fileutils'
-require 'net/http'
 require 'uri'
-require 'tempfile'
+require 'open-uri'
+require 'zip'
 
 module Cldr
   class << self
     def download(source = nil, target = nil)
-      source ||= 'http://unicode.org/Public/cldr/21/core.zip'
+      source ||= 'http://unicode.org/Public/cldr/24/core.zip'
       target ||= File.expand_path('./vendor/cldr')
 
-      source = URI.parse(source)
-      tempfile = Tempfile.new('cldr-core')
-
-      system("curl #{source} -o #{tempfile.path}")
-      FileUtils.mkdir_p(target)
-      system("unzip #{tempfile.path} -d #{target}")
+      URI.parse(source).open do |tempfile|
+        FileUtils.mkdir_p(target)
+        Zip.on_exists_proc = true
+        Zip::File.open(tempfile.path) do |file|
+          file.each do |entry|
+            path = target + '/' + entry.name
+            FileUtils.mkdir_p(File.dirname(path))
+            file.extract(entry, path)
+          end
+        end
+      end
     end
   end
-end
+end

data/lib/cldr/export.rb

@@ -3,6 +3,7 @@ require 'i18n/locale/fallbacks'
 require 'core_ext/string/camelize'
 require 'core_ext/string/underscore'
 require 'core_ext/hash/deep_stringify_keys'
+require 'core_ext/hash/deep_merge'
 
 module Cldr
   module Export
@@ -11,6 +12,14 @@ module Cldr
     autoload :Ruby, 'cldr/export/ruby'
     autoload :Yaml, 'cldr/export/yaml'
 
+    SHARED_COMPONENTS = [
+      'CurrencyDigitsAndRounding',
+      'RbnfRoot',
+      'Metazones',
+      'WindowsZones',
+      'NumberingSystems'
+    ]
+
     class << self
       def base_path
         @@base_path ||= File.expand_path('./data')
@@ -22,11 +31,20 @@ module Cldr
 
       def export(options = {}, &block)
         locales        = options[:locales]    || Data.locales
-        components     = options[:components] || Data.components
+        components     = (options[:components] || Data.components).map { |c| c.to_s.camelize }
         self.base_path = options[:target] if options[:target]
 
+        shared_components, locale_components = components.partition do |component|
+          is_shared_component?(component)
+        end
+
+        shared_components.each do |component|
+          ex = exporter(component, options[:format])
+          ex.export('', component, options, &block)
+        end
+
         locales.each do |locale|
-          components.each do |component|
+          locale_components.each do |component|
             exporter(component, options[:format]).export(locale, component, options, &block)
           end
         end
@@ -38,26 +56,45 @@ module Cldr
       end
 
       def data(component, locale, options = {})
-        if component.to_s == 'Plurals'
-          Data.const_get(component.to_s.camelize).new(locale)
-        else
-          data = locales(locale, options).inject({}) do |result, locale|
-            data = Data.const_get(component.to_s.camelize).new(locale)
-            if data
-              data.is_a?(Hash) ? data.deep_merge(result) : data
+        case component.to_s
+          when 'Plurals'
+            plural_data(component, locale, options)
+          else
+            if is_shared_component?(component)
+              shared_data(component, options)
             else
-              result
+              locale_based_data(component, locale, options)
             end
+        end
+      end
+
+      def locale_based_data(component, locale, options = {})
+        data = locales(locale, component, options).inject({}) do |result, locale|
+          data = Data.const_get(component.to_s.camelize).new(locale)
+          if data
+            data.is_a?(Hash) ? data.deep_merge(result) : data
+          else
+            result
           end
-          # data = resolve_links if options[:merge] TODO!!
-          data
         end
+
+        # data = resolve_links if options[:merge] TODO!!
+        data
       end
 
-      def locales(locale, options)
+      def plural_data(component, locale, options = {})
+        data = locale_based_data(component, locale, options)
+        "{ :'#{locale}' => { :i18n => { :plural => { :keys => #{data[:keys].inspect}, :rule => #{data[:rule]} } } } }"
+      end
+
+      def shared_data(component, options = {})
+        Data.const_get(component.to_s.camelize).new
+      end
+
+      def locales(locale, component, options)
         locale = locale.to_s.gsub('_', '-')
-        locales = options[:merge] ? I18n::Locale::Fallbacks.new[locale.to_sym] : [locale.to_sym] 
-        locales << :root
+        locales = options[:merge] ? I18n::Locale::Fallbacks.new[locale.to_sym] : [locale.to_sym]
+        locales << :root if component_should_merge_root?(component)
         locales
       end
 
@@ -68,7 +105,18 @@ module Cldr
       end
 
       def path(locale, component, extension)
-        "#{Export.base_path}/#{locale.to_s.gsub('_', '-')}/#{component.to_s.underscore}.#{extension}"
+        path = [Export.base_path]
+        path << locale.to_s.gsub('_', '-') unless is_shared_component?(component)
+        path << "#{component.to_s.underscore}.#{extension}"
+        File.join(*path)
+      end
+
+      def is_shared_component?(component)
+        SHARED_COMPONENTS.include?(component)
+      end
+
+      def component_should_merge_root?(component)
+        component != "Rbnf"
       end
     end
   end

data/lib/cldr/export/data.rb

@@ -3,16 +3,24 @@ require 'core_ext/string/camelize'
 module Cldr
   module Export
     module Data
-      autoload :Base,          'cldr/export/data/base'
-      autoload :Calendars,     'cldr/export/data/calendars'
-      autoload :Currencies,    'cldr/export/data/currencies'
-      autoload :Delimiters,    'cldr/export/data/delimiters'
-      autoload :Languages,     'cldr/export/data/languages'
-      autoload :Numbers,       'cldr/export/data/numbers'
-      autoload :Plurals,       'cldr/export/data/plurals'
-      autoload :Territories,   'cldr/export/data/territories'
-      autoload :Timezones,     'cldr/export/data/timezones'
-      autoload :Units,         'cldr/export/data/units'
+      autoload :Base,             'cldr/export/data/base'
+      autoload :Calendars,        'cldr/export/data/calendars'
+      autoload :Currencies,       'cldr/export/data/currencies'
+      autoload :CurrencyDigitsAndRounding,    'cldr/export/data/currency_digits_and_rounding'
+      autoload :Delimiters,       'cldr/export/data/delimiters'
+      autoload :Languages,        'cldr/export/data/languages'
+      autoload :Numbers,          'cldr/export/data/numbers'
+      autoload :Plurals,          'cldr/export/data/plurals'
+      autoload :Territories,      'cldr/export/data/territories'
+      autoload :Timezones,        'cldr/export/data/timezones'
+      autoload :Metazones,        'cldr/export/data/metazones'
+      autoload :WindowsZones,     'cldr/export/data/windows_zones'
+      autoload :Units,            'cldr/export/data/units'
+      autoload :Lists,            'cldr/export/data/lists'
+      autoload :Layout,           'cldr/export/data/layout'
+      autoload :Rbnf,             'cldr/export/data/rbnf'
+      autoload :RbnfRoot,         'cldr/export/data/rbnf_root'
+      autoload :NumberingSystems, 'cldr/export/data/numbering_systems'
 
       class << self
         def dir

data/lib/cldr/export/data/calendars/gregorian.rb

@@ -10,13 +10,14 @@ module Cldr
               :days     => contexts('day'),
               :eras     => eras,
               :quarters => contexts('quarter'),
-              :periods  => contexts('dayPeriod'),
+              :periods  => contexts('dayPeriod', :group => "alt"),
               :fields   => fields,
               :formats => {
                 :date     => formats('date'),
                 :time     => formats('time'),
                 :datetime => formats('dateTime')
-              }
+              },
+              :additional_formats => additional_formats
             )
           end
 
@@ -24,31 +25,39 @@ module Cldr
             @calendar ||= select('dates/calendars/calendar[@type="gregorian"]').first
           end
 
-          def contexts(kind)
+          def contexts(kind, options = {})
             select(calendar, "#{kind}s/#{kind}Context").inject({}) do |result, node|
               context = node.attribute('type').value.to_sym
-              result[context] = widths(node, kind, context)
+              result[context] = widths(node, kind, context, options)
               result
             end
           end
 
-          def widths(node, kind, context)
+          def widths(node, kind, context, options = {})
             select(node, "#{kind}Width").inject({}) do |result, node|
-              width  = node.attribute('type').value.to_sym
-              result[width] = elements(node, kind, context, width)
+              width = node.attribute('type').value.to_sym
+              result[width] = elements(node, kind, context, width, options)
               result
             end
           end
 
-          def elements(node, kind, context, width)
+          def elements(node, kind, context, width, options = {})
             aliased = select(node, 'alias').first
+
             if aliased
               xpath_to_key(aliased.attribute('path').value, kind, context, width)
             else
               select(node, kind).inject({}) do |result, node|
                 key = node.attribute('type').value
                 key = key =~ /^\d*$/ ? key.to_i : key.to_sym
-                result[key] = node.content
+
+                if options[:group] && found_group = node.attribute(options[:group])
+                  result[found_group.value] ||= {}
+                  result[found_group.value][key] = node.content
+                else
+                  result[key] = node.content
+                end
+
                 result
               end
             end
@@ -75,18 +84,22 @@ module Cldr
           end
 
           def eras
-            base_path = calendar.path.gsub('/ldml/', '') + '/eras'
-            keys = select("#{base_path}/*").map { |node| node.name }
-
-            keys.inject({}) do |result, name|
-              path = "#{base_path}/#{name}/*"
-              key  = name.gsub('era', '').gsub(/s$/, '').downcase.to_sym
-              result[key] = select(path).inject({}) do |ret, node|
-                type = node.attribute('type').value.to_i rescue 0
-                ret[type] = node.content
-                ret
+            if calendar
+              base_path = calendar.path.gsub('/ldml/', '') + '/eras'
+              keys = select("#{base_path}/*").map { |node| node.name }
+
+              keys.inject({}) do |result, name|
+                path = "#{base_path}/#{name}/*"
+                key  = name.gsub('era', '').gsub(/s$/, '').downcase.to_sym
+                result[key] = select(path).inject({}) do |ret, node|
+                  type = node.attribute('type').value.to_i rescue 0
+                  ret[type] = node.content
+                  ret
+                end
+                result
               end
-              result
+            else
+              {}
             end
           end
 
@@ -110,7 +123,15 @@ module Cldr
             end
             formats
           end
-        
+
+          def additional_formats
+            select(calendar, "dateTimeFormats/availableFormats/dateFormatItem").inject({}) do |result, node|
+              key = node.attribute('id').value
+              result[key] = node.content
+              result
+            end
+          end
+
           def default_format(type)
             if node = select(calendar, "#{type}Formats/default").first
               key = node.attribute('choice').value.to_sym
@@ -127,8 +148,10 @@ module Cldr
             end
           end
 
+          # NOTE: As of CLDR 23, this data moved from inside each "calendar" tag to under its parent, the "dates" tag.
+          # That probably means this `fields` method should be moved up to the parent as well.
           def fields
-            select(calendar, "fields/field").inject({}) do |result, node|
+            select("dates/fields/field").inject({}) do |result, node|
               key  = node.attribute('type').value.to_sym
               name = node.xpath('displayName').first
               result[key] = name.content if name

data/lib/cldr/export/data/currencies.rb

@@ -16,11 +16,16 @@ module Cldr
         end
 
         def currency(node)
-          select(node, 'displayName').inject({}) do |result, node|
+          data = select(node, 'displayName').inject({}) do |result, node|
             count = node.attribute('count') ? node.attribute('count').value.to_sym : :one
             result[count] = node.content unless draft?(node)
             result
           end
+
+          symbol = select(node, 'symbol')
+          data[:symbol] = symbol.first.content if symbol.length > 0
+
+          data
         end
       end
     end

data/lib/cldr/export/data/currency_digits_and_rounding.rb

@@ -0,0 +1,22 @@
+require 'nokogiri'
+
+module Cldr
+  module Export
+    module Data
+      class CurrencyDigitsAndRounding < Hash
+        def initialize
+          path = "#{Cldr::Export::Data.dir}/supplemental/supplementalData.xml"
+          doc = File.open(path) { |file| Nokogiri::XML(file) }
+
+          currency_digits_and_rounding = doc.xpath('//currencyData/fractions/info').each do |node|
+            code = node.attr('iso4217')
+            digits = node.attr('digits').to_i
+            rounding = node.attr('rounding').to_i
+
+            self[code.upcase.to_sym] = { :digits => digits, :rounding => rounding }
+          end
+        end
+      end
+    end
+  end
+end