icalendar 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2962f7c7001cbc2bdcda2edce835db80b7987be9
-  data.tar.gz: 443602bd7933214e17ef4a083bce5004952b099a
+  metadata.gz: 961c1bb54f8d041206166d436da335415ffa8373
+  data.tar.gz: 559c04b6e5456b74649baf53db4c60d2dd2f2485
 SHA512:
-  metadata.gz: 9233eda8abd935a3f515c46125a89b489bbff45e3fd5571abb6b01102f019f6f80d5cc1b8189d18e522f89337cb248be7b88d50d6bfb3b0f1029d5d462da32af
-  data.tar.gz: d3cc60211692b14e71edd51dc0cd220a240a4615f50b9b371f8064bf809f33f501dc4fa9da5e0380555295bab3b161555bb2a9ef705896a13973fb4934f7221c
+  metadata.gz: e0e4f2ee01e35b88c0d8916f7a17bd441338b6eda24aba19ab4e78c6cbf25b4bf2614fa94e82c1e085b9cf4bd006a863d690e17234c05aad0a670bc883f97534
+  data.tar.gz: db81643632c9054fcc1595d344949cd36848b7c3c5dea2fccced3322069320dde48c7ece037f6087025df04719b86b62fe369a1f34fbfb7a1c59107b2bbeac9a

data/History.txt

@@ -1,3 +1,7 @@
+=== 2.1.2 2014-09-10
+ * Fix timezone abbreviation generation - Jan Vlnas
+ * Fix timezone repeat rules for end of month
+
 === 2.1.1 2014-07-23
  * Quiet TimeWithZone support logging
  * Use SecureRandom.uuid - antoinelyset

data/lib/icalendar/tzinfo.rb

@@ -56,13 +56,21 @@ module Icalendar
       offset.ical_offset
     end
 
+    def offset_abbreviation
+      offset.abbreviation.to_s
+    end
+
     def rrule
       start = local_start.to_datetime
       # this is somewhat of a hack, but seems to work ok
+      # assumes that no timezone transition is in law as "4th X of the month"
+      # but only as 1st X, 2nd X, 3rd X, or Last X
+      start_week = ((start.day - 1) / 7).to_i + 1
+      start_week = (start_week > 3) ? -1 : start_week
       [sprintf(
         'FREQ=YEARLY;BYMONTH=%d;BYDAY=%d%s',
         start.month,
-        ((start.day - 1)/ 7).to_i + 1,
+        start_week,
         start.strftime('%a').upcase[0,2]
       )]
     end
@@ -129,7 +137,7 @@ module TZInfo
           day.dtstart = start_transition.dtstart
           day.rrule = start_transition.rrule unless end_transition.nil?
         else
-          day.tzname = abbreviation.to_s.sub("ST","DT")
+          day.tzname = end_transition.offset_abbreviation
           day.tzoffsetfrom = end_transition.offset_from
           day.tzoffsetto = end_transition.offset_to
           day.dtstart = end_transition.dtstart
@@ -141,7 +149,7 @@ module TZInfo
     def standard
       Icalendar::Timezone::Standard.new.tap do |std|
         if dst?
-          std.tzname = abbreviation.to_s.sub('DT', 'ST')
+          std.tzname = end_transition.offset_abbreviation
           std.tzoffsetfrom = end_transition.offset_from
           std.tzoffsetto = end_transition.offset_to
           std.dtstart = end_transition.dtstart

data/lib/icalendar/version.rb

@@ -1,5 +1,5 @@
 module Icalendar
 
-  VERSION = '2.1.1'
+  VERSION = '2.1.2'
 
 end

data/spec/tzinfo_spec.rb

@@ -4,7 +4,7 @@ require_relative '../lib/icalendar/tzinfo'
 describe 'TZInfo::Timezone' do
 
   let(:tz) { TZInfo::Timezone.get 'Europe/Copenhagen' }
-  let(:date) { DateTime.new 1970 }
+  let(:date) { DateTime.new 2014 }
   subject { tz.ical_timezone date }
 
   describe 'daylight offset' do
@@ -17,6 +17,14 @@ describe 'TZInfo::Timezone' do
     specify { expect(subject.standards.first.tzoffsetfrom.value_ical).to eq "+0200" }
   end
 
+  describe 'daylight recurrence rule' do
+    specify { expect(subject.daylights.first.rrule.first.value_ical).to eq "FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3" }
+  end
+
+  describe 'standard recurrence rule' do
+    specify { expect(subject.standards.first.rrule.first.value_ical).to eq "FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10" }
+  end
+
   describe 'no end transition' do
     let(:tz) { TZInfo::Timezone.get 'America/Cayman' }
     let(:date) { DateTime.now }
@@ -82,4 +90,21 @@ END:VTIMEZONE
     end
   end
 
+  describe 'tzname for offset' do
+    # Check for CET/CEST correctness, which doesn't follow
+    # the more common *ST/*DT style abbreviations.
+    let(:tz) { TZInfo::Timezone.get 'Europe/Prague' }
+    let(:ical_tz) { tz.ical_timezone date }
+
+    describe '#daylight' do
+      subject(:tzname) { ical_tz.daylights.first.tzname.first }
+      it { should eql 'CEST' }
+    end
+
+    describe '#standard' do
+      subject(:tzname) { ical_tz.standards.first.tzname.first }
+      it { should eql 'CET' }
+    end
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: icalendar
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Ryan Ahearn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-24 00:00:00.000000000 Z
+date: 2014-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake