twitter_cldr 3.0.8 → 3.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d336c0b6f46b4c7d1f0264115537a6662831e24
-  data.tar.gz: 832d49c1731724d17b5094e770a69726d0fd5d0c
+  metadata.gz: b592fa7bd949a4235c4c700453a4e0a4c3b8b9f3
+  data.tar.gz: 125364255f3c0ceab9d3150a0e4b5073235bd563
 SHA512:
-  metadata.gz: 7ba318dda353bfdc8bbd5b54800fbdb4099354907dc73c6a8d4afacdc46748c0955535c084cf1e13db0e309b56c2819d3279bd0c6d287373b11bb0098d764929
-  data.tar.gz: aaad0c5df06f766990b8ec05f590d563dde0e7ee2dd7c7990c0520b1a348fcc2c00c711a8ea634dc1247e29cdfb0e0b29bf7c916587ec0cce9af52507baafaf2
+  metadata.gz: d55d1f0467e355b8b7170168ef30e2ae33a034f8d8698c03f713fe41ea9197b188190f4a1cfd74b13ac1e5554daa2f9e3711e93b6c447ec1f2d0c185cf3e73a9
+  data.tar.gz: 705b067d1948aa7e1bfcfe4f75c4bc9536f2cc2040fc32f29329235310cc9bc11a1e95754dbb5c47afbc7aea211ebb670cde0a0bbf7f2f20f294ae96431c23b7

data/History.txt

@@ -1,3 +1,7 @@
+== 3.0.9
+
+* Fixing date and time formatting issue where calling `to_additional_s` on an instance of `LocalizedDate` could raise an error.
+
 == 3.0.8
 
 * Fixing issue causing extraneous single quotes to appear in formatted dates and times.

data/lib/twitter_cldr/localized/localized_date.rb

@@ -46,11 +46,13 @@ module TwitterCldr
         timezone_info.utc_to_local(time.is_a?(DateTime) ? time.new_offset(0) : time.utc)
       end
 
-      def data_reader_for(type)
-        TwitterCldr::DataReaders::DateDataReader.new(locale, {
-          :calendar_type => calendar_type,
-          :type => type
-        })
+      def data_reader_for(type, options = {})
+        TwitterCldr::DataReaders::DateDataReader.new(
+          locale, options.merge({
+            :calendar_type => calendar_type,
+            :type => type
+          })
+        )
       end
 
     end

data/lib/twitter_cldr/localized/localized_datetime.rb

@@ -37,7 +37,12 @@ module TwitterCldr
           :additional_format => additional_format
         })
 
-        tokens = data_reader.tokenizer.full_tokenize(data_reader.pattern)
+        tokens = if data_reader.tokenizer.respond_to?(:full_tokenize)
+          data_reader.tokenizer.full_tokenize(data_reader.pattern)
+        else
+          data_reader.tokenizer.tokenize(data_reader.pattern)
+        end
+
         data_reader.formatter.format(tokens, base_in_timezone)
       end
 
@@ -98,10 +103,12 @@ module TwitterCldr
       protected
 
       def data_reader_for(type, options = {})
-        TwitterCldr::DataReaders::DateTimeDataReader.new(locale, options.merge({
-          :calendar_type => calendar_type,
-          :type => type
-        }))
+        TwitterCldr::DataReaders::DateTimeDataReader.new(
+          locale, options.merge({
+            :calendar_type => calendar_type,
+            :type => type
+          })
+        )
       end
 
       def chain_params

data/lib/twitter_cldr/localized/localized_time.rb

@@ -35,16 +35,14 @@ module TwitterCldr
         timezone_info.utc_to_local(@base_obj.utc)
       end
 
-      def data_reader_for(type)
-        TwitterCldr::DataReaders::TimeDataReader.new(locale, {
-          :calendar_type => calendar_type,
-          :type => type
-        })
+      def data_reader_for(type, options = {})
+        TwitterCldr::DataReaders::TimeDataReader.new(
+          locale, options.merge({
+            :calendar_type => calendar_type,
+            :type => type
+          })
+        )
       end
-
-      # def formatter_const
-      #   TwitterCldr::Formatters::TimeFormatter
-      # end
     end
 
   end

data/lib/twitter_cldr/version.rb

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

data/spec/localized/localized_date_spec.rb

@@ -120,7 +120,16 @@ describe LocalizedDate do
     end
   end
 
-  describe 'formatters' do
+  describe "#to_additional_s" do
+    let(:date_time) { DateTime.new(2010, 7, 6, 12, 12, 30) }
+
+    it "should format using additional patterns" do
+      date = date_time.localize(:en).to_date
+      expect(date.to_additional_s("yMMMd")).to eq("Jul 6, 2010")
+    end
+  end
+
+  describe "formatters" do
     it "don't raise errors for any locale" do
       TwitterCldr.supported_locales.each do |locale|
         (LocalizedDate.types - [:additional]).each do |type|

data/spec/localized/localized_datetime_spec.rb

@@ -94,6 +94,12 @@ describe LocalizedDateTime do
     end
   end
 
+  describe "#to_additional_s" do
+    it "should format using additional patterns" do
+      expect(date_time.localize(:en).to_additional_s("EHms")).to eq("Sun 22:05:00")
+    end
+  end
+
   describe "#to_s" do
     it "uses the default format if no :format is given" do
       loc_date = date_time.localize

data/spec/localized/localized_time_spec.rb

@@ -21,7 +21,7 @@ describe LocalizedTime do
     it "should stringify with buddhist calendar" do
       # Ensure that buddhist calendar data is present in th locale.
       expect(TwitterCldr.get_locale_resource(:th, :calendars)[:th][:calendars][:buddhist]).not_to(
-          be_nil, 'buddhist calendar is missing for :th locale (check resources/locales/th/calendars.yml)'
+        be_nil, 'buddhist calendar is missing for :th locale (check resources/locales/th/calendars.yml)'
       )
 
       #time.localize(:th, :calendar_type => :buddhist).to_full_s # It doesn't support era
@@ -65,6 +65,13 @@ describe LocalizedTime do
     end
   end
 
+  describe "#to_additional_s" do
+    it "should format using additional patterns" do
+      time = Time.utc(2000, 5, 12, 22, 5)
+      expect(time.localize(:es).to_additional_s("Hms")).to eq("22:05:00")
+    end
+  end
+
   describe "#with_timezone" do
     it "calculates the right time depending on the timezone" do
       time = Time.utc(2000, 5, 12, 22, 5).localize

metadata

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