twitter_cldr 2.2.0 → 2.4.0

data/Gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source "https://rubygems.org"
 
 gemspec
 
@@ -10,7 +10,7 @@ end
 
 group :development do
   gem 'nokogiri'
-  gem 'ruby-cldr', :github => 'svenfuchs/ruby-cldr'
+  gem 'ruby-cldr', :github => 'camertron/ruby-cldr'
 end
 
 group :test do

data/History.txt

@@ -1,3 +1,14 @@
+== 2.4.0
+
+* Upgrade to CLDR v23.
+* Ability to disable loading of any custom locale resources.
+* Long and short decimal formatters now respect the :precision option.
+
+== 2.3.0
+
+* Adding timezone support to date/time formatting.
+* Removing the localize method from Date objects.  Call to_date on a LocalizedDateTime or LocalizedTime object instead.
+
 == 2.2.0
 
 * Relaxing JSON dependency to give users more version flexibility. JSON gem now has no version number in twitter-cldr-rb.

data/README.md

@@ -89,8 +89,8 @@ In addition to formatting regular decimals, TwitterCLDR supports short and long
 `Date`, `Time`, and `DateTime` objects are supported:
 
 ```ruby
-DateTime.now.localize(:es).to_full_s               # "lunes, 12 de diciembre de 2011 21:44:57 UTC -0800"
-DateTime.now.localize(:es).to_long_s               # "12 de diciembre de 2011 21:44:57 -08:00"
+DateTime.now.localize(:es).to_full_s               # "lunes, 12 de diciembre de 2011 21:44:57 UTC -08:00"
+DateTime.now.localize(:es).to_long_s               # "12 de diciembre de 2011 21:44:57 UTC"
 DateTime.now.localize(:es).to_medium_s             # "12/12/2011 21:44:57"
 DateTime.now.localize(:es).to_short_s              # "12/12/11 21:44"
 

data/Rakefile

@@ -80,7 +80,7 @@ namespace :update do
     TwitterCldr::Resources::TailoringImporter.new(
         args[:cldr_path] || './vendor/cldr',
         './resources/collation/tailoring',
-        args[:icu4j_jar_path] ||'./vendor/icu4j-49_1.jar'
+        args[:icu4j_jar_path] ||'./vendor/icu4j-50_1_1.jar'
     ).import(TwitterCldr.supported_locales)
   end
 

data/lib/twitter_cldr.rb

@@ -56,6 +56,7 @@ module TwitterCldr
   class << self
 
     attr_writer :locale
+    attr_accessor :disable_custom_locale_resources
 
     def resources
       @resources ||= TwitterCldr::Resources::Loader.new

data/lib/twitter_cldr/core_ext.rb

@@ -7,6 +7,6 @@
   TwitterCldr::Localized::LocalizedNumber.localize(klass)
 end
 
-[Array, Date, DateTime, String, Symbol, Time, Hash].each do |klass|
+[Array, DateTime, String, Symbol, Time, Hash].each do |klass|
   TwitterCldr::Localized::const_get("Localized#{klass}").localize(klass)
 end

data/lib/twitter_cldr/formatters/base.rb

@@ -9,12 +9,12 @@ module TwitterCldr
       attr_reader :tokenizer
 
       def format(obj, options = {})
-        process_tokens(self.get_tokens(obj, options), obj)
+        process_tokens(self.get_tokens(obj, options), obj, options)
       end
 
       protected
 
-      def process_tokens(tokens, obj)
+      def process_tokens(tokens, obj, options = {})
         result = ""
 
         tokens.each_with_index do |token, index|
@@ -22,7 +22,7 @@ module TwitterCldr
             when :composite
               result << eval(process_tokens(token.tokens, obj)).to_s
             when :pattern
-              result << self.result_for_token(token, index, obj)
+              result << self.result_for_token(token, index, obj, options)
             else
               if token.value.size > 0 && token.value[0].chr == "'" && token.value[-1].chr == "'"
                 result << token.value[1..-2]

data/lib/twitter_cldr/formatters/calendars/datetime_formatter.rb

@@ -6,6 +6,8 @@
 # This class has been adapted from Sven Fuch's ruby-cldr gem
 # See LICENSE for the accompanying license for his contributions
 
+require 'tzinfo'
+
 module TwitterCldr
   module Formatters
     class DateTimeFormatter < Base
@@ -49,8 +51,8 @@ module TwitterCldr
         )
       end
 
-      def result_for_token(token, index, date)
-        self.send(METHODS[token.value[0].chr], date, token.value, token.value.size)
+      def result_for_token(token, index, date, options = {})
+        self.send(METHODS[token.value[0].chr], date, token.value, token.value.size, options)
       end
 
       def additional_format_selector
@@ -69,7 +71,7 @@ module TwitterCldr
 
       # there is incomplete era data in CLDR for certain locales like Hindi
       # fall back if that happens
-      def era(date, pattern, length)
+      def era(date, pattern, length, options = {})
         choices = case length
           when 0
             ["", ""]
@@ -86,22 +88,22 @@ module TwitterCldr
         end
       end
 
-      def year(date, pattern, length)
+      def year(date, pattern, length, options = {})
         year = date.year.to_s
         year = year.length == 1 ? year : year[-2, 2] if length == 2
         year = year.rjust(length, '0') if length > 1
         year
       end
 
-      def year_of_week_of_year(date, pattern, length)
+      def year_of_week_of_year(date, pattern, length, options = {})
         raise NotImplementedError
       end
 
-      def day_of_week_in_month(date, pattern, length) # e.g. 2nd Wed in July
+      def day_of_week_in_month(date, pattern, length, options = {}) # e.g. 2nd Wed in July
         raise NotImplementedError
       end
 
-      def quarter(date, pattern, length)
+      def quarter(date, pattern, length, options = {})
         quarter = (date.month.to_i - 1) / 3 + 1
         case length
           when 1
@@ -115,7 +117,7 @@ module TwitterCldr
         end
       end
 
-      def quarter_stand_alone(date, pattern, length)
+      def quarter_stand_alone(date, pattern, length, options = {})
         quarter = (date.month.to_i - 1) / 3 + 1
         case length
           when 1
@@ -133,7 +135,7 @@ module TwitterCldr
         end
       end
 
-      def month(date, pattern, length)
+      def month(date, pattern, length, options = {})
         case length
           when 1
             date.month.to_s
@@ -151,7 +153,7 @@ module TwitterCldr
         end
       end
 
-      def month_stand_alone(date, pattern, length)
+      def month_stand_alone(date, pattern, length, options = {})
         case length
           when 1
             date.month.to_s
@@ -168,7 +170,7 @@ module TwitterCldr
         end
       end
 
-      def day(date, pattern, length)
+      def day(date, pattern, length, options = {})
         case length
           when 1
             date.day.to_s
@@ -177,7 +179,7 @@ module TwitterCldr
         end
       end
 
-      def weekday(date, pattern, length)
+      def weekday(date, pattern, length, options = {})
         key = WEEKDAY_KEYS[date.wday]
         case length
           when 1..3
@@ -189,7 +191,7 @@ module TwitterCldr
         end
       end
 
-      def weekday_local(date, pattern, length)
+      def weekday_local(date, pattern, length, options = {})
         # "Like E except adds a numeric value depending on the local starting day of the week"
         # CLDR does not contain data as to which day is the first day of the week, so we will assume Monday (Ruby default)
         case length
@@ -200,7 +202,7 @@ module TwitterCldr
         end
       end
 
-      def weekday_local_stand_alone(date, pattern, length)
+      def weekday_local_stand_alone(date, pattern, length, options = {})
         case length
           when 1
             weekday_local(date, pattern, length)
@@ -209,14 +211,14 @@ module TwitterCldr
         end
       end
 
-      def period(time, pattern, length)
+      def period(time, pattern, length, options = {})
         # Always use :wide form. Day-period design was changed in CLDR -
         # http://cldr.unicode.org/development/development-process/design-proposals/day-period-design that means some
         # major changes are required for a full support of day periods.
         @tokenizer.calendar[:periods][:format][:wide][time.strftime('%p').downcase.to_sym]
       end
 
-      def hour(time, pattern, length)
+      def hour(time, pattern, length, options = {})
         hour = time.hour
         hour = case pattern[0, 1]
           when 'h' # [1-12]
@@ -231,29 +233,36 @@ module TwitterCldr
         length == 1 ? hour.to_s : hour.to_s.rjust(length, '0')
       end
 
-      def minute(time, pattern, length)
+      def minute(time, pattern, length, options = {})
         length == 1 ? time.min.to_s : time.min.to_s.rjust(length, '0')
       end
 
-      def second(time, pattern, length)
+      def second(time, pattern, length, options = {})
         length == 1 ? time.sec.to_s : time.sec.to_s.rjust(length, '0')
       end
 
-      def second_fraction(time, pattern, length)
+      def second_fraction(time, pattern, length, options = {})
         raise ArgumentError.new('can not use the S format with more than 6 digits') if length > 6
         (time.usec.to_f / 10 ** (6 - length)).round.to_s.rjust(length, '0')
       end
 
-      def timezone(time, pattern, length)
+      def timezone(time, pattern, length, options = {})
+        # ruby is dumb and doesn't let you set non-UTC timezones in dates/times, so we have to pass it as an option instead
+        timezone_info = TZInfo::Timezone.get(options[:timezone] || "UTC")
+
         case length
           when 1..3
-            time.zone
+            timezone_info.current_period.abbreviation.to_s
           else
-            "UTC #{time.strftime("%z")}"
+            hours = (timezone_info.current_period.utc_offset.to_f / 60 ** 2).abs
+            divisor = hours.to_i
+            minutes = (hours % (divisor == 0 ? 1 : divisor)) * 60
+            sign = timezone_info.current_period.utc_offset < 0 ? "-" : "+"
+            "UTC #{sign}#{divisor.to_s.rjust(2, "0")}:#{minutes.floor.to_s.rjust(2, "0")}"
         end
       end
 
-      def timezone_generic_non_location(time, pattern, length)
+      def timezone_generic_non_location(time, pattern, length, options = {})
         raise NotImplementedError, 'requires timezone translation data'
       end
     end

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

@@ -36,8 +36,9 @@ module TwitterCldr
 
       def transform_number(number)
         if (number < NUMBER_MAX) && (number >= NUMBER_MIN)
-          sig_figs = ((number.to_i.to_s.size - 1) % 3)
-          number.to_s[0..sig_figs].to_i
+          power = (((number.to_s.length - 1) / 3) * 3).floor
+          factor = (10 ** power).to_f
+          number / factor
         else
           number
         end

data/lib/twitter_cldr/localized/localized_date.rb

@@ -7,26 +7,45 @@ module TwitterCldr
   module Localized
 
     class LocalizedDate < LocalizedDateTime
-      def to_datetime(time)
-        time_obj = time.is_a?(LocalizedTime) ? time.base_obj : time
-        LocalizedDateTime.new(DateTime.parse("#{@base_obj.strftime("%Y-%m-%d")}T#{time_obj.strftime("%H:%M:%S%z")}"), @locale, :calendar_type => @calendar_type)
+      def to_datetime(time = Time.now)
+        dt = DateTime.parse("#{@base_obj.strftime("%Y-%m-%d")}T#{unwrap_time_obj(time).strftime("%H:%M:%S%z")}")
+        LocalizedDateTime.new(dt, @locale, chain_params)
       end
 
       def to_time(base = Time.now)
-        time = Time.gm(
-          @base_obj.year,
-          @base_obj.month,
-          @base_obj.day,
-          base.hour,
-          base.min,
-          base.sec
-        )
-
-        LocalizedTime.new(time, @locale, :calendar_type => @calendar_type)
+        case @base_obj
+          when Time
+            LocalizedTime.new(@base_obj, @locale, chain_params)
+          when DateTime
+            utc_dt = @base_obj.new_offset(0)
+
+            time = Time.gm(
+              utc_dt.year,
+              utc_dt.month,
+              utc_dt.day,
+              utc_dt.hour,
+              utc_dt.min,
+              utc_dt.sec,
+              utc_dt.sec_fraction * (RUBY_VERSION < '1.9' ? 86400000000 : 1000000)
+            )
+
+            LocalizedTime.new(time, @locale, chain_params)
+          else
+            nil
+        end
       end
 
       protected
 
+      def unwrap_time_obj(time)
+        time.is_a?(LocalizedTime) ? time.base_obj : time
+      end
+
+      def base_in_timezone
+        time = unwrap_time_obj(to_time)
+        timezone_info.utc_to_local(time.is_a?(DateTime) ? time.new_offset(0) : time.utc)
+      end
+
       def formatter_const
         TwitterCldr::Formatters::DateFormatter
       end

data/lib/twitter_cldr/localized/localized_datetime.rb

@@ -3,20 +3,23 @@
 # Copyright 2012 Twitter, Inc
 # http://www.apache.org/licenses/LICENSE-2.0
 
+require 'tzinfo'
+
 module TwitterCldr
   module Localized
 
     class LocalizedDateTime < LocalizedObject
-      attr_reader :calendar_type
+      attr_reader :calendar_type, :timezone
 
       def initialize(obj, locale, options = {})
         super
         @calendar_type = options[:calendar_type] || TwitterCldr::DEFAULT_CALENDAR_TYPE
+        @timezone = options[:timezone] || "UTC"
       end
 
       TwitterCldr::Tokenizers::DateTimeTokenizer::VALID_TYPES.each do |format_type|
         define_method "to_#{format_type}_s" do
-          @formatter.format(@base_obj, :type => format_type.to_sym)
+          @formatter.format(base_in_timezone, chain_params.merge(:type => format_type.to_sym))
         end
       end
 
@@ -42,15 +45,14 @@ module TwitterCldr
 
       def to_s(options = {})
         if options[:format]
-          @formatter.format(@base_obj, options.merge(:type => :additional))
+          @formatter.format(base_in_timezone, options.merge(:type => :additional))
         else
           to_default_s
         end
       end
 
       def to_date
-        date = Date.new(@base_obj.year, @base_obj.month, @base_obj.day)
-        LocalizedDate.new(date, @locale, :calendar_type => @calendar_type)
+        LocalizedDate.new(@base_obj, @locale, chain_params)
       end
 
       def to_time(base = Time.now)
@@ -66,14 +68,30 @@ module TwitterCldr
           utc_dt.sec_fraction * (RUBY_VERSION < '1.9' ? 86400000000 : 1000000)
         )
 
-        LocalizedTime.new(time, @locale, :calendar_type => @calendar_type)
+        LocalizedTime.new(time, @locale, chain_params)
+      end
+
+      def with_timezone(timezone)
+        self.class.new(@base_obj, @locale, chain_params.merge(:timezone => timezone))
       end
 
       protected
 
+      def chain_params
+        { :calendar_type => @calendar_type, :timezone => @timezone }
+      end
+
+      def base_in_timezone
+        timezone_info.utc_to_local(@base_obj.new_offset(0))
+      end
+
       def formatter_const
         TwitterCldr::Formatters::DateTimeFormatter
       end
+
+      def timezone_info
+        (@@timezone_info ||= {})[@timezone] ||= TZInfo::Timezone.get(@timezone)
+      end
     end
 
   end

data/lib/twitter_cldr/localized/localized_time.rb

@@ -9,23 +9,32 @@ module TwitterCldr
     class LocalizedTime < LocalizedDateTime
       def to_datetime(date)
         date_obj = date.is_a?(LocalizedDate) ? date.base_obj : date
-        LocalizedDateTime.new(DateTime.parse("#{date_obj.strftime("%Y-%m-%d")}T#{@base_obj.strftime("%H:%M:%S%z")}"), @locale, :calendar_type => @calendar_type)
+        dt = DateTime.parse("#{date_obj.strftime("%Y-%m-%d")}T#{@base_obj.strftime("%H:%M:%S%z")}")
+        LocalizedDateTime.new(dt, @locale, chain_params)
       end
 
       def to_time(base_time = Time.now)
         self
       end
 
+      def to_date
+        LocalizedDate.new(@base_obj, @locale, chain_params)
+      end
+
       def gmtime
-        LocalizedTime.new(@base_obj.gmtime, @locale, :calendar_type => @calendar_type)
+        LocalizedTime.new(@base_obj.gmtime, @locale, chain_params)
       end
 
       def localtime
-        LocalizedTime.new(@base_obj.localtime, @locale, :calendar_type => @calendar_type)
+        LocalizedTime.new(@base_obj.localtime, @locale, chain_params)
       end
 
       protected
 
+      def base_in_timezone
+        timezone_info.utc_to_local(@base_obj.utc)
+      end
+
       def formatter_const
         TwitterCldr::Formatters::TimeFormatter
       end