spina-admin-conferences-fork 2.1.2 → 3.0.0.rc1

data/db/migrate/20210315164411_convert_partables_to_json.rb

@@ -11,7 +11,7 @@ Spina::Part.register(Spina::Parts::Admin::Conferences::Url)
 # If you have custom partables you must modify this migration to ensure the conversion of your partables is handled appropriately
 # by implementing <tt>convert_to_json!</tt> for your partables.
 class ConvertPartablesToJson < ActiveRecord::Migration[6.1]
-  def up # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+  def up # rubocop:disable Metrics/AbcSize
     announce 'converting partables to JSON parts'
     Spina.config.locales.each do |locale|
       I18n.with_locale(locale) do
@@ -37,7 +37,7 @@ class ConvertPartablesToJson < ActiveRecord::Migration[6.1]
     end
   end
 
-  def down # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+  def down # rubocop:disable Metrics/AbcSize
     announce 'converting JSON parts to partables'
     Spina.config.locales.each do |locale|
       I18n.with_locale(locale) do
@@ -204,15 +204,13 @@ module Spina # :nodoc: all
 
     def convert_page_parts_to_json!
       page_parts.reject { |page_part| page_part.page_partable.nil? }
-                .collect(&:convert_to_json!)
-                .compact
+                .filter_map(&:convert_to_json!)
                 .then { |parts| send(:"#{I18n.locale}_content").union(parts) }
                 .then { |parts| update("#{I18n.locale}_content": parts) }
     end
 
     def convert_json_to_parts!
-      update(page_parts: send(:"#{I18n.locale}_content").collect(&:convert_to_partable!)
-                                                        .compact
+      update(page_parts: send(:"#{I18n.locale}_content").filter_map(&:convert_to_partable!)
                                                         .collect { |partable| PagePart.new(page_partable: partable) })
     end
   end
@@ -222,16 +220,14 @@ module Spina # :nodoc: all
 
     def convert_layout_parts_to_json!
       layout_parts.reject { |layout_part| layout_part.layout_partable.nil? }
-                  .collect(&:convert_to_json!)
-                  .compact
+                  .filter_map(&:convert_to_json!)
                   .then { |parts| send(:"#{I18n.locale}_content").union(parts) }
                   .then { |parts| update("#{I18n.locale}_content": parts) }
     end
 
     def convert_json_to_parts!
       update(layout_parts: send(:"#{I18n.locale}_content")
-                             .collect(&:convert_to_partable!)
-                             .compact
+                             .filter_map(&:convert_to_partable!)
                              .collect { |partable| LayoutPart.new(layout_partable: partable) })
     end
   end
@@ -242,8 +238,7 @@ module Spina # :nodoc: all
 
     def convert_to_json!
       Parts::RepeaterContent.new(parts: structure_parts.reject { |structure_part| structure_part.structure_partable.nil? }
-                                                       .collect(&:convert_to_json!)
-                                                       .compact)
+                                                       .filter_map(&:convert_to_json!))
     end
   end
 
@@ -298,8 +293,7 @@ module Spina # :nodoc: all
 
     class RepeaterContent < Base
       def convert_to_structure_item!
-        Spina::StructureItem.new(structure_parts: parts.collect(&:convert_to_partable!)
-                                                       .compact
+        Spina::StructureItem.new(structure_parts: parts.filter_map(&:convert_to_partable!)
                                                        .collect { |partable| StructurePart.new(structure_partable: partable) })
       end
     end
@@ -381,15 +375,13 @@ module Spina # :nodoc: all
 
           def convert_parts_to_json!
             parts.reject { |part| part.partable.nil? }
-                 .collect(&:convert_to_json!)
-                 .compact
+                 .filter_map(&:convert_to_json!)
                  .then { |parts| send(:"#{I18n.locale}_content").union(parts) }
                  .then { |parts| update("#{I18n.locale}_content": parts) }
           end
 
           def convert_json_to_parts!
-            update(parts: send(:"#{I18n.locale}_content").collect(&:convert_to_partable!)
-                                                         .compact
+            update(parts: send(:"#{I18n.locale}_content").filter_map(&:convert_to_partable!)
                                                          .collect { |partable| Part.new(partable: partable) })
           end
         end

data/db/migrate/20210417102513_add_locale_to_action_text_rich_texts.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class AddLocaleToActionTextRichTexts < ActiveRecord::Migration[6.1]
+class AddLocaleToActionTextRichTexts < ActiveRecord::Migration[6.1] # :nodoc:
   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,

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

@@ -8,6 +8,19 @@ module Spina
       class Engine < ::Rails::Engine
         isolate_namespace Spina::Admin::Conferences
 
+        initializer 'spina.admin.conferences.assets' do
+          Spina.config.importmap.draw do
+            pin_all_from Spina::Admin::Conferences::Engine.root.join('app/assets/javascripts/spina/admin/conferences/controllers'),
+                         under: 'controllers', to: 'spina/admin/conferences/controllers'
+          end
+
+          Spina.config.tailwind_content.concat(["#{Spina::Admin::Conferences::Engine.root}/app/views/**/*.*",
+                                                "#{Spina::Admin::Conferences::Engine.root}/app/components/**/*.*",
+                                                "#{Spina::Admin::Conferences::Engine.root}/app/helpers/**/*.*",
+                                                "#{Spina::Admin::Conferences::Engine.root}/app/assets/javascripts/**/*.js",
+                                                "#{Spina::Admin::Conferences::Engine.root}/app/**/application.tailwind.css"])
+        end
+
         config.before_initialize do
           ::Spina::Plugin.register do |plugin|
             plugin.name = 'conferences'

data/lib/spina/admin/conferences/migration/renaming.rb

@@ -6,7 +6,7 @@ module Spina
   module Admin
     module Conferences
       module Migration
-        module Renaming
+        module Renaming # :nodoc:
           extend ActiveSupport::Concern
 
           included do
@@ -14,7 +14,7 @@ module Spina
             @migrations_path ||= nil
           end
 
-          class_methods do
+          class_methods do # rubocop:disable Metrics/BlockLength
             def rename_migration(name, to:)
               config.after_initialize do
                 migration = {}
@@ -32,7 +32,7 @@ module Spina
 
             attr_reader :duplicate_migrations
 
-            class DuplicateMigrationsError < ::StandardError
+            class DuplicateMigrationsError < ::StandardError # :nodoc:
               def initialize(migrations)
                 messages = migrations.collect { |migration| generate_message(migration) }
                 super(messages.join("\n"))
@@ -42,7 +42,7 @@ module Spina
 
               MIGRATION_REGEXP = /([0-9]+)_.+\.(spina(_admin)?_conferences).rb$/.freeze
 
-              def generate_message(migration)
+              def generate_message(migration) # rubocop:disable Metrics/AbcSize
                 old_version, old_scope = parse_filename(migration[:old][:file])
                 messages = []
                 messages << "#{File.basename(migration[:new][:file])} is a renamed version of #{File.basename(migration[:old][:file])}."

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

@@ -5,6 +5,7 @@ require 'spina/admin/conferences/migration/renaming'
 module Spina
   module Admin
     module Conferences
+      # Railtie for renaming some migrations to be more concise, if they were previously installed
       class Railtie < Rails::Railtie
         include Migration::Renaming
 

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

@@ -4,7 +4,7 @@ module Spina
   module Admin
     module Conferences
       # Version number.
-      VERSION = '2.1.2'
+      VERSION = '3.0.0.rc1'
     end
   end
 end

data/lib/spina/admin/conferences.rb

@@ -1,11 +1,10 @@
 # frozen_string_literal: true
 
+require 'haml-rails'
 require 'spina'
 require 'spina/admin/conferences/engine'
 require 'spina/admin/conferences/railtie' if defined?(Rails::Railtie)
 require 'rails-i18n'
-require 'stimulus-rails'
-require 'turbo-rails'
 require 'icalendar'
 require 'icalendar/tzinfo'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spina-admin-conferences-fork
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 3.0.0.rc1
 platform: ruby
 authors:
 - Louis Van Steene
@@ -9,120 +9,118 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-20 00:00:00.000000000 Z
+date: 2022-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: icalendar
+  name: haml-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: mobility-actiontext
+  name: icalendar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '2.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '2.5'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: mobility-actiontext
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
-  name: rails-i18n
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '6.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '6.0'
-- !ruby/object:Gem::Dependency
-  name: redis
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '8'
 - !ruby/object:Gem::Dependency
-  name: spina
+  name: rails-i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '6.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '6.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8'
 - !ruby/object:Gem::Dependency
-  name: stimulus-rails
+  name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: '4.2'
 - !ruby/object:Gem::Dependency
-  name: turbo-rails
+  name: spina
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.9
+        version: '2.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.9
+        version: '2.8'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -165,20 +163,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.12'
-- !ruby/object:Gem::Dependency
-  name: minitest-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '6.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
@@ -283,14 +267,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.142'
+        version: '4.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.142'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
@@ -373,20 +357,15 @@ files:
 - README.md
 - Rakefile
 - app/assets/config/spina_admin_conferences_manifest.js
-- app/assets/javascripts/controllers/spina/admin/conferences/conference_events_form_controller.js
-- app/assets/javascripts/controllers/spina/admin/conferences/presentation_attachments_form_controller.js
-- app/assets/javascripts/controllers/spina/admin/conferences/select_options_controller.js
-- app/assets/javascripts/importmap.json.erb
 - app/assets/javascripts/spina/admin/conferences/application.js
-- app/assets/stylesheets/spina/admin/conferences/application.sass
+- app/assets/javascripts/spina/admin/conferences/controllers/select_options_controller.js
+- app/assets/stylesheets/spina/admin/conferences/application.tailwind.css
 - app/controllers/spina/admin/conferences/application_controller.rb
 - app/controllers/spina/admin/conferences/conferences_controller.rb
 - app/controllers/spina/admin/conferences/delegates_controller.rb
 - app/controllers/spina/admin/conferences/dietary_requirements_controller.rb
-- app/controllers/spina/admin/conferences/events_controller.rb
 - app/controllers/spina/admin/conferences/institutions_controller.rb
 - app/controllers/spina/admin/conferences/presentation_attachment_types_controller.rb
-- app/controllers/spina/admin/conferences/presentation_attachments_controller.rb
 - app/controllers/spina/admin/conferences/presentation_types_controller.rb
 - app/controllers/spina/admin/conferences/presentations_controller.rb
 - app/controllers/spina/admin/conferences/rooms_controller.rb
@@ -418,13 +397,6 @@ files:
 - app/validators/spina/admin/conferences/finish_date_validator.rb
 - app/validators/spina/admin/conferences/finish_time_validator.rb
 - app/validators/spina/admin/conferences/http_url_validator.rb
-- app/views/layouts/spina/admin/conferences/application.html.haml
-- app/views/layouts/spina/admin/conferences/conferences.html.haml
-- app/views/layouts/spina/admin/conferences/delegates.html.haml
-- app/views/layouts/spina/admin/conferences/dietary_requirements.html.haml
-- 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
@@ -439,30 +411,35 @@ files:
 - 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_structure.html.haml
-- app/views/spina/admin/conferences/conferences/_form_structure_item.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/edit.html.haml
 - app/views/spina/admin/conferences/conferences/index.html.haml
 - 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
@@ -472,28 +449,31 @@ files:
 - app/views/spina/admin/conferences/presentation_attachment_types/edit.html.haml
 - app/views/spina/admin/conferences/presentation_attachment_types/index.html.haml
 - app/views/spina/admin/conferences/presentation_attachment_types/new.html.haml
-- 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
 - app/views/spina/admin/conferences/presentation_types/new.html.haml
 - app/views/spina/admin/conferences/presentations/_attachment_fields.html.haml
-- 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
@@ -506,7 +486,6 @@ files:
 - 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
 - db/migrate/20180907141228_create_spina_dates.rb
@@ -577,12 +556,11 @@ files:
 - lib/spina/admin/conferences/railtie.rb
 - lib/spina/admin/conferences/version.rb
 - lib/tasks/spina/admin/conferences_tasks.rake
-- vendor/assets/javascripts/spina/trix.js
-- vendor/assets/stylesheets/spina/trix.css
 homepage: https://jmalcic.github.io/projects/spina-admin-conferences
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -594,9 +572,9 @@ 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.6
 signing_key: