twitter_cldr 1.9.1 → 2.0.0

data/lib/twitter_cldr/formatters/numbers/abbreviated/long_decimal_formatter.rb

@@ -0,0 +1,18 @@
+# encoding: UTF-8
+
+# Copyright 2012 Twitter, Inc
+# http://www.apache.org/licenses/LICENSE-2.0
+
+module TwitterCldr
+  module Formatters
+    class LongDecimalFormatter < AbbreviatedNumberFormatter
+
+      protected
+
+      def get_type
+        :long_decimal
+      end
+
+    end
+  end
+end

data/lib/twitter_cldr/formatters/numbers/abbreviated/short_decimal_formatter.rb

@@ -0,0 +1,18 @@
+# encoding: UTF-8
+
+# Copyright 2012 Twitter, Inc
+# http://www.apache.org/licenses/LICENSE-2.0
+
+module TwitterCldr
+  module Formatters
+    class ShortDecimalFormatter < AbbreviatedNumberFormatter
+
+      protected
+
+      def get_type
+        :short_decimal
+      end
+
+    end
+  end
+end

data/lib/twitter_cldr/formatters/numbers/currency_formatter.rb

@@ -9,27 +9,32 @@ module TwitterCldr
       DEFAULT_CURRENCY_SYMBOL = "$"
       DEFAULT_PRECISION = 2
 
-      def initialize(options = {})
-        @tokenizer = TwitterCldr::Tokenizers::NumberTokenizer.new(:locale => self.extract_locale(options), :type => :currency)
-        super
-      end
-
       def format(number, options = {})
-        if options[:currency]
-          currency ||= TwitterCldr::Shared::Currencies.for_code(options[:currency])
-          currency ||= TwitterCldr::Shared::Currencies.for_country(options[:currency])
-          currency ||= { :symbol => options[:currency] }
-        else
-          currency = { :symbol => DEFAULT_CURRENCY_SYMBOL }
-        end
+        options[:currency] ||= "USD"
+        currency = TwitterCldr::Shared::Currencies.for_code(options[:currency])
+        currency ||= TwitterCldr::Shared::Currencies.for_country(options[:currency])
+        currency ||= { :symbol => options[:currency], :currency => options[:currency] }
+
+        digits_and_rounding = resource(options[:currency])
+        options[:precision] ||= digits_and_rounding[:digits]
+        options[:rounding] ||= digits_and_rounding[:rounding]
+
+        super(number, options).gsub('¤', (currency[:symbol] || currency[:currency].to_s))
+      end
 
-        super(number, options).gsub('¤', currency[:symbol])
+      private
+      def resource(code)
+        @resource ||= TwitterCldr.get_resource(:shared, :currency_digits_and_rounding)
+        @resource[code.to_sym] || @resource[:DEFAULT]
       end
 
-      def default_format_options_for(number)
-        precision = precision_from(number)
-        { :precision => precision == 0 ? DEFAULT_PRECISION : precision }
+      def get_tokens(obj, options = {})
+        opts = options.dup.merge(
+          :sign => obj.abs == obj ? :positive : :negative,
+          :type => :currency
+        )
+        @tokenizer.tokens(opts)
       end
     end
   end
-end
+end

data/lib/twitter_cldr/formatters/numbers/decimal_formatter.rb

@@ -6,20 +6,11 @@
 module TwitterCldr
   module Formatters
     class DecimalFormatter < NumberFormatter
-      def initialize(options = {})
-        @tokenizer = TwitterCldr::Tokenizers::NumberTokenizer.new(:locale => self.extract_locale(options), :type => :decimal)
-        super
-      end
-
       def format(number, options = {})
         super(number, options)
       rescue TypeError, ArgumentError
         number
       end
-
-      def default_format_options_for(number)
-        { :precision => precision_from(number) }
-      end
     end
   end
 end

data/lib/twitter_cldr/formatters/numbers/helpers/base.rb

@@ -10,7 +10,7 @@ module TwitterCldr
         def interpolate(string, value, orientation = :right)
           value  = value.to_s
           length = value.length
-          start = orientation == :left ? 0 : -length
+          start  = orientation == :left ? 0 : -length
 
           string = string.dup
           string = string.ljust(length, '#') if string.length < length

data/lib/twitter_cldr/formatters/numbers/number_formatter.rb

@@ -11,13 +11,15 @@ module TwitterCldr
       DEFAULT_SYMBOLS = { :group => ',', :decimal => '.', :plus_sign => '+', :minus_sign => '-' }
 
       def initialize(options = {})
+        @tokenizer = TwitterCldr::Tokenizers::NumberTokenizer.new(:locale => extract_locale(options))
         @symbols = DEFAULT_SYMBOLS.merge(tokenizer.symbols)
       end
 
-      def format(number, options = {})
-        opts = self.default_format_options_for(number).merge(options)
-        prefix, suffix, integer_format, fraction_format = *partition_tokens(self.get_tokens(number, opts))
-        
+      def format(number, opts = {})
+        opts[:precision] ||= precision_from(number)
+        prefix, suffix, integer_format, fraction_format = *partition_tokens(get_tokens(number, opts))
+        number = transform_number(number)
+
         int, fraction = parse_number(number, opts)
         result =  integer_format.apply(int, opts)
         result << fraction_format.apply(fraction, opts) if fraction
@@ -26,6 +28,10 @@ module TwitterCldr
 
       protected
 
+      def transform_number(number)
+        number  # noop for base class
+      end
+
       def partition_tokens(tokens)
         [tokens[0] || "",
          tokens[2] || "",
@@ -34,14 +40,22 @@ module TwitterCldr
       end
 
       def parse_number(number, options = {})
-        precision = options[:precision] || self.precision_from(number)
-        number = "%.#{precision}f" % round_to(number, precision).abs
+        precision = options[:precision] || precision_from(number)
+        rounding = options[:rounding] || 0
+
+        number = "%.#{precision}f" % round_to(number, precision, rounding).abs
         number.split(".")
       end
 
-      def round_to(number, precision)
+      def round_to(number, precision, rounding = 0)
         factor = 10 ** precision
-        (number * factor).round.to_f / factor
+        result = (number * factor).round.to_f / factor
+        if rounding > 0
+          rounding = rounding.to_f / factor
+          result = (result *  (1.0 / rounding)).round.to_f / (1.0 / rounding)
+        end
+
+        result
       end
 
       def precision_from(num)
@@ -50,8 +64,9 @@ module TwitterCldr
       end
 
       def get_tokens(obj, options = {})
-        obj.abs == obj ? @tokenizer.tokens(:sign => :positive) : @tokenizer.tokens(:sign => :negative)
+        opts = options.dup.merge(:sign => obj.abs == obj ? :positive : :negative)
+        @tokenizer.tokens(opts)
       end
     end
   end
-end
+end

data/lib/twitter_cldr/formatters/numbers/percent_formatter.rb

@@ -8,11 +8,6 @@ module TwitterCldr
     class PercentFormatter < NumberFormatter
       DEFAULT_PERCENT_SIGN = "%"
 
-      def initialize(options = {})
-        @tokenizer = TwitterCldr::Tokenizers::NumberTokenizer.new(:locale => self.extract_locale(options), :type => :percent)
-        super
-      end
-
       def format(number, options = {})
         super(number, options).gsub('¤', @tokenizer.symbols[:percent_sign] || DEFAULT_PERCENT_SIGN)
       end
@@ -20,6 +15,14 @@ module TwitterCldr
       def default_format_options_for(number)
         { :precision => 0 }
       end
+
+      def get_tokens(obj, options = {})
+        opts = options.dup.merge(
+          :sign => obj.abs == obj ? :positive : :negative,
+          :type => :percent
+        )
+        @tokenizer.tokens(opts)
+      end
     end
   end
-end
+end

data/lib/twitter_cldr/localized/localized_datetime.rb

@@ -40,8 +40,12 @@ module TwitterCldr
         TwitterCldr::Localized::LocalizedTimespan.new(seconds, options.merge(:locale => @locale))
       end
 
-      def to_s
-        to_default_s
+      def to_s(options = {})
+        if options[:format]
+          @formatter.format(@base_obj, options.merge(:type => :additional))
+        else
+          to_default_s
+        end
       end
 
       def to_date

data/lib/twitter_cldr/localized/localized_number.rb

@@ -7,8 +7,14 @@ module TwitterCldr
   module Localized
 
     class LocalizedNumber < LocalizedObject
-      TYPES = [:decimal, :currency, :percent]
       DEFAULT_TYPE = :decimal
+      TYPES = [
+        :decimal,
+        :short_decimal,
+        :long_decimal,
+        :currency,
+        :percent,
+      ]
 
       attr_reader :type
 
@@ -28,7 +34,7 @@ module TwitterCldr
       end
 
       def to_s(options = {})
-        @formatter.format(@base_obj, options)
+        @formatter.format(@base_obj, options.merge(:type => @type))
       end
 
       def plural_rule
@@ -38,7 +44,7 @@ module TwitterCldr
       protected
 
       def formatter_const
-        TwitterCldr::Formatters.const_get("#{@type.to_s.capitalize}Formatter")
+        TwitterCldr::Formatters.const_get("#{@type.to_s.split("_").map(&:capitalize).join}Formatter")
       end
 
       def to_type(target_type)

data/lib/twitter_cldr/localized/localized_timespan.rb

@@ -8,7 +8,7 @@ module TwitterCldr
 
     class LocalizedTimespan < LocalizedObject
       def initialize(seconds, options = {})
-        super(seconds, options[:locale], options)
+        super(seconds, options[:locale] || TwitterCldr.get_locale, options)
       end
 
       def to_s(options = {})

data/lib/twitter_cldr/resources.rb

@@ -5,17 +5,18 @@
 
 module TwitterCldr
   module Resources
-    autoload :CanonicalCompositionsUpdater,   'twitter_cldr/resources/canonical_compositions_updater'
-    autoload :CollationTriesDumper,           'twitter_cldr/resources/collation_tries_dumper'
-    autoload :CompositionExclusionsImporter,  'twitter_cldr/resources/composition_exclusions_importer'
-    autoload :CustomLocalesResourcesImporter, 'twitter_cldr/resources/custom_locales_resources_importer'
-    autoload :LanguageCodesImporter,          'twitter_cldr/resources/language_codes_importer'
-    autoload :Loader,                         'twitter_cldr/resources/loader'
-    autoload :LocalesResourcesImporter,       'twitter_cldr/resources/locales_resources_importer'
-    autoload :PhoneCodesImporter,             'twitter_cldr/resources/phone_codes_importer'
-    autoload :PostalCodesImporter,            'twitter_cldr/resources/postal_codes_importer'
-    autoload :TailoringImporter,              'twitter_cldr/resources/tailoring_importer'
-    autoload :UnicodeDataImporter,            'twitter_cldr/resources/unicode_data_importer'
-    autoload :BidiTestImporter,               'twitter_cldr/resources/bidi_test_importer'
+    autoload :CanonicalCompositionsUpdater,       'twitter_cldr/resources/canonical_compositions_updater'
+    autoload :CollationTriesDumper,               'twitter_cldr/resources/collation_tries_dumper'
+    autoload :CompositionExclusionsImporter,      'twitter_cldr/resources/composition_exclusions_importer'
+    autoload :CurrenciesImporter,                 'twitter_cldr/resources/currencies_importer'
+    autoload :CustomLocalesResourcesImporter,     'twitter_cldr/resources/custom_locales_resources_importer'
+    autoload :LanguageCodesImporter,              'twitter_cldr/resources/language_codes_importer'
+    autoload :Loader,                             'twitter_cldr/resources/loader'
+    autoload :LocalesResourcesImporter,           'twitter_cldr/resources/locales_resources_importer'
+    autoload :PhoneCodesImporter,                 'twitter_cldr/resources/phone_codes_importer'
+    autoload :PostalCodesImporter,                'twitter_cldr/resources/postal_codes_importer'
+    autoload :TailoringImporter,                  'twitter_cldr/resources/tailoring_importer'
+    autoload :UnicodeDataImporter,                'twitter_cldr/resources/unicode_data_importer'
+    autoload :BidiTestImporter,                   'twitter_cldr/resources/bidi_test_importer'
   end
 end

data/lib/twitter_cldr/resources/custom_locales_resources_importer.rb

@@ -11,7 +11,7 @@ module TwitterCldr
 
     class CustomLocalesResourcesImporter
 
-      API_ENDPOINT = "http://translate.twttr.com/api/2/twitter/phrase/%s/translations.json"
+      API_ENDPOINT = "http://translate.twitter.com/api/2/twitter/phrase/%s/translations.json"
 
       TIME_PERIODS = {
           :day    => 19636,

data/lib/twitter_cldr/resources/download.rb

@@ -8,7 +8,7 @@ require 'cldr/download'
 module TwitterCldr
   module Resources
 
-    CLDR_URL = 'http://unicode.org/Public/cldr/21/core.zip'
+    CLDR_URL = 'http://unicode.org/Public/cldr/22.1/core.zip'
 
     class << self
 

data/lib/twitter_cldr/resources/locales_resources_importer.rb

@@ -12,7 +12,7 @@ module TwitterCldr
 
     class LocalesResourcesImporter
 
-      COMPONENTS = %w[calendars languages numbers units plurals lists layout]
+      COMPONENTS = %w[calendars languages numbers units plurals lists layout currencies]
 
       # Arguments:
       #
@@ -39,19 +39,23 @@ module TwitterCldr
       # Copies zh plurals to zh-Hant (they can share, but locale code needs to be different).
       #
       def copy_zh_hant_plurals
-        File.open(File.join(@output_path, 'zh-Hant', 'plurals.yml'), 'w:utf-8') do |output|
-          data = YAML.load(File.read(File.join(@output_path, 'zh', 'plurals.yml')))
+        File.open(File.join(@output_path, 'locales', 'zh-Hant', 'plurals.yml'), 'w:utf-8') do |output|
+          data = YAML.load(File.read(File.join(@output_path, 'locales', 'zh', 'plurals.yml')))
           output.write(YAML.dump(:'zh-Hant' => data[:zh].gsub(':zh', ":'zh-Hant'")))
         end
       end
 
       def import_components
-        Cldr::Export.export(:locales => TwitterCldr.supported_locales, :components => COMPONENTS, :target => @output_path) do |component, locale, path|
+        Cldr::Export.export(:locales => TwitterCldr.supported_locales, :components => COMPONENTS, :target => File.join(@output_path, 'locales')) do |component, locale, path|
           add_buddhist_calendar(component, locale, path)
           process_plurals(component, locale, path)
           deep_symbolize(component, locale, path)
         end
 
+        Cldr::Export.export(:components => ["currency_digits_and_rounding"], :target => File.join(@output_path, 'shared')) do |component, locale, path|
+          deep_symbolize(component, locale, path)
+        end
+
         copy_zh_hant_plurals
       end
 
@@ -65,7 +69,7 @@ module TwitterCldr
       end
 
       def process_plurals(component, locale, path)
-        return unless component == 'plurals'
+        return unless component == 'Plurals'
 
         plural_rules = File.read(path)
 
@@ -79,7 +83,7 @@ module TwitterCldr
       # TODO: export buddhist calendar from CLDR data instead of using BUDDHIST_CALENDAR constant.
       #
       def add_buddhist_calendar(component, locale, path)
-        return unless component == 'calendars' && locale == :th
+        return unless component == 'Calendars' && locale == :th
 
         data = YAML.load(File.read(path))
         data['th']['calendars']['buddhist'] = BUDDHIST_CALENDAR

data/lib/twitter_cldr/shared/bidi.rb

@@ -465,36 +465,36 @@ module TwitterCldr
 
           # Process from the end as we are copying the array over itself here.
           (@formatter_indices.size - 1).downto(0) do |index|
-              next_fmt = @formatter_indices[index]
-
-              # nextFmt points to a location in the original array.  So,
-              # nextFmt+1 is the target of our copying.  output is the location
-              # to which we last copied, thus we can derive the length of the
-              # copy from it.
-              len = output - next_fmt - 1
-              output = next_fmt
-              input -= len
-
-              # Note that we no longer need 'types' at this point, so we
-              # only edit 'levels'.
-              if next_fmt + 1 < @levels.size
-                arraycopy(@levels, input, @levels, next_fmt + 1, len)
-              end
+            next_fmt = @formatter_indices[index]
+
+            # nextFmt points to a location in the original array.  So,
+            # nextFmt+1 is the target of our copying.  output is the location
+            # to which we last copied, thus we can derive the length of the
+            # copy from it.
+            len = output - next_fmt - 1
+            output = next_fmt
+            input -= len
+
+            # Note that we no longer need 'types' at this point, so we
+            # only edit 'levels'.
+            if next_fmt + 1 < @levels.size
+              arraycopy(@levels, input, @levels, next_fmt + 1, len)
+            end
 
-              # Now set the level at the reinsertion point.
-              right_level = if output == @levels.length - 1
-                @base_embedding
-              else
-                @levels[output + 1] || 0
-              end
+            # Now set the level at the reinsertion point.
+            right_level = if output == @levels.length - 1
+              @base_embedding
+            else
+              @levels[output + 1] || 0
+            end
 
-              left_level = if input == 0
-                @base_embedding
-              else
-                @levels[input] || 0;
-              end
+            left_level = if input == 0
+              @base_embedding
+            else
+              @levels[input] || 0;
+            end
 
-              @levels[output] = [left_level, right_level].max
+            @levels[output] = [left_level, right_level].max
           end
         end