spina-conferences-primer_theme 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0411781b97280c551101adc4a5ce6c22dc4670ebb46756344f15db684a0f076
-  data.tar.gz: faf507df7d5c70707f1bb89deba383e7d9d3566d45e6d5e15fbe619247fba2ec
+  metadata.gz: be34b710284ade259e6bdbb4db326c4cfd124507ff193b32f7d086195196c994
+  data.tar.gz: 1d44bedb13f387539eafa74fe5de6a87cf51c257fc4e550aca7d9b47ebabadad
 SHA512:
-  metadata.gz: 63bbf621738d325bef6bc0ef09e98c03c5da4410627f1d9406a3da10829100af8052a5d5fb16e81999b2856a66318dcba69fc7580f270831d514eeaf1cee41d5
-  data.tar.gz: 8ee36494041609dd364b8bc8ea1b3e1477cb2a7e499e631b20b17ba44cc6103d231b9121b7abd3e425fe99a32866327e6d5a4de42883b97d2b9b5a2c79f3cb29
+  metadata.gz: 835fabc2cc7ac850e5e347dff08c852b6afcae6eed70a166ae3a03f478be6005c4c1c8cd96ff5a6f0d08a190196c78fe64a1bd6b3871d7412bc27bba1bdd8570
+  data.tar.gz: d8a110b50aeb46c4da7e37a41b836b34554ef88909b4aa763124ecdc8697c9291536b78f4e72f2bb0b68e57f7fb9bb76760cae41a9150978be7181c727bb1691

data/app/controllers/spina/conferences/primer_theme/presentations_controller.rb

@@ -5,7 +5,7 @@ module Spina
     module PrimerTheme
       # User-facing controller for presentations, serving both html and ics
       class PresentationsController < ApplicationController
-        before_action :set_presentation, :set_conference, :set_breadcrumb, :set_metadata
+        before_action :set_presentation, :set_conference, :set_breadcrumb
 
         def show
           add_breadcrumb @presentation.name
@@ -34,11 +34,6 @@ module Spina
           add_breadcrumb Admin::Conferences::Conference.model_name.human.pluralize, frontend_conferences_path
           add_breadcrumb @conference.name, frontend_conference_path(@conference)
         end
-
-        def set_metadata
-          @title = @presentation.present? ? @presentation.name : Admin::Conferences::Presentation.model_name.human(count: 0)
-          @description = @presentation.present? ? helpers.strip_tags(@presentation.abstract) : ''
-        end
       end
     end
   end

data/app/helpers/spina/conferences/primer_theme/application_helper.rb

@@ -5,14 +5,12 @@ module Spina
     module PrimerTheme
       # Base helper
       module ApplicationHelper
+        include Spina::PagesHelper
+
         def latest_conference
           Spina::Admin::Conferences::Conference.sorted.first
         end
 
-        def breadcrumbs(options = {}, &block)
-          render_breadcrumbs(builder: Breadcrumbs::Builder, **options, &block)
-        end
-
         def ancestors
           return [] if current_page.blank?
 
@@ -24,24 +22,6 @@ module Spina
           end
         end
 
-        def author
-          current_account.name
-        end
-
-        def description
-          current_page.present? ? current_page.description : @description # rubocop:disable Rails/HelperInstanceVariable
-        end
-
-        def title
-          # noinspection RailsI18nInspection
-          t :'.title', title: current_page.present? ? current_page.title : @title, suffix: current_account.name # rubocop:disable Rails/HelperInstanceVariable
-        end
-
-        def seo_title
-          # noinspection RailsI18nInspection
-          t :'.title', title: current_page.present? ? current_page.seo_title : @title, suffix: current_account.name # rubocop:disable Rails/HelperInstanceVariable
-        end
-
         def partable_for(*part_names, parent: current_page)
           association = case parent
                         when Spina::Page then :page_partable
@@ -50,12 +30,13 @@ module Spina
                         else :partable
                         end
           parts = parent.parts.where(name: part_names)
-          part_parents = parts.collect { |part| part.try(association) }
-          [*parts, *part_parents]
+          partables = parts.collect { |part| part.try(association) }
+          [*parts, *partables]
         end
 
         def calendar(name:, &block)
           # noinspection SpellCheckingInspection
+          block ||= proc { '' }
           Icalendar::Calendar.new.tap { |calendar| calendar.x_wr_calname = name }
                              .then(&:to_ical).then { |calendar| calendar.insert(calendar.index('END:VCALENDAR'), capture(&block)) }
         end

data/app/helpers/spina/conferences/primer_theme/asset_helper.rb

@@ -5,29 +5,22 @@ module Spina
     module PrimerTheme
       # Helper for computing asset sources
       module AssetHelper
-        METHODS_TO_RESIZE = %i[resize_to_limit resize_to_fit resize_to_fill resize_and_pad].freeze
-        DEFAULT_FACTORS = [1, 2, 3, 4].freeze
-
-        def concat_srcset(image, **options)
-          srcset(image, **options).collect { |src_path, size| "#{src_path} #{size}" }
-                                  .join ', '
-        end
-
         def srcset(image, **options)
           return if image.blank?
 
           options = options.symbolize_keys
           variant_options = options.delete(:variant)
+          return if variant_options.blank?
+
           factors = options.delete(:factors) || DEFAULT_FACTORS
           variants_for image, variant_options: variant_options, factors: factors
         end
 
-        def src(image, **options)
-          main_app.url_for(image.variant(**options))
-        end
-
         private
 
+        METHODS_TO_RESIZE = %i[resize_to_limit resize_to_fit resize_to_fill resize_and_pad].freeze
+        DEFAULT_FACTORS = [1, 2, 3, 4].freeze
+
         def variants_for(image, variant_options:, factors:)
           factors.inject({}) { |srcset, factor| srcset.update(variant_url(image, variant_options, factor) => "#{factor}x") }
         end
@@ -41,7 +34,7 @@ module Spina
         end
 
         def resize_dimensions_for_key(key, factor, dimensions)
-          dimensions.collect { |dimension| resize_dimension(dimension, factor) } if METHODS_TO_RESIZE.include? key
+          METHODS_TO_RESIZE.include?(key) ? dimensions.collect { |dimension| resize_dimension(dimension, factor) } : dimensions
         end
 
         def resize_dimension(dimension = 0, factor = 0)

data/app/views/conferences_primer_theme/pages/homepage.html.haml

@@ -1,6 +1,5 @@
 - content_for :hero do
-  - cache current_page do
-    - cache partable_for(:gallery) do
-      = render partial: 'homepage_content',
-               layout: has_content?(:gallery) && content(:gallery).images.any? ? 'image_collection' : 'jumbotron',
-               locals: { conference: latest_conference, advance: true, image_collection: content(:gallery) }
+  - cache [current_page, partable_for(:gallery), latest_conference] do
+    = render partial: 'homepage_content',
+             layout: has_content?(:gallery) && content(:gallery).images.any? ? 'image_collection' : 'jumbotron',
+             locals: { conference: latest_conference, advance: true, image_collection: content(:gallery) }

data/app/views/layouts/conferences_primer_theme/application.html.haml

@@ -2,4 +2,7 @@
   - if current_page.ancestors.any?
     = ancestors
 
-= render template: 'layouts/spina/conferences/primer_theme/application'
+= render template: 'layouts/spina/conferences/primer_theme/application',
+         locals: { author: current_account.name, description: current_page.description,
+                   seo_title: t(:'.title', title: current_page.seo_title, suffix: current_account.name),
+                   title: t(:'.title', title: current_page.title, suffix: current_account.name) }

data/app/views/layouts/spina/conferences/primer_theme/conferences.html.haml

@@ -1,4 +1,5 @@
 - content_for :breadcrumbs do
-  = breadcrumbs
+  = render_breadcrumbs(builder: Spina::Conferences::PrimerTheme::Breadcrumbs::Builder)
 
-= render template: 'layouts/spina/conferences/primer_theme/application'
+= render template: 'layouts/spina/conferences/primer_theme/application',
+         locals: { author: current_account.name, description: @description, title: @title, seo_title: @title }

data/app/views/layouts/spina/conferences/primer_theme/presentations.html.haml

@@ -1,4 +1,6 @@
 - content_for :breadcrumbs do
-  = breadcrumbs
+  = render_breadcrumbs(builder: Spina::Conferences::PrimerTheme::Breadcrumbs::Builder)
 
-= render template: 'layouts/spina/conferences/primer_theme/application'
+= render template: 'layouts/spina/conferences/primer_theme/application',
+         locals: { author: current_account.name, description: strip_tags(@presentation.abstract), title: @presentation.name,
+                   seo_title: @presentation.name }

data/app/views/spina/admin/layout_partables/texts/_form.html.haml

@@ -0,0 +1,4 @@
+= f.fields_for :layout_partable, f.object.layout_partable do |ff|
+  - object_id = (ff.object.persisted? ? ff.object.object_id : "new_association_#{ff.object.object_id}").to_s + "_content"
+  = ff.hidden_field :content, id: "#{object_id}_input", value: ff.object.content(fallback: false, default: nil)
+  %trix-editor.text-input.trix-content{ input: "#{object_id}_input" }

data/app/views/spina/application/_current_conference_alert.html.haml

@@ -1,4 +1,4 @@
 - content_for :flash do
   - cache partable_for(:current_conference_alert, parent: current_account) do
     - if current_account.has_content? :current_conference_alert
-      = render(Primer::FlashComponent.new(full: true, variant: :warning)) { current_account.content(:current_conference_alert) }
+      = render(Primer::FlashComponent.new(full: true, variant: :warning)) { current_account.content(:current_conference_alert).html_safe }

data/app/views/spina/application/_list_item.html.haml

@@ -1 +1 @@
-%li.list-style-none.py-4.border-bottom= yield
+%li.list-style-none.py-4.border-bottom{ id: local_assigns[:list_item_id]&.call(local_assigns) }= yield

data/app/views/spina/application/_navigation_item.html.haml

@@ -5,7 +5,7 @@
         = navigation_item.menu_title
         %span.dropdown-caret
       %details-menu.dropdown-menu.dropdown-menu-se.mt-3{ role: 'menu' }
-        - navigation_item.children.each do |child|
+        - navigation_item.children.in_menu.sorted.each do |child|
           %li= link_to child.menu_title, child.materialized_path, class: 'dropdown-item'
 - elsif navigation_item.is_root?
   .Header-item.d-none.d-lg-flex

data/app/views/spina/conferences/primer_theme/conferences/index.html.haml

@@ -14,6 +14,7 @@
   - if @conferences.any?
     %ul{ class: dom_class(@conferences), data: { filter: { list: true } } }
       = render partial: 'conference', collection: @conferences, layout: 'list_item',
+               locals: { list_item_id: ->(local_assigns) { dom_id(local_assigns[:conference]) } },
                cached: -> conference { [conference, conference.institutions, conference.institutions.collect(&:logo)] }
   - else
     = render Primer::BlankslateComponent.new(title: t(:'.no_conferences'), icon: 'mortar-board')

data/app/views/spina/conferences/primer_theme/conferences/show.html.haml

@@ -1,7 +1,7 @@
 - if @conference.has_content?(:submission_date) && @conference.content(:submission_date) >= Date.today
   - content_for :flash do
     - cache partable_for(:submission_url, :submission_date, :submission_text, parent: @conference) do
-      = render Primer::FlashComponent.new(variant: :warning, full: true) do
+      = render Primer::FlashComponent.new(variant: :warning, full: true, classes: dom_class(@conference)) do
         - cache partable_for(:submission_url, parent: @conference) do
           - if @conference.content(:submission_url).present?
             = link_to t(:'.submit_abstract'), @conference.content(:submission_url),

data/app/views/spina/pages/_committee_bio.html.haml

@@ -1,11 +1,11 @@
 - cache [committee_bio, committee_bio.structure_parts.collect(&:structure_partable)] do
   .d-flex.flex-column.flex-md-row.flex-items-start
     - cache partable_for(:profile_picture, parent: committee_bio) do
-      - if committee_bio.has_content?(:profile_picture) && committee_bio.content(:profile_picture).persisted?
+      - if committee_bio.has_content?(:profile_picture) && committee_bio.content(:profile_picture).persisted? && committee_bio.content(:profile_picture).file.present?
         .flex-shrink-0
-          = render Primer::AvatarComponent.new(src: src(committee_bio.content(:profile_picture).file, resize_to_fill: [150, 150]),
-                                               srcset: concat_srcset(committee_bio.content(:profile_picture).file,
-                                                                     variant: { resize_to_limit: [150, 150] }),
+          = render Primer::AvatarComponent.new(src: main_app.url_for(committee_bio.content(:profile_picture).file.variant(resize_to_fill: [150, 150])),
+                                               srcset: srcset(committee_bio.content(:profile_picture).file,
+                                                              variant: { resize_to_limit: [150, 150] }),
                                                draggable: false, alt: committee_bio.content(:name), size: 150, mr: [nil, nil, 3, nil],
                                                mb: [3, nil, 0, nil])
     .flex-auto

data/app/views/spina/pages/_committee_bios.html.haml

@@ -1,6 +1,7 @@
 - if committee_bios.structure_items.any?
   %ul{ class: dom_class(committee_bios), id: dom_id(committee_bios) }
     = render partial: 'committee_bio', collection: committee_bios.structure_items.sorted_by_structure, layout: 'list_item',
+             locals: { list_item_id: ->(local_assigns) { dom_id(local_assigns[:committee_bio]) } },
              cached: ->(committee_bio) { [committee_bio, committee_bio.structure_parts.collect(&:structure_partable)] }
 - else
   = render Primer::BlankslateComponent.new(title: t(:'.no_bios'), icon: 'file')

data/app/views/spina/pages/_event.html.haml

@@ -4,8 +4,7 @@
       - if event.has_content?(:name)
         %h3.flex-auto= event.content(:name)
     - cache partable_for(:location, :start_time, parent: event) do
-      -# TODO: use 'format: :full' once edit-submission-flash is merged
-      %h4.flex-auto= t(:'.time_and_place', time: event.has_content?(:start_time) ? time_tag(event.content(:start_time), format: :short) : t('.time_tbc'),
+      %h4.flex-auto= t(:'.time_and_place', time: event.has_content?(:start_time) ? time_tag(event.content(:start_time), format: :ordinal_datetime_with_year) : t('.time_tbc'),
                                           place: event.has_content?(:location) ? event.content(:location) : t('.location_tbc')).try(:html_safe)
     - cache partable_for(:description, parent: event) do
       - if event.has_content?(:description)

data/app/views/spina/pages/_minutes_entry.html.haml

@@ -1,5 +1,5 @@
 - cache [minutes_entry, minutes_entry.structure_parts.collect(&:structure_partable)] do
-  %li.list-style-none.py-1.d-flex.flex-items-center
+  %li.list-style-none.py-1.d-flex.flex-items-center{ id: dom_id(local_assigns[:minutes_entry]) }
     - cache partable_for(:date, parent: minutes_entry) do
       .flex-auto= minutes_entry.has_content?(:date) ? t(:'.minutes_html', date: time_tag(minutes_entry.content(:date))) : t(:'.no_date')
     - cache partable_for(:attachment, parent: minutes_entry) do

data/app/views/spina/pages/_partner_societies.html.haml

@@ -4,7 +4,7 @@
 - if partner_societies.structure_items.any?
   %ul{ class: dom_class(partner_societies), id: dom_id(partner_societies) }
     = render partial: 'partner_society', collection: partner_societies.structure_items.sorted_by_structure,
-             layout: 'list_item',
+             layout: 'list_item', locals: { list_item_id: ->(local_assigns) { dom_id(local_assigns[:partner_society]) } },
              cached: ->(partner_society) { [partner_society, partner_society.structure_parts.collect(&:structure_partable)] }
 - else
   = render Primer::BlankslateComponent.new(title: t(:'.no_societies'), icon: 'organization')

data/app/views/spina/pages/_partner_society.html.haml

@@ -20,7 +20,7 @@
         - if partner_society.has_content? :description
           .text-gray= render partial: 'text', object: partner_society.content(:description)
     - cache partable_for(:logo, parent: partner_society) do
-      - if partner_society.has_content?(:logo) && partner_society.content(:logo).persisted?
+      - if partner_society.has_content?(:logo) && partner_society.content(:logo).persisted? && partner_society.content(:logo).file.present?
         = image_tag(main_app.url_for(partner_society.content(:logo).file.variant(resize_to_limit: [200, 150])),
                     srcset: srcset(partner_society.content(:logo).file, variant: { resize_to_limit: [200, 150] }), size: nil,
                     alt_description: partner_society.content(:name), draggable: false, class: %w[mt-4 mt-md-0 mr-md-4])

data/config/initializers/themes/conferences_primer_theme.rb

@@ -81,7 +81,7 @@
   theme.layout_parts = [{
     name: 'current_conference_alert',
     title: 'Alert',
-    partable_type: 'Spina::Line'
+    partable_type: 'Spina::Text'
   }, {
     name: 'github_url',
     title: 'GitHub URL',

data/config/locales/en.rb

@@ -6,6 +6,11 @@
       formats: {
         full: ->(time, _) { "%A, #{time.day.ordinalize} %B %Y" }
       }
+    },
+    time: {
+      formats: {
+        ordinal_datetime_with_year: ->(time, _) { "#{time.day.ordinalize} %b %Y, %R" }
+      }
     }
   }
 }

data/db/migrate/20210206170704_change_current_conference_alert_to_text.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+class ChangeCurrentConferenceAlertToText < ActiveRecord::Migration[6.0]
+  def up
+    Spina::LayoutPart.where(name: 'current_conference_alert', layout_partable_type: 'Spina::Line').each do |layout_part|
+      if layout_part.partable.present?
+        Spina::Text.create(content: layout_part.partable.content).then do |text|
+          layout_part.partable.destroy
+          layout_part.update(partable: text)
+        end
+      else
+        layout_part.update(partable_type: 'Spina::Text')
+      end
+    end
+  end
+
+  def down
+    Spina::LayoutPart.where(name: 'current_conference_alert', layout_partable_type: 'Spina::Text').each do |layout_part|
+      if layout_part.partable.present?
+        Spina::Line.create(content: layout_part.partable.content).then do |line|
+          layout_part.partable.destroy
+          layout_part.update(partable: line)
+        end
+      else
+        layout_part.update(partable_type: 'Spina::Line')
+      end
+    end
+  end
+end

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

@@ -3,7 +3,7 @@
 module Spina
   module Conferences
     module PrimerTheme
-      VERSION = '0.1.11'
+      VERSION = '0.1.12'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spina-conferences-primer_theme
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - Justin Malčić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-30 00:00:00.000000000 Z
+date: 2021-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: babel-transpiler
@@ -58,28 +58,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.10
+        version: 0.0.18
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.10
+        version: 0.0.18
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.2
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.2
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: spina
   requirement: !ruby/object:Gem::Requirement
@@ -136,20 +136,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.7'
-- !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
@@ -248,6 +234,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.19'
+- !ruby/object:Gem::Dependency
+  name: simplecov-lcov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: web-console
   requirement: !ruby/object:Gem::Requirement
@@ -311,6 +311,7 @@ files:
 - app/views/layouts/spina/conferences/primer_theme/application.html.haml
 - app/views/layouts/spina/conferences/primer_theme/conferences.html.haml
 - app/views/layouts/spina/conferences/primer_theme/presentations.html.haml
+- app/views/spina/admin/layout_partables/texts/_form.html.haml
 - app/views/spina/application/_cookies.html.haml
 - app/views/spina/application/_current_conference_alert.html.haml
 - app/views/spina/application/_footer.html.haml
@@ -363,6 +364,7 @@ files:
 - config/locales/en.rb
 - config/locales/en.yml
 - config/routes.rb
+- db/migrate/20210206170704_change_current_conference_alert_to_text.rb
 - lib/spina/conferences/primer_theme.rb
 - lib/spina/conferences/primer_theme/breadcrumbs/builder.rb
 - lib/spina/conferences/primer_theme/engine.rb
@@ -387,7 +389,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Spina::Admin::Conferences frontend theme.