event_calendar_engine 0.1.7 → 0.1.8

data/VERSION

@@ -1 +1 @@
-0.1.7
+0.1.8

data/app/controllers/events_controller.rb

@@ -1,6 +1,7 @@
 class EventsController < EventCalendar::ApplicationController
   
   # before_filter :load_and_authorize_current_user, :except => [:index, :show]
+  before_filter :parse_dates_from_params, :only => [:create, :update]
   
   private
     def events_to_json
@@ -17,6 +18,25 @@ class EventsController < EventCalendar::ApplicationController
       end
       json.to_json
     end
+    
+    def parse_dates_from_params
+      params[:event].delete :"start_time(1i)"
+      params[:event].delete :"start_time(2i)"
+      params[:event].delete :"start_time(3i)"
+      params[:event].delete :"end_time(1i)"
+      params[:event].delete :"end_time(2i)"
+      params[:event].delete :"end_time(3i)"
+      start_hour = params[:event].delete :"start_time(4i)"
+      start_min = params[:event].delete :"start_time(5i)"
+      end_hour = params[:event].delete :"end_time(4i)"
+      end_min = params[:event].delete :"end_time(5i)"
+      start_date = Date.parse(params[:event][:start_date])
+      end_date = Date.parse(params[:event][:end_date])
+      params[:event][:start_on] = Time.local(start_date.year, start_date.month, start_date.day, start_hour, start_min)
+      params[:event][:end_on] = Time.local(end_date.year, end_date.month, end_date.day, end_hour, end_min)
+      params[:event][:start_time] = params[:event][:start_on]
+      params[:event][:end_time] = params[:event][:end_on]
+    end
   protected
   public
   
@@ -26,7 +46,7 @@ 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.find :all
+      @events = Event.all
     end
 
     respond_to do |format|
@@ -68,14 +88,14 @@ class EventsController < EventCalendar::ApplicationController
   # GET /events/1/edit
   def edit
     @event = Event.find(params[:id])
+    Time.zone = @event.timezone
   end
 
   # POST /events
   # POST /events.xml
   def create
     @event = Event.new(params[:event])
-    # @event.modified_by_user = current_user
-
+    
     respond_to do |format|
       if @event.save
         flash[:notice] = 'Event was successfully created.'

data/app/models/event.rb

@@ -3,17 +3,11 @@ class Event < ActiveRecord::Base
   
   include ActionView::Helpers::TextHelper
   
-  has_many :attendees
-  #has_many :contacts, :through => :attendees, :order => ["last_name, first_name"],
-  # :conditions => {:revisable_is_current => true}
-  
-  #has_many :file_attachments
+  attr_accessor :start_time, :end_time, :start_date, :end_date
 
-  #belongs_to :modified_by_user, :class_name => 'User'
+  has_many :attendees
 
   validates_presence_of :name, :event_type, :start_on
-
-  # acts_as_stripped :name
   
   searchable_by :name, :event_type, :location, :description
   
@@ -22,12 +16,14 @@ 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|
+  scope :between, lambda{ |start_datetime, end_datetime|
     where(["start_on BETWEEN ? AND ? OR end_on BETWEEN ? AND ?",
-      start_date, end_date, start_date, end_date])
+      start_datetime, end_datetime, start_datetime, end_datetime])
   }
   
   validate :sane_dates
+  
+  before_save :set_timezone
 
   private
 
@@ -37,9 +33,29 @@ class Event < ActiveRecord::Base
       end
     end
     
+    def set_timezone
+      Time.zone = timezone
+    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

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

@@ -4,23 +4,26 @@
 </p>
 
 <p>
-  <strong>When:</strong>
-  <%= event_details.start_on %>
-  <% if event_details.end_on %>
-    - <%=  event_details.end_on %>
-  <% end %>
+  <strong>Starts</strong><br />
+  <%= event_details.start_on.in_time_zone(event_details.timezone).strftime('%A, %B %d %Y at %I:%M %p (%Z)') %>
 </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.location.blank? %>
 <p>
-  <strong>Where:</strong><br/>
+  <strong>Location</strong><br/>
   <%= textilize_without_paragraph event_details.location %>
 </p>
 <% end %>
 
 <% unless event_details.description.blank? %>
 <p>
-  <strong>Description/Other Details:</strong>
+  <strong>Description/Other Details</strong><br />
   <%= textilize_without_paragraph event_details.description %>
 </p>
 <% end %>

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

@@ -4,10 +4,13 @@
   <%= form.inputs do %>
     <%= form.input :name, :hint => "the name of the event" %>
     <%= form.input :event_type, :hint => "conference, meeting, training, etc" %>
-    <%= form.input :start_on, :required => false, :label => "Starting date of event", :as => :string,
-          :input_html => { :value => @event.start_on.to_s } %>
-    <%= form.input :end_on, :required => false, :label => "Ending date of event", :as => :string,
-          :input_html => { :value => @event.end_on.to_s } %>
+    <%= form.input :start_time, :as => :time, :minute_step => 15 %>
+    <%= form.input :start_date, :required => false, :as => :string,
+          :input_html => { :value => @event.start_date.to_s } %>
+    <%= form.input :end_time, :as => :time, :minute_step => 15 %>
+    <%= form.input :end_date, :required => false, :as => :string,
+          :input_html => { :value => @event.end_date.to_s } %>
+    <%= form.input :timezone, :as => :time_zone, :priority_zones => /^(Eastern|Central|Mountain|Pacific) Time/ %>
     <%= form.input :location, :required => false, :label => 'Location' %>
     <%= form.input :description, :required => false, :label => 'Description' %>
     <% unless @event.new_record? %>
@@ -28,8 +31,8 @@
     
     $('form.formtastic fieldset ol li.text textarea').attach(TextareaExpander, 40, 300);
 
-    $('#event_start_on').datepicker();
-    $('#event_end_on').datepicker();
+    $('#event_start_date').datepicker();
+    $('#event_end_date').datepicker();
   });
 </script>
 

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

@@ -3,6 +3,7 @@
 
 <%= render :partial => 'event_details', :object => @event %>
 
+<!--
 <h3>Attendees/Participants</h3>
 
 <% 
@@ -33,4 +34,5 @@
 <% 
 #end
  %>
+-->
 </div>

data/db/migrate/20101223221015_change_start_on_end_on_to_timestamp.rb

@@ -0,0 +1,11 @@
+class ChangeStartOnEndOnToTimestamp < ActiveRecord::Migration
+  def self.up
+    change_column :event_calendar_events, :start_on, :datetime
+    change_column :event_calendar_events, :end_on, :datetime
+  end
+
+  def self.down
+    change_column :event_calendar_events, :start_on, :date
+    change_column :event_calendar_events, :end_on, :date
+  end
+end

data/db/migrate/20101223233354_add_timezone_to_events.rb

@@ -0,0 +1,9 @@
+class AddTimezoneToEvents < ActiveRecord::Migration
+  def self.up
+    add_column :event_calendar_events, :timezone, :string
+  end
+
+  def self.down
+    remove_column :event_calendar_events, :timezone
+  end
+end

data/db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20101011200048) do
+ActiveRecord::Schema.define(:version => 20101223233354) do
 
   create_table "event_calendar_attendees", :force => true do |t|
     t.integer  "event_id"
@@ -24,8 +24,8 @@ ActiveRecord::Schema.define(:version => 20101011200048) do
   create_table "event_calendar_events", :force => true do |t|
     t.string   "name"
     t.string   "event_type"
-    t.date     "start_on"
-    t.date     "end_on"
+    t.datetime "start_on"
+    t.datetime "end_on"
     t.text     "location"
     t.text     "description"
     t.text     "notes"
@@ -40,6 +40,7 @@ ActiveRecord::Schema.define(:version => 20101011200048) do
     t.datetime "revisable_revised_at"
     t.datetime "revisable_deleted_at"
     t.boolean  "revisable_is_current",       :default => true
+    t.string   "timezone"
   end
 
 end

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

@@ -381,14 +381,6 @@ table.fc-header {width:100%;}
 #calendar_front_page h2 {font-size:1.3em
 ;}
 div.select_popper_box ul li:hover {background:#EEE;}
-form.formtastic li {width:380px;margin-right:40px;}
-form.formtastic fieldset ol li {vertical-align:top;}
-form.formtastic fieldset ol li label {width:30%;}
-form.formtastic fieldset ol li.string input {width:69%;}
-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%;}
 #event_start_on_input label {width:49%
 ;}
 #event_start_on {width:50%
@@ -446,6 +438,14 @@ input[type="checkbox"], input[type="radio"], input.checkbox, input.radio {top:0
 ;}
 .error, .notice, .success {margin:10px;}
 .caps {font-size:1em;font-variant:normal;letter-spacing:0;padding:0;text-transform:none;}
+form.formtastic li {width:380px;margin-right:40px;}
+form.formtastic fieldset ol li {vertical-align:top;}
+form.formtastic fieldset ol li label {width:30%;}
+form.formtastic fieldset ol li.string input {width:69%;}
+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%;}
 .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/public/stylesheets/event_calendar/formtastic_changes.css

@@ -12,3 +12,6 @@ The following style may be *conditionally* included for improved support on olde
 form.formtastic fieldset ol li fieldset legend { margin-left: -6px;}
 
 --------------------------------------------------------------------------------------------------*/
+form.formtastic fieldset > ol > li {
+    overflow: hidden;
+}

data/spec/controllers/events_controller_spec.rb

@@ -1,27 +1,37 @@
 require 'spec_helper'
 
-describe require 'spec_helper'
-
-describe EventsController do
-
+describe EventsController do  
+  subject{ Event }
+  let(:event) do
+    mock_model(Event, {
+      :name => 'Some Event',
+      :start_on => Date.yesterday,
+      :end_on => Date.tomorrow,
+      :timezone => 'Pacific Time (US & Canada)',
+      :description => 'Some Description',
+      :location => 'Some City'
+    })
+  end
+  let(:params) do
+    {
+      :id => "37"
+    }
+  end
+  before(:each) do
+    subject.stub(:find).with("37"){ event }
+  end
+  
     describe "GET index" do
       it "assigns all events as @events" do
-        Event.stub(:find).with(:all).and_return([mock_event])
+        subject.stub(:all){ [event] }
         get :index
-        assigns[:events].should == [mock_event]
+        assigns(:events).should eq [event]
       end
     end
     
     describe "GET index as json" do
       it "renders @events as json" do
-        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])
+        subject.stub(:between).and_return([event])
         get :index, :format => 'js'
         response.should be_success
       end
@@ -29,54 +39,63 @@ describe EventsController do
 
     describe "GET show" do
       it "assigns the requested event as @event" do
-        Event.stub(:find).with("37").and_return(mock_event)
-        get :show, :id => "37"
-        assigns[:event].should equal(mock_event)
+        get :show, params
+        assigns(:event).should eq event
       end
     end
 
     describe "GET new" do
       it "assigns a new event as @event" do
-        Event.stub(:new).and_return(mock_event)
+        subject.stub(:new){ event }
         get :new
-        assigns[:event].should equal(mock_event)
+        assigns(:event).should eq event
       end
     end
 
     describe "GET edit" do
       it "assigns the requested event as @event" do
-        Event.stub(:find).with("37").and_return(mock_event)
-        get :edit, :id => "37"
-        assigns[:event].should equal(mock_event)
+        subject.stub(:find).with("37").and_return(event)
+        get :edit, params
+        assigns(:event).should eq event
       end
     end
 
     describe "POST create" do
-
+      let :params do 
+        {
+          :event => {
+            :start_date => Date.yesterday.to_s,
+            :end_date => Date.tomorrow.to_s
+          }
+        }
+      end
+      before(:each) do
+        event.stub(:save){ true }
+        subject.stub(:new){ event }
+      end
       describe "with valid params" do
         it "assigns a newly created event as @event" do
-          Event.stub(:new).with({'these' => 'params'}).and_return(mock_event(:save => true, :modified_by_user= => nil))
-          post :create, :event => {:these => 'params'}
-          assigns[:event].should equal(mock_event)
+          post :create, params
+          assigns(:event).should eq event
         end
 
         it "redirects to the created event" do
-          Event.stub(:new).and_return(mock_event(:save => true, :modified_by_user= => nil))
-          post :create, :event => {}
-          response.should redirect_to(event_url(mock_event))
+          post :create, params
+          response.should redirect_to event_url event
         end
       end
 
       describe "with invalid params" do
+        before(:each) do
+          event.stub(:save){ false }
+        end
         it "assigns a newly created but unsaved event as @event" do
-          Event.stub(:new).with({'these' => 'params'}).and_return(mock_event(:save => false, :modified_by_user= => nil))
-          post :create, :event => {:these => 'params'}
-          assigns[:event].should equal(mock_event)
+          post :create, params
+          assigns(:event).should eq event
         end
 
         it "re-renders the 'new' template" do
-          Event.stub(:new).and_return(mock_event(:save => false, :modified_by_user= => nil))
-          post :create, :event => {}
+          post :create, params
           response.should render_template('new')
         end
       end
@@ -84,48 +103,52 @@ describe EventsController do
     end
 
     describe "PUT update" do
+      let :params do 
+        {
+          :id => "37",
+          :event => {
+            :start_date => Date.yesterday.to_s,
+            :end_date => Date.tomorrow.to_s
+          }
+        }
+      end
+      before(:each) do
+        subject.stub(:find).with("37"){ event }
+        event.stub(:update_attributes){ nil }
+      end  
+      it "updates the requested event" do
+        Event.should_receive(:find).with("37"){ event }
+        event.should_receive(:update_attributes)
+        put :update, params
+      end
 
+      it "assigns the requested event as @event" do
+        put :update, params
+        assigns(:event).should eq event
+      end
+      
       describe "with valid params" do
-        it "updates the requested event" do
-          Event.should_receive(:find).with("37").and_return(mock_event)
-          # mock_event.should_receive(:update_attributes).with({'these' => 'params',
-          #   'modified_by_user' => mock_admin_user})
-          
-          mock_event.should_receive(:update_attributes).with({'these' => 'params'})
-          put :update, :id => "37", :event => {:these => 'params'}
+        before(:each) do
+          event.stub(:update_attributes){ true }
         end
-
-        it "assigns the requested event as @event" do
-          Event.stub(:find).and_return(mock_event(:update_attributes => true))
-          put :update, :id => "1", :event => {}
-          assigns[:event].should equal(mock_event)
+        
+        it "sets a flash[:notice]" do
+          put :update, params
+          flash[:notice].should_not be_nil
         end
-
         it "redirects to the event" do
-          Event.stub(:find).and_return(mock_event(:update_attributes => true))
-          put :update, :id => "1", :event => {}
-          response.should redirect_to(event_url(mock_event))
+          put :update, params
+          response.should redirect_to event_url event
         end
       end
 
       describe "with invalid params" do
-        it "updates the requested event" do
-          Event.should_receive(:find).with("37").and_return(mock_event)
-          mock_event.should_receive(:update_attributes).with({'these' => 'params'})
-          # mock_event.should_receive(:update_attributes).with({'these' => 'params',
-          #     'modified_by_user' => mock_admin_user })
-          put :update, :id => "37", :event => { :these => 'params'}
-        end
-
-        it "assigns the event as @event" do
-          Event.stub(:find).and_return(mock_event(:update_attributes => false))
-          put :update, :id => "1", :event => { 'these' => 'params'}
-          assigns[:event].should equal(mock_event)
+        before(:each) do
+          event.stub(:update_attributes){ false }
         end
 
         it "re-renders the 'edit' template" do
-          Event.stub(:find).and_return(mock_event(:update_attributes => false))
-          put :update, :id => "1", :event => { 'these' => 'params'}
+          put :update, params
           response.should render_template('edit')
         end
       end
@@ -134,15 +157,13 @@ describe EventsController do
 
     describe "DELETE destroy" do
       it "destroys the requested event" do
-        Event.should_receive(:find).with("37").and_return(mock_event)
-        mock_event.should_receive(:destroy)
-        delete :destroy, :id => "37"
+        event.should_receive(:destroy)
+        delete :destroy, params
       end
 
       it "redirects to the events list" do
-        Event.stub(:find).and_return(mock_event(:destroy => true))
-        delete :destroy, :id => "1"
-        response.should redirect_to(events_url)
+        delete :destroy, params
+        response.should redirect_to events_url
       end
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: event_calendar_engine
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 11
   prerelease: false
   segments: 
   - 0
   - 1
-  - 7
-  version: 0.1.7
+  - 8
+  version: 0.1.8
 platform: ruby
 authors: 
 - Jason LaPier
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-23 00:00:00 -08:00
+date: 2011-01-06 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -445,6 +445,8 @@ files:
 - db/migrate/20101011142543_create_events.rb
 - db/migrate/20101011172027_create_attendees.rb
 - db/migrate/20101011200048_make_events_revisable.rb
+- db/migrate/20101223221015_change_start_on_end_on_to_timestamp.rb
+- db/migrate/20101223233354_add_timezone_to_events.rb
 - db/schema.rb
 - db/seeds.rb
 - lib/event_calendar.rb