lib/tasks/development_support.rake @@ -24,11 +24,13 @@ class EventsController < ApplicationController end def new - @event = Event.new_event(:kind => "colloquium", :start => Time.now, :length => 1) + start = Chronic.parse("tomorrow at 3:30pm") + stop = start + 1.hour + @event = Event.new_event(:kind => "Colloquium", :start => start, :stop => stop) end def create - @event = Event.new_event(params[:event]) + @event = Event.new_event(params[:colloquium] || params[:conference]) if @event.save redirect_to events_path else app/controllers/events_controller.rb @@ -61,7 +61,7 @@ class Event < ActiveRecord::Base case params[:kind].downcase when "colloquium" Colloquium.new(params) - when "conference": + when "conference" Conference.new(params) else raise "Invalid event type #{params[:kind]}" app/models/event.rb @@ -4,12 +4,9 @@ </ul> <% form_for @event do |form| -%> + <%= form.hidden_field :kind %> <table border="0" summary="event form"> <tr> - <td><%= form.label :kind, "Type of event" %></td> - <td><%= form.select :kind, ["Colloquium", "Conference"] %></td> - </tr> - <tr> <td><%= form.label :title %></td> <td><%= form.text_field :title %></td> </tr> @@ -35,7 +32,8 @@ </tr> <tr> <td><%= form.label :length %></td> - <td><%= form.text_field :length, :size => 3 %> <span id="scale"><%= @event.scale %></span></td> + <td><%= form.text_field :length, :size => 3 %> + <span id="scale"><%= @event.scale %></span></td> </tr> <tr> <td></td> app/views/events/_form.html.erb @@ -3,32 +3,36 @@ <div id="administration"> <h2>News and Events</h2> - <img src="/images/newspaper-icon.png" /> + <img src="/images/newspaper-icon.png"/> <ul id="news_administration"> <li><%= link_to 'Create news item', new_newsitem_path %></li> - <li><%= link_to 'Create event', new_event_path %></li> + <li>Events</li> + <ul> + <li><%= link_to 'Create new colloquium', new_event_path(:kind => "colloquium") %></li> + <li><%= link_to 'Create new conference', new_event_path(:kind => "conference") %></li> + </ul> </ul> <h2>Webpages and Other Documents</h2> - <img src="/images/page-icon.png" /> + <img src="/images/page-icon.png"/> <ul id="content_administration"> <li><%= link_to 'List', pages_path %></li> <li><%= link_to 'Create', new_page_path %></li> </ul> <h2>Image Album</h2> - - <img src="/images/images-icon.png" /> + + <img src="/images/images-icon.png"/> <ul id="album_administration"> - <li><%= link_to 'List images', images_path %></li> - <li><%= link_to 'Add image', new_image_path %></li> + <li><%= link_to 'List images', images_path %></li> + <li><%= link_to 'Add image', new_image_path %></li> </ul> - + <h2>Courses</h2> - + <ul id="course_administration"> - <li><%= link_to 'List', :controller => 'curriculum', :action => 'list_courses' %></li> - <li><%= link_to 'Create', :controller => 'curriculum', :action => 'new_course' %></li> + <li><%= link_to 'List', :controller => 'curriculum', :action => 'list_courses' %></li> + <li><%= link_to 'Create', :controller => 'curriculum', :action => 'new_course' %></li> </ul> </div> \ No newline at end of file app/views/home/administrate.html.erb @@ -19,9 +19,10 @@ Rails::Initializer.run do |config| } # gems - config.gem "RedCloth", :lib => 'redcloth' #, :version => ">= 4.0" + config.gem "RedCloth", :lib => 'redcloth' config.gem "imagesize", :lib => 'image_size' - config.gem 'rcov' + config.gem 'rcov' + config.gem "chronic", :version => ">= 0.2.3" end # time formats config/environment.rb @@ -1,4 +1,4 @@ -# IMPORTANT: This file was generated by Cucumber 0.4.2 +# IMPORTANT: This file was generated by Cucumber 0.4.3 # Edit at your own peril - it's recommended to regenerate this file # in the future when you upgrade to a newer version of Cucumber. @@ -19,8 +19,9 @@ config.action_controller.allow_forgery_protection = false # ActionMailer::Base.deliveries array. config.action_mailer.delivery_method = :test -config.gem 'cucumber', :lib => false, :version => '>=0.4.2' unless File.directory?(File.join(Rails.root, 'vendor/plugins/cucumber')) -config.gem 'webrat', :lib => false, :version => '>=0.5.0' unless File.directory?(File.join(Rails.root, 'vendor/plugins/webrat')) -config.gem 'rspec', :lib => false, :version => '>=1.2.8' unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec')) -config.gem 'rspec-rails', :lib => false, :version => '>=1.2.7.1' unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec-rails')) +config.gem 'cucumber', :lib => false, :version => '>=0.4.3' unless File.directory?(File.join(Rails.root, 'vendor/plugins/cucumber')) +config.gem 'webrat', :lib => false, :version => '>=0.5.3' unless File.directory?(File.join(Rails.root, 'vendor/plugins/webrat')) +config.gem 'rspec', :lib => false, :version => '>=1.2.9' unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec')) +config.gem 'rspec-rails', :lib => false, :version => '>=1.2.9' unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec-rails')) +config.gem 'chronic', :version => '>=0.2.3' config/environments/cucumber.rb @@ -16,3 +16,14 @@ config.action_view.debug_rjs = true # Don't care if the mailer can't send config.action_mailer.raise_delivery_errors = false config.gem 'jscruggs-metric_fu', :lib => 'metric_fu', :source => 'http://gems.github.com' +config.gem 'bullet', :source => 'http://gemcutter.org' + +config.after_initialize do + Bullet.enable = true + Bullet.alert = true + Bullet.bullet_logger = true + Bullet.console = true + Bullet.growl = true + Bullet.rails_logger = true + Bullet.disable_browser_cache = true +end config/environments/development.rb @@ -8,17 +8,16 @@ Feature: managing events When I go to the new event page Then I should be on the login page - @wip Scenario: add a colloquium Given I am logged in as an editor - When I am on the new event page - And I select "Colloquium" from "event[kind]" - And I fill in "event[title]" with "Amazing Ruby Code" - And I fill in "event[subtitle]" with "Check It Out!" - And I fill in "event[presenter]" with "Charles M. Ruby" + When I am on the administration page + And I follow "Create new colloquium" + And I fill in "Title" with "Amazing Ruby Code" + And I fill in "Subtitle" with "Check It Out!" + And I fill in "Presenter" with "Charles M. Ruby" And I fill in "Location" with "Room of Presentations" And I select tomorrow at "16:00" as the date and time - And I fill in "event[length]" with "1.5" + And I fill in "Length" with "1.5" And I press "Create" Then I should be on the list of events And I should see "Amazing Ruby Code: Check It Out!" @@ -29,11 +28,11 @@ Feature: managing events @wip Scenario: add a conference Given I am logged in as an editor - When I am on the new event page - And I select "Conference" from "event[kind]" - And I fill in "event[title]" with "Meeting of the Railers" + When I am on the administration page + And I follow "Create new conference" + And I fill in "Title" with "Meeting of the Railers" And I select tomorrow as the date - And I fill in "event[length]" with "2" + And I fill in "Length" with "2" And I press "Create" Then I should be on the list of events And I should see "Meeting of the Railers" features/event_management.feature @@ -14,10 +14,7 @@ Feature: the home page And I should see "sploosh!" Scenario: see the home page with an event today - Given the following pages - | identifier | title | content | - | _home_page | does not matter | some content | - | _home_splash | does not matter | sploosh! | + Given the subpages for the home page And the following colloquia | title | when | | Get Real | tomorrow | @@ -30,24 +27,27 @@ Feature: the home page Then I should see "Get Real" Scenario: see the home page with an event tomorrow - Given the following pages - | identifier | title | content | - | _home_page | does not matter | some content | - | _home_splash | does not matter | sploosh! | + Given the subpages for the home page And the following colloquia - | title | when | + | title | when | | Get Real | today | When I go to the homepage - Then I should be on the homepage + Then I should see "Get Real" And I should see "Colloquium today!" And I should not see "Colloquium this week!" - And I should see "Get Real" + + Scenario:see the home page with a conference today and tomorrow + Given the subpages for the home page + And the following conferences + | title | start | stop | + | GLSEC | yesterday | tomorrow | + When I go to the homepage + Then I should see "GLSEC" + And I should see "Conference today!" + And I should not see "Conference this week!" Scenario: see the home page with certain events - Given the following pages - | identifier | title | content | - | _home_page | does not matter | some content | - | _home_splash | does not matter | sploosh! | + Given the subpages for the home page And the following colloquia | title | when | | Old West | yesterday | @@ -61,10 +61,7 @@ Feature: the home page And I should see "The Future" Scenario: see the home page with some news - Given the following pages - | identifier | title | content | - | _home_page | does not matter | some content | - | _home_splash | does not matter | sploosh! | + Given the subpages for the home page And the following news items | headline | teaser | content | | News! | na na! | No news is good news. | @@ -78,10 +75,9 @@ Feature: the home page And I should see "No news is good news." Scenario: try every page on the main menu + Given the subpages for the home page Given the following pages | identifier | title | content | - | _home_page | does not matter | some content | - | _home_splash | does not matter | sploosh! | | about_us | All About Us | About all us all. | | academics | Academics | Academe me! | | students | Students! | Students rule like nothing else. | features/homepage_for_users.feature @@ -44,16 +44,10 @@ module EventHelpers end def create_conference(hash) - hash = { "start" => 2.days.from_now.to_s(:db), - "stop" => 5.days.from_now.to_s(:db), - "descriptor" => "conference" }.merge(hash) - case hash["when"] - when "yesterday" - hash = hash.merge("start" => 5.days.ago.to_s(:db), "stop" => 1.day.ago.to_s(:db)) - end - Conference.create!(:title => hash["title"], - :start => hash["start"], :stop => hash["stop"], - :descriptor => hash["descriptor"]) + hash = { "descriptor" => "conference" }.merge(hash) + hash["start"] = (Chronic.parse(hash["start"]) || 2.days.from_now).to_s(:db) + hash["stop"] = (Chronic.parse(hash["stop"]) || 2.days.from_now).to_s(:db) + Conference.create!(hash) end end World(EventHelpers) features/step_definitions/event_steps.rb @@ -4,10 +4,15 @@ end Given /^the following pages$/ do |table| table.hashes.each do |hash| - Page.create!(hash) + Page.create!({ :title => "NO TITLE GIVEN" }.merge(hash)) end end +Given /^the subpages for the home page$/ do + Page.create!(:identifier => "_home_page", :title => "not needed", :content => "whatever") + Page.create!(:identifier => "_home_splash", :title => "not needed", :content => "whatever") +end + Then /^I should create (\w+) page$/ do |identifier| URI.parse(current_url).path.should == "/pages/new/#{identifier}" response.should have_selector("input#page_identifier", :value => identifier) features/step_definitions/page_steps.rb @@ -1,4 +1,4 @@ -# IMPORTANT: This file was generated by Cucumber 0.4.2 +# IMPORTANT: This file was generated by Cucumber 0.4.3 # Edit at your own peril - it's recommended to regenerate this file # in the future when you upgrade to a newer version of Cucumber. # Consider adding your own code to a new file instead of editing this one. features/step_definitions/webrat_steps.rb @@ -1,4 +1,4 @@ -# IMPORTANT: This file was generated by Cucumber 0.4.2 +# IMPORTANT: This file was generated by Cucumber 0.4.3 # Edit at your own peril - it's recommended to regenerate this file # in the future when you upgrade to a newer version of Cucumber. # Consider adding your own code to a new file instead of editing this one. features/support/env.rb @@ -1,10 +1,12 @@ -if Cucumber::VERSION != '0.4.2' +require 'cucumber/formatter/ansicolor' +extend Cucumber::Formatter::ANSIColor +if Cucumber::VERSION != '0.4.3' warning = <<-WARNING -(::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) +#{red_cukes(15)} - (::) R O T T E N C U C U M B E R A L E R T (::) + #{red_cukes(1)} R O T T E N C U C U M B E R A L E R T #{red_cukes(1)} -Your #{__FILE__.gsub(/version_check.rb$/, 'env.rb')} file was generated with Cucumber 0.4.2, +Your #{__FILE__.gsub(/version_check.rb$/, 'env.rb')} file was generated with Cucumber 0.4.3, but you seem to be running Cucumber #{Cucumber::VERSION}. If you're running an older version than #{Cucumber::VERSION}, just upgrade your gem. If you're running a newer version than #{Cucumber::VERSION} you should: @@ -18,11 +20,11 @@ version than #{Cucumber::VERSION} you should: If you get prompted to replace a file, hit 'd' to see the difference. When you're sure you have captured any personal edits, confirm that you want to overwrite #{__FILE__.gsub(/version_check.rb$/, 'env.rb')} by pressing 'y'. Then reapply any -personal changes that may have been overwritten. +personal changes that may have been overwritten, preferably in separate files. This message will then self destruct. -(::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) +#{red_cukes(15)} WARNING warn(warning) at_exit {warn(warning)} features/support/version_check.rb @@ -155,7 +155,7 @@ p.img-caption { /***********************/ #administration img { - float: left; + float: right; width: 128px; } public/stylesheets/department.css @@ -71,9 +71,14 @@ describe EventsController do user_fixtures it "should have a new action with a form" do - Timecop.freeze(Time.now) event = mock("event") - Event.should_receive(:new_event).with(:kind => "colloquium", :start => Time.now, :length => 1).and_return(event) + start = mock("start") + stop = mock("stop") + + Chronic.should_receive(:parse).with("tomorrow at 3:30pm").and_return(start) + start.should_receive(:+).with(1.hour).and_return(stop) + Event.should_receive(:new_event). + with(:kind => "Colloquium", :start => start, :stop => stop).and_return(event) get :new, {}, user_session(:edit) @@ -87,11 +92,23 @@ describe EventsController do response.should redirect_to(:controller => 'users', :action => 'login') end - it "should create a new event" do - params = { :event => mock("event params") } + it "should create a new colloquium" do + params = { :colloquium => mock("event params") } + event = mock("event") + + Event.should_receive(:new_event).with(params[:colloquium]).and_return(event) + event.should_receive(:save).and_return(true) + + post :create, params, user_session(:edit) + assigns[:event].should eql(event) + response.should redirect_to(:action => "index") + end + + it "should create a new conference" do + params = { :conference => mock("event params") } event = mock("event") - Event.should_receive(:new_event).with(params[:event]).and_return(event) + Event.should_receive(:new_event).with(params[:conference]).and_return(event) event.should_receive(:save).and_return(true) post :create, params, user_session(:edit) @@ -100,10 +117,10 @@ describe EventsController do end it "should fail to create a new event" do - params = { :event => mock("event params") } + params = { :colloquium => mock("event params") } event = mock("event") - Event.should_receive(:new_event).with(params[:event]).and_return(event) + Event.should_receive(:new_event).with(params[:colloquium]).and_return(event) event.should_receive(:save).and_return(false) post :create, params, user_session(:edit) spec/controllers/events_controller_spec.rb @@ -2,7 +2,29 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper') describe "/events/_form.html.erb" do - it "should view a form for a new event" do + it "should view a form for a new colloquium" do + event = mock_model(Event, :new_record? => true, :kind => "Colloquium", :title => "the title", + :subtitle => "the subtitle", + :presenter => 'the presenter', :location => "somewhere", + :description => "description!", + :start => Time.now, :length => 1, :scale => "days") + assigns[:event] = event + + render "events/_form" + + response.should have_selector("form", :action => "/events", :method => "post") do |form| + form.should have_selector "input#event_title" + form.should have_selector "input#event_subtitle" + form.should have_selector "input#event_presenter" + form.should have_selector "input#event_location" + form.should have_selector "textarea#event_description" + form.should have_selector "input#event_length" + form.should have_selector("#scale", :content => "days") + form.should have_selector "input[type=submit]" + end + end + + it "should view a form for a new conference" do event = mock_model(Event, :new_record? => true, :kind => "Conference", :title => "the title", :subtitle => "the subtitle", :presenter => 'the presenter', :location => "somewhere", @@ -13,11 +35,6 @@ describe "/events/_form.html.erb" do render "events/_form" response.should have_selector("form", :action => "/events", :method => "post") do |form| - form.should have_selector("#event_kind") do |type| - type.should have_selector("option", :count => 2) - type.should have_selector("option", :content => "Colloquium") - type.should have_selector("option", :content => "Conference") - end form.should have_selector "input#event_title" form.should have_selector "input#event_subtitle" form.should have_selector "input#event_presenter" spec/views/events/_form.html.erb_spec.rb @@ -14,7 +14,8 @@ describe "/home/administrate.html.erb" do response.should have_tag('h2', "News and Events") response.should have_tag("ul#news_administration") do with_tag("a[href=/newsitems/new]", /create news item/i) - with_tag("a[href=/events/new]", /create event/i) + with_tag("a[href=/events/new?kind=colloquium]", /create new colloquium/i) + with_tag("a[href=/events/new?kind=conference]", /create new conference/i) end end spec/views/home/administrate.html.erb_spec.rb lib/tasks/upgrade.rake bc8187fab170d9631e84b73c948eb098ff65a4a7 Jeremy D. Frens jdfrens@gmail.com http://github.com/jdfrens/calvincs/commit/ff1754df643a68ba79abb24c8ecb35a79628f2b6 ff1754df643a68ba79abb24c8ecb35a79628f2b6 2009-11-08T13:11:20-08:00 2009-11-08T13:11:20-08:00 adding support for some gems and performance issues 22c93813d8d74cb4baf9f781ed8790216ea1a772 Jeremy D. Frens jdfrens@gmail.com