twitter_cldr 3.1.1 → 3.1.2

data/lib/twitter_cldr/parsers/unicode_regex/component.rb

@@ -11,10 +11,7 @@ module TwitterCldr
         protected
 
         def to_utf8(codepoints)
-          # note: we do this for ruby 1.8 compatibility
-          # if we didn't have to support 1.8, we could do this instead:
-          # Array(codepoints).map { |cp| "\\u{#{cp.to_s(16).rjust(4, "0")}}"}.join
-          Array(codepoints).pack("U*").bytes.map { |s| "\\" + s.to_s(8) }.join
+          Array(codepoints).map { |cp| "\\u{#{cp.to_s(16).rjust(4, "0")}}"}.join
         end
 
         def range_to_regex(range)

data/lib/twitter_cldr/resources/locales_resources_importer.rb

@@ -87,14 +87,10 @@ module TwitterCldr
 
         File.open(path, 'w:utf-8') do |output|
           output.write(
-            # Quote all strings for compat with 1.8. This is important because
-            # RBNF syntax includes characters that are significant in the Yaml
-            # syntax, like >, <, etc. Psych doesn't have problems parsing them,
-            # but Syck does (ruby 1.8).
-            TwitterCldr::Utils::YAML.dump(TwitterCldr::Utils.deep_symbolize_keys(data), {
-              :quote_all_strings => true,
+            TwitterCldr::Utils::YAML.dump(
+              TwitterCldr::Utils.deep_symbolize_keys(data),
               :use_natural_symbols => true
-            })
+            )
           )
         end
       end

data/lib/twitter_cldr/resources/readme_renderer.rb

@@ -5,13 +5,6 @@
 
 require 'erb'
 
-# patch to add compare operator to Symbol (for mri 1.8)
-class Symbol
-  def <=>(other)
-    to_s <=> other.to_s
-  end
-end
-
 module TwitterCldr
   module Resources
 

data/lib/twitter_cldr/shared/calendar.rb

@@ -10,7 +10,7 @@ module TwitterCldr
       DEFAULT_FORMAT = :'stand-alone'
       DEFAULT_PERIOD_FORMAT = :format
 
-      NAMES_FORMS = [:wide, :narrow, :abbreviated]
+      NAMES_FORMS = [:wide, :narrow, :short, :abbreviated, :foo]
       ERAS_NAMES_FORMS = [:abbr, :name]
 
       DATETIME_METHOD_MAP = {
@@ -164,4 +164,4 @@ module TwitterCldr
 
     end
   end
-end
+end

data/lib/twitter_cldr/shared/postal_codes.rb

@@ -76,15 +76,7 @@ module TwitterCldr
       private
 
       def build_regexp(regexp_str, modifiers = '')
-        if RUBY_VERSION <= "1.8.7"
-          begin
-            Oniguruma::ORegexp.new(regexp_str, modifiers)
-          rescue NameError
-            raise "Postal codes require the Oniguruma gem when using Ruby 1.8. Please install, require, and retry."
-          end
-        else
-          Regexp.new(regexp_str, modifiers)
-        end
+        Regexp.new(regexp_str, modifiers)
       end
 
       def generator

data/lib/twitter_cldr/shared/unicode_regex.rb

@@ -61,15 +61,7 @@ module TwitterCldr
       end
 
       def to_regexp
-        if RUBY_VERSION <= "1.8.7"
-          begin
-            Oniguruma::ORegexp.new(to_regexp_str, modifiers)
-          rescue NameError
-            raise "Unicode regular expressions require the Oniguruma gem when using Ruby 1.8. Please install, require, and retry."
-          end
-        else
-          @regexp ||= Regexp.new(to_regexp_str, modifiers)
-        end
+        @regexp ||= Regexp.new(to_regexp_str, modifiers)
       end
 
       def to_regexp_str

data/lib/twitter_cldr/tokenizers/numbers/rbnf_tokenizer.rb

@@ -16,11 +16,7 @@ module TwitterCldr
       def tokenizer
         @tokenizer ||= begin
           # i.e. %spellout-numbering, %%2d-year
-          rule_regex = if RUBY_VERSION <= "1.8.7"
-            /%%?[\w\-]+/u
-          else
-            Regexp.new("%%?[[:word:]\-]+")
-          end
+          rule_regex = Regexp.new("%%?[[:word:]\-]+")
 
           recognizers = [
             # special rule descriptors

data/lib/twitter_cldr/utils.rb

@@ -72,5 +72,3 @@ module TwitterCldr
 
   end
 end
-
-require 'twitter_cldr/utils/interpolation'

data/lib/twitter_cldr/utils/yaml.rb

@@ -128,8 +128,6 @@ module TwitterCldr
       class << self
 
         def dump(obj, opts = {})
-          raise 'set $KCODE to "UTF8".' if (RUBY_VERSION < '1.9.0') && ($KCODE != 'UTF8')
-
           @options = opts.dup
           @options[:indent_size] = 2          if @options[:indent_size].to_i <= 0
           @options[:minimum_block_length] = 0 if @options[:minimum_block_length].to_i <= 0

data/lib/twitter_cldr/version.rb

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

data/resources/locales/af/calendars.yml

@@ -3,7 +3,7 @@
   :calendars: 
     :gregorian: 
       :additional_formats: 
-        :E: "ccc"
+        :E: ccc
         :EHm: "E HH:mm"
         :EHms: "E HH:mm:ss"
         :Ed: "E d"
@@ -13,140 +13,140 @@
         :GyMMM: "MMM y G"
         :GyMMMEd: "E, dd MMM y G"
         :GyMMMd: "dd MMM y G"
-        :H: "HH"
+        :H: HH
         :Hm: "HH:mm"
         :Hms: "HH:mm:ss"
-        :M: "L"
+        :M: L
         :MEd: "E, d/M"
-        :MMM: "LLL"
+        :MMM: LLL
         :MMMEd: "E d MMM"
         :MMMMEd: "E d MMMM"
         :MMMMd: "d MMM"
         :MMMMdd: "dd MMMM"
         :MMMd: "d MMM"
-        :Md: "dd-MM"
-        :d: "d"
+        :Md: dd-MM
+        :d: d
         :h: "h a"
         :hm: "h:mm a"
         :hms: "h:mm:ss a"
         :ms: "mm:ss"
         ? !ruby/symbol "y"
         : "y"
-        :yM: "MM-y"
+        :yM: MM-y
         :yMEd: "E y-MM-dd"
         :yMMM: "MMM y"
         :yMMMEd: "E, d MMM y"
         :yMMMM: "MMMM y"
         :yMMMd: "d MMM y"
-        :yMd: "y-MM-dd"
+        :yMd: y-MM-dd
         :yQQQ: "QQQ y"
         :yQQQQ: "QQQQ y"
       :days: 
         :format: 
           :abbreviated: 
-            :fri: "Vr"
-            :mon: "Ma"
-            :sat: "Sa"
-            :sun: "So"
-            :thu: "Do"
-            :tue: "Di"
-            :wed: "Wo"
+            :fri: Vr
+            :mon: Ma
+            :sat: Sa
+            :sun: So
+            :thu: Do
+            :tue: Di
+            :wed: Wo
           :narrow: 
-            :fri: "V"
-            :mon: "M"
-            :sat: "S"
-            :sun: "S"
-            :thu: "D"
-            :tue: "D"
-            :wed: "W"
+            :fri: V
+            :mon: M
+            :sat: S
+            :sun: S
+            :thu: D
+            :tue: D
+            :wed: W
           :short: 
-            :fri: "Vr."
-            :mon: "Ma."
-            :sat: "Sa."
-            :sun: "So."
-            :thu: "Do."
-            :tue: "Di."
-            :wed: "Wo."
+            :fri: Vr.
+            :mon: Ma.
+            :sat: Sa.
+            :sun: So.
+            :thu: Do.
+            :tue: Di.
+            :wed: Wo.
           :wide: 
-            :fri: "Vrydag"
-            :mon: "Maandag"
-            :sat: "Saterdag"
-            :sun: "Sondag"
-            :thu: "Donderdag"
-            :tue: "Dinsdag"
-            :wed: "Woensdag"
+            :fri: Vrydag
+            :mon: Maandag
+            :sat: Saterdag
+            :sun: Sondag
+            :thu: Donderdag
+            :tue: Dinsdag
+            :wed: Woensdag
         :stand-alone: 
           :abbreviated: 
-            :fri: "Vr"
-            :mon: "Ma"
-            :sat: "Sa"
-            :sun: "So"
-            :thu: "Do"
-            :tue: "Di"
-            :wed: "Wo"
+            :fri: Vr
+            :mon: Ma
+            :sat: Sa
+            :sun: So
+            :thu: Do
+            :tue: Di
+            :wed: Wo
           :narrow: 
-            :fri: "V"
-            :mon: "M"
-            :sat: "S"
-            :sun: "S"
-            :thu: "D"
-            :tue: "D"
-            :wed: "W"
+            :fri: V
+            :mon: M
+            :sat: S
+            :sun: S
+            :thu: D
+            :tue: D
+            :wed: W
           :short: 
-            :fri: "Vr."
-            :mon: "Ma."
-            :sat: "Sa."
-            :sun: "So."
-            :thu: "Do."
-            :tue: "Di."
-            :wed: "Wo."
+            :fri: Vr.
+            :mon: Ma.
+            :sat: Sa.
+            :sun: So.
+            :thu: Do.
+            :tue: Di.
+            :wed: Wo.
           :wide: 
-            :fri: "Vrydag"
-            :mon: "Maandag"
-            :sat: "Saterdag"
-            :sun: "Sondag"
-            :thu: "Donderdag"
-            :tue: "Dinsdag"
-            :wed: "Woensdag"
+            :fri: Vrydag
+            :mon: Maandag
+            :sat: Saterdag
+            :sun: Sondag
+            :thu: Donderdag
+            :tue: Dinsdag
+            :wed: Woensdag
       :eras: 
         :abbr: 
-          0: "v.g.j."
-          1: "g.j."
+          0: v.g.j.
+          1: g.j.
         :name: 
-          0: "v.g.j."
-          1: "g.j."
+          0: v.g.j.
+          1: g.j.
         :narrow: 
-          0: "vgj"
-          1: "vg"
+          0: vgj
+          1: vg
       :fields: 
-        :day: "Dag"
-        :day-narrow: "d."
-        :day-short: "d."
-        :dayperiod: "VM/NM"
-        :era: "Era"
-        :hour: "Uur"
-        :hour-narrow: "u."
-        :hour-short: "u."
-        :minute: "Minuut"
-        :minute-narrow: "m."
-        :minute-short: "min."
-        :month: "Maand"
-        :month-narrow: "md."
-        :month-short: "md."
-        :quarter: "Kwartaal"
-        :quarter-narrow: "kw."
-        :quarter-short: "kw."
-        :second: "Sekonde"
-        :second-narrow: "s."
-        :second-short: "sek."
-        :week: "Week"
-        :week-narrow: "wk."
-        :week-short: "wk."
+        :day: Dag
+        :day-narrow: d.
+        :day-short: d.
+        :dayperiod: VM/NM
+        :era: Era
+        :hour: Uur
+        :hour-narrow: u.
+        :hour-short: u.
+        :minute: Minuut
+        :minute-narrow: m.
+        :minute-short: min.
+        :month: Maand
+        :month-narrow: md.
+        :month-short: md.
+        :quarter: Kwartaal
+        :quarter-narrow: kw.
+        :quarter-short: kw.
+        :second: Sekonde
+        :second-narrow: s.
+        :second-short: sek.
+        :week: Week
+        :week-narrow: wk.
+        :week-short: wk.
         :weekday: "Dag van die Week"
-        :year: "Jaar"
-        :year-narrow: "j."
-        :year-short: "j."
-        :zone: "Tydsone"
+        :year: Jaar
+        :year-narrow: j.
+        :year-short: j.
+        :zone: Tydsone
       :formats: 
         :date: 
           :full: 
@@ -156,7 +156,7 @@
           :medium: 
             :pattern: "dd MMM y"
           :short: 
-            :pattern: "y-MM-dd"
+            :pattern: y-MM-dd
         :datetime: 
           :full: 
             :pattern: "{{date}} {{time}}"
@@ -178,103 +178,103 @@
       :months: 
         :format: 
           :abbreviated: 
-            1: "Jan."
-            10: "Okt"
-            11: "Nov"
-            12: "Des"
-            2: "Feb."
-            3: "Mrt."
-            4: "Apr"
-            5: "Mei"
-            6: "Jun"
-            7: "Jul"
-            8: "Aug"
-            9: "Sep"
+            1: Jan.
+            10: Okt
+            11: Nov
+            12: Des
+            2: Feb.
+            3: Mrt.
+            4: Apr
+            5: Mei
+            6: Jun
+            7: Jul
+            8: Aug
+            9: Sep
           :narrow: 
-            1: "J"
-            10: "O"
+            1: J
+            10: O
             11: "N"
-            12: "D"
-            2: "F"
-            3: "M"
-            4: "A"
-            5: "M"
-            6: "J"
-            7: "J"
-            8: "A"
-            9: "S"
+            12: D
+            2: F
+            3: M
+            4: A
+            5: M
+            6: J
+            7: J
+            8: A
+            9: S
           :wide: 
-            1: "Januarie"
-            10: "Oktober"
-            11: "November"
-            12: "Desember"
-            2: "Februarie"
-            3: "Maart"
-            4: "April"
-            5: "Mei"
-            6: "Junie"
-            7: "Julie"
-            8: "Augustus"
-            9: "September"
+            1: Januarie
+            10: Oktober
+            11: November
+            12: Desember
+            2: Februarie
+            3: Maart
+            4: April
+            5: Mei
+            6: Junie
+            7: Julie
+            8: Augustus
+            9: September
         :stand-alone: 
           :abbreviated: 
-            1: "Jan."
-            10: "Okt"
-            11: "Nov"
-            12: "Des"
-            2: "Feb."
-            3: "Mrt."
-            4: "Apr"
-            5: "Mei"
-            6: "Jun"
-            7: "Jul"
-            8: "Aug"
-            9: "Sep"
+            1: Jan.
+            10: Okt
+            11: Nov
+            12: Des
+            2: Feb.
+            3: Mrt.
+            4: Apr
+            5: Mei
+            6: Jun
+            7: Jul
+            8: Aug
+            9: Sep
           :narrow: 
-            1: "J"
-            10: "O"
+            1: J
+            10: O
             11: "N"
-            12: "D"
-            2: "F"
-            3: "M"
-            4: "A"
-            5: "M"
-            6: "J"
-            7: "J"
-            8: "A"
-            9: "S"
+            12: D
+            2: F
+            3: M
+            4: A
+            5: M
+            6: J
+            7: J
+            8: A
+            9: S
           :wide: 
-            1: "Januarie"
-            10: "Oktober"
-            11: "November"
-            12: "Desember"
-            2: "Februarie"
-            3: "Maart"
-            4: "April"
-            5: "Mei"
-            6: "Junie"
-            7: "Julie"
-            8: "Augustus"
-            9: "September"
+            1: Januarie
+            10: Oktober
+            11: November
+            12: Desember
+            2: Februarie
+            3: Maart
+            4: April
+            5: Mei
+            6: Junie
+            7: Julie
+            8: Augustus
+            9: September
       :periods: 
         :format: 
           :abbreviated: :calendars.gregorian.dayPeriods.format.wide
           :narrow: 
-            :am: "v"
-            :noon: "m"
+            :am: v
+            :noon: m
             :pm: "n"
           :wide: 
-            :am: "vm."
-            :noon: "middag"
-            :pm: "nm."
+            :am: vm.
+            :noon: middag
+            :pm: nm.
         :stand-alone: {}
       :quarters: 
         :format: 
           :abbreviated: 
-            1: "K1"
-            2: "K2"
-            3: "K3"
-            4: "K4"
+            1: K1
+            2: K2
+            3: K3
+            4: K4
           :narrow: 
             1: 1
             2: 2
@@ -287,10 +287,10 @@
             4: "4de kwartaal"
         :stand-alone: 
           :abbreviated: 
-            1: "K1"
-            2: "K2"
-            3: "K3"
-            4: "K4"
+            1: K1
+            2: K2
+            3: K3
+            4: K4
           :narrow: 
             1: 1
             2: 2