spina-admin-conferences 1.3.10 → 2.0.0.alpha

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

@@ -6,6 +6,8 @@ module Spina
       # Engine class for the plugin. This is where the plugin is registered as a {Spina::Plugin} with {Spina}.
       # @note The +name+ and +namespace+ of the {Spina::Plugin} object is +'conferences'+ (for compatibility reasons).
       class Engine < ::Rails::Engine
+        isolate_namespace Spina::Admin::Conferences
+
         config.before_initialize do
           ::Spina::Plugin.register do |plugin|
             plugin.name = 'conferences'
@@ -14,6 +16,11 @@ module Spina
         end
 
         config.after_initialize do
+          Spina::Part.register(Spina::Parts::Admin::Conferences::Date)
+          Spina::Part.register(Spina::Parts::Admin::Conferences::EmailAddress)
+          Spina::Part.register(Spina::Parts::Admin::Conferences::Time)
+          Spina::Part.register(Spina::Parts::Admin::Conferences::Url)
+
           ActiveSupport::Deprecation
             .new('2.0', 'Spina::Admin::Conferences')
             .tap { |deprecator| deprecator.deprecate_methods(Conference, to_ics: :to_event) }

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

@@ -4,7 +4,7 @@ module Spina
   module Admin
     module Conferences
       # Version number.
-      VERSION = '1.3.10'
+      VERSION = '2.0.0.alpha'
     end
   end
 end

data/lib/tasks/spina/admin/conferences_tasks.rake

@@ -1,4 +1,14 @@
 # frozen_string_literal: true
 
-namespace :spina_admin_conferences do
+namespace :spina do
+  Rake::Task[:convert_layout_parts_to_json].clear if Rake::Task.task_defined?('spina:convert_layout_parts_to_json')
+  Rake::Task[:convert_page_parts_to_json].clear if Rake::Task.task_defined?('spina:convert_page_parts_to_json')
+
+  desc 'Convert table-based partables to JSON-based parts'
+  task convert_parts_to_json: %i[environment spina_admin_conferences:install:migrations] do
+    puts "If the upgrade migrations were missing, they should now have been copied to your migrations path.\n" \
+         'If you have custom partables, you must modify the upgrade migration before running it: ' \
+         "for more information, see the documentation in the migration.\n" \
+         'Once the migration is ready, run `rails db:migrate`.'
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spina-admin-conferences
 version: !ruby/object:Gem::Version
-  version: 1.3.10
+  version: 2.0.0.alpha
 platform: ruby
 authors:
 - Justin Malčić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-03 00:00:00.000000000 Z
+date: 2021-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: icalendar
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: stimulus-rails
   requirement: !ruby/object:Gem::Requirement
@@ -375,7 +375,6 @@ files:
 - app/controllers/spina/admin/conferences/presentations_controller.rb
 - app/controllers/spina/admin/conferences/rooms_controller.rb
 - app/controllers/spina/admin/conferences/sessions_controller.rb
-- app/helpers/spina/admin/conferences/conferences_helper.rb
 - app/jobs/spina/admin/conferences/application_job.rb
 - app/jobs/spina/admin/conferences/delegate_import_job.rb
 - app/jobs/spina/admin/conferences/import_job.rb
@@ -384,21 +383,20 @@ files:
 - app/models/spina/admin/conferences.rb
 - app/models/spina/admin/conferences/application_record.rb
 - app/models/spina/admin/conferences/conference.rb
-- app/models/spina/admin/conferences/date_part.rb
 - app/models/spina/admin/conferences/delegate.rb
 - app/models/spina/admin/conferences/dietary_requirement.rb
-- app/models/spina/admin/conferences/email_address_part.rb
 - app/models/spina/admin/conferences/event.rb
 - app/models/spina/admin/conferences/institution.rb
-- app/models/spina/admin/conferences/part.rb
 - app/models/spina/admin/conferences/presentation.rb
 - app/models/spina/admin/conferences/presentation_attachment.rb
 - app/models/spina/admin/conferences/presentation_attachment_type.rb
 - app/models/spina/admin/conferences/presentation_type.rb
 - app/models/spina/admin/conferences/room.rb
 - app/models/spina/admin/conferences/session.rb
-- app/models/spina/admin/conferences/time_part.rb
-- app/models/spina/admin/conferences/url_part.rb
+- app/models/spina/parts/admin/conferences/date.rb
+- app/models/spina/parts/admin/conferences/email_address.rb
+- app/models/spina/parts/admin/conferences/time.rb
+- app/models/spina/parts/admin/conferences/url.rb
 - app/validators/spina/admin/conferences/conference_date_validator.rb
 - app/validators/spina/admin/conferences/email_address_validator.rb
 - app/validators/spina/admin/conferences/finish_date_validator.rb
@@ -411,19 +409,24 @@ files:
 - app/views/layouts/spina/admin/conferences/institutions.html.haml
 - app/views/layouts/spina/admin/conferences/presentation_attachment_types.html.haml
 - app/views/layouts/spina/admin/conferences/presentations.html.haml
+- app/views/spina/admin/conferences/application/_conferences.html.haml
+- app/views/spina/admin/conferences/application/_delegates.html.haml
+- app/views/spina/admin/conferences/application/_dietary_requirements.html.haml
 - app/views/spina/admin/conferences/application/_empty_list.html.haml
 - app/views/spina/admin/conferences/application/_errors.html.haml
 - app/views/spina/admin/conferences/application/_errors.turbo_stream.haml
+- app/views/spina/admin/conferences/application/_institutions.html.haml
+- app/views/spina/admin/conferences/application/_presentation_attachment_types.html.haml
+- app/views/spina/admin/conferences/application/_presentation_types.html.haml
+- app/views/spina/admin/conferences/application/_presentations.html.haml
+- app/views/spina/admin/conferences/application/_rooms.html.haml
+- app/views/spina/admin/conferences/application/_sessions.html.haml
 - app/views/spina/admin/conferences/conferences/_conference.html.haml
 - app/views/spina/admin/conferences/conferences/_event_fields.html.haml
 - app/views/spina/admin/conferences/conferences/_event_row.html.haml
 - app/views/spina/admin/conferences/conferences/_form.html.haml
 - app/views/spina/admin/conferences/conferences/_form_conference_details.html.haml
-- app/views/spina/admin/conferences/conferences/_form_delegates.html.haml
 - app/views/spina/admin/conferences/conferences/_form_parts.html.haml
-- app/views/spina/admin/conferences/conferences/_form_presentation_types.html.haml
-- app/views/spina/admin/conferences/conferences/_form_presentations.html.haml
-- app/views/spina/admin/conferences/conferences/_form_rooms.html.haml
 - app/views/spina/admin/conferences/conferences/_form_structure.html.haml
 - app/views/spina/admin/conferences/conferences/_form_structure_item.html.haml
 - app/views/spina/admin/conferences/conferences/edit.html.haml
@@ -431,24 +434,19 @@ files:
 - app/views/spina/admin/conferences/conferences/new.html.haml
 - app/views/spina/admin/conferences/delegates/_delegate.html.haml
 - app/views/spina/admin/conferences/delegates/_form.html.haml
-- app/views/spina/admin/conferences/delegates/_form_conferences.html.haml
 - app/views/spina/admin/conferences/delegates/_form_delegate_details.html.haml
-- app/views/spina/admin/conferences/delegates/_form_presentations.html.haml
 - app/views/spina/admin/conferences/delegates/edit.html.haml
 - app/views/spina/admin/conferences/delegates/index.html.haml
 - app/views/spina/admin/conferences/delegates/new.html.haml
 - app/views/spina/admin/conferences/dietary_requirements/_dietary_requirement.html.haml
 - app/views/spina/admin/conferences/dietary_requirements/_form.html.haml
-- app/views/spina/admin/conferences/dietary_requirements/_form_delegates.html.haml
 - app/views/spina/admin/conferences/dietary_requirements/_form_dietary_requirement_details.html.haml
 - app/views/spina/admin/conferences/dietary_requirements/edit.html.haml
 - app/views/spina/admin/conferences/dietary_requirements/index.html.haml
 - app/views/spina/admin/conferences/dietary_requirements/new.html.haml
 - app/views/spina/admin/conferences/events/new.js.erb
 - app/views/spina/admin/conferences/institutions/_form.html.haml
-- app/views/spina/admin/conferences/institutions/_form_delegates.html.haml
 - app/views/spina/admin/conferences/institutions/_form_institution_details.html.haml
-- app/views/spina/admin/conferences/institutions/_form_rooms.html.haml
 - app/views/spina/admin/conferences/institutions/_institution.html.haml
 - app/views/spina/admin/conferences/institutions/edit.html.haml
 - app/views/spina/admin/conferences/institutions/index.html.haml
@@ -461,8 +459,6 @@ files:
 - app/views/spina/admin/conferences/presentation_attachments/new.js.erb
 - app/views/spina/admin/conferences/presentation_types/_form.html.haml
 - app/views/spina/admin/conferences/presentation_types/_form_presentation_type_details.html.haml
-- app/views/spina/admin/conferences/presentation_types/_form_presentations.html.haml
-- app/views/spina/admin/conferences/presentation_types/_form_sessions.html.haml
 - app/views/spina/admin/conferences/presentation_types/_presentation_type.html.haml
 - app/views/spina/admin/conferences/presentation_types/edit.html.haml
 - app/views/spina/admin/conferences/presentation_types/index.html.haml
@@ -471,20 +467,17 @@ files:
 - app/views/spina/admin/conferences/presentations/_attachment_row.html.haml
 - app/views/spina/admin/conferences/presentations/_form.html.haml
 - app/views/spina/admin/conferences/presentations/_form_presentation_details.html.haml
-- app/views/spina/admin/conferences/presentations/_form_presenters.html.haml
 - app/views/spina/admin/conferences/presentations/_presentation.html.haml
 - app/views/spina/admin/conferences/presentations/edit.html.haml
 - app/views/spina/admin/conferences/presentations/index.html.haml
 - app/views/spina/admin/conferences/presentations/new.html.haml
 - app/views/spina/admin/conferences/rooms/_form.html.haml
-- app/views/spina/admin/conferences/rooms/_form_presentations.html.haml
 - app/views/spina/admin/conferences/rooms/_form_room_details.html.haml
 - app/views/spina/admin/conferences/rooms/_room.html.haml
 - app/views/spina/admin/conferences/rooms/edit.html.haml
 - app/views/spina/admin/conferences/rooms/index.html.haml
 - app/views/spina/admin/conferences/rooms/new.html.haml
 - app/views/spina/admin/conferences/sessions/_form.html.haml
-- app/views/spina/admin/conferences/sessions/_form_presentations.html.haml
 - app/views/spina/admin/conferences/sessions/_form_session_details.html.haml
 - app/views/spina/admin/conferences/sessions/_session.html.haml
 - app/views/spina/admin/conferences/sessions/edit.html.haml
@@ -493,10 +486,10 @@ files:
 - app/views/spina/admin/hooks/conferences/_head.html.haml
 - app/views/spina/admin/hooks/conferences/_primary_navigation.html.haml
 - app/views/spina/admin/hooks/conferences/_settings_secondary_navigation.html.haml
-- app/views/spina/admin/partables/admin/conferences/date_parts/_form.html.haml
-- app/views/spina/admin/partables/admin/conferences/email_address_parts/_form.html.haml
-- app/views/spina/admin/partables/admin/conferences/time_parts/_form.html.haml
-- app/views/spina/admin/partables/admin/conferences/url_parts/_form.html.haml
+- app/views/spina/admin/parts/admin/conferences/dates/_form.html.haml
+- app/views/spina/admin/parts/admin/conferences/email_addresses/_form.html.haml
+- app/views/spina/admin/parts/admin/conferences/times/_form.html.haml
+- app/views/spina/admin/parts/admin/conferences/urls/_form.html.haml
 - config/initializers/assets.rb
 - config/locales/en.yml
 - config/routes.rb
@@ -557,6 +550,9 @@ files:
 - db/migrate/20200911161739_move_conference_parts.rb
 - db/migrate/20201002122517_remove_spina_conferences_conference_page_parts.rb
 - db/migrate/20201007125625_add_timestamps_to_spina_conferences_parts.rb
+- 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
 - lib/spina/admin/conferences.rb
 - lib/spina/admin/conferences/engine.rb
 - lib/spina/admin/conferences/migration/renaming.rb
@@ -578,11 +574,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Conference management plugin for Spina.

data/app/helpers/spina/admin/conferences/conferences_helper.rb

@@ -1,44 +0,0 @@
-# frozen_string_literal: true
-
-module Spina
-  module Admin
-    module Conferences
-      # Helper for conferences
-      module ConferencesHelper
-        STRUCTURES = [
-          { name: 'sponsors', structure_parts: [
-            { name: 'name', title: 'Name', partable_type: 'Spina::Line' },
-            { name: 'logo', title: 'Logo', partable_type: 'Spina::Image' },
-            { name: 'website', title: 'Website', partable_type: 'Spina::Admin::Conferences::UrlPart' }
-          ] }
-        ].freeze
-
-        def new_custom_structure_item(form, part)
-          item = StructureItem.new
-          build_custom_structure_parts(part.name, item)
-          fields = form.fields_for(:structure_items, item, child_index: item.object_id) do |builder|
-            render('spina/admin/conferences/conferences/form_structure_item', f: builder, structure: part)
-          end
-          link_to icon('plus'), '#', class: %w[add_structure_item_fields button button-link],
-                                     data: { id: item.object_id, fields: fields.squish }
-        end
-
-        def build_custom_structure_parts(name, item)
-          structure = STRUCTURES.find { |structure_attributes| structure_attributes[:name] == name }
-          return item.parts if structure.blank?
-
-          structure[:structure_parts].map { |part_attributes| build_custom_structure_part(item.parts, part_attributes) }
-        end
-
-        private
-
-        def build_custom_structure_part(parts, part_attributes)
-          parts.where(name: part_attributes[:name]).first_or_initialize(**part_attributes).then do |part|
-            part.partable ||= part.partable_type.constantize.new
-            part
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-module Spina
-  module Admin
-    module Conferences
-      # Date parts, without associated times.
-      class DatePart < ApplicationRecord
-        has_many :page_parts, as: :page_partable
-        has_many :parts, as: :partable
-        has_many :layout_parts, as: :layout_partable
-        has_many :structure_parts, as: :structure_partable
-      end
-    end
-  end
-end

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

@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-module Spina
-  module Admin
-    module Conferences
-      # Email address parts. The format is validated.
-      #
-      # = Validators
-      # Email address (using {EmailAddressValidator}):: {#content}.
-      # @see EmailAddressValidator
-      class EmailAddressPart < ApplicationRecord
-        has_many :page_parts, as: :page_partable
-        has_many :parts, as: :partable
-        has_many :layout_parts, as: :layout_partable
-        has_many :structure_parts, as: :structure_partable
-
-        validates :content, 'spina/admin/conferences/email_address': true, allow_blank: true
-      end
-    end
-  end
-end

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

@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-module Spina
-  module Admin
-    module Conferences
-      # Join records between partables and pageables.
-      class Part < ApplicationRecord
-        include Spina::Part
-        include Spina::Optionable
-
-        belongs_to :pageable, inverse_of: :parts, polymorphic: true, touch: true
-        belongs_to :partable, polymorphic: true, optional: true
-
-        accepts_nested_attributes_for :partable
-
-        validates :name, uniqueness: { scope: :pageable_id }
-      end
-    end
-  end
-end

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

@@ -1,53 +0,0 @@
-# frozen_string_literal: true
-
-module Spina
-  module Admin
-    module Conferences
-      # Time parts.
-      class TimePart < ApplicationRecord
-        has_many :page_parts, as: :page_partable
-        has_many :parts, as: :partable
-        has_many :layout_parts, as: :layout_partable
-        has_many :structure_parts, as: :structure_partable
-
-        # @return [Date, nil] the date of the time part. Nil if the time part has no date and time
-        def date
-          return if content.blank?
-
-          content.to_date
-        end
-
-        # Sets the date of the time part.
-        # @param date [Date] the new date
-        # @return [void]
-        def date=(date)
-          if date.blank? || date.to_date.blank?
-            self.content = nil
-            return
-          end
-
-          self.content = date.to_date + (content.try(:seconds_since_midnight) || 0).seconds
-        end
-
-        # @return [ActiveSupport::TimeWithZone, nil] the time of the time part. Nil if the time part has no date and time
-        def time
-          return if content.blank?
-
-          content
-        end
-
-        # Sets the start time of the time part.
-        # @param time [ActiveSupport::TimeWithZone] the new time
-        # @return [void]
-        def time=(time)
-          if time.blank?
-            self.content = nil
-            return
-          end
-
-          self.content = Time.parse(time, date).to_datetime.in_time_zone
-        end
-      end
-    end
-  end
-end

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

@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-module Spina
-  module Admin
-    module Conferences
-      # URL parts. The format is validated.
-      #
-      # = Validators
-      # HTTP(S) URL (using {HttpUrlValidator}):: {#content}.
-      # @see HttpUrlValidator
-      class UrlPart < ApplicationRecord
-        has_many :page_parts, as: :page_partable
-        has_many :parts, as: :partable
-        has_many :layout_parts, as: :layout_partable
-        has_many :structure_parts, as: :structure_partable
-
-        validates :content, 'spina/admin/conferences/http_url': true, allow_blank: true
-      end
-    end
-  end
-end

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

@@ -1,12 +0,0 @@
-#presentations.tab-content.well
-  .table-container
-    %table.table
-      %thead
-        %tr
-          %th= Spina::Admin::Conferences::Presentation.human_attribute_name :conference
-          %th= Spina::Admin::Conferences::Presentation.human_attribute_name :title
-          %th= Spina::Admin::Conferences::Presentation.human_attribute_name :presenters
-          %th
-
-      %tbody
-        = render @conference.presentations.any? ? @conference.presentations : 'empty_list', message: t('spina.admin.conferences.presentations.index.no_presentations')

data/app/views/spina/admin/conferences/delegates/_form_presentations.html.haml

@@ -1,12 +0,0 @@
-#presentations.tab-content.well
-  .table-container
-    %table.table
-      %thead
-        %tr
-          %th= Spina::Admin::Conferences::Presentation.human_attribute_name :conference
-          %th= Spina::Admin::Conferences::Presentation.human_attribute_name :title
-          %th= Spina::Admin::Conferences::Presentation.human_attribute_name :presenters
-          %th
-
-      %tbody
-        = render @delegate.presentations.any? ? @delegate.presentations : 'empty_list', message: t('spina.admin.conferences.presentations.index.no_presentations')