open_conference_ware 1.0.0.pre3 → 1.0.0.pre4

data/.travis.yml

@@ -6,10 +6,16 @@ bundler_args: --without debug
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.1.5
+  - 2.2.0
+matrix:
+  allow_failures:
+    - rvm: 2.2.0
 env:
   - DB=mysql
   - DB=postgresql
   - DB=sqlite
+cache: bundler
 before_script:
   - sqlite3 --version
   - mysql --version

data/CHANGES.md

@@ -3,7 +3,20 @@
 OpenConferenceWare stable releases and changes included, with latest at top:
 
 ### master
+
+### v1.0.0.pre3
+- Added missing database indexes and improved index naming
+- Fixed image paths in CSS
+- Fixed some issues with the Ignite-style proposal list
+- Added a feature flag to enable/disable user favorites
+- Improved handling of OmniAuth OpenID and failure cases
+- Removed CacheLookupsMixin
+- Extracted sensitive configuration values to config/secrets.yml
+
+### v1.0.0.pre2
 - Improved gem packaging
+- Added a generator to copy views from the engine into the host app
+- Cleaned up file naming and unnecessary files
 
 ### v1.0.0.pre1
 - Converted to a Rails engine

data/app/assets/javascripts/open_conference_ware/application.js

@@ -5,6 +5,8 @@
 //= require jquery.localScroll
 //= require farbtastic
 //= require audiojs/audio.min
+//= require openid-selector/openid-jquery
+//= require openid-selector/openid-en
 //= require bootstrap
 //= require open_conference_ware/base
 //= require open_conference_ware/util

data/app/assets/javascripts/open_conference_ware/proposals.js

@@ -54,14 +54,6 @@ function bind_proposal_generic_control(kind, elements) {
           if (matcher) {
             target.html(matcher[1]);
           }
-
-          // Hide or unhide the room and schedule controls based on the proposal's state
-          var dependent = target.parent().parent().find('.proposal_admin_controls_dependent_on_confirmed_status');
-          if (response['proposal_status'] == 'confirmed') {
-            dependent.show();
-          } else {
-            dependent.hide();
-          }
         }
       }
     });
@@ -84,10 +76,14 @@ function bind_proposal_schedule_controls() {
     if(target.parent().find('option:selected[value]').get().length == 3) {
 
       data = {
-        'authenticity_token': app.authenticity_token,
-        'start_time[date]': target.parent().find('select.date').attr('value'),
-        'start_time[hour]': target.parent().find('select.hour').attr('value'),
-        'start_time[minute]': target.parent().find('select.minute').attr('value')
+        proposal: {
+          authenticity_token: app.authenticity_token,
+          start_time: {
+            date: target.parent().find('select.date').attr('value'),
+            hour: target.parent().find('select.hour').attr('value'),
+            minute: target.parent().find('select.minute').attr('value')
+          }
+        }
       };
       proposal_id = target.parent().attr('id').split('_').pop();
       format = 'json';

data/app/assets/stylesheets/open_conference_ware/application.css

@@ -3,6 +3,7 @@
 *= require bootstrap-theme
 *= require persona-buttons
 *= require farbtastic
+*= require openid-selector/openid
 *= require open_conference_ware/custom
 */
 

data/app/controllers/open_conference_ware/application_controller.rb

@@ -29,6 +29,10 @@ module OpenConferenceWare
     before_filter :log_the_current_user
     before_filter :log_the_session
 
+    rescue_from ActionController::UnknownFormat do |e|
+      render(text: 'Not Found', status: 404)
+    end
+
     #---[ Authentication ]--------------------------------------------------
 
     # Store the given user in the session.
@@ -149,9 +153,7 @@ module OpenConferenceWare
     def notify(level, message)
       level = level.to_sym
       raise ArgumentError, "Invalid flash notification level: #{level}" unless NOTIFY_LEVELS.include?(level)
-      flash[level] ?
-        flash[level] << " #{message}".html_safe :
-        flash[level] = "#{message}".html_safe
+      flash[level] = "#{flash[level]} #{message}".strip.html_safe
     end
 
     #---[ Access control ]--------------------------------------------------
@@ -257,7 +259,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.find(key)
+        if event = Event.find_by_slug(key)
           return [event, :assigned_to_param]
         else
           logger.info "error, couldn't find event from key: #{key}"
@@ -469,7 +471,7 @@ module OpenConferenceWare
       if @event
         if event_tracks? && @event.tracks.size == 0
           if admin?
-            notify :notice, "This event needs a track, you should #{view_context.link_to 'create one', new_event_track_path(@event)}."
+            notify :notice, "This event needs a track, you should #{view_context.link_to 'create one', new_event_track_path(@event)}.".html_safe
           else
             notify :failure, "This event has no tracks, an admin must create at least one."
           end
@@ -477,7 +479,7 @@ module OpenConferenceWare
 
         if event_session_types? && @event.session_types.size == 0
           if admin?
-            notify :notice, "This event needs a session type, you should #{view_context.link_to 'create one', new_event_session_type_path(@event)}."
+            notify :notice, "This event needs a session type, you should #{view_context.link_to 'create one', new_event_session_type_path(@event)}.".html_safe
           else
             notify :failure, "This event has no session types, an admin must create at least one."
           end

data/app/controllers/open_conference_ware/authentications_controller.rb

@@ -34,7 +34,7 @@ module OpenConferenceWare
 
     def failure
       flash[:error] = params[:message]
-      redirect sign_in_path
+      redirect_to sign_in_path
     end
 
     protected

data/app/controllers/open_conference_ware/events_controller.rb

@@ -14,6 +14,7 @@ module OpenConferenceWare
       respond_to do |format|
         format.html
         format.json { render json: @events }
+        format.xml  { render xml:  @events }
       end
     end
 
@@ -21,6 +22,7 @@ module OpenConferenceWare
       respond_to do |format|
         format.html { redirect_to event_proposals_path(@event) }
         format.json { render json: @event }
+        format.xml  { render xml:  @event }
       end
     end
 
@@ -29,7 +31,9 @@ module OpenConferenceWare
 
       respond_to do |format|
         format.html
-        format.csv { render csv: @speakers, style: admin? ? :full : :public }
+        format.json { render json: @speakers }
+        format.xml  { render xml:  @speakers }
+        format.csv  { render csv:  @speakers, style: admin? ? :full : :public }
       end
     end
   end

data/app/controllers/open_conference_ware/proposals_controller.rb

@@ -53,10 +53,10 @@ module OpenConferenceWare
           # index.atom.builder
           if @event_assignment == :assigned_to_param
             @cache_key = "proposals_atom,event_#{@event.id}"
-            @proposals = Defer { @event.populated_proposals(:proposals).order("submitted_at desc").limit(MAX_FEED_ITEMS) }
+            @proposals = Defer { @event.populated_proposals(:proposals).reorder("submitted_at desc").limit(MAX_FEED_ITEMS) }
           else
             @cache_key = "proposals_atom,all"
-            @proposals = Defer { Proposal.populated.order("submitted_at desc").limit(MAX_FEED_ITEMS) }
+            @proposals = Defer { Proposal.populated.reorder("submitted_at desc").limit(MAX_FEED_ITEMS) }
           end
         }
         format.csv {
@@ -233,11 +233,11 @@ module OpenConferenceWare
         params[:proposal].delete(:title)
       end
 
-      if params[:start_time] && admin?
-        if params[:start_time][:date].blank? || params[:start_time][:hour].blank? || params[:start_time][:minute].blank?
+      if params[:proposal][:start_time] && admin?
+        if params[:proposal][:start_time][:date].blank? || params[:proposal][:start_time][:hour].blank? || params[:proposal][:start_time][:minute].blank?
           @proposal.start_time = nil
         else
-          @proposal.start_time = "#{params[:start_time][:date]} #{params[:start_time][:hour]}:#{params[:start_time][:minute]}"
+          @proposal.start_time = "#{params[:proposal][:start_time][:date]} #{params[:proposal][:start_time][:hour]}:#{params[:proposal][:start_time][:minute]}"
         end
       end
 
@@ -260,7 +260,7 @@ module OpenConferenceWare
             render(
               json: {
                 proposal_status: @proposal.status,
-                _transition_control_html: render_to_string(partial: '/proposals/transition_control')
+                _transition_control_html: render_to_string(partial: '/open_conference_ware/proposals/transition_control', formats: [:html])
               },
               status: :ok
             )
@@ -357,7 +357,8 @@ module OpenConferenceWare
         :track_id,
         :session_type_id,
         :speaking_experience,
-        :audience_level]
+        :audience_level,
+        :tag_list]
 
       permitted += [:status, :room_id, :start_time, :audio_url] if admin?
 
@@ -433,7 +434,7 @@ module OpenConferenceWare
     end
 
     def assert_user_complete_profile
-      if user_profiles? and logged_in? and not current_user.complete_profile?
+      if user_profiles? && logged_in? && !current_user.admin? && !current_user.complete_profile?
         current_user.complete_profile = true
         if current_user.valid?
           current_user.save

data/app/controllers/open_conference_ware/session_types_controller.rb

@@ -53,7 +53,7 @@ module OpenConferenceWare
 
       respond_to do |format|
         if @session_type.save
-          flash[:notice] = 'SessionType was successfully created.'
+          flash[:notice] = 'Session type was successfully created.'
           format.html { redirect_to(session_types_path) }
           format.json  { render json: @session_type, status: :created, location: @session_type }
           format.xml  { render xml: @session_type, status: :created, location: @session_type }
@@ -70,7 +70,7 @@ module OpenConferenceWare
     def update
       respond_to do |format|
         if @session_type.update_attributes(session_type_params)
-          flash[:notice] = 'SessionType was successfully updated.'
+          flash[:notice] = 'Session type was successfully updated.'
           format.html { redirect_to(@session_type) }
           format.json  { head :ok }
           format.xml  { head :ok }

data/app/mixins/open_conference_ware/public_attributes_mixin.rb

@@ -47,7 +47,7 @@ module OpenConferenceWare
       end
 
       def serializable_hash(options={})
-        if (options.keys & [:only, :except, :methods, :include]).present?
+        if options && (options.keys & [:only, :except, :methods, :include]).present?
           super(options)
         else
           public_attributes

data/app/models/open_conference_ware/event.rb

@@ -108,9 +108,8 @@ module OpenConferenceWare
     def proposals_for_stats
       return self.proposals.
               order("created_at").
-              where("proposals.id, proposals.track_id, proposals.created_at, proposals.submitted_at, proposals.session_type_id, proposals.status").
-              includes(:track, :session_type).
-              all
+              select("open_conference_ware_proposals.id, open_conference_ware_proposals.track_id, open_conference_ware_proposals.created_at, open_conference_ware_proposals.submitted_at, open_conference_ware_proposals.session_type_id, open_conference_ware_proposals.status").
+              includes(:track, :session_type)
     end
 
     # Return an array of the Event's ScheduleItems and Proposal sessions that
@@ -155,7 +154,11 @@ module OpenConferenceWare
 
     # Return other Event objects.
     def other_events
-      return self.class.select("id, title").order("title asc").where('id != ?', self.id)
+      if new_record?
+        self.class.all
+      else
+        self.class.select("id, title").order("title asc").where('id != ?', self.id)
+      end
     end
 
     # Return array of Rooms for this event and its parent event.

data/app/models/open_conference_ware/room.rb

@@ -38,5 +38,9 @@ module OpenConferenceWare
         medium: "350>",
         small: "150>"
       }
+
+    validates_attachment_content_type :image,
+      :content_type => /\Aimage\/.*\Z/,
+      :unless => Proc.new{|r| r.image_content_type.blank? }
   end
 end

data/app/models/open_conference_ware/track.rb

@@ -46,6 +46,9 @@ module OpenConferenceWare
         raise TypeError
       end
       write_attribute(:color,new_color.html)
+    rescue ArgumentError
+      write_attribute(:color, nil)
+      errors.add(:color, "is not a recognized HTML color")
     end
   end
 end

data/app/models/open_conference_ware/user.rb

@@ -109,29 +109,35 @@ module OpenConferenceWare
       email
     end
 
-    base_comma_attributes = lambda {
+    comma :full do
+      email
       id
       first_name
       last_name
       affiliation
       biography
-      photo url: 'Photo'
       website
       twitter
       identica
       blog_url
-      created_at xmlschema: 'Created'
-      updated_at xmlschema: 'Updated'
+      created_at 'Created'
+      updated_at 'Updated'
       proposals ids: 'Session ids'
-    }
-
-    comma :full do
-      email
-      instance_eval &base_comma_attributes
     end
 
     comma :public do
-      instance_eval &base_comma_attributes
+      id
+      first_name
+      last_name
+      affiliation
+      biography
+      website
+      twitter
+      identica
+      blog_url
+      created_at 'Created'
+      updated_at 'Updated'
+      proposals ids: 'Session ids'
     end
 
     #---[ PaperClip avatar images ]-----------------------------------------
@@ -144,6 +150,10 @@ module OpenConferenceWare
         avatar: '48x48#'
       }
 
+    validates_attachment_content_type :photo,
+      :content_type => /\Aimage\/.*\Z/,
+      :unless => Proc.new{|r| r.photo_content_type.blank? }
+
     #---[ Methods ]---------------------------------------------------------
 
     def self.create_from_authentication(auth)

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

@@ -51,6 +51,9 @@
                     <% if proposal_statuses? %>
                       <li><%= link_to "Sessions", event_sessions_path(nav_event) %></li>
                     <% end %>
+                    <% if proposal_start_times? %>
+                      <li><%= link_to "Schedule", event_schedule_path(nav_event) %></li>
+                    <% end %>
                     <li><%= link_to "Proposals", event_proposals_path(nav_event) %>
                     <li><%= link_to "- Bulk edit", manage_event_proposals_path(nav_event) %></li>
                     <% unless nav_event.accepting_proposals? %>

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

@@ -89,7 +89,7 @@
             </ul>
           </li>
         </ul>
-        &copy; 2008&ndash;<%= Date.today.year %> <%= OpenConferenceWare.organization %>
+        &copy; <%= Date.today.year %> <%= OpenConferenceWare.organization %>
       </div>
   </div><!--wrapper -->
 
@@ -101,26 +101,5 @@
     <%= yield :javascript %>
   </script>
 
-  <% if Rails.env == "production" %>
-    <script type="text/javascript">
-      var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-      document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-    </script>
-    <script type="text/javascript">
-      var pageTracker = _gat._getTracker("UA-168427-8");
-      pageTracker._initData();
-      pageTracker._trackPageview();
-    </script>
-
-    <script type="text/javascript">
-    var pkBaseURL = (("https:" == document.location.protocol) ? "https://opensourcebridge.org/stats/piwik/" : "http://opensourcebridge.org/stats/piwik/");
-    document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
-    </script><script type="text/javascript">
-    piwik_action_name = '';
-    piwik_idsite = 1;
-    piwik_url = pkBaseURL + "piwik.php";
-    piwik_log(piwik_action_name, piwik_idsite, piwik_url);
-    </script>
-  <% end %>
 </body>
 </html>

data/app/views/open_conference_ware/authentications/_openid.html.erb

@@ -1,11 +1,25 @@
-<div class="auth-provider openid">
-<h3>OpenID</h3>
-<p><%= snippet_for :login_openid_text %></p>
-<form action="<%= auth_path(:open_id) %>" method='post' noValidate='noValidate' class="form-inline">
-  <div class="form-group">
-    <label for='openid_url' class="sr-only">OpenID Identifier:</label>
-    <input type='url' id='openid_url' name='openid_url' class='form-control' placeholder='OpenID Identifier'/>
-  </div>
-  <button type='submit' class='btn btn-primary'>Sign In</button>
-</form>
+<div class="auth-provider">
+  <h3>OpenID</h3>
+
+  <%= form_tag(auth_path(:open_id), :id => "openid_form" ) do %>
+    <fieldset>
+      <div id="openid_choice">
+        <p>Please click your account provider:</p>
+        <div id="openid_btns"></div>
+      </div>
+      <div id="openid_input_area" class="form-group">
+        <%= text_field_tag "openid_url", "http://", id: "openid_url", class: 'form-control' %>
+        <%= submit_tag 'Log in', class: 'btn btn-default' %>
+      </div>
+      <noscript>
+        <p><%= snippet_for :login_openid_text %></p>
+      </noscript>
+    </fieldset>
+  <% end %>
 </div>
+
+<% run_when_dom_is_ready <<-JS
+  openid.img_path = '/assets/openid-selector/';
+  openid.init('openid_url');
+JS
+%>