open_conference_ware 1.0.0.pre1 → 1.0.0.pre2

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

@@ -1,13 +1,13 @@
-<% 
+<%
 proposal ||= @proposal
 %>
 
 <div id="proposal_schedule_control_container_<%= proposal.id %>" class="proposal_schedule_control_container proposal_control_container">
   <%= form_for proposal do |f| -%>
     <%= select_tag("start_time[date]", options_for_select( proposal.event.dates_for_select, proposal.start_time.try(:strftime, "%Y-%m-%d") ), :id => "start_time_date_#{proposal.id}", :class => 'date' ) %>
-    
+
     <%= select_hour proposal.start_time, {:prefix => 'start_time', :include_blank => true}, :id => "start_time_hour_#{proposal.id}", :class => 'hour' %>
     <%= select_minute proposal.start_time, {:field_name => 'start_time', :minute_step => 5, :include_blank => true}, :id => "start_time_minute_#{proposal.id}", :class => 'minute' %>
-    
+
   <% end -%>
 </div>

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

@@ -23,7 +23,7 @@
   <ul>
     <% for conflict in @schedule.room_conflicts %>
       <li>
-        <em><%= conflict[:item].title %></em> vs. <em><%= conflict[:conflicts_with].title %></em> 
+        <em><%= conflict[:item].title %></em> vs. <em><%= conflict[:conflicts_with].title %></em>
         <% if conflict[:room] %>
           in <%= conflict[:room].name %>
         <% end %>
@@ -81,8 +81,8 @@
 
   <table class='schedule'>
     <% day.sections.each do |section| %>
-      <% 
-        colspan = day.lcm_colspan / section.slices.size 
+      <%
+        colspan = day.lcm_colspan / section.slices.size
         rows = section.lcm_rowspan
       %>
 

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

@@ -204,7 +204,7 @@ show_private_note = (can_edit?(@proposal) || selector?) && ! @proposal.note_to_o
     <% if schedule_visible? && @proposal.start_time %>
       <div class='proposal-scheduling'>
         <b>Scheduled:</b>
-        <%= normalize_time(@proposal, :format => :html) %> 
+        <%= normalize_time(@proposal, :format => :html) %>
         <% if event_rooms? && @proposal.room %>
           in
           <span class='proposal-room'>
@@ -219,7 +219,7 @@ show_private_note = (can_edit?(@proposal) || selector?) && ! @proposal.note_to_o
       </div>
     <% end -%>
   </div>
-  
+
   <% if proposal_excerpts? %>
     <h3>Excerpt</h3>
     <%= preserve_formatting_of @proposal.excerpt %>

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

@@ -1,4 +1,4 @@
-<% 
+<%
 cache "proposals_stats,event_#{@event.slug}" do
   @tracks = @event.tracks
   @session_types = @event.session_types

data/app/views/open_conference_ware/session_types/index.html.erb

@@ -3,7 +3,7 @@
 <% for session_type in @session_types %>
   <h3><%= link_to h(session_type.title), session_type_path(session_type) %></h3>
   <span class="description"><%= display_textile_for session_type.description %></span>
-  
+
   <% if admin? %>
     <div class='record-controls'>
     <%= link_to 'Edit', edit_session_type_path(session_type), :class => "editable" %>

data/app/views/open_conference_ware/tracks/index.html.erb

@@ -9,7 +9,7 @@
 <% for track in @tracks %>
   <h3 class='track block <%= track_css_class(track) %>'><%= link_to h(track.title), track_path(track) %></h3>
   <span class="description"><%= display_textile_for track.description %></span>
-  
+
   <% if admin? %>
     <div class='record-controls'>
     <%= link_to 'Edit', edit_track_path(track), :class => "editable" %>

data/app/views/open_conference_ware/users/_block.html.erb

@@ -53,13 +53,13 @@ only_for_event = local_assigns[:only_for_event]
       <%= display_textile_for user.biography %>
     </div>
   <% end %>
-  
+
   <% if can_edit?(user) %>
     <div class='record-controls'>
       <%= link_to "Edit user", edit_user_path(user), :class => "editable" %>
     </div>
   <% end %>
-  
+
   <% if display_sub_list %>
     <%= render :partial => 'open_conference_ware/proposals/sub_list', :locals => { :container => user, :header_tag => :h4 } %>
   <% else %>

data/app/views/open_conference_ware/users/index.html.erb

@@ -14,7 +14,7 @@
         <% if admin? && user.admin? %>
           (<strong class='admin'>admin</strong>)
         <% end %>
-        <%= link_to(user.label, user_path(user)) %><%= (", " + user.affiliation) unless user.affiliation.blank? %> 
+        <%= link_to(user.label, user_path(user)) %><%= (", " + user.affiliation) unless user.affiliation.blank? %>
       </td>
       <% if admin? %>
         <td nowrap="nowrap">

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

@@ -21,7 +21,7 @@ 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'
-  
+
   ##[ OCW Features ]##
   # Many features of OpenConferenceWare can be toggled via these settings
 
@@ -83,7 +83,7 @@ OpenConferenceWare.configure do |config|
   #
   # OCW can generate links to an external system, such as a wiki or an Etherpad
   # instance, that provides a place for attendees to take notes.
-  
+
   # URL where OCW is installed
   config.app_root_url = 'http://opensourcebridge.org/'
 
@@ -96,7 +96,7 @@ OpenConferenceWare.configure do |config|
   config.session_notes_url_format = '%1$swiki/%2$s/'
 
   ##[ Optional Settings ]##
-  
+
   # Policy agreement to show on the proposal form
   # If an agreement is set, presenters will be required to agree in order to submit a proposal.
   #

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

@@ -30,4 +30,3 @@ Rails.application.config.middleware.use OpenConferenceWare::OmniAuthBuilder do
   # Used to provide easy authentication during development
   provider :developer if %w[development preview].include?(Rails.env)
 end
-

data/lib/generators/open_conference_ware/views/views_generator.rb

@@ -0,0 +1,44 @@
+class OpenConferenceWare::ViewsGenerator < Rails::Generators::Base
+  VIEWS_DIR = OpenConferenceWare::Engine.root.join('app','views')
+  OCW_VIEW_DIRS = Pathname.glob(VIEWS_DIR.join("open_conference_ware","*/")).map{|d| d.basename.to_s } + ["layouts"]
+
+  source_root VIEWS_DIR
+  desc <<-DESC
+Copies OCW's views into your application. By default, all views will be copied.
+
+Optionally, you can pass specific view directories as arguments.
+
+Available directories:
+- #{OCW_VIEW_DIRS.join("\n- ")}
+
+  DESC
+  argument :which_views,
+    type: :array, 
+    default: ["all"],
+    desc: "Which view directories to copy. One or more of: #{OCW_VIEW_DIRS.join(' ')}",
+    banner: "VIEWS TO COPY"
+
+  def copy_views
+    directories_to_copy = if which_views.any?{|d| d == "all"}
+                            OCW_VIEW_DIRS
+                          else
+                            which_views.select{|d| OCW_VIEW_DIRS.include?(d) }
+                          end
+
+    directories_to_copy.each do |dir|
+      view_directory dir
+    end
+  end
+
+  protected
+
+  def view_directory(name)
+    path = if name == "layouts"
+              "layouts/open_conference_ware"
+            else
+              "open_conference_ware/#{name}"
+            end
+
+    directory path, "app/views/#{path}"
+  end
+end

data/lib/open_conference_ware.rb

@@ -29,7 +29,7 @@ module OpenConferenceWare
   self.comments_secret ||= '1234'
 
   # Email
-  
+
   mattr_accessor :default_from_address
   self.default_from_address ||= 'ocw@ocw.local'
 

data/lib/open_conference_ware/dependencies.rb

@@ -35,4 +35,3 @@ require 'defer_proxy'
 require 'ext/string_possessiveize'
 require 'ext/vpim_icalendar_extra_properties'
 require 'ext/color_rgb_serializer_fix'
-

data/lib/open_conference_ware/version.rb

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

data/lib/tasks/mediawiki.rake

@@ -36,7 +36,7 @@ For example:
     def event_wiki_title(event)
       return "Category:#{sanitize_string(event.title)}"
     end
-    
+
     def tracks_wiki_title(event)
       return "Category:#{sanitize_string(event.title)} tracks"
     end
@@ -77,7 +77,7 @@ For example:
         drone.replace_span "description", "#{textilize track.description}"
         drone.save(true)
       end
-      
+
       # Sessions
       event.proposals.confirmed.includes(:event, :track, :session_type).each do |proposal|
         drone = RwikibotPageDrone.new(wiki, session_wiki_title(proposal))

data/lib/tasks/open_conference_ware_tasks.rake

@@ -13,4 +13,3 @@ TO FINISH SETUP
 end
 
 Rake::Task["open_conference_ware:install:migrations"].clear
-

data/lib/tasks/snippets.rake

@@ -1,5 +1,5 @@
 namespace :open_conference_ware do
-  namespace :snippets do 
+  namespace :snippets do
     desc "Load initial snippets of text. Use FORCE environmental variable to avoid prompt if these are already present."
     task :reload => ["environment"] do
       replace = false

data/open_conference_ware.gemspec

@@ -27,41 +27,39 @@ Gem::Specification.new do |s|
   s.add_dependency "rails-observers", "~> 0.1.2"
 
   # Authentication
-  s.add_dependency "omniauth", "~> 1.1.4"
+  s.add_dependency "omniauth",            '~> 1.1.4'
 
-  s.add_dependency "hashery"
+  s.add_dependency "hashery",             '~> 2.1.0'
 
-  s.add_dependency 'RedCloth'
-  s.add_dependency 'aasm'
-  s.add_dependency 'acts-as-taggable-on'
-  s.add_dependency 'color'
+  s.add_dependency 'RedCloth',            '~> 4.2.0'
+  s.add_dependency 'aasm',                '~> 3.0.0'
+  s.add_dependency 'acts-as-taggable-on', '~> 2.4.1'
+  s.add_dependency 'color',               '~> 1.4.2'
   s.add_dependency 'comma',               '~> 3.0'
-  s.add_dependency 'gchartrb',            '~> 0.8.0' #, :require => 'google_chart'
-  s.add_dependency 'paperclip'
-  s.add_dependency 'vpim'
-  s.add_dependency 'nokogiri'
-  s.add_dependency 'prawn'
-  s.add_dependency 'dalli'
-  s.add_dependency "dynamic_form"
-  s.add_dependency 'rinku' #, :require => 'rails_rinku'
+  s.add_dependency 'gchartrb',            '~> 0.8.0'
+  s.add_dependency 'paperclip',           '~> 3.5.2'
+  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'
 
   # Assets
-  s.add_dependency 'jquery-rails'
-  s.add_dependency 'sass-rails', " ~> 4.0.0"
-  s.add_dependency 'uglifier'
+  s.add_dependency 'jquery-rails',        '~> 3.0.0'
+  s.add_dependency 'sass-rails',          '~> 4.0.0'
+  s.add_dependency 'uglifier',            '~> 2.3.0'
 
   # Development
-  s.add_development_dependency "sqlite3"
+  s.add_development_dependency "sqlite3", '~> 1.3.0'
 
   # Testing
-  s.add_development_dependency 'omniauth-openid'
-  s.add_development_dependency 'rspec-rails'
-  s.add_development_dependency 'capybara'
-  s.add_development_dependency 'factory_girl_rails'
-  s.add_development_dependency 'database_cleaner'
-  s.add_development_dependency 'cucumber-rails'
-  s.add_development_dependency 'guard-rspec'
-  s.add_development_dependency 'simplecov'
-  s.add_development_dependency 'cadre'
-  s.add_development_dependency 'coveralls'
+  s.add_development_dependency 'rspec-rails',         '~> 2.14.0'
+  s.add_development_dependency 'omniauth-openid',     '~> 1.0.0'
+  s.add_development_dependency 'capybara',            '~> 2.2.0'
+  s.add_development_dependency 'factory_girl_rails',  '~> 4.3.0'
+  s.add_development_dependency 'database_cleaner',    '~> 1.2.0'
+  s.add_development_dependency 'cucumber-rails',      '~> 1.4.0'
+  s.add_development_dependency 'simplecov',           '~> 0.8.2'
+  s.add_development_dependency 'coveralls',           '~> 0.7.0'
 end

data/spec/controllers/open_conference_ware/application_controller_spec.rb

@@ -69,14 +69,14 @@ describe OpenConferenceWare::ApplicationController do
           proposal = proposals(:quentin_widgets)
           can_edit?(proposal).should be_true
         end
-        
+
         it "should allow user to edit own before a status has been set" do
           login_as :quentin
           proposal = proposals(:quentin_widgets)
           proposal.status = 'proposed'
           can_edit?(proposal).should be_true
         end
-        
+
         it "should not allow user to edit own once a status has been set" do
           login_as :quentin
           proposal = proposals(:quentin_widgets)

data/spec/controllers/open_conference_ware/events_controller_spec.rb

@@ -99,4 +99,3 @@ describe OpenConferenceWare::EventsController, "when displaying events" do
 
   end
 end
-

data/spec/controllers/open_conference_ware/proposals_controller_spec.rb

@@ -380,10 +380,10 @@ describe OpenConferenceWare::ProposalsController do
         @key = 123
         @event.stub(:proposal_status_published?).and_return(opts[:published])
         stub_current_event!(event: @event)
-        
+
         @users = []
         @users.stub(:by_name).and_return([])
-        
+
         @proposal = stub_model(Proposal, id: @key, event: @event, track: @event.tracks.empty? ? nil : Track.first, users: @users)
         @proposal.stub(:confirmed?).and_return(opts[:confirmed])
         controller.stub(:get_proposal_and_assignment_status).and_return([@proposal, :assigned_via_param])
@@ -791,7 +791,7 @@ describe OpenConferenceWare::ProposalsController do
             proposal = assigns(:proposal)
             proposal.errors.should_not be_empty
             proposal.should_not be_valid
-            proposal.id.should be_nil            
+            proposal.id.should be_nil
           end
         end
       end
@@ -858,13 +858,13 @@ describe OpenConferenceWare::ProposalsController do
       @proposal = proposals(:quentin_widgets)
       @inputs = @proposal.attributes
     end
-    
+
     it "should prevent editing of title when proposal titles are locked" do
       @event = stub_current_event!
       @event.stub(:proposal_titles_locked?).and_return(true)
       @controller.stub(:get_proposal_and_assignment_status).and_return(@proposal)
       @proposal.stub(:event).and_return(@event)
-      
+
       assert_update(:quentin, id: @proposal.id, title: 'OMG') do
         @proposal.reload
         @proposal.title.should_not == 'OMG'

data/spec/controllers/open_conference_ware/rooms_controller_spec.rb

@@ -4,12 +4,12 @@ describe OpenConferenceWare::RoomsController do
   include OpenConferenceWare::RoomsHelper
   fixtures :all
   routes { OpenConferenceWare::Engine.routes }
-  
+
   before do
     @event = stub_current_event!(event: events(:open))
     @room = create(:room, event: @event)
   end
-    
+
   describe "responding to GET index" do
 
     it "should redirect to the rooms for the current event if none is given" do
@@ -32,7 +32,7 @@ describe OpenConferenceWare::RoomsController do
         response.body.should == "generated XML"
       end
     end
-    
+
   end
 
   describe "responding to GET show" do
@@ -42,7 +42,7 @@ describe OpenConferenceWare::RoomsController do
       get :show, id: "37", event_id: @event.to_param
       assigns(:room).should equal(@room)
     end
-    
+
     describe "with mime type of xml" do
 
       it "should render the requested room as xml" do
@@ -54,7 +54,7 @@ describe OpenConferenceWare::RoomsController do
       end
 
     end
-    
+
     describe "with an invalid room id" do
       it "should redirect to the rooms index" do
         Room.should_receive(:find).with("invalid").and_raise(ActiveRecord::RecordNotFound)
@@ -62,9 +62,9 @@ describe OpenConferenceWare::RoomsController do
         response.should redirect_to(event_rooms_path(events(:open)))
       end
     end
-    
+
   end
-  
+
   describe "as an admin" do
     before(:each) do
       login_as(:aaron)
@@ -74,7 +74,7 @@ describe OpenConferenceWare::RoomsController do
       before do
         @new_room = Room.new
       end
-    
+
       it "should expose a new room as @room" do
         Room.should_receive(:new).and_return(@new_room)
         get :new, event_id: @event.to_param
@@ -84,7 +84,7 @@ describe OpenConferenceWare::RoomsController do
     end
 
     describe "responding to GET edit" do
-    
+
       it "should expose the requested room as @room" do
         Room.should_receive(:find).with("37").and_return(@room)
         get :edit, id: "37", event_id: @event.to_param
@@ -99,7 +99,7 @@ describe OpenConferenceWare::RoomsController do
           @valid_params = extract_valid_params(@room)
           post :create, room: @valid_params, event_id: @event.to_param
         end
-      
+
         it "should expose a newly created room as @room" do
           extract_valid_params(assigns(:room)).should eq(@valid_params)
         end
@@ -108,7 +108,7 @@ describe OpenConferenceWare::RoomsController do
           response.should redirect_to(event_rooms_path(@event))
         end
       end
-    
+
       describe "with invalid params" do
         before do
           post :create, room: {capacity: 3}, event_id: @event.to_param
@@ -121,9 +121,9 @@ describe OpenConferenceWare::RoomsController do
         it "should re-render the 'new' template" do
           response.should render_template('new')
         end
-      
+
       end
-    
+
     end
 
     describe "responding to PUT update" do
@@ -146,7 +146,7 @@ describe OpenConferenceWare::RoomsController do
         end
 
       end
-    
+
       describe "with invalid params" do
         before do
           @room.should_receive(:update_attributes).and_return(false)
@@ -177,7 +177,7 @@ describe OpenConferenceWare::RoomsController do
         @room.should_receive(:destroy)
         delete :destroy, id: "37", event_id: @event.to_param
       end
-  
+
       it "should redirect to the rooms list" do
         Room.stub(:find).and_return(@room)
         delete :destroy, id: "1", event_id: @event.to_param