twitter_cldr 3.2.1 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ec4baf4cad935e856c25888e90a7fcc079009aa
-  data.tar.gz: bef96f67f7e7ea6e2e7fc8c86a209cdd073d5d34
+  metadata.gz: 4d3c83418de63bc5d460bb981ad0d1564a09de4f
+  data.tar.gz: 376f8ac7e27080e7cc1b604ef01e2f870bf9546d
 SHA512:
-  metadata.gz: 8ade377884a16acdf4ee1471816c2bf8551bff9d1f6382c0722354650e897cd3944831bf6a76c50241267167324aeedd8bc8b4acb70724ae790ebf0bb7c4e9da
-  data.tar.gz: 82703a0db2da4f4d9f5d3906274f7abd1a977113e7758e7d351ecf13f126979fd3de520077cd8cb9de2c8541306efc0dd38b80e781e8fb6e7e4c1733bb6e2e5d
+  metadata.gz: 625ac607af99d9ea241ffbcb406a6d024595ebe7255bb340a38a573e50ddd11afc577954e400427bf588b73fca3c0b75ea7c3848ee4c90f86fd2c7106bd617b1
+  data.tar.gz: 9746a38d2c5f56ec515e63ca88a75e0f72754d6b5553d05429bb93a8ef89d5f69ab742b1d8b269bcd4a41215fa6d87a068541c8852230ee9a0361b4af9b068e4

data/Gemfile

@@ -8,17 +8,19 @@ group :development, :test do
   gem 'pry'
   gem 'pry-nav'
 
-  gem 'ruby-prof' unless RUBY_PLATFORM == "java"
+  gem 'ruby-prof' unless RUBY_PLATFORM == 'java'
 
-  gem 'regexp_parser', '~> 0.1.6'
+  gem 'regexp_parser', '~> 0.1'
 end
 
 group :development do
   gem 'nokogiri', "~> 1.5.9"
 
-  gem 'ruby-cldr', :github => 'kl-7/ruby-cldr', :branch => 'kl_nubmber_patttern_pluralization'
+  gem 'ruby-cldr', github: 'svenfuchs/ruby-cldr'
   gem 'i18n', '~> 0.6.11'
   gem 'cldr-plurals', '~> 1.0.0'
+
+  gem 'rest-client', '~> 1.8'
 end
 
 group :test do
@@ -26,9 +28,12 @@ group :test do
   gem 'rr',    '~> 1.1.2'
 
   gem 'rubyzip'
-  gem 'coveralls', :require => false
+  gem 'coveralls', require: false
+  gem 'tins', '~> 1.6.0', require: false  # 1.7 breaks ruby 1.9 support
 
   gem 'simplecov'
   gem 'launchy'
+
+  gem 'benchmark-ips'
 end
 

data/History.txt

@@ -1,3 +1,14 @@
+== 3.3.0
+
+* Added `#as_territory` convenience method to LocalizedSymbol (@Anthony-Gaudino).
+* Improved documentation for world territories (@Anthony-Gaudino).
+* Fixed issues with Unicode regular expressions
+  - Unicode properties not recognized correctly
+  - Unicode properties not unioned correctly when placed side-by-side
+  - Inverted unicode properties not unioned correctly
+  - Leading dashes in character classes now treated as literals instead of as
+    denoting a range
+
 == 3.2.1
 * Fix units for Gujarati, Kannada, Marathi
 

data/README.md

@@ -430,6 +430,43 @@ TwitterCldr::Shared::Languages.translate_language("chino tradicional", :es, :en)
 TwitterCldr::Shared::Languages.translate_language("Traditional Chinese", :en, :es)  # "chino tradicional"
 ```
 
+### World Territories
+
+You can use the localize convenience method on territory code symbols to get their equivalents in another language:
+
+```ruby
+:gb.localize(:pt).as_territory                         # "Reino Unido"
+:cz.localize(:pt).as_territory                         # "República Tcheca"
+```
+
+Behind the scenes, these convenience methods are creating instances of `LocalizedSymbol`.  You can do the same thing if you're feeling adventurous:
+
+```ruby
+ls = TwitterCldr::Localized::LocalizedSymbol.new(:gb, :pt)
+ls.as_territory  # "Reino Unido"
+```
+
+In addition to translating territory codes, TwitterCLDR provides access to the full set of supported methods via the `TwitterCldr::Shared::Territories` class:
+
+```ruby
+# get all territories for the default locale
+TwitterCldr::Shared::Territories.all                                                 # { ... :tl=>"East Timor", :tm=>"Turkmenistan" ... }
+
+# get all territories for a specific locale
+TwitterCldr::Shared::Territories.all_for(:pt)                                        # { ... :tl=>"República Democrática de Timor-Leste", :tm=>"Turcomenistão" ... }
+
+# get a territory by its code for the default locale
+TwitterCldr::Shared::Territories.from_territory_code(:'gb')                          # "U.K."
+
+# get a territory from its code for a specific locale
+TwitterCldr::Shared::Territories.from_territory_code_for_locale(:gb, :pt)            # "Reino Unido"
+
+# translate a territory from one locale to another
+# signature: translate_territory(territory_name, source_locale, destination_locale)
+TwitterCldr::Shared::Territories.translate_territory("Reino Unido", :pt, :en)        # "U.K."
+TwitterCldr::Shared::Territories.translate_territory("U.K.", :en, :pt)               # "Reino Unido"
+```
+
 ### Postal Codes
 
 The CLDR contains postal code validation regexes for a number of countries.
@@ -464,20 +501,20 @@ postal_code.find_all("12345 23456")    # ["12345", "23456"]
 Get a list of supported territories by using the `#territories` method:
 
 ```ruby
-TwitterCldr::Shared::PostalCodes.territories  # [:ad, :am, :ar, :as, :at, ... ]
+TwitterCldr::Shared::PostalCodes.territories  # [:ac, :ad, :af, :ai, :al, ... ]
 ```
 
 Just want the regex?  No problem:
 
 ```ruby
 postal_code = TwitterCldr::Shared::PostalCodes.for_territory(:us) 
-postal_code.regexp  # /\d{5}([ \-]\d{4})?/
+postal_code.regexp  # /(\d{5})(?:[ \-](\d{4}))?/
 ```
 
 Get a sample of valid postal codes with the `#sample` method:
 
 ```ruby
-postal_code.sample(5)  # ["20274-2080", "17661", "18705", "77929", "73034-2737"]
+postal_code.sample(5)  # ["79220", "97037-1396", "41756", "07232-5538", "99181-2266"]
 ```
 
 ### Phone Codes

data/Rakefile

@@ -13,6 +13,8 @@ require 'rubygems/package_task'
 
 require './lib/twitter_cldr'
 
+require 'pry-nav'
+
 Bundler::GemHelper.install_tasks
 
 task :default => :spec
@@ -56,6 +58,7 @@ task :update do
       "update:tailoring_data",  # per locale
       "update:collation_tries", # per locale, must come after update:tailoring_data
       "update:rbnf_tests",      # per locale
+      "update:bidi_tests"
     ]
   else
     puts "You might also want to run this rake task using JRuby 1.7 (in 1.9 mode) to update collation data and RBNF tests."
@@ -64,13 +67,13 @@ task :update do
       "update:locales_resources",      # per locale (+ units resources using different CLDR and ruby-cldr, see LocalesResourcesImporter)
       "update:unicode_data",
       "update:unicode_properties",
+      "update:unicode_property_aliases",
       "update:generate_casefolder",    # must come after unicode data
-      "update:composition_exclusions",
       "update:postal_codes",
       "update:phone_codes",
       "update:language_codes",
-      "update:canonical_compositions",
       "update:segment_exceptions",     # per locale
+      "update:segment_tests",
       "update:readme"
     ]
   end
@@ -119,13 +122,21 @@ namespace :update do
   end
 
   desc 'Import Unicode property resources'
-  task :unicode_properties, :unicode_properties_path do |_, args|
-    TwitterCldr::Resources::UnicodePropertiesImporter.new(
-      args[:unicode_properties_path] || './vendor/unicode-data/properties',
+  task :unicode_properties, :properties_path do |_, args|
+    TwitterCldr::Resources::Properties::PropertiesImporter.new(
+      args[:properties_path] || './vendor/unicode-data/properties',
       './resources/unicode_data/properties'
     ).import
   end
 
+  desc 'Import unicode property value aliases'
+  task :unicode_property_aliases, :property_aliases_path do |_, args|
+    TwitterCldr::Resources::UnicodePropertyAliasesImporter.new(
+      args[:property_aliases_path] || './vendor/unicode-data',
+      './resources/unicode_data'
+    ).import
+  end
+
   desc 'Generate the casefolder class. Depends on unicode data'
   task :generate_casefolder do
     TwitterCldr::Resources::CasefolderClassGenerator.new(
@@ -134,18 +145,9 @@ namespace :update do
     ).generate
   end
 
-  desc 'Import composition exclusions resource'
-  task :composition_exclusions, :derived_normalization_props_path do |_, args|
-    TwitterCldr::Resources::CompositionExclusionsImporter.new(
-      args[:derived_normalization_props_path] || './vendor/unicode-data/DerivedNormalizationProps.txt',
-      './resources/unicode_data'
-    ).import
-  end
-
   desc 'Import postal codes resource'
-  task :postal_codes, :cldr_path do |_, args|
+  task :postal_codes do
     TwitterCldr::Resources::PostalCodesImporter.new(
-      args[:cldr_path] || './vendor/cldr',
       './resources/shared'
     ).import
   end
@@ -171,11 +173,6 @@ namespace :update do
     TwitterCldr::Resources::CollationTriesDumper.update_dumps
   end
 
-  desc 'Update canonical compositions resource'
-  task :canonical_compositions do
-    TwitterCldr::Resources::CanonicalCompositionsUpdater.new('./resources/unicode_data').update
-  end
-
   desc 'Import normalization quick check data'
   task :normalization_quick_check do
     TwitterCldr::Resources::NormalizationQuickCheckImporter.new(
@@ -199,7 +196,7 @@ namespace :update do
     ).import(TwitterCldr.supported_locales)
   end
 
-  desc 'Import segments exceptions'
+  desc 'Import segment exceptions'
   task :segment_exceptions do
     TwitterCldr::Resources::Uli::SegmentExceptionsImporter.new(
       './vendor/uli/segments',
@@ -207,6 +204,14 @@ namespace :update do
     ).import([:de, :en, :es, :fr, :it, :pt, :ru])  # only locales ULI supports at the moment
   end
 
+  desc 'Import segment tests'
+  task :segment_tests do
+    TwitterCldr::Resources::SegmentTestsImporter.new(
+      './vendor/unicode-data/segments',
+      './resources/shared/segments/tests'
+    ).import
+  end
+
   desc 'Update README'
   task :readme do |_, args|
     renderer = TwitterCldr::Resources::ReadmeRenderer.new(

data/lib/twitter_cldr/collation/collator.rb

@@ -33,9 +33,9 @@ module TwitterCldr
       end
 
       # Second arg options, supports an option :maximum_level, to
-      # pass on to SortKeyBuilder :maximum_level. 
+      # pass on to SortKeyBuilder :maximum_level.
       def get_sort_key(string_or_code_points, method_options = {})
-        TwitterCldr::Collation::SortKeyBuilder.build(get_collation_elements(string_or_code_points), :case_first => @options[:case_first], :maximum_level => method_options[:maximum_level])
+        TwitterCldr::Collation::SortKeyBuilder.build(get_collation_elements(string_or_code_points), case_first: @options[:case_first], maximum_level: method_options[:maximum_level])
       end
 
       def get_collation_elements(string_or_code_points)
@@ -108,7 +108,7 @@ module TwitterCldr
         while non_starter_pos < code_points.size && !suffixes.empty?
           # get next code point (possibly non-starter)
           non_starter_code_point = code_points[non_starter_pos]
-          combining_class        = TwitterCldr::Shared::CodePoint.find(non_starter_code_point).combining_class.to_i
+          combining_class        = TwitterCldr::Shared::CodePoint.get(non_starter_code_point).combining_class.to_i
 
           # code point is a starter or combining class has been already used (non-starter is 'blocked' from the prefix)
           break if combining_class == 0 || used_combining_classes[combining_class]

data/lib/twitter_cldr/collation/sort_key_builder.rb

@@ -248,11 +248,11 @@ module TwitterCldr
         @tertiary_bottom_count = total_tertiary_count - @tertiary_top_count
 
         @tertiary_common_space = {
-            :common       => @tertiary_common,
-            :bottom       => @tertiary_bottom,
-            :bottom_count => @tertiary_bottom_count,
-            :top          => @tertiary_top,
-            :top_count    => @tertiary_top_count
+            common:       @tertiary_common,
+            bottom:       @tertiary_bottom,
+            bottom_count: @tertiary_bottom_count,
+            top:          @tertiary_top,
+            top_count:    @tertiary_top_count
         }
       end
 
@@ -275,11 +275,11 @@ module TwitterCldr
       SECONDARY_BOTTOM_COUNT = SECONDARY_TOTAL_COUNT - SECONDARY_TOP_COUNT
 
       SECONDARY_COMMON_SPACE = {
-          :common       => SECONDARY_COMMON,
-          :bottom       => SECONDARY_BOTTOM,
-          :bottom_count => SECONDARY_BOTTOM_COUNT,
-          :top          => SECONDARY_TOP,
-          :top_count    => SECONDARY_TOP_COUNT
+          common:       SECONDARY_COMMON,
+          bottom:       SECONDARY_BOTTOM,
+          bottom_count: SECONDARY_BOTTOM_COUNT,
+          top:          SECONDARY_TOP,
+          top_count:    SECONDARY_TOP_COUNT
       }
 
       # Tertiary level compression constants

data/lib/twitter_cldr/data_readers/calendar_data_reader.rb

@@ -10,11 +10,11 @@ module TwitterCldr
       DEFAULT_TYPE = :medium
 
       TYPE_PATHS = {
-        :full       => [:full, :pattern],
-        :long       => [:long, :pattern],
-        :medium     => [:medium, :pattern],
-        :short      => [:short, :pattern],
-        :additional => [:additional_formats]
+        full:       [:full, :pattern],
+        long:       [:long, :pattern],
+        medium:     [:medium, :pattern],
+        short:      [:short, :pattern],
+        additional: [:additional_formats]
       }
 
       class << self
@@ -63,8 +63,8 @@ module TwitterCldr
           resource[:calendars].each_pair do |calendar_type, options|
             next if calendar_type == TwitterCldr::DEFAULT_CALENDAR_TYPE
             mirror_resource(
-              :from => resource[:calendars][TwitterCldr::DEFAULT_CALENDAR_TYPE],
-              :to   => resource[:calendars][calendar_type]
+              from: resource[:calendars][TwitterCldr::DEFAULT_CALENDAR_TYPE],
+              to:   resource[:calendars][calendar_type]
             )
           end
           resource
@@ -80,7 +80,7 @@ module TwitterCldr
             to[key] = from[key]
           else
             if to[key].is_a?(Hash) and from[key].is_a?(Hash)
-              mirror_resource(:from => from[key], :to => to[key])
+              mirror_resource(from: from[key], to: to[key])
             end
           end
         end

data/lib/twitter_cldr/data_readers/date_time_data_reader.rb

@@ -27,8 +27,8 @@ module TwitterCldr
 
       def gather_options
         {
-          :type => type,
-          :calendar_type => calendar_type
+          type: type,
+          calendar_type: calendar_type
         }
       end
 

data/lib/twitter_cldr/data_readers/number_data_reader.rb

@@ -18,12 +18,12 @@ module TwitterCldr
       SYMBOL_PATH = [:numbers, :symbols]
 
       TYPE_PATHS = {
-        :default       => [:decimal, :patterns],
-        :decimal       => [:decimal, :patterns],
-        :long_decimal  => [:decimal, :patterns, :long],
-        :short_decimal => [:decimal, :patterns, :short],
-        :currency      => [:currency, :patterns],
-        :percent       => [:percent, :patterns]
+        default:       [:decimal, :patterns],
+        decimal:       [:decimal, :patterns],
+        long_decimal:  [:decimal, :patterns, :long],
+        short_decimal: [:decimal, :patterns, :short],
+        currency:      [:currency, :patterns],
+        percent:       [:percent, :patterns]
       }
 
       ABBREVIATED_TYPES = [:long_decimal, :short_decimal]
@@ -51,11 +51,11 @@ module TwitterCldr
         @format = options[:format] || DEFAULT_FORMAT
       end
 
-      def format_number(number, options = [])
+      def format_number(number, options = {})
         precision = options[:precision] || 0
         pattern_for_number = pattern(number, precision == 0)
 
-        if pattern_for_number == 0
+        if pattern_for_number == '0'
           # there's no specific formatting for the number in the current locale
           number.to_s
         else
@@ -65,7 +65,7 @@ module TwitterCldr
       end
 
       def pattern(number = nil, decimal = true)
-        sign = number < 0 ? :negative : :positive 
+        sign = number < 0 ? :negative : :positive
         path = BASE_PATH + if valid_type_for?(number, type)
           TYPE_PATHS[type]
         else
@@ -134,7 +134,7 @@ module TwitterCldr
       end
 
       def get_key_for(number)
-        "1#{"0" * (number.to_i.abs.to_s.size - 1)}".to_i
+        "1#{"0" * (number.to_i.abs.to_s.size - 1)}".to_s.to_sym
       end
 
       def pattern_for_number(pattern, number, decimal)

data/lib/twitter_cldr/data_readers/timespan_data_reader.rb

@@ -13,35 +13,35 @@ module TwitterCldr
       BASE_PATH = [:units]
 
       PATHS = {
-        :ago => {
-          :default => :'hour-past',
-          :second  => :'second-past',
-          :minute  => :'minute-past',
-          :hour    => :'hour-past',
-          :day     => :'day-past',
-          :week    => :'week-past',
-          :month   => :'month-past',
-          :year    => :'year-past'
+        ago: {
+          default: :'hour-past',
+          second:  :'second-past',
+          minute:  :'minute-past',
+          hour:    :'hour-past',
+          day:     :'day-past',
+          week:    :'week-past',
+          month:   :'month-past',
+          year:    :'year-past'
         },
-        :until => {
-          :default => :'hour-future',
-          :second  => :'second-future',
-          :minute  => :'minute-future',
-          :hour    => :'hour-future',
-          :day     => :'day-future',
-          :week    => :'week-future',
-          :month   => :'month-future',
-          :year    => :'year-future'
+        until: {
+          default: :'hour-future',
+          second:  :'second-future',
+          minute:  :'minute-future',
+          hour:    :'hour-future',
+          day:     :'day-future',
+          week:    :'week-future',
+          month:   :'month-future',
+          year:    :'year-future'
         },
-        :none => {
-          :default => :second,
-          :second  => :second,
-          :minute  => :minute,
-          :hour    => :hour,
-          :day     => :day,
-          :week    => :week,
-          :month   => :month,
-          :year    => :year
+        none: {
+          default: :second,
+          second:  :second,
+          minute:  :minute,
+          hour:    :hour,
+          day:     :day,
+          week:    :week,
+          month:   :month,
+          year:    :year
         }
       }
 

data/lib/twitter_cldr/formatters/list_formatter.rb

@@ -51,7 +51,7 @@ module TwitterCldr
           result.gsub!(/\{(\d+)\}/) { $1 }  # unfortunately "{" and "}" are weak types - must replace
 
           if TwitterCldr::Shared::Languages.is_rtl?(@locale)
-            result = result.localize.to_reordered_s(:direction => :RTL)
+            result = result.localize.to_reordered_s(direction: :RTL)
           end
 
           result.gsub!(/(\d+)/) { elements[$1.to_i] }

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

@@ -11,9 +11,9 @@ module TwitterCldr
         options[:currency] ||= "USD"
         currency = TwitterCldr::Shared::Currencies.for_code(options[:currency])
         currency ||= {
-          :currency    => options[:currency],
-          :symbol      => options[:currency],
-          :cldr_symbol => options[:currency]
+          currency:    options[:currency],
+          symbol:      options[:currency],
+          cldr_symbol: options[:currency]
         }
 
         # overwrite with explicit symbol if given

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

@@ -22,23 +22,25 @@ module TwitterCldr
 
         def format_groups(string)
           return string if groups.empty?
+
           tokens = []
+
           tokens << chop_group(string, groups.first)
-          tokens << chop_group(string, groups.last) while string.length > groups.last
-          tokens << string
+          tokens << chop_group(string, groups.last) until string.empty?
+
           tokens.compact.reverse.join(separator)
         end
 
         def parse_groups(format)
           return [] unless index = format.rindex(',')
           rest   = format[0, index]
-          widths = [format.length - index - 1]
-          widths << rest.length - rest.rindex(',') - 1 if rest.rindex(',')
+          widths = [format.size - index - 1]
+          widths << rest.size - rest.rindex(',') - 1 if rest.rindex(',')
           widths.compact.uniq
         end
 
         def chop_group(string, size)
-          string.slice!(-size, size) if string.length > size
+          string.slice!([string.size - size, 0].max, size)
         end
 
         def prepare_format(format, symbols)

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

@@ -95,7 +95,7 @@ module TwitterCldr
             @decimal_tokenizer ||= TwitterCldr::Tokenizers::NumberTokenizer.new(@data_reader)
             decimal_tokens = @decimal_tokenizer.tokenize(decimal_format)
             @decimal_formatter ||= TwitterCldr::Formatters::NumberFormatter.new(@data_reader)
-            @decimal_formatter.format(decimal_tokens, number, :type => :decimal)
+            @decimal_formatter.format(decimal_tokens, number, type: :decimal)
           else
             RuleFormatter.format(number, rule_set, rule_group, locale)
           end

data/lib/twitter_cldr/formatters/numbers/rbnf/rule.rb

@@ -77,7 +77,7 @@ module TwitterCldr
         private
 
         def inline_substitutions(tokens)
-          parser.parse(tokens, :locale => locale)
+          parser.parse(tokens, locale: locale)
         end
 
         def parser

data/lib/twitter_cldr/formatters/numbers/rbnf/rule_set.rb

@@ -212,11 +212,12 @@ module TwitterCldr
 
             while low <= high
               mid = (low + high) / 2
+              mid_base_value = rules[mid].base_value
 
               case
-                when rules[mid].base_value > base_value
+                when mid_base_value > base_value
                   high = mid - 1
-                when rules[mid].base_value < base_value
+                when mid_base_value < base_value
                   low = mid + 1
                 else
                   break

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

@@ -25,8 +25,8 @@ module TwitterCldr
       class RbnfFormatter
 
         DEFAULT_SPELLOUT_OPTIONS = {
-          :rule_group => "SpelloutRules",
-          :rule_set => "spellout-numbering"
+          rule_group: "SpelloutRules",
+          rule_set: "spellout-numbering"
         }
 
         attr_reader :locale

data/lib/twitter_cldr/formatters/plurals/rules.rb

@@ -36,7 +36,7 @@ module TwitterCldr
             locale_cache[cache_key] ||= begin
               rsrc = TwitterCldr.get_locale_resource(locale, :plurals)[locale]
               rsrc.inject({}) do |ret, (rule_type, rule_data)|
-                ret[rule_type] = rule_data.merge(:rule => eval(rule_data[:rule]))
+                ret[rule_type] = rule_data.merge(rule: eval(rule_data[:rule]))
                 ret
               end
             end

data/lib/twitter_cldr/localized/localized_date.rb

@@ -49,8 +49,8 @@ module TwitterCldr
       def data_reader_for(type, options = {})
         TwitterCldr::DataReaders::DateDataReader.new(
           locale, options.merge({
-            :calendar_type => calendar_type,
-            :type => type
+            calendar_type: calendar_type,
+            type: type
           })
         )
       end

data/lib/twitter_cldr/localized/localized_datetime.rb

@@ -34,7 +34,7 @@ module TwitterCldr
 
       def to_additional_s(additional_format)
         data_reader = data_reader_for(:additional, {
-          :additional_format => additional_format
+          additional_format: additional_format
         })
 
         tokens = if data_reader.tokenizer.respond_to?(:full_tokenize)
@@ -51,21 +51,21 @@ module TwitterCldr
       def to_timespan(options = {})
         base_time = options[:base_time] || Time.now
         seconds = (self.to_time.base_obj.to_i - base_time.to_i).abs
-        TwitterCldr::Localized::LocalizedTimespan.new(seconds, options.merge(:locale => @locale, :direction => :none))
+        TwitterCldr::Localized::LocalizedTimespan.new(seconds, options.merge(locale: @locale, direction: :none))
       end
 
       def ago(options = {})
         base_time = (options[:base_time] || Time.now).gmtime
         seconds = self.to_time(base_time).base_obj.gmtime.to_i - base_time.to_i
         raise ArgumentError.new('Start date is after end date. Consider using "until" function.') if seconds > 0
-        TwitterCldr::Localized::LocalizedTimespan.new(seconds, options.merge(:locale => @locale))
+        TwitterCldr::Localized::LocalizedTimespan.new(seconds, options.merge(locale: @locale))
       end
 
       def until(options = {})
         base_time = (options[:base_time] || Time.now).gmtime
         seconds = self.to_time(base_time).base_obj.gmtime.to_i - base_time.to_i
         raise ArgumentError.new('End date is before start date. Consider using "ago" function.') if seconds < 0
-        TwitterCldr::Localized::LocalizedTimespan.new(seconds, options.merge(:locale => @locale))
+        TwitterCldr::Localized::LocalizedTimespan.new(seconds, options.merge(locale: @locale))
       end
 
       def additional_formats
@@ -97,7 +97,7 @@ module TwitterCldr
       end
 
       def with_timezone(timezone)
-        self.class.new(@base_obj, @locale, chain_params.merge(:timezone => timezone))
+        self.class.new(@base_obj, @locale, chain_params.merge(timezone: timezone))
       end
 
       protected
@@ -105,14 +105,14 @@ module TwitterCldr
       def data_reader_for(type, options = {})
         TwitterCldr::DataReaders::DateTimeDataReader.new(
           locale, options.merge({
-            :calendar_type => calendar_type,
-            :type => type
+            calendar_type: calendar_type,
+            type: type
           })
         )
       end
 
       def chain_params
-        { :calendar_type => @calendar_type, :timezone => @timezone }
+        { calendar_type: @calendar_type, timezone: @timezone }
       end
 
       def base_in_timezone