twitter_cldr 1.3.0 → 1.3.6

data/spec/tokenizers/numbers/number_tokenizer_spec.rb

@@ -17,7 +17,7 @@ describe NumberTokenizer do
 
   describe "#full_path_for" do
     it "should fill in the type and return the full path to the requested format" do
-      NumberTokenizer.new.send(:full_path_for, :default).should == "numbers.formats.decimal.patterns.default"
+      NumberTokenizer.new.send(:full_path_for, :default).should == [:numbers, :formats, :decimal, :patterns, :default]
     end
   end
 

data/spec/twitter_cldr_spec.rb

@@ -44,6 +44,22 @@ describe TwitterCldr do
       TwitterCldr.convert_locale(:'zh-cn').should == :zh
       TwitterCldr.convert_locale(:'zh-tw').should == :'zh-Hant'
     end
+
+    it "should leave unknown locales alone" do
+      TwitterCldr.convert_locale(:blarg).should == :blarg
+    end
+  end
+
+  describe "#twitter_locale" do
+    it "should convert a CLDR locale to a twitter locale" do
+      TwitterCldr.twitter_locale(:ms).should == :msa
+      TwitterCldr.twitter_locale(:zh).should == :'zh-cn'
+      TwitterCldr.twitter_locale(:'zh-Hant').should == :'zh-tw'
+    end
+
+    it "should leave unknown locales alone" do
+      TwitterCldr.twitter_locale(:blarg).should == :blarg
+    end
   end
 
   describe "#get_locale" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: twitter_cldr
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: 
   segments: 
   - 1
   - 3
-  - 0
-  version: 1.3.0
+  - 6
+  version: 1.3.6
 platform: ruby
 authors: 
 - Cameron Dutro
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-01 00:00:00 Z
+date: 2012-06-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
@@ -34,9 +34,25 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: mustache
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 411
+        segments: 
+        - 0
+        - 99
+        - 4
+        version: 0.99.4
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -48,11 +64,11 @@ dependencies:
         - 0
         version: 2.9.0
   type: :development
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rr
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -64,11 +80,11 @@ dependencies:
         - 4
         version: 1.0.4
   type: :development
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -80,11 +96,77 @@ dependencies:
         - 2
         version: 0.9.2
   type: :development
-  version_requirements: *id004
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: jasmine-headless-webkit
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 844733855
+        segments: 
+        - 0
+        - 9
+        - 0
+        - rc
+        - 1
+        version: 0.9.0.rc1
+  type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: therubyracer
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 47
+        segments: 
+        - 0
+        - 9
+        - 10
+        version: 0.9.10
+  type: :development
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: uglifier
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 2
+        - 4
+        version: 1.2.4
+  type: :development
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: coffee-script
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 2
+        - 2
+        - 0
+        version: 2.2.0
+  type: :development
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: rcov
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -94,7 +176,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id005
+  version_requirements: *id010
 description: Provides date, time, number, and list formatting functionality for various Twitter-supported locales in Ruby and Javascript.
 email: 
 - cdutro@twitter.com
@@ -113,6 +195,7 @@ files:
 - lib/twitter_cldr/core_ext/calendars/date.rb
 - lib/twitter_cldr/core_ext/calendars/datetime.rb
 - lib/twitter_cldr/core_ext/calendars/time.rb
+- lib/twitter_cldr/core_ext/calendars/timespan.rb
 - lib/twitter_cldr/core_ext/localized_object.rb
 - lib/twitter_cldr/core_ext/numbers/bignum.rb
 - lib/twitter_cldr/core_ext/numbers/fixnum.rb
@@ -125,6 +208,7 @@ files:
 - lib/twitter_cldr/formatters/calendars/date_formatter.rb
 - lib/twitter_cldr/formatters/calendars/datetime_formatter.rb
 - lib/twitter_cldr/formatters/calendars/time_formatter.rb
+- lib/twitter_cldr/formatters/calendars/timespan_formatter.rb
 - lib/twitter_cldr/formatters/numbers/currency_formatter.rb
 - lib/twitter_cldr/formatters/numbers/decimal_formatter.rb
 - lib/twitter_cldr/formatters/numbers/helpers/base.rb
@@ -152,8 +236,8 @@ files:
 - lib/twitter_cldr/tokenizers/calendars/date_tokenizer.rb
 - lib/twitter_cldr/tokenizers/calendars/datetime_tokenizer.rb
 - lib/twitter_cldr/tokenizers/calendars/time_tokenizer.rb
+- lib/twitter_cldr/tokenizers/calendars/timespan_tokenizer.rb
 - lib/twitter_cldr/tokenizers/composite_token.rb
-- lib/twitter_cldr/tokenizers/key_path.rb
 - lib/twitter_cldr/tokenizers/numbers/number_tokenizer.rb
 - lib/twitter_cldr/tokenizers/token.rb
 - lib/twitter_cldr/tokenizers.rb
@@ -174,6 +258,7 @@ files:
 - spec/core_ext/symbol_spec.rb
 - spec/formatters/base_spec.rb
 - spec/formatters/calendars/datetime_formatter_spec.rb
+- spec/formatters/calendars/timespan_formatter_spec.rb
 - spec/formatters/numbers/currency_formatter_spec.rb
 - spec/formatters/numbers/decimal_formatter_spec.rb
 - spec/formatters/numbers/helpers/fraction_spec.rb
@@ -198,8 +283,8 @@ files:
 - spec/tokenizers/calendars/date_tokenizer_spec.rb
 - spec/tokenizers/calendars/datetime_tokenizer_spec.rb
 - spec/tokenizers/calendars/time_tokenizer_spec.rb
+- spec/tokenizers/calendars/timespan_tokenizer_spec.rb
 - spec/tokenizers/composite_token_spec.rb
-- spec/tokenizers/key_path_spec.rb
 - spec/tokenizers/numbers/number_tokenizer_spec.rb
 - spec/tokenizers/token_spec.rb
 - spec/twitter_cldr_spec.rb
@@ -210,74 +295,92 @@ files:
 - resources/locales/ar/languages.yml
 - resources/locales/ar/numbers.yml
 - resources/locales/ar/plurals.yml
+- resources/locales/ar/units.yml
 - resources/locales/da/calendars.yml
 - resources/locales/da/languages.yml
 - resources/locales/da/numbers.yml
 - resources/locales/da/plurals.yml
+- resources/locales/da/units.yml
 - resources/locales/de/calendars.yml
 - resources/locales/de/languages.yml
 - resources/locales/de/numbers.yml
 - resources/locales/de/plurals.yml
+- resources/locales/de/units.yml
 - resources/locales/en/calendars.yml
 - resources/locales/en/languages.yml
 - resources/locales/en/numbers.yml
 - resources/locales/en/plurals.yml
+- resources/locales/en/units.yml
 - resources/locales/es/calendars.yml
 - resources/locales/es/languages.yml
 - resources/locales/es/numbers.yml
 - resources/locales/es/plurals.yml
+- resources/locales/es/units.yml
 - resources/locales/fa/calendars.yml
 - resources/locales/fa/languages.yml
 - resources/locales/fa/numbers.yml
 - resources/locales/fa/plurals.yml
+- resources/locales/fa/units.yml
 - resources/locales/fi/calendars.yml
 - resources/locales/fi/languages.yml
 - resources/locales/fi/numbers.yml
 - resources/locales/fi/plurals.yml
+- resources/locales/fi/units.yml
 - resources/locales/fil/calendars.yml
 - resources/locales/fil/languages.yml
 - resources/locales/fil/numbers.yml
 - resources/locales/fil/plurals.yml
+- resources/locales/fil/units.yml
 - resources/locales/fr/calendars.yml
 - resources/locales/fr/languages.yml
 - resources/locales/fr/numbers.yml
 - resources/locales/fr/plurals.yml
+- resources/locales/fr/units.yml
 - resources/locales/he/calendars.yml
 - resources/locales/he/languages.yml
 - resources/locales/he/numbers.yml
 - resources/locales/he/plurals.yml
+- resources/locales/he/units.yml
 - resources/locales/hi/calendars.yml
 - resources/locales/hi/languages.yml
 - resources/locales/hi/numbers.yml
 - resources/locales/hi/plurals.yml
+- resources/locales/hi/units.yml
 - resources/locales/hu/calendars.yml
 - resources/locales/hu/languages.yml
 - resources/locales/hu/numbers.yml
 - resources/locales/hu/plurals.yml
+- resources/locales/hu/units.yml
 - resources/locales/id/calendars.yml
 - resources/locales/id/languages.yml
 - resources/locales/id/numbers.yml
 - resources/locales/id/plurals.yml
+- resources/locales/id/units.yml
 - resources/locales/it/calendars.yml
 - resources/locales/it/languages.yml
 - resources/locales/it/numbers.yml
 - resources/locales/it/plurals.yml
+- resources/locales/it/units.yml
 - resources/locales/ja/calendars.yml
 - resources/locales/ja/languages.yml
 - resources/locales/ja/numbers.yml
 - resources/locales/ja/plurals.yml
+- resources/locales/ja/units.yml
 - resources/locales/ko/calendars.yml
 - resources/locales/ko/languages.yml
 - resources/locales/ko/numbers.yml
 - resources/locales/ko/plurals.yml
+- resources/locales/ko/units.yml
 - resources/locales/ms/calendars.yml
 - resources/locales/ms/languages.yml
 - resources/locales/ms/numbers.yml
 - resources/locales/ms/plurals.yml
+- resources/locales/ms/units.yml
 - resources/locales/nl/calendars.yml
 - resources/locales/nl/languages.yml
 - resources/locales/nl/numbers.yml
 - resources/locales/nl/plurals.yml
+- resources/locales/nl/units.yml
 - resources/locales/no/calendars.yml
 - resources/locales/no/languages.yml
 - resources/locales/no/numbers.yml
@@ -286,37 +389,46 @@ files:
 - resources/locales/pl/languages.yml
 - resources/locales/pl/numbers.yml
 - resources/locales/pl/plurals.yml
+- resources/locales/pl/units.yml
 - resources/locales/pt/calendars.yml
 - resources/locales/pt/languages.yml
 - resources/locales/pt/numbers.yml
 - resources/locales/pt/plurals.yml
+- resources/locales/pt/units.yml
 - resources/locales/ru/calendars.yml
 - resources/locales/ru/languages.yml
 - resources/locales/ru/numbers.yml
 - resources/locales/ru/plurals.yml
+- resources/locales/ru/units.yml
 - resources/locales/sv/calendars.yml
 - resources/locales/sv/languages.yml
 - resources/locales/sv/numbers.yml
 - resources/locales/sv/plurals.yml
+- resources/locales/sv/units.yml
 - resources/locales/th/calendars.yml
 - resources/locales/th/languages.yml
 - resources/locales/th/numbers.yml
 - resources/locales/th/plurals.yml
+- resources/locales/th/units.yml
 - resources/locales/tr/calendars.yml
 - resources/locales/tr/languages.yml
 - resources/locales/tr/numbers.yml
 - resources/locales/tr/plurals.yml
+- resources/locales/tr/units.yml
 - resources/locales/ur/calendars.yml
 - resources/locales/ur/languages.yml
 - resources/locales/ur/numbers.yml
 - resources/locales/ur/plurals.yml
+- resources/locales/ur/units.yml
 - resources/locales/zh/calendars.yml
 - resources/locales/zh/languages.yml
 - resources/locales/zh/numbers.yml
 - resources/locales/zh/plurals.yml
+- resources/locales/zh/units.yml
 - resources/locales/zh-Hant/calendars.yml
 - resources/locales/zh-Hant/languages.yml
 - resources/locales/zh-Hant/numbers.yml
+- resources/locales/zh-Hant/units.yml
 - resources/shared/currencies.yml
 - resources/unicode_data/aegean_numbers.yml
 - resources/unicode_data/alchemical_symbols.yml

data/lib/twitter_cldr/tokenizers/key_path.rb

@@ -1,35 +0,0 @@
-# encoding: UTF-8
-
-# Copyright 2012 Twitter, Inc
-# http://www.apache.org/licenses/LICENSE-2.0
-
-module TwitterCldr
-  module Tokenizers
-    class KeyPath
-      class << self
-        def dirname(path)
-          self.join_path(self.split_path(path)[0..-2])
-        end
-
-        def join(*args)
-          final = ""
-          args.each do |arg|
-            fixed_arg = arg.chomp(".")
-            fixed_arg = arg[1..-1] if fixed_arg[0].chr == "."
-            final << "." if final.size > 0
-            final << fixed_arg
-          end
-          final
-        end
-
-        def split_path(path)
-          path.split(/\./)
-        end
-
-        def join_path(path_arr)
-          path_arr.join(".")
-        end
-      end
-    end
-  end
-end

data/spec/tokenizers/key_path_spec.rb

@@ -1,49 +0,0 @@
-# encoding: UTF-8
-
-# Copyright 2012 Twitter, Inc
-# http://www.apache.org/licenses/LICENSE-2.0
-
-require File.join(File.dirname(File.dirname(__FILE__)), "spec_helper")
-include TwitterCldr::Tokenizers
-
-describe KeyPath do
-  describe "#dirname" do
-    it "should strip off the last element" do
-      KeyPath.dirname("castle.in.the.sky").should == "castle.in.the"
-    end
-
-    it "shouldn't choke if given an empty string" do
-      KeyPath.dirname("").should == ""
-    end
-  end
-
-  describe "#join" do
-    it "joins two args with two dots" do
-      KeyPath.join("seahawks.", ".rule").should == "seahawks.rule"
-    end
-
-    it "joins two args with one dot at the end of the first" do
-      KeyPath.join("seahawks.", "rule").should == "seahawks.rule"
-    end
-
-    it "joins two args with one dot at the beginning of the second" do
-      KeyPath.join("seahawks", ".rule").should == "seahawks.rule"
-    end
-
-    it "joins two args with no dots" do
-      KeyPath.join("seahawks", "rule").should == "seahawks.rule"
-    end
-  end
-
-  describe "#split_path" do
-    it "should split the path by dots" do
-      KeyPath.split_path("rain.in.spain").should == ["rain", "in", "spain"]
-    end
-  end
-
-  describe "#join_path" do
-    it "should join the path with dots" do
-      KeyPath.join_path(["rain", "in", "spain"]).should == "rain.in.spain"
-    end
-  end
-end