spina-conferences-primer_theme 0.2.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22d47fcfce152343cb9baa7ec78661b6c65d4e3704cbd706c61b176c8eaa645f
-  data.tar.gz: 6278037a4f3ebc25de33fc412b5fa42702f3a5839447472b7bec85a149f22520
+  metadata.gz: 3f9332dab27a0db7ba980280a95c67f5277362a85b5786bd552a4ff9337b5a6f
+  data.tar.gz: 6cb511d37aecdd415ffc56576562d92a65c4d4c848e4e60dfba8eb94449dd2c9
 SHA512:
-  metadata.gz: d4a6d4b275de914475fd02a4a6a91e26c5ef5a3aa87cc2d030d472dfd1e51b9763e54071bdb787319f0efc656cd12c822f416dec2ec940d643e57acc38043db9
-  data.tar.gz: '099156869d9fbe3e677eb5a4e8f48e8dc75be819f1c65c6bd39256d2563f9c29f36e54350875a574374cc7ce8579d9d213a83c6d8276239833b30d6bab7b47ae'
+  metadata.gz: e3fa1e8800cf378145d9a136919fa22c780231717f9af981eb73e7c741176158cab2e0975b719f94535a70fff986bf80aa83f71c37f64c0ca828528e0dbb6983
+  data.tar.gz: 1ed5d9d97805e85b5a9580b7b26ebdf65c7406ba3756bbf59b9631810f5e5ceac5091c5b601a5e486ba0f6629a530a706a53fd352746113fea758700dcfa0812

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

@@ -10,12 +10,18 @@ module Spina
 
         def index
           @conferences = Admin::Conferences::Conference.sorted.includes(institutions: [:logo])
-          respond_to :html, :ics
+          respond_to do |format|
+            format.html
+            format.ics { render body: @conferences.to_ics }
+          end
         end
 
         def show
           add_breadcrumb @conference.name
-          respond_to :html, :ics
+          respond_to do |format|
+            format.html
+            format.ics { render body: @conference.to_ics }
+          end
         end
 
         private

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

@@ -23,11 +23,12 @@ module Spina
           end
         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)) }
+        def calendar(name:)
+          Icalendar::Calendar.new
+                             .tap { |calendar| calendar.x_wr_calname = name }
+                             .tap { |calendar| yield(calendar) }
+                             .tap(&:publish)
+                             .then(&:to_ical)
         end
       end
     end

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

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

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

@@ -8,4 +8,5 @@
       = render(Primer::BaseComponent.new(tag: :address, display: :inline)) { event.location }
   = render Primer::FlexItemComponent.new(flex_auto: true, col: [nil, nil, 8, nil]) do
     = render(Primer::HeadingComponent.new(tag: :h3, mb: 1)) { event.name }
-    = render(Primer::TextComponent.new(tag: :div, color: :text_secondary)) { event.description.try(:html_safe) }
+    = render(Primer::TextComponent.new(tag: :div, color: :text_secondary)) do
+      = event.description

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

@@ -1 +1,2 @@
-= render(Primer::MarkdownComponent.new(my: 4)) { abstract.html_safe }
+= render(Primer::MarkdownComponent.new(my: 4)) do
+  = abstract

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

@@ -3,7 +3,7 @@
 module Spina
   module Conferences
     module PrimerTheme
-      VERSION = '0.2.4'
+      VERSION = '0.3.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spina-conferences-primer_theme
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.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: babel-transpiler
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -321,22 +321,17 @@ files:
 - app/views/spina/application/_navigation_item.html.haml
 - app/views/spina/application/_text.html.haml
 - app/views/spina/conferences/primer_theme/conferences/_conference.html.haml
-- app/views/spina/conferences/primer_theme/conferences/_conference.ics.erb
 - app/views/spina/conferences/primer_theme/conferences/_event.html.haml
-- app/views/spina/conferences/primer_theme/conferences/_event.ics.erb
 - app/views/spina/conferences/primer_theme/conferences/_events.html.haml
 - app/views/spina/conferences/primer_theme/conferences/_header.html.haml
 - app/views/spina/conferences/primer_theme/conferences/_institution.html.haml
 - app/views/spina/conferences/primer_theme/conferences/_institution_logo.html.haml
 - app/views/spina/conferences/primer_theme/conferences/_presentation.html.haml
-- app/views/spina/conferences/primer_theme/conferences/_presentation.ics.erb
 - app/views/spina/conferences/primer_theme/conferences/_presentation_type.html.haml
 - app/views/spina/conferences/primer_theme/conferences/_presentations.html.haml
 - app/views/spina/conferences/primer_theme/conferences/_submission_flash.html.haml
 - app/views/spina/conferences/primer_theme/conferences/index.html.haml
-- app/views/spina/conferences/primer_theme/conferences/index.ics.erb
 - app/views/spina/conferences/primer_theme/conferences/show.html.haml
-- app/views/spina/conferences/primer_theme/conferences/show.ics.erb
 - app/views/spina/conferences/primer_theme/kaminari/_gap.html.haml
 - app/views/spina/conferences/primer_theme/kaminari/_next_page.html.haml
 - app/views/spina/conferences/primer_theme/kaminari/_page.html.haml

data/app/views/spina/conferences/primer_theme/conferences/_conference.ics.erb

@@ -1 +0,0 @@
-<%= conference.to_event.to_ical -%>

data/app/views/spina/conferences/primer_theme/conferences/_event.ics.erb

@@ -1 +0,0 @@
-<%= event.to_event.to_ical -%>

data/app/views/spina/conferences/primer_theme/conferences/_presentation.ics.erb

@@ -1 +0,0 @@
-<%= presentation.to_event.to_ical -%>

data/app/views/spina/conferences/primer_theme/conferences/index.ics.erb

@@ -1,3 +0,0 @@
-<%= calendar name: current_account.name do -%>
-<%= render partial: 'conference', collection: @conferences, cached: true -%>
-<% end %>

data/app/views/spina/conferences/primer_theme/conferences/show.ics.erb

@@ -1,5 +0,0 @@
-<%= calendar name: @conference.name do -%>
-<%= render partial: 'conference', object: @conference, cached: true -%>
-<%= render partial: 'presentation', collection: @conference.presentations, cached: true -%>
-<%= render partial: 'event', collection: @conference.events, cached: true -%>
-<% end %>