icalendar 2.12.5 → 2.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 278fc513495386d4f80933b71c9ebb97195f6d9d365a2da920dd60f6375553d8
-  data.tar.gz: c6b6c63d1c24c7726b6e816cd350e5d7260c11a6e4475b8b886bd4658bfca15a
+  metadata.gz: 7437b0ae5b86b89cb49c3db3c405aabe0a07ad4a9b1a6fd333faf4ed48d82384
+  data.tar.gz: 7a73813c5bbccc460acf9b2e80398dc17b48d65b16fe568e433f7fb6e50df107
 SHA512:
-  metadata.gz: 3e9e9a916e27b8b6adad3f65beaa9658ebd7a786a2d78b10e83d405a5520228e5ad2bbc1ad07dbeeec2dbd86b726f2edf9b08834bf13dc09e1c82248dd389c5f
-  data.tar.gz: b993e6df56b6f1219675c40cb2219514951771c6bbeacdd371e237677133e458f4938dbeb144452c98e70ccc2a5e28145fc3c1b6dc54a66030dedac4f8cee070
+  metadata.gz: 22a6861abb0548b74eb3ea814e4c8632da9d35b6ad0bc798faed60ee053b215d7cd32450b7317606b17f0d73fda188974f18d9d14cddd24cde92b1d3511872d1
+  data.tar.gz: 72ac340771b89b5d7eb6628a00e85aea8c19833ac0e74e15313de71feaac42073604ba1dd3e964cbff843cf9e832f430480bbd9976af19f9f851e076009b7c49

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## Unreleased
 
+## 2.13.0 - 2026-10-11
+- Generate `CATEGORIES` as a single comma-separated line instead of one line per value, matching how Google Calendar and Nextcloud expect it (#226). Setting `categories = [...]` now stores the joined value as one item, so code that reads `#categories` expecting one entry per category will see a single combined entry instead; `append_categories` is unaffected and still adds a separate line. - Carlos Kvasir
+- Replace OpenStruct with Structs in Duration, Recur and UtcOffset values and drop the ostruct dependency (#329). Requires Ruby 2.5 or newer, for `Struct`'s `keyword_init:`. The parts keep the same readers and setters, but `#value` is now a Struct, so assigning an attribute that isn't one of its parts raises `NoMethodError`. - David Corson-Knowles
+- Correct negative fractional-hour TZInfo offsets - ac1982
+
 ## 2.12.5 - 2026-09-25
 - Generate timezone transition onsets and recurrence dates using the previous UTC offset. - Ben Abulafia
 - Limit parsing depth

data/icalendar.gemspec

@@ -29,12 +29,11 @@ ActiveSupport is required for TimeWithZone support, but not required for general
   s.executables = `git ls-files -- bin/*`.split("\n").map { |f| File.basename f }
   s.require_paths = ['lib']
 
-  s.required_ruby_version = '>= 2.4.0'
+  s.required_ruby_version = '>= 2.5.0'
 
   s.add_dependency 'base64'
   s.add_dependency 'ice_cube', '~> 0.16'
   s.add_dependency 'logger'
-  s.add_dependency 'ostruct'
 
   s.add_development_dependency 'rake', '~> 13.0'
   s.add_development_dependency 'bundler'

data/lib/icalendar/calendar.rb

@@ -12,7 +12,7 @@ module Icalendar
     optional_single_property :uid
     optional_single_property :last_modified, Icalendar::Values::DateTime, true
     optional_single_property :url, Icalendar::Values::Uri, true
-    optional_property :categories
+    optional_property :categories, Icalendar::Values::Text, false, false, true
     optional_single_property :refresh_interval, Icalendar::Values::Duration, true
     optional_single_property :source, Icalendar::Values::Uri, true
     optional_single_property :color

data/lib/icalendar/event.rb

@@ -32,7 +32,7 @@ module Icalendar
     optional_property :rrule, Icalendar::Values::Recur, true
     optional_property :attach, Icalendar::Values::Uri
     optional_property :attendee, Icalendar::Values::CalAddress
-    optional_property :categories
+    optional_property :categories, Icalendar::Values::Text, false, false, true
     optional_property :comment
     optional_property :contact
     optional_property :exdate, Icalendar::Values::DateTime

data/lib/icalendar/has_properties.rb

@@ -123,9 +123,9 @@ module Icalendar
         self.mutex_properties << properties
       end
 
-      def optional_property(prop, klass = Icalendar::Values::Text, suggested_single = false, new_property = false)
+      def optional_property(prop, klass = Icalendar::Values::Text, suggested_single = false, new_property = false, single_line = false)
         self.suggested_single_properties << prop if suggested_single
-        multi_property prop, klass, new_property
+        multi_property prop, klass, new_property, single_line
       end
 
       def single_property(prop, klass, new_property)
@@ -141,14 +141,16 @@ module Icalendar
         end
       end
 
-      def multi_property(prop, klass, new_property)
+      def multi_property(prop, klass, new_property, single_line = false)
         self.multiple_properties << prop.to_s
         self.default_property_types[prop.to_s] = klass
         property_var = "@#{prop}"
 
         define_method "#{prop}=" do |value|
           mapped = map_property_value value, klass, true, new_property
-          if mapped.is_a? Icalendar::Values::Helpers::Array
+          if single_line
+            instance_variable_set property_var, [mapped].compact
+          elsif mapped.is_a? Icalendar::Values::Helpers::Array
             instance_variable_set property_var, mapped.to_a.compact
           else
             instance_variable_set property_var, [mapped].compact

data/lib/icalendar/journal.rb

@@ -22,7 +22,7 @@ module Icalendar
     optional_property :rrule, Icalendar::Values::Recur, true
     optional_property :attach, Icalendar::Values::Uri
     optional_property :attendee, Icalendar::Values::CalAddress
-    optional_property :categories
+    optional_property :categories, Icalendar::Values::Text, false, false, true
     optional_property :comment
     optional_property :contact
     optional_property :description

data/lib/icalendar/todo.rb

@@ -33,7 +33,7 @@ module Icalendar
     optional_property :rrule, Icalendar::Values::Recur, true
     optional_property :attach, Icalendar::Values::Uri
     optional_property :attendee, Icalendar::Values::CalAddress
-    optional_property :categories
+    optional_property :categories, Icalendar::Values::Text, false, false, true
     optional_property :comment
     optional_property :contact
     optional_property :exdate, Icalendar::Values::DateTime

data/lib/icalendar/tzinfo.rb

@@ -86,7 +86,8 @@ module Icalendar
   module TimezoneOffset
     def ical_offset
       o = utc_total_offset
-      sprintf '%+-2.2d%2.2d', (o / 3600).to_i, ((o / 60) % 60).to_i
+      magnitude = o.abs
+      sprintf '%s%02d%02d', o < 0 ? '-' : '+', magnitude / 3600, (magnitude / 60) % 60
     end
   end
 end

data/lib/icalendar/values/duration.rb

@@ -1,17 +1,16 @@
 # frozen_string_literal: true
 
-require 'ostruct'
-
 module Icalendar
   module Values
 
     class Duration < Value
+      Parts = Struct.new(:past, :weeks, :days, :hours, :minutes, :seconds, keyword_init: true)
 
       def initialize(value, *args)
         if value.is_a? Icalendar::Values::Duration
           super value.value, *args
         else
-          super OpenStruct.new(parse_fields value), *args
+          super Parts.new(**parse_fields(value)), *args
         end
       end
 

data/lib/icalendar/values/recur.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'ostruct'
-
 module Icalendar
   module Values
 
@@ -11,12 +9,29 @@ module Icalendar
       WEEKDAY = "(?:[+-]?\\d{1,2})?(?:#{DAYNAME})"
       MONTHDAY = '[+-]?\d{1,2}'
       YEARDAY = '[+-]?\d{1,3}'
+      Parts = Struct.new(
+        :frequency,
+        :until,
+        :count,
+        :interval,
+        :by_second,
+        :by_minute,
+        :by_hour,
+        :by_day,
+        :by_month_day,
+        :by_year_day,
+        :by_week_number,
+        :by_month,
+        :by_set_position,
+        :week_start,
+        keyword_init: true
+      )
 
       def initialize(value, *args)
         if value.is_a? Icalendar::Values::Recur
           super value.value, *args
         else
-          super OpenStruct.new(parse_fields value), *args
+          super Parts.new(**parse_fields(value)), *args
         end
       end
 

data/lib/icalendar/values/utc_offset.rb

@@ -1,15 +1,15 @@
 # frozen_string_literal: true
 
-require 'ostruct'
-
 module Icalendar
   module Values
     class UtcOffset < Value
+      Parts = Struct.new(:behind, :hours, :minutes, :seconds, keyword_init: true)
+
       def initialize(value, *args)
         if value.is_a? Icalendar::Values::UtcOffset
           value = value.value
         else
-          value = OpenStruct.new parse_fields(value)
+          value = Parts.new(**parse_fields(value))
         end
         super value, *args
       end

data/lib/icalendar/version.rb

@@ -2,6 +2,6 @@
 
 module Icalendar
 
-  VERSION = '2.12.5'
+  VERSION = '2.13.0'
 
 end

data/spec/calendar_spec.rb

@@ -52,6 +52,13 @@ describe Icalendar::Calendar do
     end
   end
 
+  describe '#categories' do
+    it 'renders multiple categories as a single comma-separated line' do
+      subject.categories = ['CAT A', 'CAT B']
+      expect(subject.to_ical).to include "CATEGORIES:CAT A,CAT B\r\n"
+    end
+  end
+
   context 'components' do
     let(:ical_component) { double 'Component', name: 'event', :'parent=' => nil }
 

data/spec/tzinfo_spec.rb

@@ -17,6 +17,27 @@ describe 'TZInfo::Timezone' do
     specify { expect(subject.standards.first.tzoffsetfrom.value_ical).to eq "+0200" }
   end
 
+  describe 'negative fractional-hour offsets' do
+    let(:tz) { TZInfo::Timezone.get 'America/St_Johns' }
+
+    [DateTime.new(2021, 1, 1), DateTime.new(2021, 7, 1)].each do |reference_date|
+      context reference_date.to_s do
+        let(:date) { reference_date }
+
+        it 'round-trips the standard and daylight offsets' do
+          calendar = Icalendar::Calendar.new
+          calendar.add_timezone subject
+          parsed = Icalendar::Calendar.parse(calendar.to_ical).first.timezones.first
+
+          expect(parsed.daylights.first.tzoffsetfrom.value_ical).to eq '-0330'
+          expect(parsed.daylights.first.tzoffsetto.value_ical).to eq '-0230'
+          expect(parsed.standards.first.tzoffsetfrom.value_ical).to eq '-0230'
+          expect(parsed.standards.first.tzoffsetto.value_ical).to eq '-0330'
+        end
+      end
+    end
+  end
+
   describe 'daylight recurrence rule' do
     specify { expect(subject.daylights.first.rrule.first.value_ical).to eq "FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3" }
   end
@@ -151,3 +172,22 @@ END:VTIMEZONE
   end
 
 end
+
+
+describe Icalendar::TimezoneOffset do
+  {
+    -12600 => '-0330',
+    -34200 => '-0930',
+    -1800 => '-0030',
+    -3600 => '-0100',
+    0 => '+0000',
+    19800 => '+0530',
+    20700 => '+0545'
+  }.each do |seconds, expected|
+    it "formats #{seconds} seconds as #{expected}" do
+      offset = Object.new.extend(described_class)
+      allow(offset).to receive(:utc_total_offset).and_return(seconds)
+      expect(offset.ical_offset).to eq expected
+    end
+  end
+end

data/spec/values/duration_spec.rb

@@ -64,4 +64,22 @@ describe Icalendar::Values::Duration do
       expect(subject.value_ical).to eq 'P4D'
     end
   end
+
+  describe 'field access' do
+    let(:value) { '-P1DT2H' }
+
+    it 'is backed by a Struct of the duration parts' do
+      expect(subject.value).to be_a Icalendar::Values::Duration::Parts
+      expect(subject.value.to_h).to eq(past: true, weeks: 0, days: 1, hours: 2, minutes: 0, seconds: 0)
+    end
+
+    it 'writes parts through setters' do
+      subject.hours = 3
+      expect(subject.value_ical).to eq '-P1DT3H'
+    end
+
+    it 'copies another duration' do
+      expect(described_class.new(subject).value_ical).to eq '-P1DT2H'
+    end
+  end
 end

data/spec/values/period_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'ostruct'
 
 describe Icalendar::Values::Period do
 
@@ -24,7 +23,7 @@ describe Icalendar::Values::Period do
 
   context 'date-time/duration' do
     let(:value) { '19830507T000600Z/P1604W' }
-    let(:expected_duration) { OpenStruct.new past: false, weeks: 1604, days: 0, hours: 0, minutes: 0, seconds: 0 }
+    let(:expected_duration) { Icalendar::Values::Duration::Parts.new(past: false, weeks: 1604, days: 0, hours: 0, minutes: 0, seconds: 0) }
 
     describe '#value_ical' do
       specify { expect(subject.value_ical).to eq value }

data/spec/values/recur_spec.rb

@@ -56,4 +56,23 @@ describe Icalendar::Values::Recur do
       expect(subject.value_ical).to eq 'FREQ=DAILY;BYDAY=SU,SA;BYYEARDAY=1,34,56,240'
     end
   end
+
+  describe 'field access' do
+    let(:value) { 'FREQ=WEEKLY;COUNT=4;BYDAY=MO,WE,FR' }
+
+    it 'is backed by a Struct of the RRULE parts' do
+      expect(subject.value).to be_a Icalendar::Values::Recur::Parts
+      expect(subject.value.to_h).to include(frequency: 'WEEKLY', count: 4, by_day: %w(MO WE FR), until: nil)
+    end
+
+    it 'writes parts through setters' do
+      subject.frequency = 'DAILY'
+      subject.count = 2
+      expect(subject.value_ical).to eq 'FREQ=DAILY;COUNT=2;BYDAY=MO,WE,FR'
+    end
+
+    it 'copies another recur' do
+      expect(described_class.new(subject).value_ical).to eq subject.value_ical
+    end
+  end
 end

data/spec/values/utc_offset_spec.rb

@@ -38,4 +38,22 @@ describe Icalendar::Values::UtcOffset do
       end
     end
   end
+
+  describe 'field access' do
+    subject { described_class.new '-0530' }
+
+    it 'is backed by a Struct of the offset parts' do
+      expect(subject.value).to be_a Icalendar::Values::UtcOffset::Parts
+      expect(subject.value.to_h).to eq(behind: true, hours: 5, minutes: 30, seconds: 0)
+    end
+
+    it 'writes parts through setters' do
+      subject.minutes = 45
+      expect(subject.value_ical).to eq '-0545'
+    end
+
+    it 'copies another offset' do
+      expect(described_class.new(subject).value_ical).to eq '-0530'
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: icalendar
 version: !ruby/object:Gem::Version
-  version: 2.12.5
+  version: 2.13.0
 platform: ruby
 authors:
 - Ryan Ahearn
@@ -51,20 +51,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: ostruct
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -314,7 +300,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="