Merge pull request #391 from srogers/develop

Release v097

app/document_generators/conference_directory_pdf.rb

@@ -265,7 +265,7 @@ def numbering
   def initialize(options)
     # super here is calling https://github.com/prawnpdf/prawn/blob/master/lib/prawn/document.rb initialize
     # Page Sizes: https://github.com/prawnpdf/prawn/blob/master/lib/prawn/document.rb  defined in PDF::Core::PageGeometry
-    super :page_size => 'LETTER', info: { Title: 'Conference Directory', Author: 'Various', Creator: 'ObjectivistConferences.info', CreationDate: Time.now }
+    super :page_size => 'LETTER', info: { Title: 'Conference Directory', Author: 'Various', Creator: 'ObjectivistMedia.com', CreationDate: Time.now }
 
     # Generate the document according to the specified options
     cover_page

app/mailers/application_mailer.rb

@@ -1,4 +1,4 @@
 class ApplicationMailer < ActionMailer::Base
-  default from: 'robots@objectivistconferences.info'
+  default from: 'robots@objectivistmedia.com'
   layout 'mailer'
 end

app/views/event_users/index.html.haml

@@ -7,7 +7,7 @@
     - if @conference.present?
       %h3= "Members Attending #{ @conference.name }"
     - if @attendees.blank?
-      %p No users have marked themselves as attending this conference.
+      %p No users have marked themselves as attending this event.
     - else
       %table.table
         =# render :partial => "table_head"

app/views/events/_conference.html.haml

@@ -16,4 +16,4 @@
     .col.text-right
       = link_to icon('far', 'edit', class: 'fa-fw fa-sm'), edit_event_path(conference), :class => "btn btn-xs btn-primary"
       - if can?(:destroy, conference) && conference.presentations.empty?
-        = link_to icon('far', 'trash-alt', class: 'fa-fw fa-sm'), event_path(conference), :method => :delete, :class => "btn btn-xs btn-danger", :data => { :confirm => 'Permanently remove this conference?' }, :post => true
+        = link_to icon('far', 'trash-alt', class: 'fa-fw fa-sm'), event_path(conference), :method => :delete, :class => "btn btn-xs btn-danger", :data => { :confirm => 'Permanently remove this event?' }, :post => true

app/views/events/_control_bar.html.haml

@@ -11,7 +11,7 @@
         %ul.navbar-nav.mr-auto.d-inline.d-lg-flex
           - if can? :create, Conference
             %li.nav-item{ class: active_if(action_name == 'new', 'mr-1 d-inline-block d-lg-list-item') }
-              =link_to icon('fas', 'plus', 'Add', class: 'fa-sm'), new_event_path, class: 'nav-link', title: 'Add a Conference'
+              =link_to icon('fas', 'plus', 'Add', class: 'fa-sm'), new_event_path, class: 'nav-link', title: 'Add an Event'
 
           -# For Events, this just returns things that haven't been explicitly marked as done
           - if current_user&.editor? || current_user&.admin?
@@ -41,7 +41,7 @@
         -# action-specific buttons or search form
         - if action_name == 'show'
           - if can?(:destroy, @conference) && @presentations.empty?
-            = link_to icon('far', 'trash-alt', '', class: 'fa-fw'), event_path(@conference), :method => :delete, :class => "btn btn-sm btn-danger mr-3", :data => { :confirm => 'Permanently remove this conference?' }, :post => true
+            = link_to icon('far', 'trash-alt', '', class: 'fa-fw'), event_path(@conference), :method => :delete, :class => "btn btn-sm btn-danger mr-3", :data => { :confirm => 'Permanently remove this event?' }, :post => true
           - if @conference.future? && @conference.registration_url.present?
             = link_to "Register", @conference.registration_url, :class => "btn btn-sm btn-primary ml-3", target: '_blank'
           - if !@conference.completed && can?(:create, Presentation)

app/views/events/_form_fields.html.haml

@@ -14,7 +14,7 @@
 .small.mb-3 Historic or organizational details specific to this event (e.g., attendance)
 = f.input :registration_url, input_html: { autocomplete: "off" }, hint: "A link where attendees can sign up"
 = render partial: 'shared/location', locals:  {f: f, venue_type: @conference.venue}
-= f.input :completed, as: :boolean, hint: "Check this when all the conference's presentations have been entered."
+= f.input :completed, as: :boolean, hint: "Check this when all the event's presentations have been entered."
 - if current_user&.editor? || current_user&.admin?
   = f.label :editors_notes, "Editor's Notes"
   = f.trix_editor :editors_notes

app/views/events/show.html.haml

@@ -12,7 +12,7 @@
         - if current_user.attended? @conference
           %p
             = attendance_status_message(@conference)
-            = link_to icon('far', 'trash-alt', class: 'fa-fw'), event_user_path(@conference_user), :method => :delete, :style => "color: #F00", :data => { :confirm => 'Remove your association with this conference?' }, :post => true
+            = link_to icon('far', 'trash-alt', class: 'fa-fw'), event_user_path(@conference_user), :method => :delete, :style => "color: #F00", :data => { :confirm => 'Remove your association with this event?' }, :post => true
         - else
           = simple_form_for @conference_user, url: event_users_path do |f|
             = f.input :conference_id, as: :hidden, input_html: { value: @conference.id }

app/views/layouts/application.html.erb

@@ -36,7 +36,7 @@
       <div class="container">
         <div class="float-right"><%= link_to "About Us", about_path %></div>
         <p>
-          ObjectivistConferences.info - a community supported archive
+          ObjectivistMedia.com - a community supported archive
         </p>
       </div>
       <%= yield :footer %>

app/views/pages/about.html.haml

@@ -31,7 +31,7 @@
         %td= Publication.count
     %p With your help, we can cover everything.
 
-    %p This site is not affiliated with the Ayn Rand Institute, nor any of the other conference sponsor organizations.
+    %p This site is not affiliated with the Ayn Rand Institute, nor any of the other event sponsor organizations.
 
     %p
       Version:

app/views/pages/guidelines.html.haml

@@ -4,7 +4,7 @@
   .col-md-12
     =title 'Guidelines for Editors'
     %p
-      There are many options in terms of how to enter the conference info, and how to tag it. Following these guidelines will
+      There are many options in terms of how to enter the event info, and how to tag it. Following these guidelines will
       help keep the data consistent. Guidelines will evolve over time. Feel free to make suggestions.
 
     %h4 Events
@@ -24,13 +24,13 @@
         When you create an event, a name will be assigned automatically based on the event organizer and year
         you select (e.g., OCON 2012). This name will be used as part of the URL for the event, and this uniform
         naming scheme helps make things searchable. The URL doesn't change, even if the event name is updated,
-        so if you accidentally create the conference with the wrong organizer, delete it and start over-you don't want
+        so if you accidentally create the event with the wrong organizer, delete it and start over-you don't want
         OCON 2020 to have a URL that ends with "irm-1996".
         %b
         For the same reason, it's also important to carefully pick the name of special events, such as:
-        = link_to "Ayn Rand Comes to Harvard 1996", 'https://objectivistconferences.info/events/ayn-rand-comes-to-harvard-1996'
+        = link_to "Ayn Rand Comes to Harvard 1996", '/events/ayn-rand-comes-to-harvard-1996'
         or
-        = link_to "ARI Ford Hall Forum Event", "https://objectivistconferences.info/events/ari-special-event-oct-20-22-2006-boston-ma"
+        = link_to "ARI Ford Hall Forum Event", "/events/ari-special-event-oct-20-22-2006-boston-ma"
         Use the program event name if available. Otherwise, pick something that is meaningful in the context of the event listing.
       %li
         %b Organizer
@@ -75,24 +75,24 @@
       %li
         The OCON schedule puts "Panel:" and "Lunch:" qualifiers on some session names. We're not including that in the title.
         So the listing in the OCON schedule as "Panel: Transforming Burnout with Selfishness" is just "
-        =link_to "Transforming Burnout With Selfishness", "https://objectivistconferences.info/presentations/transforming-burnout-with-selfishness"
+        =link_to "Transforming Burnout With Selfishness", "/presentations/transforming-burnout-with-selfishness"
         " in the presentation listing.
       %li
         Sometimes a presentation is listed as a single event on the schedule, but media is released in multiple parts - typically
         for a multi-speaker panel. In this case, create one presentation as it appears the schedule, and attach multiple publications to it.
         For example, see
-        %i= link_to "Free Will, Free Speech, Free Borders, Freedom in the Middle East", 'http://objectivistconferences.info/presentations/free-will-free-speech-free-borders-freedom-in-the-middle-east'
+        %i= link_to "Free Will, Free Speech, Free Borders, Freedom in the Middle East", '/presentations/free-will-free-speech-free-borders-freedom-in-the-middle-east'
       %li
         Courses spanning multiple days are listed as a single presentation with the parts in the description, as in
-        =link_to "The Foundations of Knowledge.", "https://objectivistconferences.info/presentations/the-foundations-of-knowledge"
+        =link_to "The Foundations of Knowledge.", "/presentations/the-foundations-of-knowledge"
         This is tedious, but from the perspective of the site being an index into the media, it should be helpful for
         people who are shopping for presentations to hear (vs. browsing with curiosity about history).
       %li
         Each delivery of a presentation is considered distinct, even if the name is the same, and the content is substantially
         the same. Each presentation may still have its own recorded media, and a unique Q&A. For example, see:
         %ul
-          %li= link_to "Democracy vs. Victory – Why the “Forward Strategy of Freedom” Had to Fail", "https://objectivistconferences.info/presentations/democracy-vs-victory-why-the-forward-strategy-of-freedom-had-to-fail"
-          %li= link_to "Democracy vs. Victory – Why the “Forward Strategy of Freedom” Had to Fail", "https://objectivistconferences.info/presentations/democracy-vs-victory-why-the-forward-strategy-of-freedom-had-to-fail-c02a07d6-7062-47e1-8251-73f4fb8f6912"
+          %li= link_to "Democracy vs. Victory – Why the “Forward Strategy of Freedom” Had to Fail", "/presentations/democracy-vs-victory-why-the-forward-strategy-of-freedom-had-to-fail"
+          %li= link_to "Democracy vs. Victory – Why the “Forward Strategy of Freedom” Had to Fail", "/presentations/democracy-vs-victory-why-the-forward-strategy-of-freedom-had-to-fail-c02a07d6-7062-47e1-8251-73f4fb8f6912"
       %li
         The ARI schedules from 2014 forward include JavaScript to show/hide descriptions which makes them difficult to copy.
         To get around that, open the schedule in a different browser and turn JavaScript off in the browser preferences.
@@ -127,7 +127,7 @@
         Use topic/category style tags, like history, psychology, etc. Not adjective-style like: historical, psychological.
       %li
         You can see the existing tags on the Presentations page, under the
-        = link_to "Topics", "https://objectivistconferences.info/presentations/tags"
+        = link_to "Topics", "/presentations/tags"
         button.
 
     %h4 Speakers
@@ -152,7 +152,7 @@
       was given in several different places, and we just don't know which one corresponds to the recording. The system
       allows the same publication to be associated with multiple lectures, and the "real" one can be marked if it is known.
       This way, we keep an accurate record of the media that exists (e.g. one taped lecture by Peter Schwartz named
-      %i= link_to "Contextual Knowledge", "https://objectivistconferences.info/presentations?search_term=contextual+knowledge"
+      %i= link_to "Contextual Knowledge", "/presentations?search_term=contextual+knowledge"
       associated with two presentations by the same name.
     %p
       The system will try to find likely publications in the "Manage Publications" section - and also on the flip-side

app/views/pages/news.html.haml

@@ -4,7 +4,7 @@
 
 .row
   .col-md-12.carousel-container
-    %h1.carousel-title Objectivist Conferences
+    %h1.carousel-title Objectivist Media
     = render partial: 'carousel'
 
 -# Add a space between the carousel and the news . . . or not.
@@ -46,7 +46,7 @@
 .row
   .col-md-12
     %p
-      = fb_social_bar(title: 'Objectivist Conferences', description: "An Archive of Objectivist Conferences and Media")
+      = fb_social_bar(title: 'Objectivist Media', description: "An Archive of Objectivist events and the media they produced.")
 
 -# This gets each one of the content areas above loaded Ajaxily, without the pages controller getting involved.
 - content_for :footer do

app/views/pages/robots.text.erb

@@ -1,2 +1,2 @@
 User-agent: *
-Disallow: <%= request.host.include?('objectivistconferences.info') ? '' : '/' %>
+Disallow: <%= request.host.include?('herokuapp') ? '/' : '' %>

app/views/presentations/_presentation.html.haml

@@ -54,7 +54,7 @@
       = icon('fas', 'tag', class: 'fa-fw', title: 'Needs topic tags') if presentation.tags.empty?
       = icon('fas', 'align-left', class: 'fa-fw', title: 'Needs a description') if presentation.description.blank?
       = icon('fas', 'puzzle-piece', class: 'fa-fw', title: 'Needs number of parts') if presentation.parts.blank?
-      = icon('fas', 'chalkboard-teacher', class: 'fa-fw', title: 'Not yet associated with a conference') if presentation.conference.blank?
+      = icon('fas', 'chalkboard-teacher', class: 'fa-fw', title: 'Not yet associated with an event') if presentation.conference.blank?
 
   .col.col-sm-2.col-md-2.text-right= linked_format_icons(presentation)
 

app/views/presentations/show.html.haml

@@ -76,7 +76,7 @@
   .row
     .col-md-12
       - if @presentation.conference.blank?
-        %h5 Link to a Conference
+        %h5 Link to an Event
         = simple_form_for @presentation do |f|
           = f.input :presentation_id, as: :hidden, input_html: { value: @presentation.id }
           = f.input :conference_id, collection: [['',0]], label: false, input_html: { data: { delimiter: ',', placeholder: "enter an event name or year...", source: events_path(format: :json) }, class: "select2-autocomplete", id: "conference_picker" }

app/views/shared/_fb_og_meta_tags.html.haml

@@ -11,5 +11,5 @@
 =tag :meta, property: "og:image:height", content: og_image_height  if og_image_height.present?
 
 -# Optional properties
-=tag :meta, property: "og:site_name",    content: "Objectivist Conferences"
+=tag :meta, property: "og:site_name",    content: "Objectivist Media"
 =tag :meta, property: "og:description",  content: og_description   if og_description.present?

app/views/users/events.html.haml

@@ -18,7 +18,7 @@
           = current_event_type.pluralize
           as attended yet.
           - if current_event_type == 'Events' # only say this when the user hasn't marked any events at all
-            You can do that on the conference details page. Look for a button that says, "I was there!"
+            You can do that on the event details page. Look for a button that says, "I was there!"
         - else
           -# This shouldn't come up, because the only way to get here is when the user has marked the conference as
           -# attended. But handle it anyway.

config/environments/production.rb

@@ -46,7 +46,7 @@
 
 
   # Force SSL only on production - staging doesn't have a cert
-  if ENV['MAIL_HOST'] == 'objectivistconferences.info'
+  if ENV['MAIL_HOST'] == 'objectivistmedia.com'
     # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
     config.force_ssl = true
     config.ssl_options = {  redirect: { status: 307, port: 81 } }

spec/helpers/application_helper_spec.rb

@@ -105,7 +105,7 @@
         end
 
         it "includes site name" do
-          expect(doc.css("meta[property='og:site_name']").first.attributes["content"].value).to eq('Objectivist Conferences')
+          expect(doc.css("meta[property='og:site_name']").first.attributes["content"].value).to eq('Objectivist Media')
         end
 
         context "for image" do
@@ -154,7 +154,7 @@
         end
 
         it "includes site name" do
-          expect(doc.css("meta[property='og:site_name']").first.attributes["content"].value).to eq('Objectivist Conferences')
+          expect(doc.css("meta[property='og:site_name']").first.attributes["content"].value).to eq('Objectivist Media')
         end
 
         context "for image" do
@@ -203,7 +203,7 @@
         end
 
         it "includes site name" do
-          expect(doc.css("meta[property='og:site_name']").first.attributes["content"].value).to eq('Objectivist Conferences')
+          expect(doc.css("meta[property='og:site_name']").first.attributes["content"].value).to eq('Objectivist Media')
         end
 
         context "for image" do

spec/models/setting_spec.rb

@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe Speaker, type: :model do
+RSpec.describe Setting, type: :model do
 
   context "when getting settings for" do