event_calendar_engine 0.2.1 → 0.2.2

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/app/controllers/events_controller.rb

@@ -106,7 +106,7 @@ class EventsController < EventCalendar::ApplicationController
   # POST /events.xml
   def create
     @event = Event.new(params[:event])
-    
+    @event.adjust_to_utc = true
     respond_to do |format|
       if @event.save
         flash[:notice] = 'Event was successfully created.'
@@ -124,7 +124,7 @@ class EventsController < EventCalendar::ApplicationController
   # PUT /events/1.xml
   def update
     @event = Event.find(params[:id])
-
+    @event.adjust_to_utc = true
     respond_to do |format|
       if @event.update_attributes(params[:event])
         flash[:notice] = 'Event was successfully updated.'

data/app/helpers/event_calendar/application_helper.rb

@@ -11,14 +11,6 @@ module EventCalendar::ApplicationHelper
     link_text = link_options.delete(:link_text) || path
     highlight = wrapper_options.delete(:highlight)
   
-    unless path.blank?
-      if current_page?(path) && (highlight.nil? || highlight)
-        wrapper_options.merge!({
-          :class => (wrapper_options[:class] || '') + " nav_highlight"
-        })
-      end
-    end
-  
     unless wrapper_options.delete(:no_wrapper)
       return content_tag(tag, wrapper_options) do
         link_to(link_text, path, link_options)
@@ -145,6 +137,14 @@ module EventCalendar::ApplicationHelper
     }.merge!(link_options))
   end
   
+  def link_to_new_link(event, wrapper_options={}, link_options={})
+    return unless has_authorization?(:create, Link.new)
+    link_wrapper(new_event_link_path(event), wrapper_options, {
+      :link_text => 'New link',
+      :class => 'fake_button'
+    }.merge!(link_options))
+  end
+  
   def link_to_edit_link(event, link, wrapper_options={}, link_options={})
     return unless has_authorization?(:update, link)
     link_wrapper(edit_event_link_path(event, link), {

data/app/models/event.rb

@@ -1,6 +1,8 @@
 class Event < ActiveRecord::Base
   set_table_name "event_calendar_events"
   
+  attr_accessor :adjust_to_utc
+  
   include ActionView::Helpers::TextHelper
   
   include EventInstanceMethods
@@ -44,7 +46,7 @@ class Event < ActiveRecord::Base
     end
     
     def adjust_to_utc_from_timezone
-      return true if deleted?
+      return true unless adjust_to_utc
       tz_offset = start_on.in_time_zone(timezone).utc_offset
       self.start_on = self.start_on - tz_offset
       self.end_on = self.end_on - tz_offset

data/app/views/links/_links.html.erb

@@ -1,6 +1,6 @@
 <p><strong>Materials/Resources</strong></p>
 <div id="links" class="links">
   <%= render @event.links.all %>
-  <p class="new"><%= link_to 'New Link', new_event_link_path(@event), :class => 'fake_button' %></p>
+  <%= link_to_new_link(@event, {:class => 'new'}) %>
   <%= render :partial => 'links/form' %>
 </div>

data/spec/controllers/events_controller_spec.rb

@@ -11,7 +11,8 @@ describe EventsController do
       :timezone => 'Pacific Time (US & Canada)',
       :description => 'Some Description',
       :location => 'Some City',
-      :links => mock('Relation', :build => mock_model(Link))
+      :links => mock('Relation', :build => mock_model(Link)),
+      :adjust_to_utc= => nil
     })
   end
   let(:params) do
@@ -78,6 +79,7 @@ describe EventsController do
       end
       before(:each) do
         event.stub(:save){ true }
+        event.stub(:adjust_to_utc=){ true }
         subject.stub(:new){ event }
       end
       describe "with valid params" do
@@ -85,7 +87,10 @@ describe EventsController do
           post :create, params
           assigns(:event).should eq event
         end
-
+        it "sets adjust_to_utc to true" do
+          event.should_receive(:adjust_to_utc=).with(true)
+          post :create, params
+        end
         it "redirects to the created event" do
           post :create, params
           response.should redirect_to event_url event
@@ -122,13 +127,21 @@ describe EventsController do
       before(:each) do
         subject.stub(:find).with("37"){ event }
         event.stub(:update_attributes){ nil }
-      end  
-      it "updates the requested event" do
+        event.stub(:adjust_to_utc=){ true }
+      end
+      it "loads the @event" do
         Event.should_receive(:find).with("37"){ event }
+        put :update, params
+        assigns(:event).should eq event
+      end
+      it "sets adjust_to_utc to true" do
+        event.should_receive(:adjust_to_utc=).with(true)
+        put :update, params
+      end
+      it "updates the requested event" do
         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

data/spec/fixtures/event_calendar_events.yml

@@ -15,4 +15,13 @@ restorable_event:
   location: "Portland, Oregon"
   start_on: 2011-02-04 14:00:00.000000
   end_on: 2011-02-04 15:00:00.000000
+  timezone: 'Pacific Time (US & Canada)'
+  
+linkable_event:
+  id: <%= Fixtures.identify :linkable_event %>
+  name: Linkable Event
+  event_type: Meeting
+  location: "Portland, Oregon"
+  start_on: 2011-02-04 14:00:00.000000
+  end_on: 2011-02-04 15:00:00.000000
   timezone: 'Pacific Time (US & Canada)'

data/spec/fixtures/event_calendar_events_links.yml

@@ -1,3 +1,3 @@
-editable_event_editable_link:
-  event_id: <%= Fixtures.identify :editable_event %>
+linkable_event_editable_link:
+  event_id: <%= Fixtures.identify :linkable_event %>
   link_id: <%= Fixtures.identify :editable_link %>

data/spec/models/event_spec.rb

@@ -48,29 +48,23 @@ describe Event do
     event.should_not be_valid
   end
   
-  context "setting default end_on of start_on + 1.hour if start_on is present and" do
-    before(:each) do
-      Time.zone = 'Pacific Time (US & Canada)'
-    end
-    let(:event) do
-      Event.new(@valid_attributes.merge!({
-        :timezone => 'Pacific Time (US & Canada)',
-        :start_on => 1.hour.from_now,
-        :end_on => nil
-      }))
-    end
-    
-    it "end_on is blank" do
-      event.one_day?.should be_true
-      event.valid?
-      event.end_on.should eq event.start_on + 1.hour
-    end
-    it "end_on <= start_on" do
-      event.end_on = 4.hours.ago
-      event.one_day?.should be_true
-      event.valid?
-      event.end_on.should eq event.start_on + 1.hour
-    end
+  it "adjusts start_on and end_on to utc from timezone when adjust_to_utc == true" do
+    Time.zone = 'Pacific Time (US & Canada)' # mimic default rails behavior
+    f = '%A %B %d %Y @ %H%M'
+    pac_start = 2.hours.from_now
+    pac_end = 4.hours.from_now
+    event = Event.new(@valid_attributes.merge!({
+      :timezone => 'Pacific Time (US & Canada)',
+      :start_on => pac_start,
+      :end_on => pac_end
+    }))
+    event.save!
+    event.start_on.strftime(f).should eq pac_start.strftime(f)
+    event.end_on.strftime(f).should eq pac_end.strftime(f)
+    event.adjust_to_utc = true
+    event.save!
+    event.start_on.strftime(f).should eq pac_start.utc.strftime(f)
+    event.end_on.strftime(f).should eq pac_end.utc.strftime(f)
   end
 
   it "should find event types" do
@@ -101,5 +95,28 @@ describe Event do
     event.save
     event.revision_number.should == 0
   end
-  
+  context "setting default end_on of start_on + 1.hour if start_on is present and" do
+    before(:each) do
+      Time.zone = 'Pacific Time (US & Canada)'
+    end
+    let(:event) do
+      Event.new(@valid_attributes.merge!({
+        :timezone => 'Pacific Time (US & Canada)',
+        :start_on => 1.hour.from_now,
+        :end_on => nil
+      }))
+    end
+    
+    it "end_on is blank" do
+      event.one_day?.should be_true
+      event.valid?
+      event.end_on.should eq event.start_on + 1.hour
+    end
+    it "end_on <= start_on" do
+      event.end_on = 4.hours.ago
+      event.one_day?.should be_true
+      event.valid?
+      event.end_on.should eq event.start_on + 1.hour
+    end
+  end  
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: event_calendar_engine
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Jason LaPier
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-06 00:00:00 -08:00
+date: 2011-02-07 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency