ruby-cldr 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ac65fa730274ef7d70f6dde1a20a4a6ed4a36f1407d65e12ba220539d6a0424
-  data.tar.gz: 900156546c3603e66501d527714a8b9ac3c66287ebde5672f699da68d5cbbfc8
+  metadata.gz: d2730108a5324c951320fd218ac7c4be0bbfb0f98fd0640c40ac45cd3c9c1bc8
+  data.tar.gz: f3f218f3e52903be3bc9f7e46d1a9406e995a03fbc56c413dadf47b668799215
 SHA512:
-  metadata.gz: '0589799c818cf86570883c73bcb095889496bc158026d51557829ba3c9eda8f13c1879823689c1263eee20931b77bd0a01de4e6680cfb5064ccb807a36fb0e69'
-  data.tar.gz: 642f18b73738a815314e6c0ee39ceac70c0f5d26c89027f4936f9089b577943481a8422980674bf725dd6243cce449af96d13ba5567f499564b9f42420ab40f2
+  metadata.gz: c9928d8c1f33e5c8e651492cf8b801e6fd642e6a4c1913268f8ac976dbe4185e23d4e1e7662c0a3e81ab7eabbbc603bd1cf9db727d6e278fe18e5119faeb58e5
+  data.tar.gz: c2a868e0af577e0fe61550daa773f8a13ee2cb92f71307ac761eb7b1b2ba0eea626423d811897c5de00cd16b19532693544bf4f35e797971ca8b156a8cd8ba60

data/CHANGELOG.md

@@ -0,0 +1,44 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## How do I make a good changelog?
+### Guiding Principles
+- Changelogs are for humans, not machines.
+- There should be an entry for every single version.
+- The same types of changes should be grouped.
+- Versions and sections should be linkable.
+- The latest version comes first.
+- The release date of each version is displayed.
+- Mention whether you follow Semantic Versioning.
+
+### Types of changes
+- Added for new features.
+- Changed for changes in existing functionality.
+- Deprecated for soon-to-be removed features.
+- Removed for now removed features.
+- Fixed for any bug fixes.
+- Security in case of vulnerabilities.
+
+## [Unreleased]
+
+- Added a changelog, [#49](https://github.com/ruby-i18n/ruby-cldr/pull/49)
+- Added Travis CI for testing, [#48](https://github.com/ruby-i18n/ruby-cldr/pull/48)
+- Added root fallback to en language, [#47](https://github.com/ruby-i18n/ruby-cldr/pull/47)
+- Added subdivisions to the list of exportable components, [#46](https://github.com/ruby-i18n/ruby-cldr/pull/46)
+
+---
+
+## [0.2.0] - 2019-03-26
+
+- Updated to CLDR 34 [#43](https://github.com/ruby-i18n/ruby-cldr/pull/43)
+- Lots of [other changes](https://github.com/ruby-i18n/ruby-cldr/compare/v0.1.1...v0.2.0)
+
+## [0.3.0] - 2019-06-16
+
+- Export currency names [#51](https://github.com/ruby-i18n/ruby-cldr/pull/51)
+- Bring back root fallback for english [#47](https://github.com/ruby-i18n/ruby-cldr/pull/47)
+- Export subdivisions [#46](https://github.com/ruby-i18n/ruby-cldr/pull/46)
+
+[Unreleased]: https://github.com/ruby-i18n/ruby-cldr/compare/v0.3.0...HEAD

data/Gemfile.lock

@@ -68,6 +68,7 @@ GEM
 
 PLATFORMS
   ruby
+  x86_64-darwin-17
 
 DEPENDENCIES
   i18n
@@ -80,4 +81,4 @@ DEPENDENCIES
   thor
 
 BUNDLED WITH
-   2.0.1
+   2.0.2

data/README.textile

@@ -1,5 +1,7 @@
 h1. Ruby library for exporting and using data from CLDR
 
+!https://travis-ci.com/ruby-i18n/ruby-cldr.svg?branch=master!:https://travis-ci.com/ruby-i18n/ruby-cldr
+
 CLDR ("Common Locale Data Repository":http://cldr.unicode.org) contains tons of high-quality locale data such as formatting rules for dates, times, numbers, currencies as well as language, country, calendar-specific names etc.
 
 For localizing applications in Ruby we'll obviously be able to use this incredibly comprehensive and well-maintained resource.

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/lib/cldr/export.rb

@@ -144,12 +144,12 @@ module Cldr
             end
           end
 
-          ancestry << :root if component_should_merge_root?(component)
           ancestry 
         else
           [locale]
         end
 
+        locales << :root if should_merge_root?(locale, component, options)
         locales
       end
 
@@ -170,8 +170,10 @@ module Cldr
         SHARED_COMPONENTS.include?(component)
       end
 
-      def component_should_merge_root?(component)
-        !%w(Rbnf Fields).include?(component)
+      def should_merge_root?(locale, component, options)
+        return false if %w(Rbnf Fields).include?(component)
+        return true if options[:merge]
+        locale == :en
       end
     end
   end

data/lib/cldr/export/data.rb

@@ -25,6 +25,7 @@ module Cldr
       autoload :RbnfRoot,                  'cldr/export/data/rbnf_root'
       autoload :RegionCurrencies,          'cldr/export/data/region_currencies'
       autoload :SegmentsRoot,              'cldr/export/data/segments_root'
+      autoload :Subdivisions,              'cldr/export/data/subdivisions'
       autoload :Territories,               'cldr/export/data/territories'
       autoload :TerritoriesContainment,    'cldr/export/data/territories_containment'
       autoload :Timezones,                 'cldr/export/data/timezones'
@@ -47,7 +48,7 @@ module Cldr
         end
 
         def components
-          self.constants.sort - [:Base, :Export]
+          self.constants.sort - [:Base, :Export, :ParentLocales]
         end
       end
     end

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

@@ -17,8 +17,16 @@ module Cldr
 
         def currency(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)
+            unless draft?(node)
+              if node.attribute('count')
+                count = node.attribute('count').value.to_sym
+                result[count] = node.content
+              else
+                result[:one] = node.content if result[:one].nil?
+                result[:name] = node.content
+              end
+            end
+
             result
           end
 
@@ -30,4 +38,4 @@ module Cldr
       end
     end
   end
-end
+end

data/lib/cldr/export/data/parent_locales.rb

@@ -4,7 +4,7 @@ module Cldr
   module Export
     module Data
       class ParentLocales < Hash
-        def initialize(_)
+        def initialize(_ = nil)
           path = File.join(Cldr::Export::Data.dir, 'supplemental', 'supplementalData.xml')
           doc = File.open(path) { |file| Nokogiri::XML(file) }
 

data/lib/cldr/export/data/subdivisions.rb

@@ -0,0 +1,35 @@
+module Cldr
+  module Export
+    module Data
+      class Subdivisions < Base
+
+        def initialize(locale)
+          super
+          update(:subdivisions => subdivisions)
+        end
+
+        private
+
+        def subdivisions
+          @subdivisions ||= select('localeDisplayNames/subdivisions/subdivision').inject({}) do |result, node|
+            result[node.attribute('type').value.to_sym] = node.content unless draft?(node) or alt?(node)
+            result
+          end
+        end
+
+        def doc
+          begin
+            super
+          rescue Errno::ENOENT
+            @doc = Nokogiri::XML('')
+          end
+        end
+
+        def path
+          @path ||= "#{Cldr::Export::Data.dir}/subdivisions/#{locale.to_s.gsub('-', '_')}.xml"
+        end
+
+      end
+    end
+  end
+end

data/test/export/data/calendars_test.rb

@@ -20,11 +20,27 @@ class TestCldrDataCalendars < Test::Unit::TestCase
         :abbreviated => { 1 => 'Jan', 2 => 'Feb', 3 => 'Mär', 4 => 'Apr', 5 => 'Mai', 6 => 'Jun', 7 => 'Jul', 8 => 'Aug', 9 => 'Sep', 10 => 'Okt', 11 => 'Nov', 12 => 'Dez' },
         :narrow => { 1 => 'J', 2 => 'F', 3 => 'M', 4 => 'A', 5 => 'M', 6 => 'J', 7 => 'J', 8 => 'A', 9 => 'S', 10 => 'O', 11 => 'N', 12 => 'D' },
         :wide => { 1 => 'Januar', 2 => 'Februar', 3 => 'März', 4 => 'April', 5 => 'Mai', 6 => 'Juni', 7 => 'Juli', 8 => 'August', 9 => 'September', 10 => 'Oktober', 11 => 'November', 12 => 'Dezember' },
-      }
+      },
     }
     assert_equal months, gregorian[:months]
   end
 
+  test 'calendars months :en' do
+    months = {
+      :format => {
+        :abbreviated => { 1 => "Jan", 2 => "Feb", 3 => "Mar", 4 => "Apr", 5 => "May", 6 => "Jun", 7 => "Jul", 8 => "Aug", 9 => "Sep", 10 => "Oct", 11 => "Nov", 12 => "Dec" },
+        :narrow => :"calendars.gregorian.months.stand-alone.narrow",
+        :wide => { 1 => "January", 2 => "February", 3 => "March", 4 => "April", 5 => "May", 6 => "June", 7 => "July", 8 => "August", 9 => "September", 10 => "October", 11 => "November", 12 => "December" },
+      },
+      :"stand-alone" => {
+        :abbreviated => :"calendars.gregorian.months.format.abbreviated",
+        :narrow => { 1 => "J", 2 => "F", 3 => "M", 4 => "A", 5 => "M", 6 => "J", 7 => "J", 8 => "A", 9 => "S", 10 => "O", 11 => "N", 12 => "D" },
+        :wide => :"calendars.gregorian.months.format.wide",
+      },
+    }
+    assert_equal months, gregorian(locale: :en)[:months]
+  end
+
   test 'calendars days :de' do
     days = {
       :format => {

data/test/export/data/currencies_test.rb

@@ -36,7 +36,12 @@ class TestCldrCurrencies < Test::Unit::TestCase
     currencies = Cldr::Export::Data::Currencies.new('de')[:currencies]
     assert_empty codes - currencies.keys, "Unexpected missing currencies"
     assert_empty currencies.keys - codes, "Unexpected extra currencies"
-    assert_equal({ :one => 'Euro', :other => 'Euro', :symbol => '€' }, currencies[:EUR])
+    assert_equal({ :name => 'Euro', :one => 'Euro', :other => 'Euro', :symbol => '€' }, currencies[:EUR])
+  end
+
+  test 'currencies uses the label to populate :one when count is unavailable' do
+    currencies = Cldr::Export::Data::Currencies.new('ak')[:currencies]
+    assert_equal({ :name => 'Yuan', :one => 'Yuan' }, currencies[:CNY])
   end
 
   # Cldr::Export::Data.locales.each do |locale|

data/test/export/data/languages_test.rb

@@ -18,7 +18,7 @@ class TestCldrDataLanguages < Test::Unit::TestCase
       :csb, :cu, :cv, :cy, :da, :dak, :dar, :dav, :de, :"de-AT",
       :"de-CH", :del, :den, :dgr, :din, :dje, :doi, :dsb, :dtp,
       :dua, :dum, :dv, :dyo, :dyu, :dz, :dzg, :ebu, :ee, :efi,
-      :egl, :egy, :eka, :el, :elx, :en, :"en-GB", :"en-US", :enm,
+      :egl, :egy, :eka, :el, :elx, :en, :enm,
       :eo, :es, :esu, :et, :eu, :ewo, :ext, :fa, :fan, :fat, :ff,
       :fi, :fil, :fit, :fj, :fo, :fon, :fr, :frc, :frm, :fro,
       :frp, :frr, :frs, :fur, :fy, :ga, :gaa, :gag, :gan, :gay,

data/test/export/data/subdivisions_test.rb

@@ -0,0 +1,33 @@
+# encoding: utf-8
+
+require File.expand_path(File.join(File.dirname(__FILE__) + '/../../test_helper'))
+
+class TestCldrDataSubdivisions < Test::Unit::TestCase
+  test 'subdivisions for Canada/Quebec in :ja' do
+    subdivisions = Cldr::Export::Data::Subdivisions.new(:ja)[:subdivisions]
+
+    assert_equal('ケベック州', subdivisions[:caqc])
+  end
+
+  test 'subdivisions for a non an unsupported locale :zz' do
+    subdivisions = Cldr::Export::Data::Subdivisions.new(:zz)
+
+    assert_empty(subdivisions)
+  end
+
+  test 'subdivisions locales are a subset of main locales' do
+    root = File.expand_path('./vendor/cldr/common')
+
+    main_locales = Dir["#{root}/main/*.xml"].map { |path| path =~ /([\w_-]+)\.xml/ && $1 }
+    subdivisions_locales = Dir["#{root}/subdivisions/*.xml"].map { |path| path =~ /([\w_-]+)\.xml/ && $1 }
+
+    assert_empty(subdivisions_locales - main_locales)
+  end
+
+ #
+ #   test "extract subdivisions for #{locale}" do
+ #     assert_nothing_raised do
+ #       Cldr::Export::Data::Subdivisions.new(locale)
+ #     end
+ #   end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-cldr
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Sven Fuchs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-21 00:00:00.000000000 Z
+date: 2019-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -131,6 +131,7 @@ extra_rdoc_files:
 - README.textile
 - TODO
 files:
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -172,6 +173,7 @@ files:
 - lib/cldr/export/data/rbnf_root.rb
 - lib/cldr/export/data/region_currencies.rb
 - lib/cldr/export/data/segments_root.rb
+- lib/cldr/export/data/subdivisions.rb
 - lib/cldr/export/data/territories.rb
 - lib/cldr/export/data/territories_containment.rb
 - lib/cldr/export/data/timezones.rb
@@ -209,6 +211,7 @@ files:
 - test/export/data/metazones_test.rb
 - test/export/data/numbers_test.rb
 - test/export/data/plurals_test.rb
+- test/export/data/subdivisions_test.rb
 - test/export/data/territories_containment_test.rb
 - test/export/data/territories_test.rb
 - test/export/data/timezones_test.rb
@@ -245,8 +248,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.9
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: Ruby library for exporting and using data from CLDR