twitter_cldr 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: accacbf47c61c3008a7cdae91acde6d4bb848bc9
-  data.tar.gz: 112cdf6e94bc614b5677289ee345b4ea38bd55e0
+  metadata.gz: d9c6af08b1eab959bef74d6da6df7187178d6c8a
+  data.tar.gz: c1e6a87f70fd295d46f4b9bb57951910568a2223
 SHA512:
-  metadata.gz: f923179204c1627ebe184f5fe38d2249e0016b1c20a524c0c0b7e06c3382f19240b054866daf0019edf9215e6034c1bc65d942e4914c8ed4332894883fdd6402
-  data.tar.gz: 48dd5f10034e32e5900abec0f02a1ff11e0e98bb14dd6921f355b1e171f2fa03bc8c1f68bfb885244abdd9c0b8b1f3fa16cefc62f582c77f661f9db8fbd91050
+  metadata.gz: 2d4e1affea9c1f3f93f87d4a9378c8cdcb65beadf7d257693285510e72977fbd5fad2f5601000866f5b7cfb18112eba10973377b368423841b4dfc7a83402ecd
+  data.tar.gz: 19dc931849ded8e6b2717be5a0a2bace3f5605e351fd28c03d302128d17a26a54ea3bf2c7612d282d91774dfcb726f105b6bc4aba40338b178a1f637722b62ca

data/History.txt

@@ -1,3 +1,8 @@
+== 3.1.1
+* Fixed an issue with single quotes appearing in dates formatting.
+* Added support for locale codes that have region code in lower case.
+* Fixed time zone formatting for DateTime objects.
+
 == 3.1.0
 
 * Updated resources from CLDR v26 (except the collation data).

data/lib/twitter_cldr.rb

@@ -64,6 +64,8 @@ module TwitterCldr
     end
 
     def locale
+      # doing all this work in locale getter rather than locale setter makes it possible to use locale fallbacks
+      # even if they were configured (or became available) after @locale was already assigned an unsupported locale
       locale = supported_locale?(@locale) ? @locale : find_fallback
       locale = DEFAULT_LOCALE if locale.to_s.empty?
       (supported_locale?(locale) ? locale : DEFAULT_LOCALE).to_sym
@@ -104,6 +106,7 @@ module TwitterCldr
 
     def convert_locale(locale)
       locale = locale.to_sym if locale.respond_to?(:to_sym)
+      locale = lowercase_locales_map.fetch(locale, locale)
       TWITTER_LOCALE_MAP.fetch(locale, locale)
     end
 
@@ -138,6 +141,14 @@ module TwitterCldr
       nil
     end
 
+    def lowercase_locales_map
+      @lowercase_locales_map ||= supported_locales.inject({}) do |memo, locale|
+        lowercase = locale.to_s.downcase.to_sym
+        memo[lowercase] = locale unless lowercase == locale
+        memo
+      end
+    end
+
   end
 
 end

data/lib/twitter_cldr/formatters/formatter.rb

@@ -23,11 +23,7 @@ module TwitterCldr
       protected
 
       def format_plaintext(token, index, obj, options)
-        if match = token.value.match(/([\s]*)'(.*)'([\s]*)/)
-          match.captures.join
-        else
-          token.value
-        end
+        token.value.gsub(/'([^']+)'/, '\1') # remove single-quote escaping for "real" characters
       end
 
       def format_composite(token, index, obj, options)

data/lib/twitter_cldr/localized/localized_datetime.rb

@@ -28,7 +28,7 @@ module TwitterCldr
           # @ TODO: these need to be cheap to create
           data_reader = data_reader_for(type)
           tokens = data_reader.tokenizer.tokenize(data_reader.pattern)
-          data_reader.formatter.format(tokens, base_in_timezone)
+          data_reader.formatter.format(tokens, base_in_timezone, chain_params)
         end
       end
 

data/lib/twitter_cldr/version.rb

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

data/spec/formatters/plurals/rules_spec.rb

@@ -76,6 +76,14 @@ describe Rules do
         :one, :two, :few, :other
       ])
     end
+
+    it "works with upercase region code" do
+      expect(TwitterCldr::Formatters::Plurals::Rules.all_for('en-gb')).to match_array([:one, :other])
+    end
+
+    it "works with lowercase region code" do
+      expect(TwitterCldr::Formatters::Plurals::Rules.all_for('en-gb')).to match_array([:one, :other])
+    end
   end
 
   describe "#all" do

data/spec/localized/localized_datetime_spec.rb

@@ -45,6 +45,10 @@ describe LocalizedDateTime do
       # notice there are no single quotes around the "at"
       expect(date_time.localize(:en).to_long_s).to eq("September 20, 1987 at 10:05:00 PM UTC")
     end
+
+    it 'should stringify with proper time zone' do
+      expect(date_time.localize(:en).with_timezone('America/Los_Angeles').to_long_s).to eq("September 20, 1987 at 3:05:00 PM PST")
+    end
   end
 
   describe "#to_date" do
@@ -98,6 +102,14 @@ describe LocalizedDateTime do
     it "should format using additional patterns" do
       expect(date_time.localize(:en).to_additional_s("EHms")).to eq("Sun 22:05:00")
     end
+
+    it "should properly handle single quotes escaping" do
+      expect(date_time.localize(:ru).to_additional_s("GyMMMd")).to eq("20 сент. 1987 г. н. э.")
+    end
+
+    it "should unescape multiple groups" do
+      expect(date_time.localize(:es).to_additional_s("yMMMd")).to eq("20 de sept. de 1987")
+    end
   end
 
   describe "#to_s" do

data/spec/twitter_cldr_spec.rb

@@ -22,6 +22,16 @@ describe TwitterCldr do
       expect(TwitterCldr.supported_locale?(:'zh-tw')).to be_true
       expect(TwitterCldr.supported_locale?(:msa)).to be_true
     end
+
+    it "should work with lowercase region codes" do
+      expect(TwitterCldr.supported_locale?('en-gb')).to be_true
+      expect(TwitterCldr.supported_locale?('zh-hant')).to be_true
+    end
+
+    it "should work with upper case region codes" do
+      expect(TwitterCldr.supported_locale?('en-GB')).to be_true
+      expect(TwitterCldr.supported_locale?('zh-Hant')).to be_true
+    end
   end
 
   describe "#supported_locales" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twitter_cldr
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Cameron Dutro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-10 00:00:00.000000000 Z
+date: 2014-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json