open_conference_ware 1.0.0.pre1 → 1.0.0.pre2

data/spec/models/open_conference_ware/proposal_spec.rb

@@ -80,7 +80,7 @@ describe OpenConferenceWare::Proposal do
       @proposal.confirm!
       @proposal.should be_confirmed
     end
-    
+
     it "should be possible to decline an accepted proposal" do
       @proposal.status = 'accepted'
       @proposal.decline!
@@ -379,7 +379,7 @@ describe OpenConferenceWare::Proposal do
       @bishoujo = stub_model(Track, title: "Bishoujo")
       @tracks = [@shonen, @bishoujo]
 
-      @naruto = stub_model(Proposal, 
+      @naruto = stub_model(Proposal,
         title: "Naruto",
         track: @shonen,
         status: "proposed",

data/spec/spec_helper.rb

@@ -1,13 +1,21 @@
 require 'simplecov'
-require 'cadre/simplecov'
 require 'coveralls'
 
-SimpleCov.start 'rails' do
-  formatter SimpleCov::Formatter::MultiFormatter[
+formatters = [
     Coveralls::SimpleCov::Formatter,
-    SimpleCov::Formatter::HTMLFormatter,
-    Cadre::SimpleCov::VimFormatter
-  ]
+    SimpleCov::Formatter::HTMLFormatter
+]
+
+
+begin
+  require 'cadre/simplecov'
+  formatters << Cadre::SimpleCov::VimFormatter
+rescue LoadError
+  # Cadre not found, skipping
+end
+
+SimpleCov.start 'rails' do
+  formatter SimpleCov::Formatter::MultiFormatter[*formatters]
 end
 
 # Coveralls.wear!('rails')

data/spec/support/add_all_helpers_to_view.rb

@@ -1,6 +1,6 @@
 module AddAllHelpersToView
   HELPER_PATH = OpenConferenceWare::Engine.root.join('app', 'helpers', 'open_conference_ware', '*.rb')
-  def _all_helper_modules 
+  def _all_helper_modules
     @@_all_helper_modules ||= [
       Dir.glob(HELPER_PATH).map {|f| "OpenConferenceWare::#{File.basename(f, '.rb').camelize}".constantize },
       OpenConferenceWare::Engine.routes.url_helpers

data/spec/support/fixture_shortcuts.rb

@@ -1,5 +1,5 @@
-# Sets up unprefixed shortcuts for namespaced open_conference_ware_* 
-# fixtures, so that specs can still call users(:quentin) instead of 
+# Sets up unprefixed shortcuts for namespaced open_conference_ware_*
+# fixtures, so that specs can still call users(:quentin) instead of
 # open_conference_ware_users(:quentin)
 
 module FixtureShortcuts
@@ -15,4 +15,3 @@ end
 RSpec.configure do |c|
   c.include FixtureShortcuts
 end
-

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

@@ -20,4 +20,3 @@ describe "open_conference_ware/proposals/_room_control.html.erb" do
     end
   end
 end
-

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

@@ -10,21 +10,21 @@ describe "open_conference_ware/proposals/show.html.erb" do
 
     view.stub(:schedule_visible? => true)
   end
-  
+
   %w[accepted confirmed waitlisted rejected junk].each do |status|
     it "should not show the status for #{status} proposals if statuses are not published" do
       @event.proposal_status_published = false
       @proposal.status = status
-      
+
       assign(:event, @event)
       assign(:proposal, @proposal)
       assign(:kind, :proposal)
-    
+
       render
       rendered.should_not have_selector(".#{status}")
     end
   end
-  
+
   it "should show the proposal status for a confirmed proposal if statuses are published" do
     @event.proposal_status_published = true
     @proposal.status = 'confirmed'
@@ -41,11 +41,11 @@ describe "open_conference_ware/proposals/show.html.erb" do
     it "should should not show the status for #{status} proposals even if statuses are published" do
       @event.proposal_status_published = true
       @proposal.status = status
-      
+
       assign(:event, @event)
       assign(:proposal, @proposal)
       assign(:kind, :proposal)
-    
+
       render
       rendered.should_not have_selector(".#{status}")
     end
@@ -125,4 +125,3 @@ describe "open_conference_ware/proposals/show.html.erb" do
     rendered.should_not have_selector(".session_info a[href='#{session_path(other_proposal )}']")
   end
 end
-

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

@@ -16,4 +16,3 @@ describe "open_conference_ware/rooms/index.html.erb" do
     render
   end
 end
-

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

@@ -12,4 +12,3 @@ describe "open_conference_ware/rooms/show.html.erb" do
     render
   end
 end
-

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

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe "open_conference_ware/session_types/edit.html.erb" do
   include OpenConferenceWare::SessionTypesHelper
-  
+
   before(:each) do
     @event = stub_current_event!
     @session_type = stub_model(SessionType,
@@ -13,7 +13,7 @@ describe "open_conference_ware/session_types/edit.html.erb" do
 
   it "should render edit form" do
     render
-    
+
     rendered.should have_selector("form[action='#{OpenConferenceWare.mounted_path(event_session_type_path(@event, @session_type))}'][method='post']") do |node|
       node.should have_selector("input#session_type_title[name='session_type[title]']")
       node.should have_selector("textarea#session_type_description[name='session_type[description]']")
@@ -21,5 +21,3 @@ describe "open_conference_ware/session_types/edit.html.erb" do
     end
   end
 end
-
-

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

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe "open_conference_ware/session_types/index.html.erb" do
   include OpenConferenceWare::SessionTypesHelper
-  
+
   before(:each) do
     @event = stub_current_event!
     assign(:session_types, [
@@ -16,4 +16,3 @@ describe "open_conference_ware/session_types/index.html.erb" do
     render
   end
 end
-

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

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe "open_conference_ware/session_types/new.html.erb" do
   include OpenConferenceWare::SessionTypesHelper
-  
+
   before(:each) do
     @session_type = stub_model(SessionType).as_new_record
     assign(:session_type, @session_type)
@@ -12,7 +12,7 @@ describe "open_conference_ware/session_types/new.html.erb" do
 
   it "should render new form" do
     render
-    
+
     rendered.should have_selector("form[action='#{OpenConferenceWare.mounted_path(event_session_types_path(@event))}'][method=post]") do |node|
       node.should have_selector("input#session_type_title[name='session_type[title]']")
       node.should have_selector("textarea#session_type_description[name='session_type[description]']")
@@ -20,5 +20,3 @@ describe "open_conference_ware/session_types/new.html.erb" do
     end
   end
 end
-
-

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

@@ -15,4 +15,3 @@ describe "open_conference_ware/session_types/show.html.erb" do
     render
   end
 end
-

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

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe "open_conference_ware/tracks/edit.html.erb" do
   include OpenConferenceWare::TracksHelper
-  
+
   before(:each) do
     @event = stub_current_event!
     @track = stub_model(Track,
@@ -14,12 +14,10 @@ describe "open_conference_ware/tracks/edit.html.erb" do
 
   it "should render edit form" do
     render
-    
+
     rendered.should have_selector("form[action='#{OpenConferenceWare.mounted_path(event_track_path(@event, @track))}'][method='post']") do |node|
       node.should have_selector("input#track_title[name='track[title]']")
       node.should have_selector("textarea#track_description[name='track[description]']")
     end
   end
 end
-
-

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

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe "open_conference_ware/tracks/index.html.erb" do
   include OpenConferenceWare::TracksHelper
-  
+
   before(:each) do
     @event = stub_current_event!
 
@@ -53,4 +53,3 @@ describe "open_conference_ware/tracks/index.html.erb" do
     end
   end
 end
-

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

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe "open_conference_ware/tracks/new.html.erb" do
   include OpenConferenceWare::TracksHelper
-  
+
   before(:each) do
     @event = stub_current_event!
 
@@ -15,12 +15,10 @@ describe "open_conference_ware/tracks/new.html.erb" do
 
   it "should render new form" do
     render
-    
+
     rendered.should have_selector("form[action='#{OpenConferenceWare.mounted_path(event_tracks_path(@event))}'][method=post]") do |node|
       node.should have_selector("input#track_title[name='track[title]']")
       node.should have_selector("textarea#track_description[name='track[description]']")
     end
   end
 end
-
-

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

@@ -20,4 +20,3 @@ describe "open_conference_ware/tracks/show.html.erb" do
     rendered.should match(/value for description/)
   end
 end
-

data/spec/views/open_conference_ware/user_favorites/index.html.erb_spec.rb

@@ -26,4 +26,3 @@ describe "open_conference_ware/user_favorites/index.html.erb" do
     rendered.should have_selector("#proposal_row_#{@proposals[1].id}")
   end
 end
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: open_conference_ware
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre1
+  version: 1.0.0.pre2
   prerelease: 6
 platform: ruby
 authors:
@@ -98,81 +98,81 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: RedCloth
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: aasm
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: acts-as-taggable-on
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.4.1
 - !ruby/object:Gem::Dependency
   name: color
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.2
 - !ruby/object:Gem::Dependency
   name: comma
   requirement: !ruby/object:Gem::Requirement
@@ -210,129 +210,129 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.5.2
 - !ruby/object:Gem::Dependency
   name: vpim
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 13.11.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 13.11.11
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: prawn
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: dalli
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.6.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.6.4
 - !ruby/object:Gem::Dependency
   name: dynamic_form
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.4
 - !ruby/object:Gem::Dependency
   name: rinku
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.7.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.7.3
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
@@ -354,193 +354,161 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
-  name: omniauth-openid
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.14.0
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: omniauth-openid
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.3.0
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: cucumber-rails
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: cadre
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.2
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.0
 description: OpenConferenceWare is an open source web application for events and conferences.
   This customizable, general-purpose platform provides proposals, sessions, schedules,
   tracks and more.
@@ -556,12 +524,11 @@ files:
 - .rspec
 - .travis.yml
 - CHANGES.md
-- CONTRIBUTORS.markdown
+- CONTRIBUTORS.md
 - Gemfile
-- Gemfile.lock
 - Guardfile
 - LICENSE.txt
-- README.markdown
+- README.md
 - Rakefile
 - TODO.txt
 - app/assets/images/open_conference_ware/accept.png
@@ -778,7 +745,6 @@ files:
 - app/views/open_conference_ware/users/new.html.erb
 - app/views/open_conference_ware/users/proposals.html.erb
 - app/views/open_conference_ware/users/show.html.erb
-- app/views/open_conference_ware/welcome/test.html.haml
 - bin/rails
 - ci/Gemfile.ci
 - ci/copy_database_config.rb
@@ -825,6 +791,7 @@ 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/views/views_generator.rb
 - lib/open_conference_ware.rb
 - lib/open_conference_ware/dependencies.rb
 - lib/open_conference_ware/engine.rb