spina-admin-conferences 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4422ca6e7b9b65669d3442a22035ef7f22e4ab3ea7ce817ba416fe73682e04a6
-  data.tar.gz: af3da71b479742ac85a894c2ada05967ee7307a07cde2205d353374898e5ae13
+  metadata.gz: da95a8481d7f0d2b5d04a979dda9bc04455b083180c9e70106da172c604fa91c
+  data.tar.gz: 66514dbf26e695164135b6b4acd9e6acb6f22a5107b678fac6fc2b9e6e6cc22c
 SHA512:
-  metadata.gz: 92eefe536ddfffab205b45a0888f3f9a88c133a26352810788b5cf927909c83cb016215f4614bed25f3f5fc93e4377f6a081c02359dc854d69a24d26337920c8
-  data.tar.gz: d8e69093d00ecf8f14c1f6cedbfdfd1f419de19d8e485f466fb57b9974229b883120949230d1af63b3aa34dcfc9751ceeacd4bcaf9f432ce58c17cfd6a4658e1
+  metadata.gz: 9305b4aa9ae413dd88b35f4a4ff1d9e5363639289d7943d014d2f8f7f8e3c96085c48da590bed5cdf03986f8b7c21218a04ca9968068054219dfa3cb1ca0a779
+  data.tar.gz: 3296d9701c96c415b8219807591baee28631425448c6a4302e933d668a25b2e50c85448fcea6e324e2a36cebccbfefd88a37863d47ffd43b881d16f2c2677604

data/app/models/spina/admin/conferences/conference.rb

@@ -12,7 +12,7 @@ module Spina
       #
       # = Translations
       # - {#name}
-      class Conference < ApplicationRecord
+      class Conference < ApplicationRecord # rubocop:disable Metrics/ClassLength
         include AttrJson::Record
         include AttrJson::NestedAttributes
         include Spina::Partable
@@ -70,6 +70,67 @@ module Spina
         validates :name, :start_date, :finish_date, :year, presence: true
         validates :finish_date, 'spina/admin/conferences/finish_date': true, unless: proc { |conference| conference.start_date.blank? }
 
+        class << self
+          # @return [Array<TZInfo::TimezonePeriod>] the time zone periods for the conferences
+          def time_zone_periods
+            pluck(:dates).compact.collect(&:begin).collect(&:at_beginning_of_day).collect(&:period)
+          end
+
+          # @return [String] a set of conferences as an iCalendar
+          def to_ics
+            Rails.cache.fetch [all, 'calendar'] do
+              calendar = Icalendar::Calendar.new
+              calendar.x_wr_calname = (Current.account || Spina::Account.first).name
+              calendar.add_timezone(ical_timezone)
+              conference_events.each { |event| calendar.add_event(event) }
+              calendar.publish
+              calendar.to_ical
+            end
+          end
+
+          private
+
+          def conference_events
+            Rails.cache.fetch [all, 'events'] do
+              all.in_batches.each_record.collect do |conference|
+                Rails.cache.fetch([conference, 'event']) { conference.to_event }
+              end
+            end
+          end
+
+          def ical_timezone
+            Rails.cache.fetch [self, 'time_zone'] do
+              Icalendar::Timezone.new do |timezone|
+                timezone.tzid = Time.zone.name
+                daylight_periods.each { |daylight_period| timezone.add_daylight(daylight_period) }
+                standard_periods.each { |standard_period| timezone.add_daylight(standard_period) }
+              end
+            end
+          end
+
+          def daylight_periods
+            time_zone_periods.select(&:dst?).each do |period|
+              Icalendar::Timezone::Daylight.new do |ical_period|
+                ical_period.tzoffsetfrom = period.offset.ical_offset
+                ical_period.tzoffsetto = period.offset.ical_offset
+                ical_period.tzname = period.abbreviation
+                ical_period.dtstart = period.starts_at.to_datetime
+              end
+            end
+          end
+
+          def standard_periods
+            time_zone_periods.reject(&:dst?).each do |period|
+              Icalendar::Timezone::Standard.new do |ical_period|
+                ical_period.tzoffsetfrom = period.offset.ical_offset
+                ical_period.tzoffsetto = period.offset.ical_offset
+                ical_period.tzname = period.abbreviation
+                ical_period.dtstart = period.starts_at.to_datetime
+              end
+            end
+          end
+        end
+
         # @return [Date, nil] the start date of the conference. Nil if the conference has no dates
         def start_date
           return if dates.blank?
@@ -127,10 +188,8 @@ module Spina
           event = Icalendar::Event.new
           return event if invalid?
 
-          event.dtstart = start_date
-          event.dtstart.ical_param(:value, 'DATE')
-          event.dtend = finish_date
-          event.dtend.ical_param(:value, 'DATE')
+          event.dtstart = Icalendar::Values::Date.new(dates.begin)
+          event.dtend = Icalendar::Values::Date.new(dates.exclude_end? ? dates.end : dates.end + 1.day)
           event.location = location
           event.contact = Spina::Account.first.email
           event.categories = Conference.model_name.human(count: 0)
@@ -138,10 +197,71 @@ module Spina
           event
         end
 
-        # @param (see #to_event)
-        # @deprecated Use {#to_event} instead
+        # @return [TZInfo::TimezonePeriod, nil] the time zone period for the conference event
+        def time_zone_period
+          return if start_date.blank?
+
+          start_date.at_beginning_of_day.period
+        end
+
+        # @return [String, nil] the conference as an iCalendar
         def to_ics
-          to_event
+          Rails.cache.fetch [self, presentations, 'calendar'] do
+            calendar = Icalendar::Calendar.new
+            return if invalid?
+
+            calendar.x_wr_calname = name
+            calendar.add_timezone(ical_timezone)
+            eventables_events.each { |event| calendar.add_event(event) }
+            calendar.publish
+            calendar.to_ical
+          end
+        end
+
+        private
+
+        def eventables
+          [self, *events, *presentations]
+        end
+
+        def eventables_events
+          Rails.cache.fetch [self, *presentations, 'events'] do
+            eventables.collect do |eventable|
+              Rails.cache.fetch([eventable, 'event']) { eventable.to_event }
+            end
+          end
+        end
+
+        def ical_timezone
+          Rails.cache.fetch [self, presentations, 'time_zone'] do
+            Icalendar::Timezone.new do |timezone|
+              timezone.tzid = Time.zone.name
+              daylight_periods.each { |daylight_period| timezone.add_daylight(daylight_period) }
+              standard_periods.each { |standard_period| timezone.add_daylight(standard_period) }
+            end
+          end
+        end
+
+        def daylight_periods
+          time_zone_periods.select(&:dst?).each do |period|
+            Icalendar::Timezone::Daylight.new do |ical_period|
+              ical_period.tzoffsetfrom = period.offset.ical_offset
+              ical_period.tzoffsetto = period.offset.ical_offset
+              ical_period.tzname = period.abbreviation
+              ical_period.dtstart = period.starts_at.to_datetime
+            end
+          end
+        end
+
+        def standard_periods
+          time_zone_periods.reject(&:dst?).each do |period|
+            Icalendar::Timezone::Standard.new do |ical_period|
+              ical_period.tzoffsetfrom = period.offset.ical_offset
+              ical_period.tzoffsetto = period.offset.ical_offset
+              ical_period.tzname = period.abbreviation
+              ical_period.dtstart = period.starts_at.to_datetime
+            end
+          end
         end
       end
     end

data/app/models/spina/admin/conferences/event.rb

@@ -20,14 +20,15 @@ module Spina
         # @!attribute [rw] name
         #   @return [String, nil] the translated name of the event
         # @!attribute [rw] description
-        #   @return [String, nil] the translated description of the event
+        #   @return [ActionText::RichText, nil] the translated description of the event
         # @!attribute [rw] start_datetime
         #   @return [ActiveSupport::TimeWithZone, nil] the start time of the event
         # @!attribute [rw] finish_datetime
         #   @return [ActiveSupport::TimeWithZone, nil] the finish time of the event
         # @!attribute [rw] location
         #   @return [String, nil] the translated location of the event
-        translates :name, :description, :location, fallbacks: true
+        translates :name, :location, fallbacks: true
+        translates :description, backend: :action_text, fallbacks: true
 
         # @return [ActiveRecord::Relation] all events, ordered by name
         scope :sorted, -> { i18n.order :name }
@@ -56,27 +57,28 @@ module Spina
           start_datetime.to_date
         end
 
+        # @return [TZInfo::TimezonePeriod, nil] the time zone period for the event
+        def time_zone_period
+          return if start_datetime.blank?
+
+          start_datetime.period
+        end
+
         # @return [Icalendar::Event] the event as an iCal event
         def to_event # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
           event = Icalendar::Event.new
           return event if invalid?
 
-          event.dtstart = start_datetime
-          event.dtend = finish_datetime
+          event.dtstart = Icalendar::Values::DateTime.new(start_datetime, tzid: start_datetime.time_zone.tzinfo.name)
+          event.dtend = Icalendar::Values::DateTime.new(finish_datetime, tzid: start_datetime.time_zone.tzinfo.name)
           event.location = location
           event.contact = Spina::Account.first.email
           event.categories = Event.model_name.human(count: 0)
           event.summary = name
-          event.append_custom_property('alt_description', description.try(:html_safe))
-          event.description = description.try(:gsub, %r{</?[^>]*>}, '')
+          event.append_custom_property('alt_description', description.to_s)
+          event.description = description.try(:to_plain_text)
           event
         end
-
-        # @param (see #to_event)
-        # @deprecated Use {#to_event} instead
-        def to_ics
-          to_event
-        end
       end
     end
   end

data/app/models/spina/admin/conferences/presentation.rb

@@ -28,8 +28,9 @@ module Spina
         # @!attribute [rw] title
         #   @return [String, nil] the presentation title
         # @!attribute [rw] abstract
-        #   @return [String, nil] the presentation abstract
-        translates :title, :abstract, fallbacks: true
+        #   @return [ActionText::RichText, nil] the presentation abstract
+        translates :title, fallbacks: true
+        translates :abstract, backend: :action_text, fallbacks: true
 
         # @return [ActiveRecord::Relation] all conferences, ordered by date
         scope :sorted, -> { order start_datetime: :desc }
@@ -98,27 +99,35 @@ module Spina
           start_datetime.to_date
         end
 
+        # @return [ActiveSupport::TimeWithZone, nil] the presentation end time. Nil if the presentation has no start date and time
+        def finish_datetime
+          return if start_datetime.blank?
+
+          start_datetime + presentation_type.duration
+        end
+
+        # @return [TZInfo::TimezonePeriod, nil] the time zone period for the presentation
+        def time_zone_period
+          return if start_datetime.blank?
+
+          start_datetime.period
+        end
+
         # @return [Icalendar::Event] the presentation as an iCal event
         def to_event # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
           event = Icalendar::Event.new
           return event if invalid?
 
-          event.dtstart = start_datetime
-          event.dtend = start_datetime + presentation_type.duration
+          event.dtstart = Icalendar::Values::DateTime.new(start_datetime, tzid: start_datetime.time_zone.tzinfo.name)
+          event.dtend = Icalendar::Values::DateTime.new(finish_datetime, tzid: finish_datetime.time_zone.tzinfo.name)
           event.location = session.room_name
           presenters.each { |presenter| event.contact = presenter.full_name_and_institution }
           event.categories = Presentation.model_name.human(count: 0)
           event.summary = title
-          event.append_custom_property('alt_description', abstract.try(:html_safe))
-          event.description = abstract.try(:gsub, %r{</?[^>]*>}, '')
+          event.append_custom_property('alt_description', abstract.to_s)
+          event.description = abstract.try(:to_plain_text)
           event
         end
-
-        # @param (see #to_event)
-        # @deprecated Use {#to_event} instead
-        def to_ics
-          to_event
-        end
       end
     end
   end

data/app/views/spina/admin/conferences/conferences/_event_fields.html.haml

@@ -22,8 +22,7 @@
   .structure-form-part
     .page-form-label= Spina::Admin::Conferences::Event.human_attribute_name :description
     .page-form-content
-      .page-form-rich-text
-        = render 'spina/admin/shared/rich_text_field', f: f, field: :description
+      .page-form-rich-text= f.rich_text_area :description
 
   = f.hidden_field :id
 

data/app/views/spina/admin/conferences/presentations/_form_presentation_details.html.haml

@@ -23,8 +23,7 @@
   .page-form-group
     .page-form-label= Spina::Admin::Conferences::Presentation.human_attribute_name :abstract
     .page-form-content
-      .page-form-rich-text
-        = render 'spina/admin/shared/rich_text_field', f: f, field: :abstract
+      .page-form-rich-text= f.rich_text_area :abstract
 
   .page-form-group
     .page-form-label= Spina::Admin::Conferences::Presentation.human_attribute_name :presenters

data/db/migrate/20210417102513_add_locale_to_action_text_rich_texts.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class AddLocaleToActionTextRichTexts < ActiveRecord::Migration[6.1]
+  def change
+    add_column :action_text_rich_texts, :locale, :string
+    remove_index :action_text_rich_texts, column: %i[record_type record_id name], name: :index_action_text_rich_texts_uniqueness,
+                                          unique: true
+    add_index :action_text_rich_texts, %i[record_type record_id name locale], name: :index_action_text_rich_texts_uniqueness,
+                                                                              unique: true
+  end
+end

data/db/migrate/20210417102514_move_texts_to_action_text_rich_texts.rb

@@ -0,0 +1,82 @@
+# frozen_string_literal: true
+
+class MoveTextsToActionTextRichTexts < ActiveRecord::Migration[6.1] # :nodoc:
+  def change
+    create_mobility_tables
+
+    Spina.config.locales.each do |locale|
+      I18n.with_locale(locale) do
+        move_presentation_abstracts
+        move_event_descriptions
+      end
+    end
+
+    remove_column :spina_conferences_presentation_translations, :abstract, :text
+    remove_column :spina_conferences_event_translations, :description, :text
+  end
+
+  private
+
+  def create_mobility_tables
+    create_table :mobility_text_translations do |t| # rubocop:disable Rails/CreateTableWithTimestamps
+      t.string :record
+    end
+    create_table :mobility_string_translations do |t| # rubocop:disable Rails/CreateTableWithTimestamps
+      t.string :record
+    end
+  end
+
+  def move_presentation_abstracts
+    reversible do |dir|
+      Spina::Admin::Conferences::Presentation.in_batches.each_record do |presentation|
+        dir.up { presentation.update(abstract: presentation.presentation_translation.abstract) }
+        dir.down do
+          break if presentation.abstract.blank?
+
+          presentation.presentation_translation.update(abstract: presentation.abstract.read_attribute_before_type_cast('body'))
+          presentation.abstract.destroy
+        end
+      end
+    end
+  end
+
+  def move_event_descriptions
+    reversible do |dir|
+      Spina::Admin::Conferences::Event.in_batches.each_record do |event|
+        dir.up { event.update(description: event.event_translation.description) }
+        dir.down do
+          break if event.description.blank?
+
+          event.event_translation.update(description: event.description.read_attribute_before_type_cast('body'))
+          event.description.destroy
+        end
+      end
+    end
+  end
+end
+
+module Spina
+  module Admin
+    module Conferences
+      class PresentationTranslation < ApplicationRecord
+        belongs_to :presentation, foreign_key: 'spina_conferences_presentation_id'
+      end
+
+      class EventTranslation < ApplicationRecord
+        belongs_to :event, foreign_key: 'spina_conferences_event_id'
+      end
+
+      class Presentation < ApplicationRecord
+        has_one :presentation_translation, -> { where locale: I18n.locale }, foreign_key: 'spina_conferences_presentation_id'
+
+        translates :abstract, backend: :action_text
+      end
+
+      class Event < ApplicationRecord
+        has_one :event_translation, -> { where locale: I18n.locale }, foreign_key: 'spina_conferences_event_id'
+
+        translates :description, backend: :action_text
+      end
+    end
+  end
+end

data/lib/spina/admin/conferences.rb

@@ -7,6 +7,7 @@ require 'rails-i18n'
 require 'stimulus-rails'
 require 'turbo-rails'
 require 'icalendar'
+require 'icalendar/tzinfo'
 
 # Spina content management system.
 # @see https://www.spinacms.com Spina website

data/lib/spina/admin/conferences/engine.rb

@@ -20,12 +20,10 @@ module Spina
           Spina::Part.register(Spina::Parts::Admin::Conferences::EmailAddress)
           Spina::Part.register(Spina::Parts::Admin::Conferences::Time)
           Spina::Part.register(Spina::Parts::Admin::Conferences::Url)
+        end
 
-          ActiveSupport::Deprecation
-            .new('2.0', 'Spina::Admin::Conferences')
-            .tap { |deprecator| deprecator.deprecate_methods(Conference, to_ics: :to_event) }
-            .tap { |deprecator| deprecator.deprecate_methods(Presentation, to_ics: :to_event) }
-            .tap { |deprecator| deprecator.deprecate_methods(Event, to_ics: :to_event) }
+        config.to_prepare do
+          require 'mobility/action_text'
         end
       end
     end

data/lib/spina/admin/conferences/version.rb

@@ -4,7 +4,7 @@ module Spina
   module Admin
     module Conferences
       # Version number.
-      VERSION = '2.0.1'
+      VERSION = '2.1.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spina-admin-conferences
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Justin Malčić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-16 00:00:00.000000000 Z
+date: 2021-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: icalendar
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.5'
+- !ruby/object:Gem::Dependency
+  name: mobility-actiontext
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -553,6 +567,8 @@ files:
 - db/migrate/20210315164409_add_json_attributes_to_spina_conferences_presentations.rb
 - db/migrate/20210315164410_add_json_attributes_to_spina_conferences_conferences.rb
 - db/migrate/20210315164411_convert_partables_to_json.rb
+- db/migrate/20210417102513_add_locale_to_action_text_rich_texts.rb
+- db/migrate/20210417102514_move_texts_to_action_text_rich_texts.rb
 - lib/spina/admin/conferences.rb
 - lib/spina/admin/conferences/engine.rb
 - lib/spina/admin/conferences/migration/renaming.rb