open_conference_ware 1.0.0.pre2 → 1.0.0.pre3

data/app/models/open_conference_ware/snippet.rb

@@ -15,11 +15,6 @@ module OpenConferenceWare
   #
 
   class Snippet < OpenConferenceWare::Base
-
-    # Provide cached Snippet.lookup(slug) method.
-    include CacheLookupsMixin
-    cache_lookups_for :slug, order: :slug
-
     # Load the Snippets as defined in the "spec/fixtures/snippets.yml" file and
     # load them into the current database, overwriting any existing records.
     def self.load_from_fixtures(overwrite = false)
@@ -43,7 +38,7 @@ module OpenConferenceWare
 
     # Returns the content for a Snippet match +slug+, else raise an ActiveRecord::RecordNotFound.
     def self.content_for(slug)
-      if record = self.lookup(slug.to_s)
+      if record = self.find_by_slug(slug.to_s)
         return record.content
       else
         raise ActiveRecord::RecordNotFound, "Couldn't find snippet: #{slug}"

data/app/observers/open_conference_ware/cache_watcher.rb

@@ -20,10 +20,10 @@ module OpenConferenceWare
     # Expire the cache
     def self.expire(*args)
       Rails.logger.info("CacheWatcher: expiring cache")
-      case Rails.cache
-      when ActiveSupport::Cache::MemCacheStore
+      case Rails.cache.class.name
+      when "ActiveSupport::Cache::MemCacheStore"
         Rails.cache.instance_variable_get(:@data).flush_all
-      when ActiveSupport::Cache::FileStore, ActiveSupport::Cache::MemoryStore
+      when "ActiveSupport::Cache::FileStore", "ActiveSupport::Cache::MemoryStore"
         Rails.cache.delete_matched(//) rescue nil
       else
         raise NotImplementedError, "Don't know how to expire cache: #{Rails.cache.class.name}"

data/app/views/layouts/open_conference_ware/_header.html.erb

@@ -91,7 +91,9 @@
                 <% if user_profiles? %>
                   <li><%= link_to "Edit profile", edit_user_path(current_user) %></li>
                 <% end -%>
-                <li><%= link_to( "My favorites", user_favorites_path(current_user) ) %>
+                <% if user_favorites? %>
+                  <li><%= link_to( "My favorites", user_favorites_path(current_user) ) %>
+                <% end -%>
                 <li><%= link_to( "My proposals", proposals_user_path(current_user) ) %>
                 <li class="divider"></li>
                 <li><%= link_to "Sign Out", sign_out_path %></li>

data/app/views/open_conference_ware/422.html.erb

@@ -7,5 +7,5 @@
   <li>Our server's security token was just updated: please reload the form and try again.</li>
 </ol>
 <p>
-  If the instructions above didn't help, please <%= mail_to(SECRETS.administrator_email, "contact the developers", :subject => "422 Unprocessable Entity on #{Socket.gethostname}:#{File.basename(Rails.root)}", :body => "What did you do that caused the error?\n\nWhat did you expect the system to do?\n\n") %>.
+  If the instructions above didn't help, please <%= mail_to(OpenConferenceWare.administrator_email, "contact the developers", :subject => "422 Unprocessable Entity on #{Socket.gethostname}:#{File.basename(Rails.root)}", :body => "What did you do that caused the error?\n\nWhat did you expect the system to do?\n\n") %>.
 </p>

data/app/views/open_conference_ware/500.html.erb

@@ -7,5 +7,5 @@
 </p>
 
 <p>
-  If you'd like to email additional information or get notified when the problem is resolved, <%= mail_to(SECRETS.administrator_email, "contact the developers", :subject => "500 Server Error on #{Socket.gethostname}:#{File.basename(Rails.root)}", :body => "What did you do that caused the error?\n\nWhat did you expect the system to do?\n\n") %>.
+  If you'd like to email additional information or get notified when the problem is resolved, <%= mail_to(OpenConferenceWare.administrator_email, "contact the developers", :subject => "500 Server Error on #{Socket.gethostname}:#{File.basename(Rails.root)}", :body => "What did you do that caused the error?\n\nWhat did you expect the system to do?\n\n") %>.
 </p>

data/app/views/open_conference_ware/proposals/_form.html.erb

@@ -118,7 +118,7 @@
                 <% if admin? %>
                   <br /><span class='admin-only'><strong>WARNING:</strong> Titles are locked because other systems are currently depending on them. (MediaWiki, printed programs, etc.)</span>
                 <% else -%>
-                  If you need to change this information, please <%= mail_to SECRETS.administrator_email, 'contact the administrator' %>.
+                  If you need to change this information, please <%= mail_to OpenConferenceWare.administrator_email, 'contact the administrator' %>.
                 <% end -%>
               </p>
             <% end -%>
@@ -168,14 +168,14 @@
               </td>
             </tr>
           <% end %>
-          <% if Proposal.audience_levels %>
+          <% if OpenConferenceWare::Proposal.audience_levels %>
             <tr>
               <td class="label-cell">
                 <%= required_field %><%= f.label :session_type_id, "Audience level" %>
               </td>
               <td>
                 <ul class='radio-set'>
-                <% for audience_level in Proposal.audience_levels %>
+                <% for audience_level in OpenConferenceWare::Proposal.audience_levels %>
                   <li>
                     <%= f.radio_button :audience_level, audience_level['slug'], :class => :radio %>
                       <label for="proposal_audience_level_<%= audience_level['slug'] %>">
@@ -184,7 +184,7 @@
                   </li>
                 <% end %>
                 </ul>
-                <p class='help'><%= Proposal.audience_level_hint %></p>
+                <p class='help'><%= OpenConferenceWare::Proposal.audience_level_hint %></p>
               </td>
             </tr>
 
@@ -216,7 +216,7 @@
           </tr>
         <% end %>
         <tr>
-          <td class="label-cell"><%= f.label :note_to_organizers, "Note to organizers<br/ >(Optional, kept private)" %></td>
+          <td class="label-cell"><%= f.label :note_to_organizers, "Note to organizers<br/ >(Optional, kept private)".html_safe %></td>
           <td>
             <%= f.text_area :note_to_organizers, :rows => 3 %>
             <p class='help'>(Is there anything else we should know about the room requirements or plans for your talk? E.g. you will be tapdancing, throwing broccoli into the audience, and need to rehearse beforehand.)</p>

data/app/views/open_conference_ware/proposals/_list.html.erb

@@ -6,7 +6,7 @@
 # * kind => Treat these records as :sessions or :proposals. REQUIRED.
 # * sorter => Display the sort toolbar? Defaults to false.
 
-records = Proposal.sort(records, params[:sort] || "title", params[:dir] != "desc")
+records = OpenConferenceWare::Proposal.sort(records, params[:sort] || "title", params[:dir] != "desc")
 %>
 
 <% if proposal_excerpts? %>
@@ -121,9 +121,9 @@ records = Proposal.sort(records, params[:sort] || "title", params[:dir] != "desc
             <p class="proposal">
               <% styling = proposal_excerpts? ? 'display: inline-block' : 'inline' %>
               <% if multiple_presenters? %>
-                <%= link_to(h(record.title), record, :class => "title", :style => styling) %>
+                <%= link_to(record.title, record, :class => "title", :style => styling) %>
               <% else %>
-                <%= link_to(h(record.presenter)+" &mdash; "+h(record.title), record, :class => "title", :style => styling) %>
+                <%= link_to("#{record.presenter} &mdash; #{record.title}".html_safe, record, :class => "title", :style => styling) %>
               <% end %>
 
               <span class="excerpt">
@@ -146,7 +146,7 @@ records = Proposal.sort(records, params[:sort] || "title", params[:dir] != "desc
 <% end %>
           <td width="0" class="unbreakable">
             <p>
-              <% date = record.submitted_at.localtime.to_s if record.submitted_at.present? %>
+              <% date = record.submitted_at.localtime.strftime("%m/%d/%Y") if record.submitted_at.present? %>
               <% if date_cache[date] %>
                 <!--
                 <span class="date-seen"><%= date %></span>

data/app/views/open_conference_ware/proposals/_list_concise.html.erb

@@ -16,11 +16,11 @@ hide_rooms ||= false
     # Establish classs
     item_class = 'vevent'
     item_class << ' light ' << track_css_class(track) if track
-    item_class << ' generic_item' if item.is_a?(ScheduleItem)
+    item_class << ' generic_item' if item.is_a?(OpenConferenceWare::ScheduleItem)
     %>
     <li class='<%= item_class %>' id='<%= item.class.name.underscore %>-<%= item.id %>'>
       <div class='concise'>
-        <% if item.is_a?(ScheduleItem) %>
+        <% if item.is_a?(OpenConferenceWare::ScheduleItem) %>
           <span class='summary'><%= h item.title %></span>
         <% else %>
           <%= user_favorite_control_for item %>
@@ -33,7 +33,7 @@ hide_rooms ||= false
       <ul class='session_info'>
         <li>
           <strong>Title:</strong>
-          <% if item.is_a?(ScheduleItem) %>
+          <% if item.is_a?(OpenConferenceWare::ScheduleItem) %>
             <%= h item.title %>
           <% else %>
             <%= link_to h(item.title), session_path(item) %>

data/app/views/open_conference_ware/proposals/_sub_list.html.erb

@@ -36,7 +36,7 @@ include_user_favorites_javascript
   }
 
   ## Get records from variable or through an association.
-  records = local_assigns[:records] || Proposal.populated_proposals_for(container)
+  records = local_assigns[:records] || OpenConferenceWare::Proposal.populated_proposals_for(container)
 
   ## Get events to organize records.
   events_to_records = records.select(&:event).group_by(&:event)
@@ -53,7 +53,7 @@ include_user_favorites_javascript
       <% if event.proposal_status_published? %>
         <% event_records_by_confirmation = event_records.group_by(&:confirmed?) %>
         <%= displayer.call(:sessions, event_records_by_confirmation[true], false) %>
-        <% unless container.kind_of?(Room) %>
+        <% unless container.kind_of?(OpenConferenceWare::Room) %>
           <%= displayer.call(:proposals, event_records_by_confirmation[false], true) %>
         <% end %>
         <% run_when_dom_is_ready "archive_proposals_sub_list(#{event.id})" %>

data/app/views/open_conference_ware/proposals/_transition_control.html.erb

@@ -8,8 +8,8 @@ proposal ||= @proposal
 %>
 
 <div id="proposal_transition_control_container_<%= proposal.id %>" class="proposal_transition_control_container proposal_control_container">
-  <% if proposal.aasm_events_for_current_state.empty? %>
-    No valid transitions available from status <%= proposal.aasm_current_state %>
+  <% if proposal.aasm.events(proposal.aasm.current_state).empty? %>
+    No valid transitions available from status <%= proposal.aasm.current_state %>
   <% else %>
     <%= select('proposal', 'transition', proposal.titles_and_statuses[1 .. proposal.titles_and_statuses.length], {:include_blank => proposal.titles_and_statuses[0][0]}, {:class => 'proposal_transition_control proposal_control', :x_proposal_id => proposal.id}) %>
   <% end %>

data/app/views/open_conference_ware/proposals/show.html.erb

@@ -101,51 +101,6 @@ show_private_note = (can_edit?(@proposal) || selector?) && ! @proposal.note_to_o
 <%= render :partial => "open_conference_ware/proposals/admin_controls" %>
 
 <%= cache "#{@kind}_#{@proposal.id},edit_#{can_edit?(@proposal)},private_note_#{show_private_note}" do %>
-  <% unless multiple_presenters? %>
-    <div class="standard-form">
-      <table>
-        <tr>
-          <td colspan="2">
-            <h4>Speaker</h4>
-          </td>
-        </tr>
-        <tr>
-          <td class="label-cell"><label>Speaker</label ></td>
-            <td class="data-cell"><p>
-              <% if user_profiles? %>
-                <%= link_to(h(@proposal.user.fullname), user_path(@proposal.user)) %>
-              <% else %>
-                <%=h @proposal.presenter %>
-              <% end %>
-            </p></td>
-        </tr>
-        <% unless @profile.affiliation.blank? %>
-          <tr>
-            <td class="label-cell"><label>Affiliation</label ></td>
-            <td class="data-cell"><p><%=h @profile.affiliation %></p></td>
-          </tr>
-        <% end %>
-        <% if can_edit?(@proposal) %>
-          <tr>
-            <td class="label-cell"><label>Email (private)</label ></td>
-            <% email = @profile.email %>
-            <td class="data-cell"><p><%=link_to h(email), "mailto:"+h(email) %></p></td>
-          </tr>
-        <% end %>
-        <% unless @profile.website.blank? %>
-          <tr>
-            <td class="label-cell"><label>URL</label ></td>
-            <td class="data-cell"><p><%= display_link_to @profile.website %></p></td>
-          </tr>
-        <% end %>
-        <tr>
-          <td class="label-cell"><label>Biography</label ></td>
-          <td class="data-cell"><%= preserve_formatting_of @profile.biography %></td>
-        </tr>
-      </table>
-    </div>
-  <% end %>
-
   <div class='show-proposal'>
 
   <% if current_user_is_proposal_speaker? %>
@@ -198,9 +153,6 @@ show_private_note = (can_edit?(@proposal) || selector?) && ! @proposal.note_to_o
         <%= @proposal.audience_level_label %>
       </div>
     <% end %>
-    <div class='proposal-slug'>
-      <%= @proposal.slug %>
-    </div>
     <% if schedule_visible? && @proposal.start_time %>
       <div class='proposal-scheduling'>
         <b>Scheduled:</b>
@@ -243,6 +195,39 @@ show_private_note = (can_edit?(@proposal) || selector?) && ! @proposal.note_to_o
     <%= preserve_formatting_of @proposal.note_to_organizers %>
   <% end %>
 
+  <% if user_profiles? %>
+    <h3><%= @proposal.users.size <= 1 ? "Speaker" : "Speakers" %></h3>
+    <%= render :partial => 'open_conference_ware/users/list', :locals => { :users => @proposal.users.by_name, :hide_rooms => true, :only_for_event => @event } %>
+  <% else %>
+      <h3><%= @proposal.presenter %></h3>
+      <table>
+        <% if @proposal.affiliation.present? -%>
+        <tr>
+          <th>Affiliation</th>
+          <td><%= @proposal.affiliation %></td>
+        </tr>
+        <% end -%>
+        <% if @proposal.website.present? -%>
+        <tr>
+          <th>Website</th>
+          <td><%= display_link_to(@proposal.website, :nofollow => true, :class => 'url') %></td>
+        </tr>
+        <% end -%>
+        <% if admin? || can_edit?(@proposal) %>
+        <tr>
+          <th>Email (private)</th>
+          <td><%= display_link_to(@proposal.email, :mailto => true) %></td>
+        </tr>
+        <% end -%>
+        <% if @proposal.biography.present? %>
+        <tr>
+          <th>Biography</th>
+          <td><%= display_textile_for @proposal.biography %></td>
+        </tr>
+      </table>
+      <% end %>
+    <% end %>
+
   <div class="record-controls">
     <% if can_edit?(@proposal) %>
       <%= link_to 'Edit proposal', edit_proposal_path(@proposal), :class => "editable" %>
@@ -251,12 +236,6 @@ show_private_note = (can_edit?(@proposal) || selector?) && ! @proposal.note_to_o
     <%= link_to "Back to list of #{@kind.to_s.pluralize}", records_path, :class => "cancelable" %>
   </div>
 
-  <% if multiple_presenters? %>
-    <h3><%= @proposal.users.size == 1 ? "Speaker" : "Speakers" %></h3>
-
-    <%= render :partial => 'open_conference_ware/users/list', :locals => { :users => @proposal.users.by_name, :hide_rooms => true, :only_for_event => @event } %>
-
-  <% end %>
 
 <% end %>
 

data/db/migrate/20131203235216_create_open_conference_ware_comments.rb

@@ -9,6 +9,6 @@ class CreateOpenConferenceWareComments < ActiveRecord::Migration
       t.datetime "updated_at"
     end
 
-    add_index "open_conference_ware_comments", ["proposal_id"], name: "index_comments_on_proposal_id", using: :btree
+    add_index "open_conference_ware_comments", ["proposal_id"]
   end
 end

data/db/migrate/20131203235418_create_open_conference_ware_events.rb

@@ -21,7 +21,6 @@ class CreateOpenConferenceWareEvents < ActiveRecord::Migration
       t.boolean  "show_proposal_confirmation_controls",     default: false
     end
 
-    add_index "open_conference_ware_events", ["id"], name: "index_events_on_id", unique: true, using: :btree
-    add_index "open_conference_ware_events", ["slug"], name: "index_events_on_slug", using: :btree
+    add_index "open_conference_ware_events", ["slug"]
   end
 end

data/db/migrate/20131203235524_create_open_conference_ware_proposals.rb

@@ -27,10 +27,10 @@ class CreateOpenConferenceWareProposals < ActiveRecord::Migration
       t.datetime "notified_at"
     end
 
-    add_index "open_conference_ware_proposals", ["event_id"], name: "index_proposals_on_event_id", using: :btree
-    add_index "open_conference_ware_proposals", ["room_id"], name: "index_proposals_on_room_id", using: :btree
-    add_index "open_conference_ware_proposals", ["submitted_at"], name: "index_proposals_on_submitted_at", using: :btree
-    add_index "open_conference_ware_proposals", ["track_id"], name: "index_proposals_on_track_id", using: :btree
-    add_index "open_conference_ware_proposals", ["user_id"], name: "index_proposals_on_user_id", using: :btree
+    add_index "open_conference_ware_proposals", ["event_id"]
+    add_index "open_conference_ware_proposals", ["room_id"]
+    add_index "open_conference_ware_proposals", ["submitted_at"]
+    add_index "open_conference_ware_proposals", ["track_id"]
+    add_index "open_conference_ware_proposals", ["user_id"]
   end
 end

data/db/migrate/20131203235723_create_open_conference_ware_rooms.rb

@@ -15,6 +15,6 @@ class CreateOpenConferenceWareRooms < ActiveRecord::Migration
       t.datetime "image_updated_at"
     end
 
-    add_index "open_conference_ware_rooms", ["event_id"], name: "index_rooms_on_event_id", using: :btree
+    add_index "open_conference_ware_rooms", ["event_id"]
   end
 end

data/db/migrate/20131203235831_create_open_conference_ware_schedule_items.rb

@@ -12,7 +12,7 @@ class CreateOpenConferenceWareScheduleItems < ActiveRecord::Migration
       t.datetime "updated_at"
     end
 
-    add_index "open_conference_ware_schedule_items", ["event_id"], name: "index_schedule_items_on_event_id", using: :btree
-    add_index "open_conference_ware_schedule_items", ["room_id"], name: "index_schedule_items_on_room_id", using: :btree
+    add_index "open_conference_ware_schedule_items", ["event_id"]
+    add_index "open_conference_ware_schedule_items", ["room_id"]
   end
 end

data/db/migrate/20131203235934_create_open_conference_ware_session_types.rb

@@ -9,6 +9,6 @@ class CreateOpenConferenceWareSessionTypes < ActiveRecord::Migration
       t.datetime "updated_at"
     end
 
-    add_index "open_conference_ware_session_types", ["event_id"], name: "index_session_types_on_event_id", using: :btree
+    add_index "open_conference_ware_session_types", ["event_id"]
   end
 end

data/db/migrate/20131204000008_create_open_conference_ware_snippets.rb

@@ -10,6 +10,6 @@ class CreateOpenConferenceWareSnippets < ActiveRecord::Migration
       t.datetime "updated_at"
     end
 
-    add_index "open_conference_ware_snippets", ["slug"], name: "index_snippets_on_slug", unique: true, using: :btree
+    add_index "open_conference_ware_snippets", ["slug"], unique: true
   end
 end

data/db/migrate/20131204000048_create_open_conference_ware_taggings.rb

@@ -10,7 +10,7 @@ class CreateOpenConferenceWareTaggings < ActiveRecord::Migration
       t.datetime "created_at"
     end
 
-    add_index "open_conference_ware_taggings", ["tag_id"], name: "index_taggings_on_tag_id", using: :btree
-    add_index "open_conference_ware_taggings", ["taggable_id", "taggable_type", "context"], name: "index_taggings_on_taggable_id_and_taggable_type_and_context", using: :btree
+    add_index "open_conference_ware_taggings", ["tag_id"]
+    add_index "open_conference_ware_taggings", ["taggable_id", "taggable_type", "context"], name: "index_ocw_taggings_on_id_type_and_context"
   end
 end

data/db/migrate/20131204000147_create_open_conference_ware_tracks.rb

@@ -10,6 +10,6 @@ class CreateOpenConferenceWareTracks < ActiveRecord::Migration
       t.text     "excerpt"
     end
 
-    add_index "open_conference_ware_tracks", ["event_id"], name: "index_tracks_on_event_id", using: :btree
+    add_index "open_conference_ware_tracks", ["event_id"]
   end
 end

data/db/migrate/20131204000355_create_proposals_users_join_table.rb

@@ -4,5 +4,8 @@ class CreateProposalsUsersJoinTable < ActiveRecord::Migration
       t.integer :proposal_id
       t.integer :user_id
     end
+
+    add_index "open_conference_ware_proposals_users", ["proposal_id"]
+    add_index "open_conference_ware_proposals_users", ["user_id"]
   end
 end

data/lib/generators/open_conference_ware/install/install_generator.rb

@@ -1,3 +1,5 @@
+require 'securerandom'
+
 class OpenConferenceWare::InstallGenerator < Rails::Generators::Base
   source_root File.expand_path('../templates', __FILE__)
 
@@ -15,10 +17,18 @@ class OpenConferenceWare::InstallGenerator < Rails::Generators::Base
     copy_file "omniauth_initializer.rb", "config/initializers/02_omniauth.rb"
   end
 
+  def generate_secrets_yml
+    template "secrets.yml.erb", "config/secrets.yml"
+  end
+
   def mount_engine
     route %Q{mount OpenConferenceWare::Engine => "#{mount_point}"}
   end
 
+  def replace_secret_token_initializer
+    template "secret_token.rb.erb", "config/initializers/secret_token.rb"
+  end
+
   def include_engine_seeds
     append_to_file "db/seeds.rb" do
       <<-SEED

data/lib/generators/open_conference_ware/install/templates/config_initializer.rb

@@ -6,6 +6,11 @@ OpenConferenceWare.configure do |config|
   # in some cases with a string like "/open_conference_ware"
   config.mount_point = '<%= mount_point %>'
 
+  # Mailer host
+  # The hostname to use when generating links in emails.
+  # This shoud be the domain where OCW is hosted.
+  config.mailer_host = 'ocw.local'
+
   # Event name, or organization running events:
   config.organization = 'Open Source Bridge'
 
@@ -22,6 +27,21 @@ OpenConferenceWare.configure do |config|
   # TODO: Setting the current event here is a short-term hack and will be replaced shortly with a Site record that tracks the current event in the database and provides a way to set it through an admin web UI.
   # config.current_event_slug = '2012'
 
+  ##[ Secrets ]##
+  # Some are sensitive and should not be checked in to version control.
+  # These are loaded from config/secrets.yml, which should be privately copied to your
+  # server and linked by your deployment process.
+
+  secrets_file = Rails.root.join('config', 'secrets.yml')
+  if File.exists?(secrets_file)
+    secrets = YAML.load_file(secrets_file)
+    config.administrator_email = secrets["administrator_email"]
+    config.comments_secret = secrets["comments_secret"]
+    config.secret_key_base = secrets["secret_key_base"]
+  else
+    raise "Oops, config/secrets.yml could not be found."
+  end
+
   ##[ OCW Features ]##
   # Many features of OpenConferenceWare can be toggled via these settings
 
@@ -64,13 +84,16 @@ OpenConferenceWare.configure do |config|
   # Can users add comments until a toggle is flipped on the event?
   config.have_event_proposal_comments_after_deadline = true
 
+  # Can users note their favorite sessions?
+  config.have_user_favorites = true
+
   # What audience experience levels can a proposal be classified as?
   # The list will be displayed on the form in the order defined below.
   # The "slug" is the unique key defining the particular audience level, while
   # the "label" is the human-readable value displayed.
   #
   # Set this to a blank array to disable audience levels
-  config.proposal_audience_levels ||= [
+  config.proposal_audience_levels = [
     {slug: 'a', label: 'Beginner'},
     {slug: 'b', label: 'Intermediate'},
     {slug: 'c', label: 'Advanced'}
@@ -106,5 +129,4 @@ OpenConferenceWare.configure do |config|
   # NOTE: The current default theme never displays any breadcrumbs, but infrastructure exists to support them.
   #
   # config.breadcrumbs = [['Home', 'http://openconferenceware.org']]
-
 end