twitter_cldr 1.5.0 → 1.6.0

data/lib/twitter_cldr/{shared/resources.rb → resources/loader.rb}

@@ -4,8 +4,9 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 
 module TwitterCldr
-  module Shared
-    class Resources
+  module Resources
+
+    class Loader
 
       def get_resource(*path)
         resources_cache[resource_file_path(path)]
@@ -25,8 +26,19 @@ module TwitterCldr
         "#{File.join(*path.map(&:to_s))}.yml"
       end
 
-      def load_resource(path)
-        TwitterCldr::Utils.deep_symbolize_keys(YAML.load(read_resource_file(path)))
+      def load_resource(path, merge_custom = true)
+        base = TwitterCldr::Utils.deep_symbolize_keys(YAML.load(read_resource_file(path)))
+        custom_path = File.join("custom", path)
+
+        if merge_custom && resource_exists?(custom_path)
+          TwitterCldr::Utils.deep_merge!(base, load_resource(custom_path, false))
+        end
+
+        base
+      end
+
+      def resource_exists?(path)
+        File.exist?(File.join(TwitterCldr::RESOURCES_DIR, path))
       end
 
       def read_resource_file(path)
@@ -40,5 +52,6 @@ module TwitterCldr
       end
 
     end
+
   end
 end

data/lib/twitter_cldr/shared.rb

@@ -9,7 +9,6 @@ module TwitterCldr
     autoload :Currencies,  'twitter_cldr/shared/currencies'
     autoload :Languages,   'twitter_cldr/shared/languages'
     autoload :Numbers,     'twitter_cldr/shared/numbers'
-    autoload :Resources,   'twitter_cldr/shared/resources'
     autoload :CodePoint,   'twitter_cldr/shared/code_point'
   end
 end

data/lib/twitter_cldr/tokenizers/base.rb

@@ -12,8 +12,8 @@ module TwitterCldr
 
       def initialize(options = {})
         @locale = TwitterCldr.convert_locale(options[:locale] || TwitterCldr::DEFAULT_LOCALE)
-        self.init_resources
-        self.init_placeholders
+        init_resources
+        init_placeholders
       end
 
       protected
@@ -22,9 +22,9 @@ module TwitterCldr
       # expanded format string into whatever parts are defined by the subclass's token type and token splitter regexes.
       def tokenize_format(text)
         final = []
-        text.split(self.token_splitter_regex).each_with_index do |token, index|
+        text.split(token_splitter_regex).each_with_index do |token, index|
           unless index == 0 && token == ""
-            self.token_type_regexes.each do |token_type|
+            token_type_regexes.each do |token_type|
               if token =~ token_type[:regex]
                 if token_type[:type] == :composite
                   content = token.match(token_type[:content])[1]
@@ -65,11 +65,11 @@ module TwitterCldr
 
       def tokens_with_placeholders_for(key)
         @@token_cache ||= {}
-        cache_key = self.compute_cache_key(@locale, key, type)
+        cache_key = compute_cache_key(@locale, key, type)
 
         unless @@token_cache.include?(cache_key)
           result = []
-          tokens = self.tokenize_pattern(self.pattern_for(self.traverse(key)))
+          tokens = tokenize_pattern(pattern_for(traverse(key)))
           tokens.each do |token|
             result << token
           end
@@ -117,15 +117,15 @@ module TwitterCldr
       def expand_pattern(format_str, type)
         if format_str.is_a?(Symbol)
           # symbols mean another path was given
-          self.expand_pattern(self.pattern_for(self.traverse(format_str.to_s.split('.').map(&:to_sym))), type)
+          expand_pattern(pattern_for(traverse(format_str.to_s.split('.').map(&:to_sym))), type)
         else
           parts = tokenize_pattern(format_str)
           final = []
 
           parts.each do |part|
             case part[:type]
-              when :placeholder then
-                placeholder = self.choose_placeholder(part[:value], @placeholders)
+              when :placeholder
+                placeholder = choose_placeholder(part[:value], @placeholders)
                 final += placeholder ? placeholder.tokens(:type => type) : []
               else
                 final << part

data/lib/twitter_cldr/tokenizers/calendars/datetime_tokenizer.rb

@@ -79,10 +79,6 @@ module TwitterCldr
       def pattern_for(resource)
         resource.is_a?(Hash) ? resource[:pattern] : resource
       end
-
-      def path_map
-        PATH_MAP
-      end
     end
   end
 end

data/lib/twitter_cldr/tokenizers/calendars/timespan_tokenizer.rb

@@ -6,11 +6,11 @@
 module TwitterCldr
   module Tokenizers
     class TimespanTokenizer < Base
+      VALID_UNITS = [:second, :minute, :hour, :day, :week, :month, :year]
+
       def initialize(options = {})
         super(options)
 
-        @type = options[:type] || :decimal
-
         @token_splitter_regex = /([^0*#,\.]*)([0#,\.]+)([^0*#,\.]*)$/ # creates spaces
         @token_type_regexes   = [
             { :type => :pattern, :regex => /[0?#,\.]*/ }, # splits token at right places
@@ -37,13 +37,23 @@ module TwitterCldr
                 :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
             }
         }
       end
 
       def tokens(options = {})
-        path = full_path(options[:direction], options[:unit] || :default)
-        pluralization = TwitterCldr::Formatters::Plurals::Rules.rule_for(options[:number], @locale)
+        path = full_path(options[:direction], options[:unit], options[:type])
+        pluralization = options[:rule] || TwitterCldr::Formatters::Plurals::Rules.rule_for(options[:number], @locale)
 
         case pluralization # sometimes the plural rule will return ":one" when the resource only contains a path with "1"
           when :zero
@@ -53,7 +63,7 @@ module TwitterCldr
           when :two
             pluralization = 2 if token_exists(path + [2])
         end
-        path += [pluralization]
+        path << pluralization
         tokens_with_placeholders_for(path) if token_exists(path)
       end
 
@@ -63,10 +73,14 @@ module TwitterCldr
         true if @@token_cache.include?(cache_key) || traverse(path)
       end
 
+      def all_types_for(unit, direction)
+        traverse(@base_path + [@paths[direction][unit]]).keys
+      end
+
       protected
 
-      def full_path(direction, unit)
-        @base_path + [@paths[direction][unit]]
+      def full_path(direction, unit, type)
+        @base_path + [@paths[direction][unit], type]
       end
 
       def init_resources

data/lib/twitter_cldr/utils.rb

@@ -22,6 +22,17 @@ module TwitterCldr
         end
       end
 
+      def deep_merge!(first, second)
+        if first.is_a?(Hash) && second.is_a?(Hash)
+          second.each { |key, val| first[key] = deep_merge!(first[key], val) }
+        elsif first.is_a?(Array) && second.is_a?(Array)
+          second.each_with_index { |elem, index| first[index] = deep_merge!(first[index], elem) }
+        else
+         return second
+        end
+        first
+      end
+
       def compute_cache_key(*pieces)
         if pieces && pieces.size > 0
           pieces.join("|").hash

data/lib/twitter_cldr/version.rb

@@ -4,5 +4,5 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 
 module TwitterCldr
-  VERSION = "1.5.0"
+  VERSION = "1.6.0"
 end

data/resources/collation/tailoring/af.yml

@@ -0,0 +1,3 @@
+---
+tailored_table: 0149; [41, 5, 10]
+suppressed_contractions: ''

data/resources/collation/tailoring/ar.yml

@@ -0,0 +1,21 @@
+---
+tailored_table: 0629; [6144, 87, 5]
+
+  FE94; [6144, 87, 6]
+
+  FE93; [6144, 87, 7]
+
+  0649; [6287, 87, 5]
+
+  FBE8; [6287, 87, 6]
+
+  FBE9; [6287, 87, 7]
+
+  FEF0; [6287, 87, 8]
+
+  FEEF; [6287, 87, 9]
+
+  FC90; [6287, 87, A]
+
+  FC5D; [6287, 87, B]
+suppressed_contractions: ''

data/resources/collation/tailoring/ca.yml

@@ -0,0 +1,9 @@
+---
+tailored_table: 0140; [3D, 87, 5]
+
+  006C 00B7; [3D, 87, 5]
+
+  013F; [3D, 87, 86]
+
+  004C 00B7; [3D, 87, 86]
+suppressed_contractions: ''

data/resources/collation/tailoring/cs.yml

@@ -0,0 +1,25 @@
+---
+tailored_table: 0063 030C; [2C04, 5, 5]
+
+  0043 030C; [2C04, 5, 86]
+
+  0063 0068; [3604, 5, 5]
+
+  0063 0048; [3604, 5, 46]
+
+  0043 0068; [3604, 5, 47]
+
+  0043 0048; [3604, 5, 88]
+
+  0072 030C; [4A04, 5, 5]
+
+  0052 030C; [4A04, 5, 86]
+
+  0073 030C; [4C04, 5, 5]
+
+  0053 030C; [4C04, 5, 86]
+
+  007A 030C; [5A04, 5, 5]
+
+  005A 030C; [5A04, 5, 86]
+suppressed_contractions: ''

data/resources/collation/tailoring/da.yml

@@ -0,0 +1,59 @@
+---
+tailored_table: 0111; [2D, 87, 5]
+
+  0110; [2D, 87, 86]
+
+  00F0; [2D, 88, 5]
+
+  00D0; [2D, 88, 86]
+
+  00FE; [4D, 5, 6][35, 5, 5]
+
+  00DE; [4D, 5, 90][35, 5, 8F]
+
+  0075 0308; [57, 87, 5]
+
+  0055 0308; [57, 87, 86]
+
+  0075 030B; [57, 88, 5]
+
+  0055 030B; [57, 88, 86]
+
+  00E6; [5AA1, 5, 5][4, 0, C0]
+
+  00C6; [5AA1, 5, 86][4, 0, C0]
+
+  0061 0308; [5AA1, 87, 5][4, 0, C0]
+
+  0041 0308; [5AA1, 87, 86][4, 0, C0]
+
+  0065 0328; [5AA1, 88, 5][4, 0, C0]
+
+  0045 0328; [5AA1, 88, 86][4, 0, C0]
+
+  00F8; [5AA1, 5, 5][5, 0, C0]
+
+  00D8; [5AA1, 5, 86][5, 0, C0]
+
+  006F 0308; [5AA1, 87, 5][5, 0, C0]
+
+  004F 0308; [5AA1, 87, 86][5, 0, C0]
+
+  006F 030B; [5AA1, 88, 5][5, 0, C0]
+
+  004F 030B; [5AA1, 88, 86][5, 0, C0]
+
+  0153; [5AA1, 89, 5][5, 0, C0]
+
+  0152; [5AA1, 89, 86][5, 0, C0]
+
+  0061 030A; [5AA1, 5, 5][6, 0, C0]
+
+  0041 030A; [5AA1, 5, 86][6, 0, C0]
+
+  0061 0061; [5AA1, 5, 7][6, 0, C0]
+
+  0041 0061; [5AA1, 5, 48][6, 0, C0]
+
+  0041 0041; [5AA1, 5, 89][6, 0, C0]
+suppressed_contractions: ''

data/resources/collation/tailoring/de.yml

@@ -0,0 +1,3 @@
+---
+tailored_table: ''
+suppressed_contractions: ''

data/resources/collation/tailoring/el.yml

@@ -0,0 +1,3 @@
+---
+tailored_table: ''
+suppressed_contractions: ''

data/resources/collation/tailoring/en.yml

@@ -0,0 +1,3 @@
+---
+tailored_table: ''
+suppressed_contractions: ''

data/resources/collation/tailoring/es.yml

@@ -0,0 +1,5 @@
+---
+tailored_table: 006E 0303; [4204, 5, 5]
+
+  004E 0303; [4204, 5, 86]
+suppressed_contractions: ''

data/resources/collation/tailoring/eu.yml

@@ -0,0 +1,3 @@
+---
+tailored_table: ''
+suppressed_contractions: ''

data/resources/collation/tailoring/fa.yml

@@ -0,0 +1,73 @@
+---
+tailored_table: 0650; [0, D3, 5][0, A, C0]
+
+  064F; [0, D3, 5][0, B, C0]
+
+  064B; [0, D3, 5][0, C, C0]
+
+  064D; [0, D3, 5][0, D, C0]
+
+  064C; [0, D3, 5][0, E, C0]
+
+  0627 0653; [6125, 5, 5]
+
+  0671; [6126, 87, 5]
+
+  0621; [6127, 5, 5]
+
+  0627 0654; [6127, 87, 5]
+
+  0672; [6127, 88, 5]
+
+  0627 0655; [6127, 89, 5]
+
+  0673; [6127, 8A, 5]
+
+  0648 0654; [6127, 8B, 5]
+
+  06CC 0654; [6127, 8C, 5]
+
+  0649 0654; [6127, 8C, 6]
+
+  064A 0654; [6127, 8C, 7]
+
+  06AA; [6213, 87, 5]
+
+  06AB; [6213, 88, 5]
+
+  0643; [6213, 89, 5]
+
+  06AC; [6213, 8A, 5]
+
+  06AD; [6213, 8B, 5]
+
+  06AE; [6213, 8C, 5]
+
+  0647; [627E, 5, 5]
+
+  06D5; [627E, 87, 5]
+
+  06C1; [627E, 88, 5]
+
+  0629; [627E, 89, 5]
+
+  06C3; [627E, 8A, 5]
+
+  06D5 0654; [627E, 8B, 5]
+
+  06BE; [627E, 8C, 5]
+
+  0649; [6289, 87, 5]
+
+  06D2; [6289, 88, 5]
+
+  064A; [6289, 89, 5]
+
+  06D0; [6289, 8A, 5]
+
+  06D1; [6289, 8B, 5]
+
+  06CD; [6289, 8C, 5]
+
+  06CE; [6289, 8D, 5]
+suppressed_contractions: ''

data/resources/collation/tailoring/fi.yml

@@ -0,0 +1,61 @@
+---
+tailored_table: 00F0; [2D, 5, 9][0, DB, 9][0, A9, C0]
+
+  00D0; [2D, 5, 93][0, DB, 9][0, A9, C0]
+
+  0111; [2D, 87, 5][4, 5, 5][0, D0, 5][0, 3D, C0]
+
+  0110; [2D, 87, 86][4, 5, 5][0, D0, 5][0, 3D, C0]
+
+  014B; [41, 87, 5][4, 5, 5][0, D0, 5][0, 3D, C0]
+
+  014A; [41, 87, 86][4, 5, 5][0, D0, 5][0, 3D, C0]
+
+  00FE; [5A60, 5, 5]
+
+  00DE; [5A60, 5, 8F]
+
+  0077; [53, 5, 5]
+
+  0057; [53, 5, 8F]
+
+  0075 0308; [57, 87, 5]
+
+  0055 0308; [57, 87, 86]
+
+  0075 030B; [4F, 5, 5][0, 9F, 5]
+
+  0055 030B; [4F, 5, 8F][0, 9F, 5]
+
+  0061 030A; [5AA1, 5, 5][4, 0, C0]
+
+  0041 030A; [5AA1, 5, 86][4, 0, C0]
+
+  0061 0308; [5AA1, 5, 5][5, 0, C0]
+
+  0041 0308; [5AA1, 5, 86][5, 0, C0]
+
+  00E6; [5AA1, 87, 5][5, 0, C0]
+
+  00C6; [5AA1, 87, 86][5, 0, C0]
+
+  006F 0308; [5AA1, 5, 5][6, 0, C0]
+
+  004F 0308; [5AA1, 5, 86][6, 0, C0]
+
+  00F8; [5AA1, 87, 5][6, 0, C0]
+
+  00D8; [5AA1, 87, 86][6, 0, C0]
+
+  006F 030B; [43, 5, 5][0, 9F, 5]
+
+  004F 030B; [43, 5, 8F][0, 9F, 5]
+
+  006F 0303; [43, 5, 5][0, A1, 5]
+
+  004F 0303; [43, 5, 8F][0, A1, 5]
+
+  0153; [43, 5, 9][0, DB, 9][0, A9, C0][2F, 5, 3D]
+
+  0152; [43, 5, 93][0, DB, 9][0, A9, C0][2F, 5, 3D]
+suppressed_contractions: ''