ruby-cldr 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2730108a5324c951320fd218ac7c4be0bbfb0f98fd0640c40ac45cd3c9c1bc8
-  data.tar.gz: f3f218f3e52903be3bc9f7e46d1a9406e995a03fbc56c413dadf47b668799215
+  metadata.gz: bb38e30dfe8504c39a6d42b6cce5ad833b36f4f8ead5372187302e7a458c4a44
+  data.tar.gz: e68125a9223246cbaf2b9f9f702dad54cb86453fd48dae044c018cb9f7516e4f
 SHA512:
-  metadata.gz: c9928d8c1f33e5c8e651492cf8b801e6fd642e6a4c1913268f8ac976dbe4185e23d4e1e7662c0a3e81ab7eabbbc603bd1cf9db727d6e278fe18e5119faeb58e5
-  data.tar.gz: c2a868e0af577e0fe61550daa773f8a13ee2cb92f71307ac761eb7b1b2ba0eea626423d811897c5de00cd16b19532693544bf4f35e797971ca8b156a8cd8ba60
+  metadata.gz: a7429066a453c2929db798149aa0e691788286f900bcd8249f46c569932649d4ca595a5e07b92f007ac022a94b8d21d57711a150cd33e60aa412546f61e9e34a
+  data.tar.gz: 8360156badeada8c54955b010770c6462db89b141246c718c0ca25f6a56d1c669e268cf72d2504fefda7e724ee28af17e8d2aea62e92dfef955bf9efb7299236

data/CHANGELOG.md

@@ -27,6 +27,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - 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)
+- Added country codes as an exportable component, [#61](https://github.com/ruby-i18n/ruby-cldr/pull/61)
 
 ---
 
@@ -41,4 +42,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - 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
+## [0.4.0] - 2020-09-01
+
+- Support pluralization codes with missing spaces [#53](https://github.com/ruby-i18n/ruby-cldr/pull/53)
+- Add in functionality to export country codes [#61](https://github.com/ruby-i18n/ruby-cldr/pull/61)
+
+[Unreleased]: https://github.com/ruby-i18n/ruby-cldr/compare/v0.4.0...HEAD

data/Gemfile.lock

@@ -39,7 +39,7 @@ GEM
     multi_json (1.13.1)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
-    nokogiri (1.10.1)
+    nokogiri (1.10.8)
       mini_portile2 (~> 2.4.0)
     oauth2 (1.4.1)
       faraday (>= 0.8, < 0.16.0)
@@ -55,10 +55,10 @@ GEM
     pry-nav (0.2.4)
       pry (>= 0.9.10, < 0.11.0)
     psych (3.1.0)
-    rack (2.0.6)
-    rake (12.3.2)
+    rack (2.2.3)
+    rake (13.0.1)
     rdoc (6.1.1)
-    rubyzip (1.2.2)
+    rubyzip (1.3.0)
     semver2 (3.4.2)
     slop (3.6.0)
     test-unit (3.3.0)
@@ -68,7 +68,6 @@ GEM
 
 PLATFORMS
   ruby
-  x86_64-darwin-17
 
 DEPENDENCIES
   i18n
@@ -81,4 +80,4 @@ DEPENDENCIES
   thor
 
 BUNDLED WITH
-   2.0.2
+   2.1.4

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/lib/cldr/export.rb

@@ -14,6 +14,7 @@ module Cldr
     autoload :Yaml, 'cldr/export/yaml'
 
     SHARED_COMPONENTS = %w[
+      CountryCodes
       CurrencyDigitsAndRounding
       Metazones
       NumberingSystems

data/lib/cldr/export/data.rb

@@ -7,6 +7,7 @@ module Cldr
       autoload :Base,                      'cldr/export/data/base'
       autoload :Calendars,                 'cldr/export/data/calendars'
       autoload :Characters,                'cldr/export/data/characters'
+      autoload :CountryCodes,              'cldr/export/data/country_codes'
       autoload :Currencies,                'cldr/export/data/currencies'
       autoload :CurrencyDigitsAndRounding, 'cldr/export/data/currency_digits_and_rounding'
       autoload :Delimiters,                'cldr/export/data/delimiters'

data/lib/cldr/export/data/country_codes.rb

@@ -0,0 +1,29 @@
+module Cldr
+  module Export
+    module Data
+      class CountryCodes < Base
+        def initialize
+          super(nil)
+          update(:country_codes => country_codes)
+        end
+
+        private
+
+        def country_codes 
+          doc.xpath("//codeMappings/*").each_with_object({}) do |node, hash|
+            if node.name == "territoryCodes"
+              type = node.attribute('type').to_s.to_sym
+              hash[type] = {}
+              hash[type]["numeric"] = node[:numeric] if node[:numeric]
+              hash[type]["alpha3"] = node[:alpha3] if node[:alpha3]
+            end
+          end        
+        end
+
+        def path
+          @path ||= "#{Cldr::Export::Data.dir}/supplemental/supplementalData.xml"
+        end
+      end
+    end
+  end
+end

data/lib/cldr/export/data/plurals/rules.rb

@@ -57,6 +57,8 @@ module Cldr
             end
 
             def parse(code)
+              code = scrub_code(code)
+
               code = code.split('@').first.to_s
               operand = /(n|i|f|t|v|w)/i
               expr = /#{operand}(?:\s+(?:mod|%)\s+([\d]+))?/i
@@ -78,6 +80,15 @@ module Cldr
                 raise "can not parse '#{code}'"
               end
             end
+
+            private
+
+            def scrub_code(code)
+              code
+                .gsub(/(n)%(\d+)/, '\1 % \2') # n%1000 -> n % 1000
+                .gsub(/(\d+)=(\d+)/, '\1 = \2') # 10=100-> 10 = 100
+                .gsub(/(n)!=(\d+)/, '\1 != \2') # n!=100 -> n != 100
+            end
           end
 
           attr_reader :locales
@@ -199,4 +210,4 @@ module Cldr
       end
     end
   end
-end
+end

data/ruby-cldr.gemspec

@@ -0,0 +1,157 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+# stub: ruby-cldr 0.2.0 ruby lib
+
+Gem::Specification.new do |s|
+  s.name = "ruby-cldr".freeze
+  s.version = "0.4.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib".freeze]
+  s.authors = ["Sven Fuchs".freeze]
+  s.date = "2019-03-21"
+  s.description = "Ruby library for exporting and using data from CLDR, see http://cldr.unicode.org".freeze
+  s.email = "svenfuchs@artweb-design.de".freeze
+  s.extra_rdoc_files = [
+    "LICENSE",
+    "README.textile",
+    "TODO"
+  ]
+  s.files = [
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE",
+    "README.textile",
+    "Rakefile",
+    "TODO",
+    "VERSION",
+    "cldr.thor",
+    "lib/cldr.rb",
+    "lib/cldr/data.rb",
+    "lib/cldr/download.rb",
+    "lib/cldr/export.rb",
+    "lib/cldr/export/code.rb",
+    "lib/cldr/export/code/numbers.rb",
+    "lib/cldr/export/data.rb",
+    "lib/cldr/export/data/aliases.rb",
+    "lib/cldr/export/data/base.rb",
+    "lib/cldr/export/data/calendars.rb",
+    "lib/cldr/export/data/calendars/gregorian.rb",
+    "lib/cldr/export/data/characters.rb",
+    "lib/cldr/export/data/currencies.rb",
+    "lib/cldr/export/data/currency_digits_and_rounding.rb",
+    "lib/cldr/export/data/delimiters.rb",
+    "lib/cldr/export/data/fields.rb",
+    "lib/cldr/export/data/languages.rb",
+    "lib/cldr/export/data/layout.rb",
+    "lib/cldr/export/data/likely_subtags.rb",
+    "lib/cldr/export/data/lists.rb",
+    "lib/cldr/export/data/metazones.rb",
+    "lib/cldr/export/data/numbering_systems.rb",
+    "lib/cldr/export/data/numbers.rb",
+    "lib/cldr/export/data/parent_locales.rb",
+    "lib/cldr/export/data/plural_rules.rb",
+    "lib/cldr/export/data/plurals.rb",
+    "lib/cldr/export/data/plurals/cldr_grammar.treetop",
+    "lib/cldr/export/data/plurals/grammar.rb",
+    "lib/cldr/export/data/plurals/rules.rb",
+    "lib/cldr/export/data/rbnf.rb",
+    "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/territories.rb",
+    "lib/cldr/export/data/territories_containment.rb",
+    "lib/cldr/export/data/timezones.rb",
+    "lib/cldr/export/data/transforms.rb",
+    "lib/cldr/export/data/units.rb",
+    "lib/cldr/export/data/variables.rb",
+    "lib/cldr/export/data/windows_zones.rb",
+    "lib/cldr/export/ruby.rb",
+    "lib/cldr/export/yaml.rb",
+    "lib/cldr/format.rb",
+    "lib/cldr/format/currency.rb",
+    "lib/cldr/format/date.rb",
+    "lib/cldr/format/datetime.rb",
+    "lib/cldr/format/datetime/base.rb",
+    "lib/cldr/format/decimal.rb",
+    "lib/cldr/format/decimal/base.rb",
+    "lib/cldr/format/decimal/fraction.rb",
+    "lib/cldr/format/decimal/integer.rb",
+    "lib/cldr/format/decimal/number.rb",
+    "lib/cldr/format/percent.rb",
+    "lib/cldr/format/time.rb",
+    "lib/cldr/thor.rb",
+    "lib/core_ext/hash/deep_merge.rb",
+    "lib/core_ext/hash/deep_stringify_keys.rb",
+    "lib/core_ext/hash/symbolize_keys.rb",
+    "lib/core_ext/string/camelize.rb",
+    "lib/core_ext/string/underscore.rb",
+    "test/all.rb",
+    "test/export/code/numbers_test.rb",
+    "test/export/data/all.rb",
+    "test/export/data/calendars_test.rb",
+    "test/export/data/currencies_test.rb",
+    "test/export/data/delimiters_test.rb",
+    "test/export/data/languages_test.rb",
+    "test/export/data/metazones_test.rb",
+    "test/export/data/numbers_test.rb",
+    "test/export/data/plurals_test.rb",
+    "test/export/data/territories_containment_test.rb",
+    "test/export/data/territories_test.rb",
+    "test/export/data/timezones_test.rb",
+    "test/export/data/units_test.rb",
+    "test/export/data/windows_zones_test.rb",
+    "test/export_test.rb",
+    "test/format/all.rb",
+    "test/format/currency_test.rb",
+    "test/format/date_test.rb",
+    "test/format/datetime_test.rb",
+    "test/format/decimal/fraction_test.rb",
+    "test/format/decimal/integer_test.rb",
+    "test/format/decimal/number_test.rb",
+    "test/format/decimal_test.rb",
+    "test/format/percent_test.rb",
+    "test/format/time_test.rb",
+    "test/test_autotest.rb",
+    "test/test_helper.rb"
+  ]
+  s.homepage = "http://github.com/ruby-i18n/ruby-cldr".freeze
+  s.rubygems_version = "2.7.9".freeze
+  s.summary = "Ruby library for exporting and using data from CLDR".freeze
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 4
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<thor>.freeze, [">= 0"])
+      s.add_runtime_dependency(%q<i18n>.freeze, [">= 0"])
+      s.add_runtime_dependency(%q<nokogiri>.freeze, [">= 0"])
+      s.add_development_dependency(%q<rubyzip>.freeze, [">= 0"])
+      s.add_development_dependency(%q<jeweler>.freeze, [">= 0"])
+      s.add_development_dependency(%q<pry>.freeze, [">= 0"])
+      s.add_development_dependency(%q<pry-nav>.freeze, [">= 0"])
+      s.add_development_dependency(%q<test-unit>.freeze, [">= 0"])
+    else
+      s.add_dependency(%q<thor>.freeze, [">= 0"])
+      s.add_dependency(%q<i18n>.freeze, [">= 0"])
+      s.add_dependency(%q<nokogiri>.freeze, [">= 0"])
+      s.add_dependency(%q<rubyzip>.freeze, [">= 0"])
+      s.add_dependency(%q<jeweler>.freeze, [">= 0"])
+      s.add_dependency(%q<pry>.freeze, [">= 0"])
+      s.add_dependency(%q<pry-nav>.freeze, [">= 0"])
+      s.add_dependency(%q<test-unit>.freeze, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<thor>.freeze, [">= 0"])
+    s.add_dependency(%q<i18n>.freeze, [">= 0"])
+    s.add_dependency(%q<nokogiri>.freeze, [">= 0"])
+    s.add_dependency(%q<rubyzip>.freeze, [">= 0"])
+    s.add_dependency(%q<jeweler>.freeze, [">= 0"])
+    s.add_dependency(%q<pry>.freeze, [">= 0"])
+    s.add_dependency(%q<pry-nav>.freeze, [">= 0"])
+    s.add_dependency(%q<test-unit>.freeze, [">= 0"])
+  end
+end
+

data/test/export/data/country_codes_test.rb

@@ -0,0 +1,21 @@
+# encoding: utf-8
+
+require File.expand_path(File.join(File.dirname(__FILE__) + '/../../test_helper'))
+
+class TestCldrDataCountryCodes < Test::Unit::TestCase
+  test 'country codes' do
+    expected =
+      {
+        AA: {
+          "numeric" => "958",
+          "alpha3" => "AAA",
+        },
+        AC: {
+          "alpha3" => "ASC",
+        }
+      }
+    country_codes = Cldr::Export::Data::CountryCodes.new
+    assert_equal(country_codes[:country_codes][:AA], expected[:AA])
+    assert_equal(country_codes[:country_codes][:AC], expected[:AC])
+  end
+end

data/test/export/data/plurals_test.rb

@@ -176,6 +176,12 @@ class TestCldrDataPluralParser < Test::Unit::TestCase
     assert_equal false, eval(Cldr::Export::Data::Plurals::Rule.parse('n mod 100 in 3..6').to_ruby, binding)
   end
 
+  def test_codes_with_missing_spaces
+    assert_equal 'n.to_f % 100 == 0', Cldr::Export::Data::Plurals::Rule.parse('n%100 = 0').to_ruby
+    assert_equal 'n.to_f % 100 == 0', Cldr::Export::Data::Plurals::Rule.parse('n % 100=0').to_ruby
+    assert_equal 'n.to_f != 0', Cldr::Export::Data::Plurals::Rule.parse('n!=0').to_ruby
+  end
+
   def test_n_negative
     # one: i = 1 and v = 0 @integer 1
     # other: @integer 0, 2~16, 100, 1000, 10000, 100000, 1000000, … @decimal 0.0~1.5, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-cldr
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Sven Fuchs
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-06-17 00:00:00.000000000 Z
+date: 2020-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -127,6 +127,7 @@ email: svenfuchs@artweb-design.de
 executables: []
 extensions: []
 extra_rdoc_files:
+- CHANGELOG.md
 - LICENSE
 - README.textile
 - TODO
@@ -152,6 +153,7 @@ files:
 - lib/cldr/export/data/calendars.rb
 - lib/cldr/export/data/calendars/gregorian.rb
 - lib/cldr/export/data/characters.rb
+- lib/cldr/export/data/country_codes.rb
 - lib/cldr/export/data/currencies.rb
 - lib/cldr/export/data/currency_digits_and_rounding.rb
 - lib/cldr/export/data/delimiters.rb
@@ -201,10 +203,12 @@ files:
 - lib/core_ext/hash/symbolize_keys.rb
 - lib/core_ext/string/camelize.rb
 - lib/core_ext/string/underscore.rb
+- ruby-cldr.gemspec
 - test/all.rb
 - test/export/code/numbers_test.rb
 - test/export/data/all.rb
 - test/export/data/calendars_test.rb
+- test/export/data/country_codes_test.rb
 - test/export/data/currencies_test.rb
 - test/export/data/delimiters_test.rb
 - test/export/data/languages_test.rb
@@ -233,7 +237,7 @@ files:
 homepage: http://github.com/ruby-i18n/ruby-cldr
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -248,8 +252,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Ruby library for exporting and using data from CLDR
 test_files: []