open_conference_ware 1.0.0.pre2 → 1.0.0.pre3

data/lib/generators/open_conference_ware/install/templates/secret_token.rb.erb

@@ -0,0 +1,13 @@
+# Be sure to restart your server when you modify this file.
+
+# Your secret key is used for verifying the integrity of signed cookies.
+# If you change this key, all old signed cookies will become invalid!
+
+# Make sure the secret is at least 30 characters and all random,
+# no regular words or you'll be exposed to dictionary attacks.
+# You can use `rake secret` to generate a secure secret key.
+
+# Make sure your secret_key_base is kept private
+# if you're sharing your code publicly.
+<%= Rails.application.class.to_s %>.config.secret_key_base = OpenConferenceWare.secret_key_base
+

data/lib/generators/open_conference_ware/install/templates/secrets.yml.erb

@@ -0,0 +1,18 @@
+#===[ Secrets ]=========================================================
+#
+# This file is meant for storing secret information that is never
+# published or committed to a revision control system.
+#
+#---[ Values ]----------------------------------------------------------
+
+# Email address of administrator that will get requests for assistance from users:
+administrator_email: 'your@email.addr'
+
+# Secret key for getting an ATOM feed of private comments:
+comments_secret: <%= SecureRandom.hex(64) %>
+
+# The Rails secret_key_base
+# Used by config/initializers/secret_token.rb
+secret_key_base: <%= SecureRandom.hex(64) %>
+
+#===[ fin ]=============================================================

data/lib/open_conference_ware.rb

@@ -13,7 +13,7 @@ module OpenConferenceWare
   self.mount_point ||= "/"
 
   def self.mounted_path(path)
-    "#{self.mount_point}/#{path}".gsub("//","/")
+    "#{self.mount_point}/#{path}".gsub(/\/\/+/,"/")
   end
 
   # Secrets
@@ -22,11 +22,12 @@ module OpenConferenceWare
   # Email address of administrator that will get exception notifications
   # and requests for assistance from users:
   mattr_accessor :administrator_email
-  self.administrator_email ||= 'your@email.addr'
 
   # Secret key for getting an ATOM feed of private comments:
   mattr_accessor :comments_secret
-  self.comments_secret ||= '1234'
+
+  # The secret_key_base, which we'll pass on to Rails
+  mattr_accessor :secret_key_base
 
   # Email
 
@@ -135,7 +136,12 @@ module OpenConferenceWare
 
   # Can users add comments until a toggle is flipped on the event?
   mattr_accessor :have_event_proposal_comments_after_deadline
-  self.have_event_proposal_comments_after_deadline |= true
+  self.have_event_proposal_comments_after_deadline ||= true
+
+  # Can users note their favorite sessions?
+  mattr_accessor :have_user_favorites
+  self.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.
   mattr_accessor :proposal_audience_levels

data/lib/open_conference_ware/dependencies.rb

@@ -17,7 +17,6 @@ require 'paperclip'
 require 'vpim/icalendar'
 require 'nokogiri'
 require 'prawn'
-require 'dalli'
 require "dynamic_form"
 require 'rails_rinku'
 

data/lib/open_conference_ware/version.rb

@@ -1,3 +1,3 @@
 module OpenConferenceWare
-  VERSION = "1.0.0.pre2"
+  VERSION = "1.0.0.pre3"
 end

data/lib/tasks/open_conference_ware_tasks.rake

@@ -4,8 +4,9 @@ namespace :open_conference_ware do
     puts <<-HERE
 
 TO FINISH SETUP
-1. See README.markdown for information about security and customization
-2. Start the server, e.g.: bin/rails server
+1. See README.md for information about configuration and customization
+2. Edit config/initializers/01_open_conference_ware.rb and config/secrets.yml
+2. Start the server: bin/rails server
 3. Sign in as an admin in development mode
 4. Use the web-based admin interface to create and configure an event
     HERE

data/open_conference_ware.gemspec

@@ -41,7 +41,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'vpim',                '~> 13.11.11'
   s.add_dependency 'nokogiri',            '~> 1.6.0'
   s.add_dependency 'prawn',               '~> 0.12.0'
-  s.add_dependency 'dalli',               '~> 2.6.4'
   s.add_dependency "dynamic_form",        '~> 1.1.4'
   s.add_dependency 'rinku',               '~> 1.7.3'
 

data/spec/controllers/open_conference_ware/proposals_controller_spec.rb

@@ -362,7 +362,7 @@ describe OpenConferenceWare::ProposalsController do
     it "should redirect back to proposals list if asked to display a proposal without an event" do
       proposal = proposals(:quentin_widgets)
       proposal.stub(event: nil)
-      Proposal.stub(find_by_id: proposal, find: proposal, lookup: proposal)
+      Proposal.stub(find_by_id: proposal, find: proposal)
 
       get :show, id: proposal.id
 
@@ -449,7 +449,7 @@ describe OpenConferenceWare::ProposalsController do
           old_session = stub_model(Proposal, status: 'confirmed', event: old_event)
           old_session.users << old_session_user
 
-          Proposal.stub(find: old_session, find_by_id: old_session, lookup: old_session)
+          Proposal.stub(find: old_session, find_by_id: old_session)
           Event.stub(current: current_event)
 
           get :session_show, id: old_session.id
@@ -478,7 +478,7 @@ describe OpenConferenceWare::ProposalsController do
       it "should not notify owners of acceptance if proposal confirmation controls are not visible" do
         event = @proposal.event
         event.stub(:show_proposal_confirmation_controls? => false)
-        Proposal.stub(lookup: @proposal)
+        Proposal.stub(find: @proposal)
 
         login_as(users(:quentin))
 
@@ -951,7 +951,7 @@ describe OpenConferenceWare::ProposalsController do
   describe "delete" do
     before do
       @proposal = proposals(:quentin_widgets)
-      Proposal.stub(:lookup).and_return(@proposal)
+      Proposal.stub(:find).and_return(@proposal)
     end
 
     def assert_delete(login=nil, &block)
@@ -1238,7 +1238,7 @@ describe OpenConferenceWare::ProposalsController do
 
     it "should return a status of :invalid_event when a proposal doesn't have a valid event" do
       proposal = stub_model(Proposal, state: "confirmed", event: nil)
-      Proposal.stub(:lookup).and_return(proposal)
+      Proposal.stub(:find).and_return(proposal)
       @controller.stub(:params).and_return({ id: 1000 })
       @controller.send(:get_proposal_and_assignment_status).should == [proposal, :invalid_event]
     end

data/spec/dummy/config/initializers/01_open_conference_ware.rb

@@ -6,6 +6,11 @@ OpenConferenceWare.configure do |config|
   # in some cases with a string like "/open_conference_ware"
   config.mount_point = '/open_conference_ware'
 
+  # 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

data/spec/dummy/config/initializers/02_omniauth.rb

@@ -1,4 +1,4 @@
-OmniAuth.config.path_prefix = OpenConferenceWare.mounted_path("/auth")
+OmniAuth.config.path_prefix = OpenConferenceWare.mounted_path("auth")
 
 Rails.application.config.middleware.use OpenConferenceWare::OmniAuthBuilder do
   provider :developer if %w[development preview].include?(Rails.env)

data/spec/dummy/config/initializers/secret_token.rb

@@ -9,4 +9,5 @@
 
 # Make sure your secret_key_base is kept private
 # if you're sharing your code publicly.
-Dummy::Application.config.secret_key_base = 'cb9562396c82c1de554ec36a5832641b772ff8e0fad846dbd7833f9ee97dd05715a914fe979bc651065a1f27ea9256ce1f786e610ddaf3e4fdf98794a7855b94'
+Dummy::Application.config.secret_key_base = OpenConferenceWare.secret_key_base
+

data/spec/dummy/config/secrets.yml

@@ -0,0 +1,18 @@
+#===[ Secrets ]=========================================================
+#
+# This file is meant for storing secret information that is never
+# published or committed to a revision control system.
+#
+#---[ Values ]----------------------------------------------------------
+
+# Email address of administrator that will get requests for assistance from users:
+administrator_email: 'your@email.addr'
+
+# Secret key for getting an ATOM feed of private comments:
+comments_secret: e7ed7cc63ae64f10fcb1dd9c7ba34656242dca9642222dcdaa8bd63a074913d9edbe300b0bef6bdc24e9a4cf7ad3f3177c6a762a8b62ad5ca482570d3969b19b
+
+# The Rails secret_key_base
+# Used by config/initializers/secret_token.rb
+secret_key_base: 1f5085ba0fbf858fa957a9ea1406898266b8685a51da9b2127afcd8d2e54ba454a51cd59d39265e1819144da15594874dcb5a8bbfd2a5f3bcc7d30960619bb94
+
+#===[ fin ]=============================================================

data/spec/spec_helper_customizations.rb

@@ -94,7 +94,7 @@ module OCWHelpers
       assign(:events, events)
     end
 
-    Event.stub(:lookup).and_return do |*args|
+    Event.stub(:current).and_return do |*args|
       key = args.pop
       key ? event : events
     end
@@ -115,6 +115,7 @@ module OCWHelpers
     view.stub(:event_rooms?).and_return(true)
     view.stub(:proposal_speaking_experience?).and_return(true)
     view.stub(:schedule_visible?).and_return(true)
+    view.stub(:user_favorites?).and_return(true)
   end
 end
 

data/spec/views/open_conference_ware/proposals/_transition_control.html.erb_spec.rb

@@ -2,7 +2,8 @@ require 'spec_helper'
 
 describe "open_conference_ware/proposals/_transition_control.html.erb" do
   it "should render a state changing select menu with valid events and destination label" do
-    proposal = stub_model(Proposal, aasm_events_for_current_state: [:accept, :reject])
+    aasm = double("aasm", events: [:accept, :reject], current_state: :proposed)
+    proposal = stub_model(Proposal, aasm: aasm)
     assign(:proposal, proposal)
     render
     rendered.should have_selector("select[name='proposal[transition]']") do |node|

data/spec/views/open_conference_ware/rooms/show.html.erb_spec.rb

@@ -3,6 +3,7 @@ require 'spec_helper'
 describe "open_conference_ware/rooms/show.html.erb" do
   include OpenConferenceWare::RoomsHelper
   before(:each) do
+    stub_settings_accessors_on(view)
     assign(:room, stub_model(Room))
     @event = stub_current_event!
     view.stub(:admin?).and_return(false)

data/spec/views/open_conference_ware/session_types/show.html.erb_spec.rb

@@ -3,6 +3,7 @@ require 'spec_helper'
 describe "open_conference_ware/session_types/show.html.erb" do
   include OpenConferenceWare::SessionTypesHelper
   before(:each) do
+    stub_settings_accessors_on(view)
     assign(:session_type, stub_model(SessionType))
     view.stub(:admin?).and_return(false)
 

data/spec/views/open_conference_ware/tracks/show.html.erb_spec.rb

@@ -3,6 +3,7 @@ require 'spec_helper'
 describe "open_conference_ware/tracks/show.html.erb" do
   include OpenConferenceWare::TracksHelper
   before(:each) do
+    stub_settings_accessors_on(view)
     @event = stub_current_event!(controller: view)
     @track = stub_model(Track,
       title: "value for title",

data/util/transfer_schedule_items.rb

@@ -2,7 +2,7 @@
 
 def transfer_schedule_items
   current = Event.current
-  past = Event.lookup('2012')
+  past = Event.find_by_slug('2012')
 
   Event.current.dates.each_with_index do |day, i|
     past_date = past.dates[i]

data/util/user_favorites_contention_report.rb

@@ -1,5 +1,5 @@
 # Prepare
-event = Event.lookup '2011'
+event = Event.find_by_slug '2011'
 proposals = event.proposals.confirmed
 
 # Setup data structures

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: open_conference_ware
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre2
+  version: 1.0.0.pre3
   prerelease: 6
 platform: ruby
 authors:
@@ -43,7 +43,7 @@ cert_chain:
   YjFvOVpmLzMrb3VkSjhYM0I3bWgwUzRwYU9rClRSeUprSllTVWtnZG5BRk1J
   a1k2Ky9OK1RINWdBMFB4dkJzUTJYeFRvbm9XSnJRdEZra2dkRXVZck1RU1dY
   eWYKMUMzdFdKSjkKLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
-date: 2013-12-12 00:00:00.000000000 Z
+date: 2013-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -269,22 +269,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.12.0
-- !ruby/object:Gem::Dependency
-  name: dalli
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.6.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.6.4
 - !ruby/object:Gem::Dependency
   name: dynamic_form
   requirement: !ruby/object:Gem::Requirement
@@ -598,7 +582,7 @@ files:
 - app/assets/javascripts/open_conference_ware/favorites.js
 - app/assets/javascripts/open_conference_ware/ie.js
 - app/assets/javascripts/open_conference_ware/menu.js
-- app/assets/javascripts/open_conference_ware/persona.js
+- app/assets/javascripts/open_conference_ware/persona.js.erb
 - app/assets/javascripts/open_conference_ware/proposals.js
 - app/assets/javascripts/open_conference_ware/schedule.js
 - app/assets/javascripts/open_conference_ware/spinner.js
@@ -640,7 +624,6 @@ files:
 - app/helpers/open_conference_ware/user_favorites_helper.rb
 - app/mailers/open_conference_ware/speaker_mailer.rb
 - app/mixins/open_conference_ware/breadcrumbs_mixin.rb
-- app/mixins/open_conference_ware/cache_lookups_mixin.rb
 - app/mixins/open_conference_ware/faux_routes_mixin.rb
 - app/mixins/open_conference_ware/normalize_url_mixin.rb
 - app/mixins/open_conference_ware/public_attributes_mixin.rb
@@ -791,6 +774,8 @@ files:
 - lib/generators/open_conference_ware/install/install_generator.rb
 - lib/generators/open_conference_ware/install/templates/config_initializer.rb
 - lib/generators/open_conference_ware/install/templates/omniauth_initializer.rb
+- lib/generators/open_conference_ware/install/templates/secret_token.rb.erb
+- lib/generators/open_conference_ware/install/templates/secrets.yml.erb
 - lib/generators/open_conference_ware/views/views_generator.rb
 - lib/open_conference_ware.rb
 - lib/open_conference_ware/dependencies.rb
@@ -855,6 +840,7 @@ files:
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
+- spec/dummy/config/secrets.yml
 - spec/dummy/db/schema.rb
 - spec/dummy/db/seeds.rb
 - spec/dummy/lib/assets/.keep
@@ -896,7 +882,6 @@ files:
 - spec/helpers/open_conference_ware/time_range_helper_spec.rb
 - spec/helpers/open_conference_ware/tracks_helper_spec.rb
 - spec/helpers/open_conference_ware/user_favorites_helper_spec.rb
-- spec/integration/open_conference_ware/cache_lookups_mixin_spec.rb
 - spec/mixins/open_conference_ware/normalize_url_mixin_spec.rb
 - spec/models/open_conference_ware/authentication_spec.rb
 - spec/models/open_conference_ware/event_spec.rb
@@ -1057,6 +1042,7 @@ test_files:
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
+- spec/dummy/config/secrets.yml
 - spec/dummy/db/schema.rb
 - spec/dummy/db/seeds.rb
 - spec/dummy/lib/assets/.keep
@@ -1098,7 +1084,6 @@ test_files:
 - spec/helpers/open_conference_ware/time_range_helper_spec.rb
 - spec/helpers/open_conference_ware/tracks_helper_spec.rb
 - spec/helpers/open_conference_ware/user_favorites_helper_spec.rb
-- spec/integration/open_conference_ware/cache_lookups_mixin_spec.rb
 - spec/mixins/open_conference_ware/normalize_url_mixin_spec.rb
 - spec/models/open_conference_ware/authentication_spec.rb
 - spec/models/open_conference_ware/event_spec.rb

data/app/mixins/open_conference_ware/cache_lookups_mixin.rb

@@ -1,128 +0,0 @@
-module OpenConferenceWare
-
-  # = CacheLookupsMixin
-  #
-  # A mixin that provides simple caching for ActiveRecord models. It's best used
-  # for models that have relatively few records (less than a thousand) and are
-  # updated infrequently (less than once per second).
-  #
-  # == Example of usage
-  #
-  # Setup lookups for Thing:
-  #
-  #   class Thing < ActiveRecord::Base
-  #     cache_lookups_for :id, order: :created_at
-  #     ...
-  #   end
-  #
-  # Return array of things in the order they were created:
-  #   things = Thing.lookup
-  #
-  # Return a particular Thing matching ID 66:
-  #   thing = Thing.lookup(66)
-  module CacheLookupsMixin
-    def self.included(mixee)
-      mixee.send(:extend, ClassMethods)
-      mixee.class_eval do
-        # ActiveRecord model's attribute to use when asked to lookup a specific
-        # item. Defaults to :id.
-        cattr_accessor :lookup_key
-        self.lookup_key = :id
-
-        # Hash of options passed to ActiveRecord::Base.find when populating the
-        # cache. This makes it possible to add :order and filter by :condition.
-        cattr_accessor :lookup_opts
-        self.lookup_opts = {}
-      end
-    end
-
-    module ClassMethods
-      # Should lookups be cached? If the "perform_caching" Rails environment
-      # configuration setting is enabled, default to using cache.
-      #
-      # You can force caching on or off using the CACHELOOKUPS environmental
-      # variable, e.g. activate with:
-      #
-      #   CACHELOOKUPS=1 ./script/server
-      def cache_lookups?
-        if Rails.configuration.action_controller.perform_caching
-          return ENV['CACHELOOKUPS'] != '0'
-        else
-          return ENV['CACHELOOKUPS'] == '1'
-        end
-      end
-
-      # Setup the lookup caching system.
-      #
-      # Arguments:
-      # * key: The attribute you'll use as a key for doing lookups.
-      # * opts: Options to pass to ActiveRecord::Base.find.
-      def cache_lookups_for(key, opts={})
-        self.lookup_key = key
-        self.lookup_opts = opts
-      end
-
-      # Return silo that this class's values will be stored in.
-      def lookup_silo_name
-        return "#{self.name.gsub('::', '__')}_dict"
-      end
-
-      def query_one(key)
-        return self.where(self.lookup_key => key).first
-      end
-
-      def query_all
-        scope = self
-        scope = scope.order(self.lookup_opts[:order]) if self.lookup_opts[:order]
-        scope = scope.includes(*self.lookup_opts[:include]) if self.lookup_opts[:include]
-        return scope
-      end
-
-      # Return instance from cache matching +key+. If +key+ is undefined, returns
-      # array of all instances.
-      def lookup(key=nil)
-        unless self.cache_lookups?
-          return key ?
-            self.query_one(key) :
-            self.query_all
-        end
-
-        silo = self.lookup_silo_name
-        key_number = key.try(:[], '#'+to_s) if key.present?
-        ActiveRecord::Base.benchmark("Lookup: #{silo}#{key_number}") do
-          dict = self.fetch_object(silo){
-            # FIXME Exceptions within this block are silently swallowed by something. This is bad.
-            dict = Hashery::Dictionary.new
-            for record in self.query_all
-              dict[record.send(self.lookup_key)] = record
-            end
-            dict
-          }
-          return key ? dict[key.kind_of?(Symbol) ? key.to_s : key] : dict.values
-        end
-      end
-
-      def expire_cache
-        Rails.logger.info("Lookup, expiring: #{self.name}")
-        CacheWatcher.expire(/#{lookup_silo_name}_.+/)
-      end
-
-      def fetch_object(silo, &block)
-        self.revive_associations_for(self)
-        return Rails.cache.fetch(silo, &block)
-      end
-
-      def revive_associations_for(object)
-        if object.kind_of?(ActiveRecord::Base) || object.ancestors.include?(ActiveRecord::Base)
-          object.reflect_on_all_associations.each do |association|
-            name = association.class_name
-            unless object.constants.include?(name)
-              name.constantize # This line forces Rails to load this class
-            end
-          end
-        end
-      end
-    end
-
-  end
-end