icalendar 2.7.1 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fbeadc87a1316894e02896fd63e7f7644a1ab5bf3a542b0d5a02c59aabf2d603
-  data.tar.gz: 3aaf09d7984fed57644d091fa76285084d9fbf3568e6078939e7887d6f44f50a
+  metadata.gz: becd9ceba3342d0b602f1bb8a33858fb2176ceafd457a0fbca76d24ff7800dc7
+  data.tar.gz: f11054752ca18d026b1339e936ab30d4f1ff61219ecfd94d3f913b3de6b14106
 SHA512:
-  metadata.gz: e6134ff7d12c820d7ee10a316108c1d7a9db274cccd366b93a49fa491931038edd78eb37789a24962cc6370c83fd34d67508dd24b574e8d1fa235e815c1fa22d
-  data.tar.gz: 0bad8ab7548493a133686dab3a6d36a58aeecddb8642da83cef5a2184d0d08e97dc59307fc6fdd9574935319044ccb5ffa50f9c936aa60e5637a2430e78eb446
+  metadata.gz: 8262dd28d571778ecc7dd638d6df2a44e4c26bea2221183d82a644c777d100a75027c83ac83fd53c801d43cd75b9521be104111900d6653119a0593a281b8203
+  data.tar.gz: 1dea941db6e27188b9ab0d769a0df2335fdc2bc492a4ca6339a5e4a90e0d91f9821282aaed13b2cc4f8a4921e24a3d20f14aa34fea97c50c6326d3a1dc29f3cc

data/.github/workflows/main.yml

@@ -0,0 +1,32 @@
+name: Ruby
+
+on:
+  push:
+    branches:
+      - main
+      - master
+  pull_request:
+    branches:
+      - main
+      - master
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        ruby:
+          - 2.7.6
+          - 3.0.4
+          - 3.1.2
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
+    - name: Run rspec tests
+      run: bundle exec rake spec

data/History.txt

@@ -1,3 +1,9 @@
+=== 2.8.0 2022-07-10
+ * Fix compatibility with ActiveSupport 7 - Pat Allan
+ * Set default action of "DISPLAY" on alarms - Rikson
+ * Add license information to gemspec - Robert Reiz
+ * Support RFC7986 properties - Daniele Frisanco
+
 === 2.7.1 2021-03-14
  * Recover from bad line-wrapping code that splits in the middle of Unicode code points
  * Add a verbose option to the Parser to quiet some of the chattier log entries

data/icalendar.gemspec

@@ -6,6 +6,7 @@ Gem::Specification.new do |s|
 
   s.name = "icalendar"
   s.version = Icalendar::VERSION
+  s.licenses = ['BSD-2-Clause', 'GPL-3.0-only', 'icalendar']
 
   s.homepage = "https://github.com/icalendar/icalendar"
   s.platform = Gem::Platform::RUBY

data/lib/icalendar/alarm.rb

@@ -22,6 +22,7 @@ module Icalendar
 
     def initialize
       super 'alarm'
+      self.action = 'DISPLAY'
     end
 
     def valid?(strict = false)

data/lib/icalendar/calendar.rb

@@ -5,6 +5,16 @@ module Icalendar
     required_property :prodid
     optional_single_property :calscale
     optional_single_property :ip_method
+    optional_property :ip_name
+    optional_property :description
+    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_single_property :refresh_interval, Icalendar::Values::Duration, true
+    optional_single_property :source, Icalendar::Values::Uri, true
+    optional_single_property :color
+    optional_property :image, Icalendar::Values::Uri, false, true
 
     component :timezone, :tzid
     component :event

data/lib/icalendar/event.rb

@@ -12,6 +12,7 @@ module Icalendar
     mutually_exclusive_properties :dtend, :duration
 
     optional_single_property :ip_class
+    optional_single_property :color
     optional_single_property :created, Icalendar::Values::DateTime
     optional_single_property :description
     optional_single_property :geo, Icalendar::Values::Float
@@ -37,6 +38,8 @@ module Icalendar
     optional_property :related_to
     optional_property :resources
     optional_property :rdate, Icalendar::Values::DateTime
+    optional_property :conference, Icalendar::Values::Uri, false, true
+    optional_property :image, Icalendar::Values::Uri, false, true
 
     component :alarm, false
 

data/lib/icalendar/has_properties.rb

@@ -104,29 +104,29 @@ module Icalendar
       def required_property(prop, klass = Icalendar::Values::Text, validator = nil)
         validator ||= ->(component, value) { !value.nil? }
         self.required_properties[prop] = validator
-        single_property prop, klass
+        single_property prop, klass, false
       end
 
       def required_multi_property(prop, klass = Icalendar::Values::Text, validator = nil)
         validator ||= ->(component, value) { !value.compact.empty? }
         self.required_properties[prop] = validator
-        multi_property prop, klass
+        multi_property prop, klass, false
       end
 
-      def optional_single_property(prop, klass = Icalendar::Values::Text)
-        single_property prop, klass
+      def optional_single_property(prop, klass = Icalendar::Values::Text, new_property = false)
+        single_property prop, klass, new_property
       end
 
       def mutually_exclusive_properties(*properties)
         self.mutex_properties << properties
       end
 
-      def optional_property(prop, klass = Icalendar::Values::Text, suggested_single = false)
+      def optional_property(prop, klass = Icalendar::Values::Text, suggested_single = false, new_property = false)
         self.suggested_single_properties << prop if suggested_single
-        multi_property prop, klass
+        multi_property prop, klass, new_property
       end
 
-      def single_property(prop, klass)
+      def single_property(prop, klass, new_property)
         self.single_properties << prop.to_s
         self.default_property_types[prop.to_s] = klass
 
@@ -135,17 +135,17 @@ module Icalendar
         end
 
         define_method "#{prop}=" do |value|
-          instance_variable_set "@#{prop}", map_property_value(value, klass, false)
+          instance_variable_set "@#{prop}", map_property_value(value, klass, false, new_property)
         end
       end
 
-      def multi_property(prop, klass)
+      def multi_property(prop, klass, new_property)
         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
+          mapped = map_property_value value, klass, true, new_property
           if mapped.is_a? Icalendar::Values::Array
             instance_variable_set property_var, mapped.to_a.compact
           else
@@ -162,20 +162,24 @@ module Icalendar
         end
 
         define_method "append_#{prop}" do |value|
-          send(prop) << map_property_value(value, klass, true)
+          send(prop) << map_property_value(value, klass, true, new_property)
         end
       end
     end
 
     private
 
-    def map_property_value(value, klass, multi_valued)
+    def map_property_value(value, klass, multi_valued, new_property)
+      params = {}
+      if new_property
+        params.merge!('VALUE': klass.value_type)
+      end
       if value.nil? || value.is_a?(Icalendar::Value)
         value
       elsif value.is_a? ::Array
-        Icalendar::Values::Array.new value, klass, {}, {delimiter: (multi_valued ? ',' : ';')}
+        Icalendar::Values::Array.new value, klass, params, {delimiter: (multi_valued ? ',' : ';')}
       else
-        klass.new value
+        klass.new value, params
       end
     end
 

data/lib/icalendar/journal.rb

@@ -6,6 +6,7 @@ module Icalendar
     required_property :uid
 
     optional_single_property :ip_class
+    optional_single_property :color
     optional_single_property :created, Icalendar::Values::DateTime
     optional_single_property :dtstart, Icalendar::Values::DateTime
     optional_single_property :last_modified, Icalendar::Values::DateTime
@@ -27,6 +28,7 @@ module Icalendar
     optional_property :request_status
     optional_property :related_to
     optional_property :rdate, Icalendar::Values::DateTime
+    optional_property :image, Icalendar::Values::Uri, false, true
 
     def initialize
       super 'journal'

data/lib/icalendar/parser.rb

@@ -50,7 +50,7 @@ module Icalendar
 
     def parse_property(component, fields = nil)
       fields = next_fields if fields.nil?
-      prop_name = %w(class method).include?(fields[:name]) ? "ip_#{fields[:name]}" : fields[:name]
+      prop_name = %w(class method name).include?(fields[:name]) ? "ip_#{fields[:name]}" : fields[:name]
       multi_property = component.class.multiple_properties.include? prop_name
       prop_value = wrap_property_value component, fields, multi_property
       begin

data/lib/icalendar/todo.rb

@@ -12,6 +12,7 @@ module Icalendar
     mutually_exclusive_properties :due, :duration
 
     optional_single_property :ip_class
+    optional_single_property :color
     optional_single_property :completed, Icalendar::Values::DateTime
     optional_single_property :created, Icalendar::Values::DateTime
     optional_single_property :description
@@ -38,6 +39,8 @@ module Icalendar
     optional_property :related_to
     optional_property :resources
     optional_property :rdate, Icalendar::Values::DateTime
+    optional_property :conference, Icalendar::Values::Uri, false, true
+    optional_property :image, Icalendar::Values::Uri, false, true
 
     component :alarm, false
 
@@ -49,4 +52,4 @@ module Icalendar
 
   end
 
-end
+end

data/lib/icalendar/values/array.rb

@@ -52,7 +52,6 @@ module Icalendar
       def needs_value_type?(default_type)
         value.first.class != default_type
       end
-
     end
 
   end

data/lib/icalendar/values/time_with_zone.rb

@@ -6,6 +6,12 @@ begin
   if defined?(ActiveSupport::TimeWithZone)
     require 'icalendar/values/active_support_time_with_zone_adapter'
   end
+rescue NameError
+  # ActiveSupport v7+ needs the base require to be run first before loading
+  # specific parts of it.
+  # https://guides.rubyonrails.org/active_support_core_extensions.html#stand-alone-active-support
+  require 'active_support'
+  retry
 rescue LoadError
   # tis ok, just a bit less fancy
 end

data/lib/icalendar/version.rb

@@ -1,5 +1,5 @@
 module Icalendar
 
-  VERSION = '2.7.1'
+  VERSION = '2.8.0'
 
 end

data/spec/alarm_spec.rb

@@ -6,14 +6,15 @@ describe Icalendar::Alarm do
   describe '#valid?' do
     subject do
       described_class.new.tap do |a|
-        a.action = 'AUDIO'
         a.trigger = Icalendar::Values::DateTime.new(Time.now.utc)
       end
     end
     context 'neither duration or repeat is set' do
+      before(:each) { subject.action = 'AUDIO' }
       it { should be_valid }
     end
     context 'both duration and repeat are set' do
+      before(:each) { subject.action = 'AUDIO' }
       before(:each) do
         subject.duration = 'PT15M'
         subject.repeat = 4
@@ -29,8 +30,12 @@ describe Icalendar::Alarm do
       it { should_not be_valid }
     end
 
+    context 'DISPLAY is set as default action' do
+      it 'must be DISPLAY' do
+        expect(subject.action).to eq 'DISPLAY'
+      end
+    end
     context 'display action' do
-      before(:each) { subject.action = 'DISPLAY' }
       it 'requires description' do
         expect(subject).to_not be_valid
         subject.description = 'Display Text'

data/spec/calendar_spec.rb

@@ -123,6 +123,16 @@ describe Icalendar::Calendar do
   describe '#to_ical' do
     before(:each) do
       Timecop.freeze DateTime.new(2013, 12, 26, 5, 0, 0, '+0000')
+      subject.ip_name = 'Company Vacation Days'
+      subject.description = 'The description'
+      subject.last_modified = "20140101T000000Z"
+      subject.url = 'https://example.com'
+      subject.color = 'red'
+      subject.image = 'https://example.com/image.png'
+      subject.uid = '5FC53010-1267-4F8E-BC28-1D7AE55A7C99'
+      subject.categories = 'MEETING'
+      subject.refresh_interval = 'P1W'
+      subject.source = 'https://example.com/holidays.ics'
       subject.event do |e|
         e.summary = 'An event'
         e.dtstart = "20140101T000000Z"
@@ -145,6 +155,15 @@ BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:icalendar-ruby
 CALSCALE:GREGORIAN
+LAST-MODIFIED;VALUE=DATE-TIME:20140101T000000Z
+URL;VALUE=URI:https://example.com
+REFRESH-INTERVAL;VALUE=DURATION:P1W
+SOURCE;VALUE=URI:https://example.com/holidays.ics
+COLOR:red
+NAME:Company Vacation Days
+DESCRIPTION:The description
+CATEGORIES:MEETING
+IMAGE;VALUE=URI:https://example.com/image.png
 BEGIN:VEVENT
 DTSTAMP:20131226T050000Z
 DTSTART:20140101T000000Z

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: icalendar
 version: !ruby/object:Gem::Version
-  version: 2.7.1
+  version: 2.8.0
 platform: ruby
 authors:
 - Ryan Ahearn
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-15 00:00:00.000000000 Z
+date: 2022-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ice_cube
@@ -160,9 +160,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/main.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - Gemfile
 - History.txt
 - LICENSE
@@ -243,7 +243,10 @@ files:
 - spec/values/text_spec.rb
 - spec/values/utc_offset_spec.rb
 homepage: https://github.com/icalendar/icalendar
-licenses: []
+licenses:
+- BSD-2-Clause
+- GPL-3.0-only
+- icalendar
 metadata: {}
 post_install_message: 'ActiveSupport is required for TimeWithZone support, but not
   required for general use.
@@ -263,7 +266,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.11
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: A ruby implementation of the iCalendar specification (RFC-5545).

data/.travis.yml

@@ -1,17 +0,0 @@
-sudo: false
-before_install:
-  - gem install bundler
-language: ruby
-rvm:
-  - 2.7
-  - 2.6
-  - 2.5
-  - jruby-19mode
-  - ruby-head
-  - jruby-head
-  - truffleruby-head
-matrix:
-  allow_failures:
-    - rvm: ruby-head
-    - rvm: jruby-head
-script: bundle exec rake spec