event_calendar_engine 0.1.6 → 0.1.7

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.1.7

data/app/controllers/events_controller.rb

@@ -2,20 +2,37 @@ class EventsController < EventCalendar::ApplicationController
   
   # before_filter :load_and_authorize_current_user, :except => [:index, :show]
   
+  private
+    def events_to_json
+      return {} unless @events
+      json = @events.map do |event|
+        {
+          :id => event.id,
+          :title => event.name,
+          :start => event.start_on,
+          :end => event.end_on,
+          :url => event_path(event),
+          :details => render_to_string(:partial => 'events/details', :object => event)
+        }
+      end
+      json.to_json
+    end
+  protected
+  public
+  
   # GET /events
   # GET /events.xml
   def index
-    @events = Event.find :all
+    if params[:start] && params[:end]
+      @events = Event.between(Time.at(params[:start].to_i), Time.at(params[:end].to_i))
+    else
+      @events = Event.find :all
+    end
 
     respond_to do |format|
       format.html # index.html.erb
       format.xml  { render :xml => @events }
-      format.js do
-        json = @events.map do |e|
-          e.to_hash_for_calendar(event_path(e))
-        end
-        render :json => json.to_json
-      end
+      format.js { render :json => events_to_json }
     end
   end
 

data/app/models/event.rb

@@ -22,6 +22,10 @@ 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 :between, lambda{ |start_date, end_date|
+    where(["start_on BETWEEN ? AND ? OR end_on BETWEEN ? AND ?",
+      start_date, end_date, start_date, end_date])
+  }
   
   validate :sane_dates
 
@@ -100,15 +104,6 @@ class Event < ActiveRecord::Base
     def to_s
       "#{name} (#{start_on} #{end_on ? ' - ' + end_on.to_s : ''})"
     end
-  
-    def to_hash_for_calendar(url)
-      # { :id => id, :title => name_and_file_count, :start => start_on, :end => end_on, :url => "/events/#{id}", 
-      #   :description => description && description.gsub("\n", "<br/>") || '',
-      #   :location => location && location.gsub("\n", "<br/>") || '' }
-      { :id => id, :title => name, :start => start_on, :end => end_on, :url => url, 
-        :description => description && description.gsub("\n", "<br/>") || '',
-        :location => location && location.gsub("\n", "<br/>") || '' }
-    end
 
     # list all groups that had least one member in attendance at this event
     # def contact_groups_represented

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

@@ -0,0 +1,2 @@
+<%= textilize(details.location) %>
+<%= textilize(details.description) %>

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

@@ -2,38 +2,20 @@
 
 <p><em>mouse over an event to preview; click on an event for full details</em></p>
 
-<div id="calendar_now" class="calendars"></div>
-<div id="calendar_one_month" class="calendars"></div>
-<div id="calendar_two_months" class="calendars"></div>
+<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()
   {
-    $(".nice_table").tablesorter( { widgets: ['zebra'], headers: { 3:{sorter: false}, 4:{sorter: false}, 5:{sorter: false}} });
-    
-    $('#calendar_now').fullCalendar({ 
-      editable: false, events: '<%= events_path %>', height: 300, aspectRatio: 1.2,
-      buttonText: { today:null, prev:null, next: null }, eventMouseover: updateEventDescription
-    });
-    
-    $('#calendar_one_month').fullCalendar({ 
-      editable: false, events: '<%= events_path %>', height: 300, aspectRatio: 1.2,
-      buttonText: { today:null, prev:null, next: null }, eventMouseover: updateEventDescription
+    $('#calendar').fullCalendar({ 
+      editable: false, events: '<%= events_path %>', height: 500, aspectRatio: 1,
+      eventMouseover: updateEventDescription
     });
-    
-    $('#calendar_two_months').fullCalendar({ 
-      editable: false, events: '<%= events_path %>', height: 300, aspectRatio: 1.2,
-      buttonText: { today:null }, eventMouseover: updateEventDescription,
-      month: $('#calendar_one_month').fullCalendar('getDate').getMonth() + 1,
-      viewDisplay: function(view) {
-        $('#calendar_now').fullCalendar('gotoDate', $('#calendar_two_months').fullCalendar('getDate').getFullYear(), $('#calendar_two_months').fullCalendar('getDate').getMonth() - 2);
-        $('#calendar_one_month').fullCalendar('gotoDate', $('#calendar_two_months').fullCalendar('getDate').getFullYear(), $('#calendar_two_months').fullCalendar('getDate').getMonth() - 1);
-      }
-    });           
   }
 );
 

data/public/javascripts/event_calendar/event_calendar.js

@@ -1,14 +1,11 @@
 // use to give the preview of details for an event below a calendar
 var updateEventDescription = function(event, jsEvent) {
-  $("#event_quick_description")[0].innerHTML = "";
+  $("#event_quick_description").empty();
   $("#event_quick_description").append(
     $("<h3/>").append(
       $('<a/>', { text : event.title, href : event.url })
     )
-  );
-  $("#event_quick_description")[0].innerHTML += "Location: " + event.location + "<br/>";
-  $("#event_quick_description")[0].innerHTML += event.description;
-  
+  ).append(event.details);
   $("#event_quick_description").show();
 }
 

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

@@ -372,7 +372,7 @@ table.fc-header {width:100%;}
 .fc-event-vert span.fc-event-title {line-height:13px;}
 .fc-event-vert span.fc-event-bg {position:absolute;z-index:1;top:0;left:0;width:100%;height:100%;background:#fff;opacity:.3;filter:alpha(opacity=30);}
 .fc-event-vert .ui-resizable-s {bottom:0 !important;width:100% !important;height:8px !important;line-height:8px !important;font-size:11px !important;font-family:monospace;text-align:center;cursor:s-resize;}
-.calendars {width:260px;float:left;padding-right:20px;}
+.calendars {padding-right:20px;}
 #event_quick_description {clear:both;border:1px solid #999;background:#FFC;padding:12px;margin-top:15px;}
 .fc-grid table {margin-bottom:0
 ;}

data/spec/controllers/events_controller_spec.rb

@@ -3,30 +3,6 @@ require 'spec_helper'
 describe require 'spec_helper'
 
 describe EventsController do
-  # def mock_admin_user(stubs={})
-  #   @mock_admin_user ||= mock_model(User, stubs.merge({
-  #     :role => 'admin',
-  #     :contact => mock_model(Contact, {
-  #       :first_name => 'First',
-  #       :last_name => 'Last',
-  #       :email => 'test@test.com'
-  #     })
-  #   }))
-  # end
-
-  # def mock_user(stubs={})
-  #   @mock_user ||= mock_model(User, stubs.merge({:role => 'general'}))
-  # end
-
-  describe "when logged in as admin" do
-    before do
-      # pending
-      # controller.stub(:current_user_session).and_return(
-      #   mock_model(UserSession, {
-      #     :user => mock_admin_user
-      #   })
-      # )
-    end
 
     describe "GET index" do
       it "assigns all events as @events" do
@@ -38,8 +14,14 @@ describe EventsController do
     
     describe "GET index as json" do
       it "renders @events as json" do
-        mock_event.stub(:to_hash_for_calendar).and_return( { :id => 1, :name => "whatever" } )
-        Event.stub(:find).with(:all).and_return([mock_event])
+        mock_event({
+          :name => 'Some Event',
+          :start_on => Date.yesterday,
+          :end_on => Date.tomorrow,
+          :description => 'Some Description',
+          :location => 'Some City'
+        })
+        Event.stub(:between).and_return([mock_event])
         get :index, :format => 'js'
         response.should be_success
       end
@@ -162,7 +144,6 @@ describe EventsController do
         delete :destroy, :id => "1"
         response.should redirect_to(events_url)
       end
-    end    
-  end
+    end
 
 end

data/spec/models/event_spec.rb

@@ -32,6 +32,10 @@ describe Event do
   it "Event.current finds current events" do
     Event.current.first.should eql @current
   end
+  
+  it "Event.between finds events between limits" do
+    Event.between(Date.new(2100,3,1), Date.new(2100,3,30)).first.should eql @mar_2100
+  end
 
   it "should create a new instance given valid attributes" do
     Event.create!(@valid_attributes)
@@ -49,14 +53,6 @@ describe Event do
     Event.existing_event_types.should == ['Conference', 'Meeting']
   end
   
-  it "should call to_hash_for_calendar" do
-    event = Event.create! :name => "test", :start_on => "2010-01-01", :end_on => "2010-01-07", 
-      :event_type => "meeting", :description => "some kind of meeting", :location => 'skype.address'
-    event.to_hash_for_calendar("/events/#{event.id}").should == { :id => event.id, :title => "test", 
-      :start => Date.new(2010,1,1), :end => Date.new(2010,1,7), :url => "/events/#{event.id}",
-      :description => "some kind of meeting", :location => 'skype.address' }
-  end
-  
   it "should create a new version when an attribute is updated" do
     event = Event.create!(@valid_attributes)
     event.revision_number.should == 0

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: event_calendar_engine
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 1
-  - 6
-  version: 0.1.6
+  - 7
+  version: 0.1.7
 platform: ruby
 authors: 
 - Jason LaPier
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-21 00:00:00 -08:00
+date: 2010-12-23 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -414,6 +414,7 @@ files:
 - 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/_details.html.erb
 - app/views/events/_event.html.erb
 - app/views/events/_event_details.html.erb
 - app/views/events/_form.html.erb