open_conference_ware 1.0.0.pre2 → 1.0.0.pre3

data/.travis.yml

@@ -11,7 +11,10 @@ env:
   - DB=postgresql
   - DB=sqlite
 before_script:
+  - sqlite3 --version
+  - mysql --version
   - mysql -e 'create database ocw_test;'
+  - psql --version
   - psql -c 'create database ocw_test;' -U postgres
   - ruby ci/copy_database_config.rb
   - bundle exec rake db:migrate

data/README.md

@@ -34,11 +34,11 @@ OpenConferenceWare requires Ruby 1.9.3 and a host application built on Rails 4.0
 
 3. Add 'open_conference_ware' to the newly-created app's Gemfile
 
-        gem "open_conference_ware"
+        gem "open_conference_ware", "~> 1.0.0.pre"
 
 4. Run `bundle install`
 
-5. Optionally, configure your app's [database settings](http://guides.rubyonrails.org/configuring.html#configuring-a-database). It's fine to run with the default sqlite configuration, but if you prefer another database, set it up now. OCW is tested with SQLite3, MySQL, and PostgreSQL.
+5. Optionally, configure your app's [database settings](http://guides.rubyonrails.org/configuring.html#configuring-a-database). It's fine to run with the default sqlite configuration, but if you prefer another database, set it up now. OCW is tested with SQLite3, MySQL 5.5, and PostgreSQL 9.3.
 
 6. Install OpenConferenceWare's configuration files and seed data:
 
@@ -48,9 +48,11 @@ OpenConferenceWare requires Ruby 1.9.3 and a host application built on Rails 4.0
 
         $ bin/rails generate open_conference_ware:install /ocw
 
-7. Edit `config/initializers/01_open_conference_ware.rb` to configure OCW's settings. You'll find comments there explaining the available options.
+7. Edit `config/initializers/01_open_conference_ware.rb` and `config/secrets.yml` to configure OCW's settings. You'll find comments in these files explaining the available options.
 
-8. At this point, you should be able to fire up a server and see OpenConferenceWare at [http://localhost:3000](http://localhost:3000)
+8. All of these newly-generated files, _except config/secrets.yml_, should be added to your version control system. If you're using git, you may want to add `config/secrets.yml` to your `.gitignore`, to ensure it doesn't get shared accidentally.
+
+9. At this point, you should be able to fire up a server and see OpenConferenceWare at [http://localhost:3000](http://localhost:3000)
 
         $ bin/rails server
 

data/app/assets/javascripts/open_conference_ware/{persona.js → persona.js.erb}

@@ -4,7 +4,7 @@ function personaLogin() {
       $('#persona_form input[name=assertion]').val(assertion);
       $('#persona_form').submit();
     } else {
-      window.location = "#{failure_path}"
+      window.location = "<%= OpenConferenceWare::Engine.routes.url_helpers.auth_failure_path %>"
     }
   });
 }

data/app/assets/stylesheets/open_conference_ware/custom.css.scss

@@ -13,10 +13,6 @@ div.skip-link a {
   position: relative;
 }
 
-body {
-  padding-top: 1em;
-}
-
 /* @group Common Helper Classes */
 
 div.admin-only {
@@ -83,7 +79,7 @@ span.admin-only {
   top: 50%;
   left: 50%;
   color: black;
-  background: image-url('spinner-big.gif') no-repeat center #F7F1A3;
+  background: image-url('open_conference_ware/spinner-big.gif') no-repeat center #F7F1A3;
   text-align: center;
   padding: 10px;
   font: normal 16px Tahoma, Geneva, sans-serif;
@@ -115,40 +111,40 @@ span.admin-only {
 }
 
 .addable {
-  background-image: image-url('plus.png');
+  background-image: image-url('open_conference_ware/plus.png');
 }
 
 .showable {
-  background-image: image-url('document.png');
+  background-image: image-url('open_conference_ware/document.png');
 }
 
 .editable,
 .snippet_edit_link {
-  background-image: image-url('edit.png');
+  background-image: image-url('open_conference_ware/edit.png');
 }
 
 .cancelable {
-  background-image: image-url('arrow-out.png');
+  background-image: image-url('open_conference_ware/arrow-out.png');
 }
 
 .deletable {
-  background-image: image-url('delete.png');
+  background-image: image-url('open_conference_ware/delete.png');
 }
 
 .confirmable {
-  background-image: image-url('accept.png');
+  background-image: image-url('open_conference_ware/accept.png');
 }
 
 .feedable {
-  background-image: image-url('feed.png');
+  background-image: image-url('open_conference_ware/feed.png');
 }
 
 .spinning {
-  background-image: image-url('spinner.gif');
+  background-image: image-url('open_conference_ware/spinner.gif');
 }
 
 .to_top {
-  background-image: image-url('arrow-up.png');
+  background-image: image-url('open_conference_ware/arrow-up.png');
 }
 
 .popup {
@@ -156,7 +152,7 @@ span.admin-only {
   padding-left: 20px;
   background-position: left center;
   background-repeat: no-repeat;
-  background-image: image-url('new_window.gif');
+  background-image: image-url('open_conference_ware/new_window.gif');
 }
 
 /* @end */
@@ -904,7 +900,7 @@ ul.calendar_items {
 }
 
 .favorite {
-  background-image: image-url('favorite.png');
+  background-image: image-url('open_conference_ware/favorite.png');
   background-position: left -36px;
   background-repeat: no-repeat;
   width: 18px;
@@ -956,7 +952,7 @@ body.proposals.show #content h2.page_title {
 }
 
 a.to_favorites {
-  background: image-url('star.png') no-repeat left center;
+  background: image-url('open_conference_ware/star.png') no-repeat left center;
   padding: 0 0 0 22px;
 }
 /* @end */
@@ -966,7 +962,7 @@ body.users.show h2.page_title {
 }
 
 .locked {
-  background: image-url('lock.png') no-repeat 0 2px;
+  background: image-url('open_conference_ware/lock.png') no-repeat 0 2px;
   padding-left: 23px;
   margin: 1em 0;
 }

data/app/controllers/open_conference_ware/application_controller.rb

@@ -242,7 +242,7 @@ module OpenConferenceWare
 
     # Assign an @events variable for use by the layout when displaying available events.
     def assign_events
-      @events = Event.lookup
+      @events = Event.all
     end
 
     # Return the event and a status which describes how the event was assigned. The status can be one of the following:
@@ -257,7 +257,7 @@ module OpenConferenceWare
       # Try finding event using params:
       event_id_key = controller_name == "events" ? :id : :event_id
       if key = params[event_id_key]
-        if event = Event.lookup(key)
+        if event = Event.find(key)
           return [event, :assigned_to_param]
         else
           logger.info "error, couldn't find event from key: #{key}"

data/app/controllers/open_conference_ware/authentications_controller.rb

@@ -2,6 +2,9 @@ module OpenConferenceWare
   class AuthenticationsController < ApplicationController
     before_filter :require_auth_hash, only: [:create]
 
+    # We need to accept a raw POST from an OmniAuth provider with no authenticity token.
+    skip_before_filter :verify_authenticity_token, :only => :create
+
     def sign_in
       page_title "Sign In"
     end
@@ -29,6 +32,11 @@ module OpenConferenceWare
       redirect_back_or_default
     end
 
+    def failure
+      flash[:error] = params[:message]
+      redirect sign_in_path
+    end
+
     protected
 
     def auth_hash

data/app/controllers/open_conference_ware/manage/events_controller.rb

@@ -11,7 +11,7 @@ module OpenConferenceWare
       # GET /events
       # GET /events.xml
       def index
-        @events = Event.lookup
+        @events = Event.all
 
         respond_to do |format|
           format.html # index.html.erb
@@ -108,7 +108,7 @@ module OpenConferenceWare
         already_emailed = []
         proposals = params[:proposal_ids].split(',')
         proposals.each do |proposal_id|
-          proposal = Proposal.lookup(proposal_id)
+          proposal = Proposal.find(proposal_id) rescue nil
           next unless proposal
           case params[:proposal_status]
           when 'accepted'

data/app/controllers/open_conference_ware/proposals_controller.rb

@@ -393,7 +393,7 @@ module OpenConferenceWare
     # * :invalid_proposal
     # * :invalid_event
     def get_proposal_and_assignment_status
-      if proposal = Proposal.lookup(params[:id].to_i) rescue nil
+      if proposal = Proposal.find(params[:id].to_i) rescue nil
         if proposal.event
           return [proposal, :assigned_via_param]
         else

data/app/helpers/open_conference_ware/snippets_helper.rb

@@ -4,7 +4,7 @@ module OpenConferenceWare
     # Return the Snippet record matching the +slug+, else raise a
     # ActiveRecord::RecordNotFound.
     def snippet_record_for(slug)
-      if record = Snippet.lookup(slug.to_s)
+      if record = Snippet.find_by_slug(slug.to_s)
         return record
       else
         raise ActiveRecord::RecordNotFound, "Can't find snippet: #{slug}"

data/app/helpers/open_conference_ware/user_favorites_helper.rb

@@ -2,14 +2,18 @@ module OpenConferenceWare
   module UserFavoritesHelper
     # Add JavaScript to layout that populates the user's favorites and binds these controls.
     def include_user_favorites_javascript
-      expose_to_js :favorites_path, user_favorites_path(user_id: :me)
-      run_when_dom_is_ready 'populate_user_favorites();'
-      run_when_dom_is_ready 'bind_user_favorite_controls();'
+      if user_favorites?
+        expose_to_js :favorites_path, user_favorites_path(user_id: :me)
+        run_when_dom_is_ready 'populate_user_favorites();'
+        run_when_dom_is_ready 'bind_user_favorite_controls();'
+      end
     end
 
     # Return link for a UserFavorite control for the given +proposal+.
     def user_favorite_control_for(proposal)
-      return link_to(content_tag(:span, "*"), user_favorites_path(:me), class: "favorite favorite_#{proposal.id}")
+      if user_favorites?
+        return link_to(content_tag(:span, "*"), user_favorites_path(:me), class: "favorite favorite_#{proposal.id}")
+      end
     end
   end
 end

data/app/mixins/open_conference_ware/settings_checkers_mixin.rb

@@ -36,6 +36,7 @@ module OpenConferenceWare
         proposal_statuses
         user_pictures
         user_profiles
+        user_favorites
       ].each do |name|
         define_method("#{name}?") do
           return OpenConferenceWare.send("have_#{name}")

data/app/models/open_conference_ware/event.rb

@@ -27,12 +27,8 @@ module OpenConferenceWare
 
   class Event < OpenConferenceWare::Base
     # Mixins
-    ### Provide cached Snippet.lookup(id) method.
-    include CacheLookupsMixin
     include SimpleSlugMixin
 
-    cache_lookups_for :slug, order: 'deadline desc', include: [:tracks, :rooms]
-
     # Associations
     has_many :proposals, dependent: :destroy
     has_many :tracks, dependent: :destroy
@@ -86,10 +82,7 @@ module OpenConferenceWare
     # see if a snippet says which is current, else tries to return the event
     # with the latest deadline, else returns a nil.
     def self.current
-      query = lambda { self.current_by_settings || self.current_by_deadline }
-      return self.cache_lookups? ?
-        self.fetch_object('event_current', &query) :
-        query.call
+      self.current_by_settings || self.current_by_deadline
     end
 
     # Return current event by finding it by deadline.

data/app/models/open_conference_ware/proposal.rb

@@ -38,9 +38,6 @@ module OpenConferenceWare
     # Provide ::event_tracks? and other methods for accessing SETTING
     include SettingsCheckersMixin
 
-    # Provide ::lookup
-    include CacheLookupsMixin
-
     # Provide ::overlaps?
     include ScheduleOverlapsMixin
 
@@ -57,74 +54,70 @@ module OpenConferenceWare
       :track_id, :track_title,
       :user_ids, :user_titles
 
-
-    cache_lookups_for :id, order: 'submitted_at desc', include: [:event, :track, :room, :users]
-
     # Provide #tags
     acts_as_taggable_on :tags
 
     # Acts As State Machine
     include AASM
 
-    aasm_column :status
-
-    aasm_initial_state :proposed
-
-    aasm_state :proposed
-    aasm_state :accepted
-    aasm_state :waitlisted
-    aasm_state :rejected
-    aasm_state :confirmed
-    aasm_state :declined
-    aasm_state :junk
-    aasm_state :cancelled
-
-    aasm_event :accept do
-      transitions from: :proposed, to: :accepted
-      transitions from: :rejected, to: :accepted
-      transitions from: :waitlisted, to: :accepted
-    end
+    aasm(column: :status) do
+
+      state :proposed, initial: true
+      state :accepted
+      state :waitlisted
+      state :rejected
+      state :confirmed
+      state :declined
+      state :junk
+      state :cancelled
+
+      event :accept do
+        transitions from: :proposed, to: :accepted
+        transitions from: :rejected, to: :accepted
+        transitions from: :waitlisted, to: :accepted
+      end
 
-    aasm_event :reject do
-      transitions from: :proposed, to: :rejected
-      transitions from: :accepted, to: :rejected
-      transitions from: :waitlisted, to: :rejected
-    end
+      event :reject do
+        transitions from: :proposed, to: :rejected
+        transitions from: :accepted, to: :rejected
+        transitions from: :waitlisted, to: :rejected
+      end
 
-    aasm_event :waitlist do
-      transitions from: :proposed, to: :waitlisted
-      transitions from: :accepted, to: :waitlisted
-      transitions from: :rejected, to: :waitlisted
-    end
+      event :waitlist do
+        transitions from: :proposed, to: :waitlisted
+        transitions from: :accepted, to: :waitlisted
+        transitions from: :rejected, to: :waitlisted
+      end
 
-    aasm_event :confirm do
-      transitions from: :accepted, to: :confirmed
-    end
+      event :confirm do
+        transitions from: :accepted, to: :confirmed
+      end
 
-    aasm_event :decline do
-      transitions from: :accepted, to: :declined
-    end
+      event :decline do
+        transitions from: :accepted, to: :declined
+      end
 
-    aasm_event :accept_and_confirm do
-      transitions from: :proposed, to: :confirmed
-      transitions from: :waitlisted, to: :confirmed
-    end
+      event :accept_and_confirm do
+        transitions from: :proposed, to: :confirmed
+        transitions from: :waitlisted, to: :confirmed
+      end
 
-    aasm_event :accept_and_decline do
-      transitions from: :proposed, to: :declined
-      transitions from: :waitlisted, to: :declined
-    end
+      event :accept_and_decline do
+        transitions from: :proposed, to: :declined
+        transitions from: :waitlisted, to: :declined
+      end
 
-    aasm_event :mark_as_junk do
-      transitions from: :proposed, to: :junk
-    end
+      event :mark_as_junk do
+        transitions from: :proposed, to: :junk
+      end
 
-    aasm_event :reset_status do
-      transitions from: %w(accepted rejected waitlisted confirmed declined junk cancelled), to: :proposed
-    end
+      event :reset_status do
+        transitions from: %w(accepted rejected waitlisted confirmed declined junk cancelled), to: :proposed
+      end
 
-    aasm_event :cancel  do
-      transitions from: :confirmed, to: :cancelled
+      event :cancel  do
+        transitions from: :confirmed, to: :cancelled
+      end
     end
 
     # Associations
@@ -162,8 +155,8 @@ module OpenConferenceWare
     validates_presence_of :session_type,                    if: :event_session_types?
     validates_presence_of :presenter, :email, :biography,   unless: :user_profiles?
     validates_presence_of :speaking_experience,             if: :proposal_speaking_experience?
-    validates_presence_of :audience_level,                  if: Proc.new { Proposal.audience_levels }
-    validates_inclusion_of :audience_level,                 if: Proc.new { Proposal.audience_levels }, allow_blank: true,
+    validates_presence_of :audience_level,                  if: Proc.new { Proposal.audience_levels.present? }
+    validates_inclusion_of :audience_level,                 if: Proc.new { Proposal.audience_levels.present? }, allow_blank: true,
                                                             in: OpenConferenceWare.proposal_audience_levels ?
                                                                   OpenConferenceWare.proposal_audience_levels.flatten.map { |level| level.with_indifferent_access['slug'] } :
                                                                   []
@@ -268,15 +261,15 @@ module OpenConferenceWare
     # representing optional states. Of each pair, the first element is the title,
     # the second is the status.
     def titles_and_statuses
-      result = [["(currently '#{self.aasm_current_state.to_s.titleize}')", nil]]
-      result += self.aasm_events_for_current_state.map{|s|[s.to_s.titleize, s.to_s]}.sort_by{|title, state| title}
+      result = [["(currently '#{self.aasm.current_state.to_s.titleize}')", nil]]
+      result += self.aasm.events(aasm.current_state).map{|s|[s.to_s.titleize, s.to_s]}.sort_by{|title, state| title}
       return result
     end
 
     # allows an interface to state machine through update_attributes transition key
     attr_accessor :transition
     def transition=(event)
-      send("#{event}!") if !event.blank? && aasm_events_for_current_state.include?(event.to_sym)
+      send("#{event}!") if !event.blank? && aasm.events(aasm.current_state).include?(event.to_sym)
     end
 
     # Is this +user+ allowed to alter this proposal?