event_calendar_engine 0.1.8 → 0.1.9

data/VERSION

@@ -1 +1 @@
-0.1.8
+0.1.9

data/app/controllers/events_controller.rb

@@ -46,7 +46,9 @@ class EventsController < EventCalendar::ApplicationController
     if params[:start] && params[:end]
       @events = Event.between(Time.at(params[:start].to_i), Time.at(params[:end].to_i))
     else
-      @events = Event.all
+      @past_events = Event.past.order("start_on ASC")
+      @future_events = Event.future.order("start_on ASC")
+      @current_events = Event.current.order("start_on ASC")
     end
 
     respond_to do |format|

data/app/helpers/event_calendar/application_helper.rb

@@ -1,4 +1,12 @@
 module EventCalendar::ApplicationHelper
+  def div_for_record(record, options={}, &block)
+    options.merge!({:class => "span-10 #{options[:class]}"})
+    div_for(record, options){ yield }
+  end
+  def tag_for_record(tag, record, *args, &block)
+    content_tag_for(tag, record, *args){ yield }
+  end
+  
   def link_wrapper(path, wrapper_options={}, link_options={})
     tag       = wrapper_options.delete(:tag) || :p
     link_text = link_options.delete(:link_text) || path
@@ -21,6 +29,28 @@ module EventCalendar::ApplicationHelper
     end
   end
   
+  def time_with_zones(time=Time.now)
+    out = {}
+    format = "%H:%M"
+    ActiveSupport::TimeZone.us_zones.map(&:name).each do |us_zone|
+      next unless us_zone =~ /Pacific|Mountain|Central|Eastern/
+      key = time.in_time_zone(us_zone).strftime("%Z")
+      out[key] = time.in_time_zone(us_zone).strftime(format)
+    end
+    out
+  end
+  
+  def times_with_zones(event)
+    begin
+    [
+      time_with_zones(event.start_time),
+      time_with_zones(event.end_time)
+    ]
+    rescue NoMethodError => e
+      raise "#{e.message} - #{event.inspect}"
+    end
+  end
+  
   def link_to_events(wrapper_options={}, link_options={})
     return unless has_authorization?(:read, Event.new)
     link_wrapper(events_path, wrapper_options, link_options.reverse_merge!({
@@ -49,7 +79,7 @@ module EventCalendar::ApplicationHelper
   def link_to_deleted_events(wrapper_options={})
     return unless has_authorization?(:update, Event.new)
     link_wrapper(event_revisions_path, wrapper_options, {
-      :link_text => "Restore Deleted Events (#{EventRevision.deleted.count})"
+      :link_text => "Browse Deleted Events (#{EventRevision.deleted.count})"
     })
   end
 
@@ -73,7 +103,7 @@ module EventCalendar::ApplicationHelper
       :highlight => false
     }.merge!(wrapper_options), {
       :link_text => "Delete <em>#{event.name}</em>".html_safe,
-      :confirm => "Are you sure you want to permanently delete the #{event.name} #{event.type}?",
+      :confirm => "Are you sure you want to permanently delete the #{event.name} #{event.event_type}?",
       :method => "delete"
     }.merge!(link_options))
   end

data/app/models/event.rb

@@ -3,7 +3,7 @@ class Event < ActiveRecord::Base
   
   include ActionView::Helpers::TextHelper
   
-  attr_accessor :start_time, :end_time, :start_date, :end_date
+  include EventInstanceMethods
 
   has_many :attendees
 
@@ -38,48 +38,7 @@ class Event < ActiveRecord::Base
     end
     
   protected
-  public
-  
-    def start_time
-      @start_time ||= start_on
-    end
-    
-    def end_time
-      @end_time ||= end_on
-    end
-    
-    def start_date
-      @start_date ||= start_on.present? ? start_on.to_date : start_on
-    end
-    
-    def end_date
-      @end_date ||= end_on.present? ? end_on.to_date : end_on
-    end
-  
-    def start_year
-      start_on.year
-    end
-  
-    def start_month
-      start_on.strftime("%B")
-    end
-    
-    def start_day
-      start_on.day
-    end
-    
-    def end_year
-      end_on.year
-    end
-    
-    def end_month
-      end_on.strftime("%B")
-    end
-    
-    def end_day
-      end_on.day
-    end
-  
+  public  
     def participants
       return [] if attendees.count == 0
       attendees.all.collect do |attendee|

data/app/models/event_instance_methods.rb

@@ -0,0 +1,47 @@
+module EventInstanceMethods
+  attr_accessor :start_time, :end_time, :start_date, :end_date
+  
+  def start_time
+    @start_time ||= start_on
+  end
+  
+  def end_time
+    @end_time ||= end_on
+  end
+  
+  def start_date
+    @start_date ||= start_on.present? ? start_on.to_date : start_on
+  end
+  
+  def end_date
+    @end_date ||= end_on.present? ? end_on.to_date : end_on
+  end
+
+  def start_year
+    start_on.year
+  end
+
+  def start_month
+    start_on.strftime("%B")
+  end
+  
+  def start_day
+    start_on.day
+  end
+  
+  def end_year
+    end_on.year
+  end
+  
+  def end_month
+    end_on.strftime("%B")
+  end
+  
+  def end_day
+    end_on.day
+  end
+  
+  def one_day?
+    start_day == end_day
+  end
+end

data/app/models/event_revision.rb

@@ -4,6 +4,7 @@ class EventRevision < ActiveRecord::Base
   acts_as_revision :revisable_class_name => 'Event'
   
   include DeletableInstanceMethods
+  include EventInstanceMethods
   
   scope :deleted, where("revisable_deleted_at IS NOT NULL")
 end

data/app/views/attendees/_add_attendees.html.erb

@@ -0,0 +1,32 @@
+<!--
+<h3>Attendees/Participants</h3>
+
+<% 
+#if @event.attendees.empty? 
+%>
+  <p><em>No attendees for this event.</em></p>
+<% 
+#else
+ %>
+    
+  form stub
+
+  <% @event.participants.group_by(&:class).map do |type, participants| %>
+    <h4><%= link_to(pluralize(participants.size, type.to_s), polymorphic_path(type)) %></h4>
+    <ol>
+    <% participants.each do |participant| %>
+      <% name_attr = participant.attribute_names.detect{|m_attr| m_attr =~ /name/} %>
+      <% if participant.respond_to?(:name) %>
+      <li><%= link_to(participant.send(name_attr), polymorphic_path(participant)) %></li>
+      <% elsif name_attr %>
+      <li><%= link_to(participant.name, polymorphic_path(participant)) %></li>
+      <% end %>
+    <% end %>
+    </ol>
+  <% end %>
+  
+  form stub end
+<% 
+#end
+ %>
+-->

data/app/views/event_revisions/_event_revision.html.erb

@@ -0,0 +1,6 @@
+<%= tag_for_record :tr, event_revision, :style => 'background-color: #f5c6d7' do %>
+  <td><%= link_to event_revision.name, event_revision_path(event_revision) %></td>
+  <td><%= truncate(event_revision.location, :length => 100) %></td>
+  <td><%= truncate(event_revision.description, :length => 100) %></td>
+  <td></td>
+<% end %>

data/app/views/event_revisions/_list_group.html.erb

@@ -0,0 +1,30 @@
+<ul class="events">
+  <% events.group_by(&:start_year).each do |year, years_events| %>
+  <li><%= year %>
+    <ul>      
+      <% years_events.group_by(&:start_month).each do |month, months_events| %>
+      <li><%= month %>
+        <ul>
+          <% months_events.each do |event| %>
+          <li>
+            <p>
+              <%= link_to event.name, event_revision_path(event) %>
+              <%= link_to 'restore', restore_event_revision_path(event),
+                          :confirm => 'Are you sure you want to restore this deleted event?',
+                          :method => "post",
+                          :class => 'fake_button' %>
+            </p>
+            <%- if event.one_day? -%>
+            <%= render :partial => 'events/one_day_list_event', :object => event %>
+            <%- else -%>
+            <%= render :partial => 'events/multi_day_list_event', :object => event %>
+            <%- end -%>
+          </li>
+          <% end %>
+        </ul>
+      </li>
+      <% end %>
+    </ul>
+  </li>
+  <% end %>
+</ul>  

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

@@ -1,31 +1,2 @@
-<table class="nice_table tablesorter">
-  <thead>
-    <tr>
-      <th>Event</th>
-      <th>Location</th>
-      <th>Description</th>
-      <th style="border: 1px #CCF dashed; text-align:center">Manage</th>
-    </tr>
-  </thead>
-  <tbody>
-  <% for event in @deleted_events %>
-    <tr style="background-color: #f5c6d7;">
-      <td><%= link_to event.name, event_revision_path(event) %></td>
-      <td><%= truncate(event.location, :length => 100) %></td>
-      <td><%= truncate(event.description, :length => 100) %></td>
-      <td><%= link_to 'restore', restore_event_revision_path(event),
-                  :confirm => 'Are you sure you want to restore this deleted event?',
-                  :method => "post",
-                  :class => 'fake_button' %></td>
-    </tr>
-  <% end %>
-  </tbody>
-</table>
-
-<script type="text/javascript">
-$(document).ready(function()
-  {
-    $(".nice_table").tablesorter( { widgets: ['zebra'], headers: { 3:{sorter: false}, 4:{sorter: false}, 5:{sorter: false}} });
-  }
-);
-</script>
+<h2>Deleted Events (<em><%= @deleted_events.count %></em>)</h2>
+<%= render :partial => 'event_revisions/list_group', :locals => {:events => @deleted_events} %>

data/app/views/event_revisions/show.html.erb

@@ -1,11 +1,11 @@
-
 <p>
   <% if Event.where(:id => @event_revision.current_revision).count > 0 %>
   <%= link_to "< Current Version", event_path(@event_revision.current_revision), :class => 'fake_button' %>
   <% else %>
-  <%= link_to "< Browse Revisions", event_revisions_path, :class => 'fake_button' %>
+  <%= link_to "< Browse Deleted", event_revisions_path, :class => 'fake_button' %>
   <% end %>
 </p>
 
-<h1>Event - Version: <%= @event_revision.revision_number %><hr /></h1>
-<%= render :partial => 'events/event_details', :object => @event_revision %>
+<p style="float: right;" class="fake_button">Revision <%= @event_revision.revision_number %></p>
+
+<%= render :partial => 'events/event', :object => @event_revision %>

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

@@ -0,0 +1,20 @@
+<p><em>mouse over an event to preview; click on an event for full details</em></p>
+
+<div id="event_quick_description" class="span-12" style="display:none"></div>
+
+<div style="clear:both"></div>
+
+<div id="calendar" class="calendars"></div>
+
+<% content_for :javascript do %>
+<script type="text/javascript">
+$(document).ready(function()
+  {
+    $('#calendar').fullCalendar({ 
+      editable: false, events: '<%= events_path %>', height: 500, aspectRatio: 1,
+      eventMouseover: updateEventDescription
+    });
+  }
+);
+</script>
+<% end %>

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

@@ -0,0 +1,6 @@
+<%- if current_event_counter == 0; then current_event_counter += 1; end -%>
+<div class="span-2<%= current_event_counter % 8 == 0 ? ' last' : '' %>">
+  <p><strong><%= link_to current_event.name, event_path(current_event) %></strong></p>
+  <p><em><%= current_event.start_on.strftime("%a, %b %d") %></em></p>
+  <p><em><%= current_event.end_on.strftime("%a, %b %d") %></em></p>
+</div>

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

@@ -1,2 +1,13 @@
+<%- unless details.one_day? %>
 <%= textilize(details.location) %>
 <%= textilize(details.description) %>
+<%- else -%>
+<div class="span-6">
+<%= textilize(details.location) %>
+<%= textilize(details.description) %>
+</div>
+
+<div class="span-6 last">
+  <%= render :partial => 'events/times', :object => times_with_zones(details) %>
+</div>
+<%- end -%>

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

@@ -1,10 +1,5 @@
-<div class="span-8">
-  <h4><%= link_to event.name_and_file_count, event_path(event.id) %></h4>
-  <p><%=h event.event_type %></p>
-  <% if event.attendees.count > 0 %>
-    <p><%= "#{event.attendees.count} attendees" %></p>
-  <% end %>
-  <p>from <%=h event.start_on.strftime "%a, %b %d %Y (%I:%M%p)" %></p>
-  <p>until <%=h event.end_on.strftime "%a, %b %d %Y (%I:%M%p)" %></p>
-  <p><%=h event.description[0..60] %></p>
-</div>
+<%= div_for_record(event) do -%>
+  <h1><%= link_to event.name, event_path(event) %> (<em><%= event.event_type %></em>)</h1>
+  
+  <%= render :partial => 'events/event_details', :object => event %>
+<% end %>

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

@@ -1,19 +1,17 @@
-<p>
-  <strong><%= event_details.name %></strong><br/>
-  <em><%= event_details.event_type %></em>
-</p>
-
 <p>
   <strong>Starts</strong><br />
-  <%= event_details.start_on.in_time_zone(event_details.timezone).strftime('%A, %B %d %Y at %I:%M %p (%Z)') %>
+  <%= event_details.start_on.in_time_zone(event_details.timezone).strftime('%A, %B %d %Y') %>
 </p>
-<% if event_details.end_on %>
-<p>
-  <strong>Ends</strong><br />
-  <%=  event_details.end_on.in_time_zone(event_details.timezone).strftime('%A, %B %d %Y at %I:%M %p (%Z)') %>
-</p>
-<% end %>
-
+<%- unless event_details.one_day? %>
+  <% if event_details.end_on %>
+  <p>
+    <strong>Ends</strong><br />
+    <%=  event_details.end_on.in_time_zone(event_details.timezone).strftime('%A, %B %d %Y') %>
+  </p>
+  <% end %>
+<%- else -%>
+  <%= render :partial => 'events/times', :object => times_with_zones(event_details) %>
+<%- end -%>
 <% unless event_details.location.blank? %>
 <p>
   <strong>Location</strong><br/>

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

@@ -0,0 +1,13 @@
+<div class="span-16 last">
+  <h2>Current Events (<em><%= @current_events.count %></em>)</h2>
+  <%= render :partial => 'events/current_event', :collection => @current_events %>
+</div>
+<div class="span-8 last">
+  <h2>Past Events (<em><%= @past_events.count %></em>)</h2>
+  <%= render :partial => 'events/list_group', :locals => {:events => @past_events} %>
+</div>
+<div class="span-8">
+  <h2>Future Events (<em><%= @future_events.count %></em>)</h2>
+  <%= render :partial => 'events/list_group', :locals => {:events => @future_events} %>
+</div>
+<div style="clear:both;"></div>

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

@@ -0,0 +1,24 @@
+<ul class="events">
+  <% events.group_by(&:start_year).each do |year, years_events| %>
+  <li><%= year %>
+    <ul>      
+      <% years_events.group_by(&:start_month).each do |month, months_events| %>
+      <li><%= month %>
+        <ul>
+          <% months_events.each do |event| %>
+          <li>
+            <p><%= link_to event.name, event_path(event) %></p>
+            <%- if event.one_day? -%>
+            <%= render :partial => 'events/one_day_list_event', :object => event %>
+            <%- else -%>
+            <%= render :partial => 'events/multi_day_list_event', :object => event %>
+            <%- end -%>
+          </li>
+          <% end %>
+        </ul>
+      </li>
+      <% end %>
+    </ul>
+  </li>
+  <% end %>
+</ul>  

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

@@ -0,0 +1,4 @@
+<p>
+  <%= multi_day_list_event.start_on.strftime("%A") %> <%= multi_day_list_event.start_day.ordinalize %> - 
+  <%= multi_day_list_event.end_on.strftime("%A") %> <%= multi_day_list_event.end_day.ordinalize %>
+</p>

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

@@ -0,0 +1,2 @@
+<p><%= one_day_list_event.start_on.strftime("%A") %> <%= one_day_list_event.start_day.ordinalize %></p>
+<%= render :partial => 'events/times', :object => times_with_zones(one_day_list_event) %>

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

@@ -0,0 +1,3 @@
+<% times.first.each do |zone, start| %>
+  <p><%= start %> - <%= times.last[zone] %> <em><%= zone %></em></p>
+<% end %>

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

@@ -1,23 +1,10 @@
-<h1>Events</h1>
-
-<p><em>mouse over an event to preview; click on an event for full details</em></p>
-
-<div id="calendar" class="calendars"></div>
-
-<div style="clear:both"></div>
-
-<div id="event_quick_description" style="display:none"></div>
-
-<% content_for :javascript do %>
-<script type="text/javascript">
-$(document).ready(function()
-  {
-    $('#calendar').fullCalendar({ 
-      editable: false, events: '<%= events_path %>', height: 500, aspectRatio: 1,
-      eventMouseover: updateEventDescription
-    });
-  }
-);
-
-</script>
-<% end %>
+<p style="float: right;">
+  <a href="#" class="fake_button view_events calendar">Calendar</a>
+  <a href="#" class="fake_button view_events list">List</a>
+</p>
+<div id="event_calendar">
+  <%= render :partial => 'calendar' %>
+</div>
+<div id="event_list" style="display: none;">
+  <%= render :partial => 'list' %>
+</div>

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

@@ -1,38 +1 @@
-<div class="span-10">
-<h1>Event</h1>
-
-<%= render :partial => 'event_details', :object => @event %>
-
-<!--
-<h3>Attendees/Participants</h3>
-
-<% 
-#if @event.attendees.empty? 
-%>
-  <p><em>No attendees for this event.</em></p>
-<% 
-#else
- %>
-    
-  form stub
-
-  <% @event.participants.group_by(&:class).map do |type, participants| %>
-    <h4><%= link_to(pluralize(participants.size, type.to_s), polymorphic_path(type)) %></h4>
-    <ol>
-    <% participants.each do |participant| %>
-      <% name_attr = participant.attribute_names.detect{|m_attr| m_attr =~ /name/} %>
-      <% if participant.respond_to?(:name) %>
-      <li><%= link_to(participant.send(name_attr), polymorphic_path(participant)) %></li>
-      <% elsif name_attr %>
-      <li><%= link_to(participant.name, polymorphic_path(participant)) %></li>
-      <% end %>
-    <% end %>
-    </ol>
-  <% end %>
-  
-  form stub end
-<% 
-#end
- %>
--->
-</div>
+<%= render @event %>

data/public/javascripts/event_calendar/event_calendar.js

@@ -12,6 +12,7 @@ var updateEventDescription = function(event, jsEvent) {
 
 jQuery(function($) {
   $('a.show_hide_link').attach(ShowHideLink);
+  $('a.view_events').attach(EventView);
 });
 
 /*
@@ -30,30 +31,3 @@ $.fn.clearForm = function() {
       this.selectedIndex = -1;
   });
 };
-
-DynamicForm = $.klass({
-  initialize: function(options) {
-    this.formId = options.formId; // new_description
-    this.formContainer = options.formContainer; // blank_description_form
-    this.targetIdName = options.targetIdName; // file_attachment_id
-    this.targetContentName = options.targetContentName; // file_attachment[description]
-    this.targetContentType = options.targetContentType;
-    this.actionPrefix = options.actionPrefix; // /file_attachments
-  },
-  onclick: function(e) {
-    e.preventDefault();
-
-    var targetIdValue = this.element.attr(this.targetIdName);
-    var targetContentValue = this.element.attr(this.targetContentName);
-
-    $('#' + this.formId).attr("action", this.actionPrefix + "/" + targetIdValue);
-
-    $('#' + this.formId).clearForm();
-    
-    $('#' + this.formContainer).insertBefore(this.element);
-
-    $(this.targetContentType + '[name='+ this.targetContentName +']').val(targetContentValue);
-
-    $('#' + this.formContainer).show();
-  }
-});

data/public/javascripts/event_calendar/event_calendar_behaviors.js

@@ -129,3 +129,42 @@ ShowHideLink = $.klass({
     return this.doNotStop;
   }
 });
+
+DynamicForm = $.klass({
+  initialize: function(options) {
+    this.formId = options.formId; // new_description
+    this.formContainer = options.formContainer; // blank_description_form
+    this.targetIdName = options.targetIdName; // file_attachment_id
+    this.targetContentName = options.targetContentName; // file_attachment[description]
+    this.targetContentType = options.targetContentType;
+    this.actionPrefix = options.actionPrefix; // /file_attachments
+  },
+  onclick: function(e) {
+    e.preventDefault();
+
+    var targetIdValue = this.element.attr(this.targetIdName);
+    var targetContentValue = this.element.attr(this.targetContentName);
+
+    $('#' + this.formId).attr("action", this.actionPrefix + "/" + targetIdValue);
+
+    $('#' + this.formId).clearForm();
+    
+    $('#' + this.formContainer).insertBefore(this.element);
+
+    $(this.targetContentType + '[name='+ this.targetContentName +']').val(targetContentValue);
+
+    $('#' + this.formContainer).show();
+  }
+});
+
+EventView = $.klass({
+  onclick: function(e) {
+    if( this.element.hasClass('calendar') ) {
+      $('#event_list').hide();
+      $('#event_calendar').show();
+    } else if( this.element.hasClass('list') ) {
+      $('#event_calendar').hide();
+      $('#event_list').show();
+    }
+  }
+});

data/spec/controllers/events_controller_spec.rb

@@ -19,13 +19,23 @@ describe EventsController do
   end
   before(:each) do
     subject.stub(:find).with("37"){ event }
+    subject.stub_chain(:past, :order){ ['past'] }
+    subject.stub_chain(:current, :order){ ['current'] }
+    subject.stub_chain(:future, :order){ ['future'] }
   end
   
     describe "GET index" do
-      it "assigns all events as @events" do
-        subject.stub(:all){ [event] }
+      it "assigns past events as @past_events" do
         get :index
-        assigns(:events).should eq [event]
+        assigns(:past_events).should eq ['past']
+      end
+      it "assigns current events as @current_events" do
+        get :index
+        assigns(:current_events).should eq ['current']
+      end
+      it "assigns future events as @future_events" do
+        get :index
+        assigns(:future_events).should eq ['future']
       end
     end
     

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: event_calendar_engine
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 1
-  - 8
-  version: 0.1.8
+  - 9
+  version: 0.1.9
 platform: ruby
 authors: 
 - Jason LaPier
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-06 00:00:00 -08:00
+date: 2011-01-11 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -403,21 +403,32 @@ files:
 - app/models/attendee.rb
 - app/models/deletable_instance_methods.rb
 - app/models/event.rb
+- app/models/event_instance_methods.rb
 - app/models/event_revision.rb
 - app/models/participant.rb
 - app/models/participator.rb
+- app/views/attendees/_add_attendees.html.erb
 - app/views/attendees/index.html.erb
 - app/views/attendees/new.html.erb
 - app/views/event-calendar-shared/_flash.html.erb
 - app/views/event-calendar-shared/_main_menu.html.erb
 - app/views/event-calendar-shared/_navigation.html.erb
+- app/views/event_revisions/_event_revision.html.erb
+- app/views/event_revisions/_list_group.html.erb
 - app/views/event_revisions/index.html.erb
 - app/views/event_revisions/show.html.erb
 - app/views/events/_browse_event_revisions.html.erb
+- app/views/events/_calendar.html.erb
+- app/views/events/_current_event.html.erb
 - app/views/events/_details.html.erb
 - app/views/events/_event.html.erb
 - app/views/events/_event_details.html.erb
 - app/views/events/_form.html.erb
+- app/views/events/_list.html.erb
+- app/views/events/_list_group.html.erb
+- app/views/events/_multi_day_list_event.html.erb
+- app/views/events/_one_day_list_event.html.erb
+- app/views/events/_times.html.erb
 - app/views/events/attendees.html.erb
 - app/views/events/edit.html.erb
 - app/views/events/index.html.erb