event_calendar_engine 0.2.11 → 0.2.13

data/Gemfile.lock

@@ -8,7 +8,7 @@ GIT
 PATH
   remote: .
   specs:
-    event_calendar_engine (0.2.11)
+    event_calendar_engine (0.2.13)
       RedCloth
       RedCloth
       acts_as_revisable

data/VERSION

@@ -1 +1 @@
-0.2.11
+0.2.13

data/app/controllers/events_controller.rb

@@ -3,6 +3,8 @@ class EventsController < EventCalendar::ApplicationController
   # before_filter :load_and_authorize_current_user, :except => [:index, :show]
   before_filter :parse_dates_from_params, :only => [:create, :update]
   
+  include EventsHelper
+  
   private
     def events_to_json
       return {} unless @events
@@ -10,10 +12,11 @@ class EventsController < EventCalendar::ApplicationController
         {
           :id => event.id,
           :title => event.name,
+          :eventType => event.event_type,
           :start => event.start_on.in_time_zone(event.timezone),
           :end => event.end_on.in_time_zone(event.timezone),
           :url => event_path(event),
-          :className => "event_#{event.event_type.gsub(' ', '_')}",
+          :className => event_type_css_class(event.event_type),
           :allDay => !event.one_day?,
           :details => render_to_string(:partial => 'events/details', :object => event)
         }
@@ -54,6 +57,7 @@ class EventsController < EventCalendar::ApplicationController
   # GET /events
   # GET /events.xml
   def index
+    @event_types = Event.event_types
     if params[:start] && params[:end]
       @events = Event.between(Time.at(params[:start].to_i), Time.at(params[:end].to_i))
       unless params[:event_type].blank?

data/app/helpers/events_helper.rb

@@ -3,7 +3,7 @@ module EventsHelper
     [
       h(event.name),
       event_abbrev_date(event),
-      event_type_label(event),
+      event_type_label(event.event_type),
       event_details_link(event)
     ].
     join(" ").html_safe
@@ -22,9 +22,23 @@ module EventsHelper
     "<span class=\"fake_button\">#{link_to('Details', send(path, event))}</span>".html_safe
   end
   
-  def event_type_label(event)
-    event_type_css_class = event.event_type.parameterize('_').downcase +
-                           "_category_label"
-    "<span class=\"category_label #{h(event_type_css_class)}\">#{h(event.event_type)}</span>".html_safe
+  def event_type_label(event_type)
+    "<span class=\"category_label #{event_type_css_class(event_type)}\">#{h(event_type)}</span>".html_safe
+  end
+  
+  def event_type_css_class(event_type)
+    css_class = event_type.parameterize('_').downcase
+    h("#{css_class}_event")
+  end
+  
+  def event_type_legend(wrapper_css_class, wrapper_css_style='')
+    return '' unless @event_types.any?
+    
+    content_tag :ul, :class => "#{wrapper_css_class} legend", :style => wrapper_css_style do
+      @event_types.map do |event_type|
+        css_class = event_type_css_class(event_type)
+        content_tag :li, h(event_type), :class => "#{css_class} category_label"
+      end.join("\n").html_safe
+    end
   end
 end

data/app/models/event.rb

@@ -23,6 +23,7 @@ class Event < ActiveRecord::Base
     where(["start_on BETWEEN ? AND ? OR end_on BETWEEN ? AND ?",
       start_datetime, end_datetime, start_datetime, end_datetime])
   }
+  scope :existing_event_types, select('DISTINCT event_type')
   
   validate :sane_dates
   
@@ -54,8 +55,8 @@ class Event < ActiveRecord::Base
   protected
   public  
     
-    def self.existing_event_types
-      select('DISTINCT event_type').map(&:event_type).reject { |ev| ev.blank? }.sort
+    def self.event_types
+      existing_event_types.map(&:event_type).reject { |ev| ev.blank? }.sort
     end
     
     def participants

data/app/views/events/index.html.erb

@@ -15,17 +15,22 @@
 
 <div style="clear:both;"></div>
 
-<div id="event_calendar">
+<div id="event_list" class="event_list">
+  <%= render :partial => 'list' %>
+</div>
+<div id="event_calendar" class="event_calendar" style="display: none;">
   <%= render :partial => 'calendar' %>
 </div>
-<div id="event_list" style="display: none;">
-  <%= render :partial => 'list' %>
+
+<div style="clear: both; float: right;">
+  <%= event_type_legend("event_list") %>
+  <%= event_type_legend('event_calendar', 'display: none;') %>
 </div>
 
-<div style="clear:both;">
+<div>
   Events filter: 
   <%= form_tag events_path, :method => :get, :style => 'display:inline' do %>
-    <%= select_tag :event_type, '<option value="">all</option>'.html_safe + options_for_select(Event.existing_event_types, params[:event_type]) %>
+    <%= select_tag :event_type, '<option value="">all</option>'.html_safe + options_for_select(@event_types, params[:event_type]) %>
     <%= submit_tag "go" %>
   <% end %>
 </div>

data/public/javascripts/event_calendar/event_calendar.js

@@ -3,7 +3,7 @@ var updateEventDescription = function(event, jsEvent) {
   $("#event_quick_description").empty();
   $("#event_quick_description").append(
     $("<h3/>").append(
-      $('<a/>', { text : event.title, href : event.url })
+      $('<a/>', { text : event.title+' ('+event.eventType+')', href : event.url })
     )
   ).append(event.details);
   $("#event_quick_description").show();

data/public/javascripts/event_calendar/event_calendar_behaviors.js

@@ -189,13 +189,17 @@ ecDynamicForm = $.klass({
 });
 
 var EventView = $.klass({
+  initialize: function() {
+    $('.event_list').hide();
+    $('.event_calendar').show();
+  },
   onclick: function(e) {
     if( this.element.hasClass('calendar') ) {
-      $('#event_list').hide();
-      $('#event_calendar').show();
+      $('.event_list').hide();
+      $('.event_calendar').show();
     } else if( this.element.hasClass('list') ) {
-      $('#event_calendar').hide();
-      $('#event_list').show();
+      $('.event_calendar').hide();
+      $('.event_list').show();
     }
   }
 });

data/public/stylesheets/event_calendar/fullcalendar_changes.css

@@ -1,7 +1,7 @@
 /* resizable */
 /* taken directly from fullcalendar.css - here cuz blueprint's compress.rb
   does not properly compress this style and it results in a syntax error
-  preventing the subsequent styles to not get defined */
+  preventing subsequent styles from being defined */
 .fc .ui-resizable-handle {
 	display: block;
 	position: absolute;
@@ -12,10 +12,32 @@
 
 .fc td { text-align: center; }
 
-.event_conference,
-  .fc-agenda .event_conference .fc-event-time,
-  .event_conference a { background-color: #0A0; border-color: #090; color: white; }
+.fc-event a:link,
+.fc-event a:visited,
+.fc-event a:active {
+  color: white;
+}
 
-.event_meeting,
-  .fc-agenda .event_meeting .fc-event-time,
-  .event_meeting a { background-color: #C00; border-color: #900; color: white; }
+.conference_event,
+  .conference_event a:link,
+  .conference_event a:visited,
+  .conference_event a:active {
+  background-color: #0A0;
+  border-color: #090;
+}
+
+.meeting_event,
+  .meeting_event a:link,
+  .meeting_event a:visited,
+  .meeting_event a:active {
+  background-color: #C00;
+  border-color: #900;
+}
+
+.training_event,
+  .training_event a:link,
+  .training_event a:visited,
+  .training_event a:active {
+  background-color: #F30;
+  border-color: #003;
+}

data/spec/controllers/events_controller_spec.rb

@@ -5,9 +5,11 @@ describe EventsController do
   let(:event) do
     mock_model(Event, {
       :name => 'Some Event',
+      :event_type => 'Meeting',
       :start_on => 4.hours.from_now,
       :start_time= => 4.hours.from_now,
-      :end_on => Date.tomorrow,
+      :end_on => 24.hours.from_now,
+      :one_day? => true,
       :timezone => 'Pacific Time (US & Canada)',
       :description => 'Some Description',
       :location => 'Some City',
@@ -37,11 +39,32 @@ describe EventsController do
       end
     end
     
-    describe "GET index as json" do
-      it "renders @events as json" do
-        subject.stub(:between).and_return([event])
-        get :index, :format => 'js'
-        response.should be_success
+    describe "GET index as JSON" do
+      context "no @events are found" do
+        it "renders empty JSON container" do
+          subject.stub(:between){ [] }
+          get :index, :format => 'js'
+          response.body.should eq("{}")
+        end
+      end
+      context "some @events are found" do
+        before(:each) do
+          subject.stub(:between){ [event] }
+        end
+        it "renders a collection of JSON containers" do
+          get :index, :start => Time.now,
+                      :end => Time.now,
+                      :format => 'js'
+          response.body.should =~ /^\[\{.*\}\]$/
+        end
+        %w(id title eventType start end url className allDay details).each do |json_key|
+          it "adds #{json_key} to rendered JSON" do
+            get :index, :start => Time.now,
+                        :end => Time.now,
+                        :format => 'js'
+            response.body.should include("\"#{json_key}\":")
+          end
+        end
       end
     end
 

data/spec/models/event_spec.rb

@@ -70,7 +70,7 @@ describe Event do
   it "should find event types" do
     Event.create!(@valid_attributes)
     Event.create!(@valid_attributes.merge :event_type => 'Conference')
-    Event.existing_event_types.should == ['Conference', 'Meeting']
+    Event.event_types.should == ['Conference', 'Meeting']
   end
   
   it "should create a new version when an attribute is updated" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: event_calendar_engine
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 2
-  - 11
-  version: 0.2.11
+  - 13
+  version: 0.2.13
 platform: ruby
 authors: 
 - Jason LaPier
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-06 00:00:00 -07:00
+date: 2011-04-13 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -1241,8 +1241,204 @@ dependencies:
   type: :development
   requirement: *id087
 - !ruby/object:Gem::Dependency 
-  name: rails
+  name: jeweler
   version_requirements: &id088 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :development
+  requirement: *id088
+- !ruby/object:Gem::Dependency 
+  name: rspec-rails
+  version_requirements: &id089 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :development
+  requirement: *id089
+- !ruby/object:Gem::Dependency 
+  name: cucumber-rails
+  version_requirements: &id090 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :development
+  requirement: *id090
+- !ruby/object:Gem::Dependency 
+  name: capybara
+  version_requirements: &id091 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :development
+  requirement: *id091
+- !ruby/object:Gem::Dependency 
+  name: acts_as_fu
+  version_requirements: &id092 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :development
+  requirement: *id092
+- !ruby/object:Gem::Dependency 
+  name: rcov
+  version_requirements: &id093 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :development
+  requirement: *id093
+- !ruby/object:Gem::Dependency 
+  name: sqlite3
+  version_requirements: &id094 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :development
+  requirement: *id094
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  version_requirements: &id095 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :development
+  requirement: *id095
+- !ruby/object:Gem::Dependency 
+  name: rspec-rails
+  version_requirements: &id096 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :development
+  requirement: *id096
+- !ruby/object:Gem::Dependency 
+  name: cucumber-rails
+  version_requirements: &id097 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :development
+  requirement: *id097
+- !ruby/object:Gem::Dependency 
+  name: capybara
+  version_requirements: &id098 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :development
+  requirement: *id098
+- !ruby/object:Gem::Dependency 
+  name: acts_as_fu
+  version_requirements: &id099 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :development
+  requirement: *id099
+- !ruby/object:Gem::Dependency 
+  name: rcov
+  version_requirements: &id100 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :development
+  requirement: *id100
+- !ruby/object:Gem::Dependency 
+  name: sqlite3
+  version_requirements: &id101 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :development
+  requirement: *id101
+- !ruby/object:Gem::Dependency 
+  name: rails
+  version_requirements: &id102 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -1255,10 +1451,10 @@ dependencies:
         version: 3.0.3
   prerelease: false
   type: :runtime
-  requirement: *id088
+  requirement: *id102
 - !ruby/object:Gem::Dependency 
   name: RedCloth
-  version_requirements: &id089 !ruby/object:Gem::Requirement 
+  version_requirements: &id103 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -1269,10 +1465,10 @@ dependencies:
         version: "0"
   prerelease: false
   type: :runtime
-  requirement: *id089
+  requirement: *id103
 - !ruby/object:Gem::Dependency 
   name: prarupa
-  version_requirements: &id090 !ruby/object:Gem::Requirement 
+  version_requirements: &id104 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -1283,10 +1479,10 @@ dependencies:
         version: "0"
   prerelease: false
   type: :runtime
-  requirement: *id090
+  requirement: *id104
 - !ruby/object:Gem::Dependency 
   name: formtastic
-  version_requirements: &id091 !ruby/object:Gem::Requirement 
+  version_requirements: &id105 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -1297,10 +1493,10 @@ dependencies:
         version: "0"
   prerelease: false
   type: :runtime
-  requirement: *id091
+  requirement: *id105
 - !ruby/object:Gem::Dependency 
   name: acts_as_revisable
-  version_requirements: &id092 !ruby/object:Gem::Requirement 
+  version_requirements: &id106 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -1311,10 +1507,10 @@ dependencies:
         version: "0"
   prerelease: false
   type: :runtime
-  requirement: *id092
+  requirement: *id106
 - !ruby/object:Gem::Dependency 
   name: will_paginate
-  version_requirements: &id093 !ruby/object:Gem::Requirement 
+  version_requirements: &id107 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -1328,10 +1524,10 @@ dependencies:
         version: 3.0.pre2
   prerelease: false
   type: :runtime
-  requirement: *id093
+  requirement: *id107
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  version_requirements: &id094 !ruby/object:Gem::Requirement 
+  version_requirements: &id108 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -1342,10 +1538,10 @@ dependencies:
         version: "0"
   prerelease: false
   type: :development
-  requirement: *id094
+  requirement: *id108
 - !ruby/object:Gem::Dependency 
   name: rspec-rails
-  version_requirements: &id095 !ruby/object:Gem::Requirement 
+  version_requirements: &id109 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -1356,10 +1552,10 @@ dependencies:
         version: "0"
   prerelease: false
   type: :development
-  requirement: *id095
+  requirement: *id109
 - !ruby/object:Gem::Dependency 
   name: cucumber-rails
-  version_requirements: &id096 !ruby/object:Gem::Requirement 
+  version_requirements: &id110 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -1370,10 +1566,10 @@ dependencies:
         version: "0"
   prerelease: false
   type: :development
-  requirement: *id096
+  requirement: *id110
 - !ruby/object:Gem::Dependency 
   name: capybara
-  version_requirements: &id097 !ruby/object:Gem::Requirement 
+  version_requirements: &id111 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -1384,10 +1580,10 @@ dependencies:
         version: "0"
   prerelease: false
   type: :development
-  requirement: *id097
+  requirement: *id111
 - !ruby/object:Gem::Dependency 
   name: acts_as_fu
-  version_requirements: &id098 !ruby/object:Gem::Requirement 
+  version_requirements: &id112 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -1398,10 +1594,10 @@ dependencies:
         version: "0"
   prerelease: false
   type: :development
-  requirement: *id098
+  requirement: *id112
 - !ruby/object:Gem::Dependency 
   name: rcov
-  version_requirements: &id099 !ruby/object:Gem::Requirement 
+  version_requirements: &id113 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -1412,10 +1608,10 @@ dependencies:
         version: "0"
   prerelease: false
   type: :development
-  requirement: *id099
+  requirement: *id113
 - !ruby/object:Gem::Dependency 
   name: sqlite3
-  version_requirements: &id100 !ruby/object:Gem::Requirement 
+  version_requirements: &id114 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -1426,7 +1622,7 @@ dependencies:
         version: "0"
   prerelease: false
   type: :development
-  requirement: *id100
+  requirement: *id114
 description: Provides basic event management features with versioned history of changes.
 email: 
 - jason.lapier@gmail.com