open_conference_ware 1.0.0.pre1 → 1.0.0.pre2

data/.gitignore

@@ -19,3 +19,4 @@ spec/dummy/db/*.sqlite3-journal
 spec/dummy/log/*.log
 spec/dummy/tmp/
 spec/dummy/.sass-cache
+Gemfile.lock

data/.travis.yml

@@ -1,6 +1,5 @@
 language: ruby
 before_install:
-  - cp Gemfile.lock Gemfile.ci.lock
   - cp ci/Gemfile.ci Gemfile.ci
   - export BUNDLE_GEMFILE=$PWD/Gemfile.ci
 bundler_args: --without debug

data/CHANGES.md

@@ -2,6 +2,33 @@
 
 OpenConferenceWare stable releases and changes included, with latest at top:
 
+### master
+- Improved gem packaging
+
+### v1.0.0.pre1
+- Converted to a Rails engine
+- Packaged as a gem: open_conference_ware
+- Added a generator to set up config files and seed data
+- Updated documentation to reflect new packaging
+
+### v0.20131209
+- **[!] This is the final release that will be distributed as a Rails application, future releases will be packaged as a gem, providing a Rails engine**
+- Upgraded to Rails 4.0.2
+- Enabled the Rails asset pipeline
+- Dropped support for Ruby 1.8.7
+
+### v0.20131201
+- **[!] This is the final release to support Ruby 1.8.7**
+- Upgraded to Rails 3.2
+- Look and feel is now based on Bootstrap, not on the Open Source Bridge site
+- Replaced outdated authenticaiton system with OmniAuth
+- Improved database support
+
+### v0.20130830
+- Locked down a few dependencies for compatibility
+- Fixed timezone issues in test
+- Improved documentation
+
 ### v0.20130720
 
 - Added Twitter card metadata to proposal pages.

data/Gemfile

@@ -17,5 +17,7 @@ group :debug do
   gem 'debugger'
   gem 'pry'
   gem 'launchy'
+  gem 'guard-rspec'
+  gem 'cadre'
 end
 

data/{README.markdown → README.md}

@@ -1,6 +1,10 @@
 # OpenConferenceWare
 
-[![Build Status](https://travis-ci.org/osbridge/openconferenceware.png?branch=master)](https://travis-ci.org/osbridge/openconferenceware) [![Coverage Status](https://coveralls.io/repos/osbridge/openconferenceware/badge.png?branch=master)](https://coveralls.io/r/osbridge/openconferenceware?branch=master) [![Dependency Status](https://gemnasium.com/osbridge/openconferenceware.png)](https://gemnasium.com/osbridge/openconferenceware) [![Code Climate](https://codeclimate.com/github/osbridge/openconferenceware.png)](https://codeclimate.com/github/osbridge/openconferenceware)
+[![Gem Version](https://badge.fury.io/rb/open_conference_ware.png)](http://badge.fury.io/rb/open_conference_ware)
+[![Build Status](https://travis-ci.org/osbridge/openconferenceware.png?branch=master)](https://travis-ci.org/osbridge/openconferenceware)
+[![Dependency Status](https://gemnasium.com/osbridge/openconferenceware.png)](https://gemnasium.com/osbridge/openconferenceware)
+[![Coverage Status](https://coveralls.io/repos/osbridge/openconferenceware/badge.png?branch=master)](https://coveralls.io/r/osbridge/openconferenceware?branch=master)
+[![Code Climate](https://codeclimate.com/github/osbridge/openconferenceware.png)](https://codeclimate.com/github/osbridge/openconferenceware)
 
 About
 -----
@@ -22,15 +26,15 @@ OpenConferenceWare requires Ruby 1.9.3 and a host application built on Rails 4.0
 
 1. Install the latest version of Rails:
 
-       $ gem install rails -v 4.0.2
-    
+        $ gem install rails -v 4.0.2
+
 2. Create a new application to host OpenConferenceWare for your event:
 
-       $ rails new sloth_party --skip-bundle
-       
+        $ rails new sloth_party --skip-bundle
+
 3. Add 'open_conference_ware' to the newly-created app's Gemfile
 
-       gem "open_conference_ware"
+        gem "open_conference_ware"
 
 4. Run `bundle install`
 
@@ -38,18 +42,18 @@ OpenConferenceWare requires Ruby 1.9.3 and a host application built on Rails 4.0
 
 6. Install OpenConferenceWare's configuration files and seed data:
 
-       $ bin/rails generate open_conference_ware:install
-       
+        $ bin/rails generate open_conference_ware:install
+
    If you want OCW to be mounted somewhere other than the root of the application, you can pass a mount point to the generator, like so:
-       
-       $ bin/rails generate open_conference_ware:install /ocw
-       
+
+        $ 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.
 
 8. 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
-       
+        $ bin/rails server
+
 ### Authentication
 
 OpenConferenceWare uses [OmniAuth](https://github.com/intridea/omniauth/) to allow users to sign in using [a variety of external services](https://github.com/intridea/omniauth/wiki/List-of-Strategies). No authentication method is enabled by default, so you'll need to configure one before deploying OCW.
@@ -59,11 +63,11 @@ To do this, just add the gem for the desired provider to your Gemfile, run `bund
 For example, to enable sign-in with [Persona](https://login.persona.org/), you would add the [omniauth-persona](https://github.com/pklingem/omniauth-persona) gem to your Gemfile
 
     gem 'omniauth-persona'
-    
+
 and add the provider to `02_omniauth.rb`
 
     provider :persona
-    
+
 #### Sign In Forms
 
 Friendly sign-in forms are provided for [OpenID](http://openid.net/) and [Persona](https://login.persona.org/), but it's easy to add your own. After enabling an OmniAuth provider, create a partial view at `app/views/open_conference_ware/authentications/_provider_name.html.erb`, where `provider_name` is the name passed to the provider method in the initializer.
@@ -77,7 +81,19 @@ Many features of OCW can be enabled or disabled to meet your event's needs. Thes
 
 ### Views and Styles
 
-You can override any view in OpenConferenceWare by creating a view with the same name in your host application. For example, replace the view showing a single room, you would create `app/views/open_conference_ware/rooms/show.html.erb` within your host application.
+Since OpenConferenceWare is an engine, all of its views are packaged inside the gem. To customize things, you can easily override any view by creating one with the same name in your application.
+
+To simplify this process, we've included a generator that will copy views out of the gem for you. Invoking the following command will copy all of OpenConferenceWare's views:
+
+    $ bin/rails generate open_conference_ware:views
+
+If you only need to override a particular set of views, you can pass arguments to the generator to narrow things down. This will copy only the layout file and view related to rooms:
+
+    $ bin/rails generate open_conference_ware:views layouts rooms
+
+You can see a full list of available arguments by running:
+
+    $ bin/rails generate open_conference_ware:views --help
 
 Releases
 --------

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

@@ -12,4 +12,3 @@ var app = new Object;
 function logged_in() {
   return !app.current_user == false;
 }
-

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

@@ -136,7 +136,7 @@
     padding: 0.5em 0 0.25em 0; }
   .left-table td h4 {
     padding: 0.25em 0 0.1em 0; }
-  .left-table td, 
+  .left-table td,
   .left-table th {
     padding: 0.25em;
     text-align: left;
@@ -476,15 +476,15 @@ ul.jq-ui-autocomplete {
     list-style: none;
     color: #333;
 }
-ul.jq-ui-autocomplete li { 
-  display: block; 
-  padding: .3em .5em .3em .3em; 
+ul.jq-ui-autocomplete li {
+  display: block;
+  padding: .3em .5em .3em .3em;
   overflow: hidden;
   width: 100%;
 }
 
-ul.jq-ui-autocomplete li.active { 
-  background-color: <%= @colors[:light_green] %>; 
+ul.jq-ui-autocomplete li.active {
+  background-color: <%= @colors[:light_green] %>;
   color: <%= @colors[:dark_grey] %>;;
 }
 

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

@@ -51,4 +51,3 @@ a:hover { color: #fff; background-color:#000; }
   font-size: 12px;
   list-style: square;
 }
-

data/app/controllers/open_conference_ware/proposals_controller.rb

@@ -227,7 +227,7 @@ module OpenConferenceWare
     # PUT /proposals/1.xml
     def update
       # @proposal and @event set via #assign_proposal_and_event filter
-      
+
       # If proposal title editing is locked, prevent non-admin from modifying title.
       if params[:proposal] && @event.proposal_titles_locked? && ! admin?
         params[:proposal].delete(:title)
@@ -256,12 +256,12 @@ module OpenConferenceWare
             redirect_to(@proposal)
           }
           format.xml  { head :ok }
-          format.json { 
+          format.json {
             render(
               json: {
                 proposal_status: @proposal.status,
                 _transition_control_html: render_to_string(partial: '/proposals/transition_control')
-              }, 
+              },
               status: :ok
             )
           }
@@ -505,7 +505,7 @@ module OpenConferenceWare
       end
 
       respond_to do |format|
-        format.html { 
+        format.html {
           if defined?(@redirector)
             @redirector.call
           else

data/app/helpers/open_conference_ware/application_helper.rb

@@ -143,7 +143,7 @@ module OpenConferenceWare
     end
 
     #---[ Assigned events ]-------------------------------------------------
-    
+
     # Return event assigned to this request, may be nil.
     def assigned_event
       return @event

data/app/helpers/open_conference_ware/time_range_helper.rb

@@ -16,7 +16,7 @@ module OpenConferenceWare
     # "Thursday-Friday, April 3-5, 2008"
     # (context: during 2008) "Thursday April 5, 2009 at 3:30pm through Friday, April 5 at 8:45pm, 2009"
     # (same, context: during 2009) "Thursday April 5 at 3:30pm through Friday, April 5 at 8:45pm"
-    
+
     @@to_s_cache = {}
 
     def initialize(start_time, end_time=nil, opts=nil)

data/app/helpers/open_conference_ware/tracks_helper.rb

@@ -1,7 +1,7 @@
 module OpenConferenceWare
   module TracksHelper
     include FauxRoutesMixin
-    
+
     def track_css_class(track)
       "track-#{track.id}"
     end

data/app/mixins/open_conference_ware/faux_routes_mixin.rb

@@ -15,7 +15,7 @@ module OpenConferenceWare
   #
   module FauxRoutesMixin
     # FIXME this implementation is 10x more complex than it should be, but I don't know how to make it simpler
-    
+
     TRACE = false
 
     def self.included(mixee)

data/app/models/open_conference_ware/event.rb

@@ -57,7 +57,7 @@ module OpenConferenceWare
     def accepting_proposals?
       return Time.now < (self.deadline || Time.at(0))
     end
-    
+
     # Returns an array of the dates when this event is happening.
     def dates
       if self.start_date.nil? || self.end_date.nil?
@@ -66,12 +66,12 @@ module OpenConferenceWare
         return Array(self.start_date.to_date .. self.end_date.to_date)
       end
     end
-    
+
     # Formats this event's dates for use in a select form control.
     def dates_for_select
       return [['','']] + self.dates.map{|date| [date.strftime("%B %d, %Y"), date.strftime("%Y-%m-%d")]}
     end
-    
+
     # Determines if the event is currently taking place.
     def underway?
       self.start_date && self.end_date && Time.zone.now.between?(self.start_date, self.end_date)
@@ -136,12 +136,12 @@ module OpenConferenceWare
       results += (self.children.map{|child| child.calendar_items(is_admin)}.flatten)
       return results
     end
-    
+
     # Return list of people that submitted to this event.
     def users
       return User.submitted_to(self)
     end
-    
+
     # Return list of speakers for this event.
     def speakers
       return User.speaking_at(self)
@@ -174,7 +174,7 @@ module OpenConferenceWare
     def tracks_combined
       return [self.tracks_descend, self.parent.try(:tracks_descend)].flatten.compact.uniq.sort_by(&:title)
     end
-    
+
     # Return array of Tracks for this event and its children.
     def tracks_descend
       return (self.tracks + self.children.map(&:tracks)).flatten.uniq.sort_by(&:title)

data/app/models/open_conference_ware/proposal.rb

@@ -232,7 +232,7 @@ module OpenConferenceWare
 
     comma :selector_votes do
       instance_eval &base_comma_attributes
-      
+
       user_favorites size: 'Favorites count'
       selector_vote_points 'Selector points'
       selector_votes_for_comma 'Selector votes'
@@ -384,14 +384,14 @@ module OpenConferenceWare
         return self.profile.email
       end
     end
-    
+
     # Returns a string labeling a proposal object as either a proposal or a session depending on its state.
     def kind_label
       return self.confirmed? ? 'session' : 'proposal'
     end
-    
+
     # Returns URL of session notes for this proposal, if available.
-    # 
+    #
     # Reads optional OpenConferenceWare.session_notes_url_format. This 'printf' format
     # contains positional variables that filled by Proposal#session_notes_url:
     #   * %1 => site's public URL
@@ -472,7 +472,7 @@ module OpenConferenceWare
           e.lastmod     item.updated_at if item.updated_at
           e.description((item.respond_to?(:users) ? "#{item.users.map(&:fullname).join(', ')}: " : '') + item.excerpt)
           if item.room
-            e.set_text  'LOCATION', item.room.name 
+            e.set_text  'LOCATION', item.room.name
           end
           if url_helper
             url = url_helper.call(item)

data/app/models/open_conference_ware/track.rb

@@ -27,7 +27,7 @@ module OpenConferenceWare
       :excerpt,
       :event_id,
       :title
-      
+
     def <=>(against)
       self.title <=> (against.nil? ? '' : against.title)
     end

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

@@ -13,7 +13,7 @@
       ltr = coded.charAt(i)
       link += (ltr)
     }
-    else {     
+    else {
       ltr = (key.indexOf(coded.charAt(i))-shift+key.length) % key.length
       link += (key.charAt(ltr))
     }

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

@@ -1,4 +1,4 @@
-<% 
+<%
   add_javascript(javascript_include_tag "https://login.persona.org/include.js")
   run_when_dom_is_ready <<-JS
     $('#persona_form .persona-button').click(function() {

data/app/views/open_conference_ware/manage/events/_form.html.erb

@@ -46,17 +46,17 @@
     <%= f.label :deadline, "Proposal Deadline" %><br />
     <%= f.datetime_select :deadline %>
   </div>
-  
+
   <div class="form-group">
     <%= f.label :accept_selector_votes, "Accept selector votes?" %>
     <%= f.select :accept_selector_votes, [['Yes',true],["No",false]], {}, :class => 'form-control' %>
   </div>
-  
+
   <div class="form-group">
     <%= f.label :proposal_titles_locked, "Lock editing of proposal title?" %>
     <%= f.select :proposal_titles_locked, [['Yes',true],["No",false]], {}, :class => 'form-control' %>
   </div>
-  
+
   <% if proposal_statuses? %>
     <div class="form-group">
       <%= f.label :show_proposal_confirmation_controls, "Show proposal confirmation controls?" %>

data/app/views/open_conference_ware/manage/events/proposals.html.erb

@@ -95,7 +95,7 @@ control_colspan = 0
           <%= link_to(proposal.title, proposal_path(proposal)) %>
           <% if user_profiles? %>
             <br />
-            by 
+            by
             <% proposal.users.each_with_index do |user, i| %>
               <%= "&amp;" unless i == 0 %>
               <%= link_to user.fullname, user_path(user) %>

data/app/views/open_conference_ware/manage/events/show.html.erb

@@ -67,7 +67,7 @@
       <%=h @event.deadline.to_s(:ocw_date_time_long) %>
     </td>
   </tr>
-  
+
   <tr>
     <td class="label-text">
       <label>Accept selector votes?</label>
@@ -76,7 +76,7 @@
       <%= @event.accept_selector_votes ? "Yes" : "No" %>
     </td>
   </tr>
-  
+
   <tr>
     <td class="label-text">
       <label>Lock editing of proposal title?</label>
@@ -85,7 +85,7 @@
       <%= @event.proposal_titles_locked ? "Yes" : "No" %>
     </td>
   </tr>
-  
+
   <% if proposal_statuses? %>
     <tr>
       <td class="label-text">

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

@@ -7,7 +7,7 @@
           <% message = user == current_user ?
             "You will no longer be able to edit this proposal. Are you sure you want to remove yourself?" :
             "#{h user.fullname} will no longer be able to edit this proposal. Are you sure you want to remove them?" %>
-          <%= link_to "", "#", :class => "remove-speaker deletable", :speaker_id => user.id, :speaker_fullname => user.fullname %> 
+          <%= link_to "", "#", :class => "remove-speaker deletable", :speaker_id => user.id, :speaker_fullname => user.fullname %>
         <% else %>
           &nbsp;
         <% end %>