event_calendar_engine 0.1.10 → 0.1.11

data/VERSION

@@ -1 +1 @@
-0.1.10
+0.1.11

data/app/controllers/events_controller.rb

@@ -46,9 +46,8 @@ 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
-      @past_events = Event.past.order("start_on ASC")
-      @future_events = Event.future.order("start_on ASC")
-      @current_events = Event.current.order("start_on ASC")
+      @past_events = Event.past.order("start_on DESC")
+      @current_events = Event.current.order("start_on DESC")
     end
 
     respond_to do |format|

data/app/helpers/event_calendar/application_helper.rb

@@ -29,14 +29,14 @@ module EventCalendar::ApplicationHelper
   end
   
   def time_with_zones(time=Time.now)
-    out = {}
-    format = "%H:%M"
+    out = []
     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)
+      # out[key] = time.in_time_zone(us_zone).strftime(format)
+      out << [key, time.in_time_zone(us_zone).strftime(TIME_BASE)]
     end
-    out
+    out.reverse
   end
   
   def times_with_zones(event)

data/app/models/event.rb

@@ -15,7 +15,7 @@ class Event < ActiveRecord::Base
   
   scope :past, where(sanitize_sql_array(["end_on < '%s'", Date.current]))
   scope :future, where(sanitize_sql_array(["start_on > '%s'", Date.current]))
-  scope :current, where(sanitize_sql_array(["end_on >= '%s' AND start_on <= '%s'", Date.current, Date.current]))
+  scope :current, where(sanitize_sql_array(["end_on >= '%s'", Date.current]))
   scope :between, lambda{ |start_datetime, end_datetime|
     where(["start_on BETWEEN ? AND ? OR end_on BETWEEN ? AND ?",
       start_datetime, end_datetime, start_datetime, end_datetime])

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

@@ -4,7 +4,7 @@
 
 <div style="clear:both"></div>
 
-<div id="event_quick_description" class="span-12" style="display:none"></div>
+<div id="event_quick_description" class="span-16" style="display:none"></div>
 
 <% content_for :javascript do %>
 <script type="text/javascript">

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

@@ -1,10 +1,4 @@
 <%- 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>
-  <%- if current_event.one_day? -%>
-  <%= render :partial => 'events/times', :object => times_with_zones(current_event) %>
-  <%- else -%>
-  <p><em><%= current_event.start_on.in_time_zone(current_event.timezone).strftime("%a, %b %d") %></em></p>
-  <p><em><%= current_event.end_on.in_time_zone(current_event.timezone).strftime("%a, %b %d") %></em></p>
-  <%- end -%>
+<div class="span-4<%= current_event_counter % 3 == 0 ? ' last' : '' %>">
+  <%= render current_event %>
 </div>

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

@@ -1,13 +1,9 @@
-<div class="span-16 last">
+<div class="span-8">
   <h2>Current Events (<em><%= @current_events.count %></em>)</h2>
-  <%= render :partial => 'events/current_event', :collection => @current_events %>
+  <%= render :partial => 'events/list_group', :locals => {:events => @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

@@ -1,13 +1,13 @@
 <ul class="events">
   <% events.group_by(&:start_year).each do |year, years_events| %>
-  <li><%= year %>
-    <ul>      
+  <li><span class="collapsible open"><%= year %></span>
+    <ul>
       <% years_events.group_by(&:start_month).each do |month, months_events| %>
-      <li><%= month %>
+      <li><span class="collapsible closed"><%= month %></span>
         <ul>
           <% months_events.each do |event| %>
           <li>
-            <p><%= link_to event.name, event_path(event) %></p>
+            <p class="collapsible closed"><%= link_to event.name, event_path(event) %> (<%= event.start_on.strftime("%a") %> <%= event.start_day.ordinalize %>)</p>
             <%- if event.one_day? -%>
             <%= render :partial => 'events/one_day_list_event', :object => event %>
             <%- else -%>

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

@@ -1,3 +1,5 @@
-<% times.first.each do |zone, start| %>
-  <p><%= start %> - <%= times.last[zone] %> <em><%= zone %></em></p>
+<%- t = [] -%>
+<% times.first.each_with_index do |z_t, i| %>
+  <% t << "#{z_t.last} - #{times.last[i].last} " + content_tag(:em, z_t.first) %>
 <% end %>
+<p><%= t.join(" / ").html_safe %></p>

data/config/initializers/constants.rb

@@ -0,0 +1 @@
+TIME_BASE = '%I:%M %p'

data/public/javascripts/event_calendar/event_calendar.js

@@ -11,6 +11,7 @@ var updateEventDescription = function(event, jsEvent) {
 
 
 jQuery(function($) {
+  $('ul.events').attach(Collapsible);
   $('a.show_hide_link').attach(ShowHideLink);
   $('a.view_events').attach(EventView);
 });

data/public/javascripts/event_calendar/event_calendar_behaviors.js

@@ -167,4 +167,20 @@ EventView = $.klass({
       $('#event_list').show();
     }
   }
-});
+});
+
+var Collapsible = $.klass({
+  initialize: function() {
+    this.element.find('.open').each(function(i, e) {
+      $(e).siblings().show();
+    });
+    this.element.find('.closed').each(function(i, e) {
+      $(e).siblings().hide();
+    });
+  },
+  onclick: $.delegate({
+    '.collapsible': function(clickedElement, event) {
+      clickedElement.siblings().toggle();
+    }
+  })
+});

data/public/stylesheets/event_calendar/blueprint/screen.css

@@ -446,6 +446,7 @@ form.formtastic fieldset ol li.string input {width:69%;}
 form.formtastic fieldset ol li.text textarea {width:69%;height:70px;}
 form.formtastic fieldset ol li.check_boxes fieldset ol li label {font-weight:normal;padding-left:40px;}
 form.formtastic fieldset ol li p.inline-hints {color:#666666;font-size:11px;margin:0.3em 0 0 25%;}
+.collapsible {cursor:pointer;}
 .base_content {background:#fff;}
 .inner_content {padding:16px;}
 .top-banner {background:#336;-webkit-border-bottom-left-radius:8px;-moz-border-radius-bottomleft:8px;border-bottom-left-radius:8px;}

data/spec/controllers/events_controller_spec.rb

@@ -21,7 +21,6 @@ describe EventsController 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
@@ -33,10 +32,6 @@ describe EventsController 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
     
     describe "GET index as json" do

data/spec/helpers/event_calendar/application_helper_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe EventCalendar::ApplicationHelper do
+  describe "time_with_zones (singular)" do
+    it "returns times" do
+      time = Time.now
+      helper.time_with_zones(time).should eq [
+        ["EST", time.in_time_zone("Eastern Time (US & Canada)").strftime(TIME_BASE)],
+        ["CST", time.in_time_zone("Central Time (US & Canada)").strftime(TIME_BASE)],
+        ["MST", time.in_time_zone("Mountain Time (US & Canada)").strftime(TIME_BASE)],
+        ["PST", time.in_time_zone("Pacific Time (US & Canada)").strftime(TIME_BASE)]
+      ]
+    end
+  end
+end

data/spec/models/event_spec.rb

@@ -29,8 +29,9 @@ describe Event do
     Event.future.first.should eql @mar_2100
   end
   
-  it "Event.current finds current events" do
-    Event.current.first.should eql @current
+  it "Event.current finds current events (in progress and future)" do
+    Event.current.should include @current
+    Event.current.should include @mar_2100
   end
   
   it "Event.between finds events between limits" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: event_calendar_engine
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 1
-  - 10
-  version: 0.1.10
+  - 11
+  version: 0.1.11
 platform: ruby
 authors: 
 - Jason LaPier
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-11 00:00:00 -08:00
+date: 2011-01-27 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -446,6 +446,7 @@ files:
 - config/environments/production.rb
 - config/environments/test.rb
 - config/initializers/backtrace_silencers.rb
+- config/initializers/constants.rb
 - config/initializers/formtastic.rb
 - config/initializers/inflections.rb
 - config/initializers/mime_types.rb
@@ -547,6 +548,7 @@ files:
 - spec/controllers/event_revisions_controller_spec.rb
 - spec/controllers/events_controller_spec.rb
 - spec/fixtures/event_calendar_events.yml
+- spec/helpers/event_calendar/application_helper_spec.rb
 - spec/models/deletable_instance_methods_spec.rb
 - spec/models/event_revision_spec.rb
 - spec/models/event_spec.rb
@@ -591,6 +593,7 @@ test_files:
 - spec/controllers/event_revisions_controller_spec.rb
 - spec/controllers/events_controller_spec.rb
 - spec/fixtures/event_calendar_events.yml
+- spec/helpers/event_calendar/application_helper_spec.rb
 - spec/models/deletable_instance_methods_spec.rb
 - spec/models/event_revision_spec.rb
 - spec/models/event_spec.rb