event_calendar_engine 0.1.11 → 0.2.0

data/Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: git://github.com/inertialbit/acts_as_revisable.git
-  revision: 4f4cba5de4faf87c9196afde9b4e16fa83915ef8
+  revision: ac928ff786fbf0deb415ee9d8e7034b4d4b031ac
   branch: rails3
   specs:
     acts_as_revisable (1.1.2)
@@ -39,9 +39,9 @@ GEM
     acts_as_fu (0.0.7.2)
       activerecord
       sqlite3-ruby
-    arel (2.0.4)
+    arel (2.0.7)
     builder (2.1.2)
-    capybara (0.4.0)
+    capybara (0.4.1.1)
       celerity (>= 0.7.9)
       culerity (>= 0.2.4)
       mime-types (>= 1.16)
@@ -49,19 +49,19 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       selenium-webdriver (>= 0.0.27)
-      xpath (~> 0.1.2)
-    celerity (0.8.4)
-    childprocess (0.1.4)
+      xpath (~> 0.1.3)
+    celerity (0.8.7)
+    childprocess (0.1.6)
       ffi (~> 0.6.3)
-    cucumber (0.9.4)
-      builder (~> 2.1.2)
+    cucumber (0.10.0)
+      builder (>= 2.1.2)
       diff-lcs (~> 1.1.2)
-      gherkin (~> 2.2.9)
+      gherkin (~> 2.3.2)
       json (~> 1.4.6)
       term-ansicolor (~> 1.0.5)
     cucumber-rails (0.3.2)
       cucumber (>= 0.8.0)
-    culerity (0.2.12)
+    culerity (0.2.15)
     diff-lcs (1.1.2)
     engineer (0.2.3)
       jeweler (>= 1.4.0)
@@ -69,24 +69,23 @@ GEM
       abstract (>= 1.0.0)
     ffi (0.6.3)
       rake (>= 0.8.7)
-    formtastic (1.2.1)
+    formtastic (1.2.3)
       actionpack (>= 2.3.7)
       activesupport (>= 2.3.7)
-      i18n (>= 0.4.0)
-    gherkin (2.2.9)
+      i18n (~> 0.4)
+    gherkin (2.3.3)
       json (~> 1.4.6)
-      term-ansicolor (~> 1.0.5)
     git (1.2.5)
-    i18n (0.4.2)
-    jeweler (1.5.1)
+    i18n (0.5.0)
+    jeweler (1.5.2)
       bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
     json (1.4.6)
-    json_pure (1.4.6)
-    mail (2.2.10)
+    json_pure (1.5.1)
+    mail (2.2.15)
       activesupport (>= 2.3.6)
-      i18n (~> 0.4.1)
+      i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.16)
@@ -98,7 +97,7 @@ GEM
     rack (1.2.1)
     rack-mount (0.6.13)
       rack (>= 1.0.0)
-    rack-test (0.5.6)
+    rack-test (0.5.7)
       rack (>= 1.0)
     rails (3.0.3)
       actionmailer (= 3.0.3)
@@ -115,31 +114,36 @@ GEM
       thor (~> 0.14.4)
     rake (0.8.7)
     rcov (0.9.9)
-    rdiscount (1.6.5)
-    rspec (2.1.0)
-      rspec-core (~> 2.1.0)
-      rspec-expectations (~> 2.1.0)
-      rspec-mocks (~> 2.1.0)
-    rspec-core (2.1.0)
-    rspec-expectations (2.1.0)
+    rdiscount (1.6.8)
+    rspec (2.5.0)
+      rspec-core (~> 2.5.0)
+      rspec-expectations (~> 2.5.0)
+      rspec-mocks (~> 2.5.0)
+    rspec-core (2.5.0)
+    rspec-expectations (2.5.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.1.0)
-    rspec-rails (2.1.0)
-      rspec (~> 2.1.0)
+    rspec-mocks (2.5.0)
+    rspec-rails (2.5.0)
+      actionpack (~> 3.0)
+      activesupport (~> 3.0)
+      railties (~> 3.0)
+      rspec (~> 2.5.0)
     rubyzip (0.9.4)
-    selenium-webdriver (0.1.0)
-      childprocess (= 0.1.4)
+    selenium-webdriver (0.1.2)
+      childprocess (~> 0.1.5)
       ffi (~> 0.6.3)
       json_pure
       rubyzip
-    sqlite3-ruby (1.3.2)
+    sqlite3 (1.3.3)
+    sqlite3-ruby (1.3.3)
+      sqlite3 (>= 1.3.3)
     term-ansicolor (1.0.5)
     thor (0.14.6)
     treetop (1.4.9)
       polyglot (>= 0.3.1)
-    tzinfo (0.3.23)
+    tzinfo (0.3.24)
     will_paginate (3.0.pre2)
-    xpath (0.1.2)
+    xpath (0.1.3)
       nokogiri (~> 1.3)
 
 PLATFORMS

data/VERSION

@@ -1 +1 @@
-0.1.11
+0.2.0

data/app/controllers/event_revisions_controller.rb

@@ -15,7 +15,7 @@ class EventRevisionsController < EventCalendar::ApplicationController
   
   def restore
     @event_revision = EventRevision.find(params[:id])
-    if @event_revision.restore    
+    if @event_revision.restore
       flash[:notice] = "Event <em>#{@event_revision.name}</em> restored.".html_safe
       redirect_to(event_path(@event_revision))
     else

data/app/controllers/events_controller.rb

@@ -30,12 +30,21 @@ class EventsController < EventCalendar::ApplicationController
       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(nil, start_min, start_hour, start_date.day, start_date.month, start_date.year, nil, nil, nil, params[:event][:timezone])
-      params[:event][:end_on] = Time.local(nil, end_min, end_hour, end_date.day, end_date.month, end_date.year, nil, nil, nil, params[:event][:timezone])
-      params[:event][:start_time] = params[:event][:start_on]
-      params[:event][:end_time] = params[:event][:end_on]
+      if params[:event][:start_date].present?
+        start_date = Date.parse(params[:event][:start_date])
+        params[:event][:start_on] = Time.utc(start_date.year, start_date.month, start_date.day, start_hour, start_min)
+        if params[:event][:end_date].present?
+          end_date = Date.parse(params[:event][:end_date])
+        else
+          end_date = start_date
+        end
+        params[:event][:end_on] = Time.utc(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]
+      else
+        params[:event][:start_time] = ''
+        params[:event][:end_time] = ''
+      end
     end
   protected
   public
@@ -46,8 +55,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 DESC")
-      @current_events = Event.current.order("start_on DESC")
+      @past_events = Event.past.order("start_on ASC")
+      @current_events = Event.current.order("start_on ASC")
     end
 
     respond_to do |format|
@@ -68,6 +77,7 @@ class EventsController < EventCalendar::ApplicationController
   def show
     # @event = Event.find(params[:id], :include => :file_attachments)
     @event = Event.find(params[:id])
+    @link = @event.links.build
     
     respond_to do |format|
       format.html # show.html.erb
@@ -79,7 +89,7 @@ class EventsController < EventCalendar::ApplicationController
   # GET /events/new.xml
   def new
     @event = Event.new
-
+    @event.start_time = Time.local(Date.current.year, Date.current.month, Date.current.day, 06, 00)
     respond_to do |format|
       format.html # new.html.erb
       format.xml  { render :xml => @event }
@@ -103,6 +113,7 @@ class EventsController < EventCalendar::ApplicationController
         format.html { redirect_to(event_path(@event)) }
         format.xml  { render :xml => @event, :status => :created, :location => @event }
       else
+        flash.now[:notice] = @event.errors.full_messages
         format.html { render :action => "new" }
         format.xml  { render :xml => @event.errors, :status => :unprocessable_entity }
       end
@@ -115,12 +126,12 @@ class EventsController < EventCalendar::ApplicationController
     @event = Event.find(params[:id])
 
     respond_to do |format|
-      # if @event.update_attributes(params[:event].merge(:modified_by_user => current_user))
       if @event.update_attributes(params[:event])
         flash[:notice] = 'Event was successfully updated.'
         format.html { redirect_to(@event) }
         format.xml  { head :ok }
       else
+        flash.now[:notice] = @event.errors.full_messages
         format.html { render :action => "edit" }
         format.xml  { render :xml => @event.errors, :status => :unprocessable_entity }
       end
@@ -138,30 +149,4 @@ class EventsController < EventCalendar::ApplicationController
       format.xml  { head :ok }
     end
   end
-
-  # def drop_contact
-  #   @event = Event.find(params[:id])
-  #   if @event.drop_attendees(params[:contact_ids] || params[:contact_id])
-  #     flash[:notice] = "Contact(s) removed from #{@event.name} roster."
-  #   else
-  #     flash[:warning] = "Failed to remove contact(s) from #{@event.name} roster. (#{@event.errors.full_messages.join('; ')}"
-  #   end
-  #   redirect_to @event
-  # end
-
-  # def add_attendees
-  #   @event = Event.find(params[:id])
-  #   @contacts_not_in_group = Contact.find(:all, :order => 'last_name, first_name',
-  #     :conditions => 'last_name IS NOT NULL AND last_name != ""') - @event.contacts
-  # end
-
-  # def add_contacts
-  #   @event = Event.find(params[:id])
-  #   if @event.add_attendees(params[:contact_ids])
-  #     flash[:notice] = "Contacts(s) added to #{@event.name}."
-  #   else
-  #     flash[:warning] = "Failed to add contact(s) to #{@event.name}. (#{@event.errors.full_messages.join('; ')}"
-  #   end
-  #   redirect_to @event
-  # end
 end

data/app/controllers/links_controller.rb

@@ -0,0 +1,62 @@
+class LinksController < EventCalendar::ApplicationController  
+  private
+    def event
+      @event ||= Event.find(params[:event_id])
+    end
+    def link
+      @link ||= if params[:id].present?
+                  Link.find(params[:id])
+                else
+                  event.links.build(params[:link])
+                end
+    end
+    def load_resources
+      event
+      link
+    end
+    def redirect_to_event
+      redirect_to event_path params[:event_id]
+    end
+    def respond(&block)
+      respond_to do |format|
+        format.html{ yield }
+        format.js
+      end
+    end
+  protected
+  public
+    def new
+      load_resources
+    end
+    def show
+      load_resources
+    end
+    def edit
+      load_resources
+    end
+    def update
+      if link.update_attributes(params[:link])
+        flash[:notice] = "Link successfully updated." unless request.xhr?
+        event if request.xhr?
+        respond{ redirect_to_event }
+      else
+        event
+        respond{ render :edit and return }
+      end
+    end
+    def create
+      load_resources
+      begin
+        event.save!(:without_revision => true)
+        flash[:notice] = "Link successfully created." unless request.xhr?
+        respond{ redirect_to_event }
+      rescue ActiveRecord::RecordInvalid
+        respond{ render 'events/show' and return }
+      end
+    end
+    def destroy
+      link.destroy
+      flash[:notice] = "Link successfully deleted."
+      redirect_to_event
+    end
+end

data/app/helpers/event_calendar/application_helper.rb

@@ -33,21 +33,70 @@ module EventCalendar::ApplicationHelper
     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")
+      key = timezone_in_words(key.strip)
       # out[key] = time.in_time_zone(us_zone).strftime(format)
       out << [key, time.in_time_zone(us_zone).strftime(TIME_BASE)]
     end
     out.reverse
   end
+      
+  def timezone_in_words(zone)
+    pac_regex = /^P(S|D)T$/
+    mnt_regex = /^M(S|D)T$/
+    ctr_regex = /^C(S|D)T$/
+    est_regex = /^E(S|D)T$/
+    case zone
+    when pac_regex
+      zone.gsub(pac_regex, 'Pacific')
+    when mnt_regex
+      zone.gsub(mnt_regex, 'Mountain')
+    when ctr_regex
+      zone.gsub(ctr_regex, 'Central')
+    when est_regex
+      zone.gsub(est_regex, 'Eastern')
+    else
+      zone
+    end
+  end
+  
+  def event_times(event)
+    t = []
+    event_times = times_with_zones(event)
+    event_times.first.each_with_index do |z_t, i|
+      t << "#{z_t.last} - #{event_times.last[i].last} " + content_tag(:em, z_t.first)
+    end
+    t.join(" / ").html_safe
+  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 hour_options
+    [
+      ['6 AM','6'],
+      ['7 AM','7'],
+      ['8 AM','8'],
+      ['9 AM','9'],
+      ['10 AM','10'],
+      ['11 AM','11'],
+      ['12 PM','12'],
+      ['1 PM','13'],
+      ['2 PM','14'],
+      ['3 PM','15'],
+      ['4 PM','16'],
+      ['5 PM','17'],
+      ['6 PM','18'],
+      ['7 PM','19'],
+      ['8 PM','20']
+    ]
+  end
+  
+  def minute_options
+    ['00', '15', '30', '45']
   end
   
   def link_to_events(wrapper_options={}, link_options={})
@@ -95,6 +144,26 @@ module EventCalendar::ApplicationHelper
       :link_text => "Edit <em>#{h(event.name)}</em>".html_safe
     }.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), {
+      :no_wrapper => true
+    }.merge!(wrapper_options), {
+      :link_text => "edit"
+    }.merge!(link_options))
+  end
+  
+  def link_to_delete_link(event, link, wrapper_options={}, link_options={})
+    return unless has_authorization?(:delete, link)
+    link_wrapper(event_link_path(event, link), {
+      :no_wrapper => true
+    }.merge!(wrapper_options), {
+      :link_text => 'delete',
+      :confirm => "Are you sure you want to permanently delete the #{link.name} link?",
+      :method => "delete"
+    }.merge!(link_options))
+  end
 
   def link_to_delete_event(event, wrapper_options={}, link_options={})
     return unless has_authorization?(:delete, event)

data/app/models/event.rb

@@ -6,6 +6,7 @@ class Event < ActiveRecord::Base
   include EventInstanceMethods
 
   has_many :attendees
+  has_and_belongs_to_many :links, :join_table => 'event_calendar_events_links'
 
   validates_presence_of :name, :event_type, :start_on
   
@@ -23,7 +24,16 @@ class Event < ActiveRecord::Base
   
   validate :sane_dates
   
-  before_save :set_timezone
+  before_validation do
+    if one_day? && ((end_on.present? && start_on.present? && end_on <= start_on) ||
+                    (end_on.blank? && start_on.present?))
+      unless changed_attributes.include?(:revisable_deleted_at)
+        self.end_on = start_on + 1.hour
+      end
+    end
+  end
+  
+  before_save :adjust_to_utc_from_timezone
 
   private
 
@@ -33,12 +43,19 @@ class Event < ActiveRecord::Base
       end
     end
     
-    def set_timezone
-      Time.zone = timezone
+    def adjust_to_utc_from_timezone
+      return true if deleted?
+      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
     end
-    
   protected
   public  
+    
+    def self.existing_event_types
+      select('DISTINCT event_type').map(&:event_type).reject { |ev| ev.blank? }.sort
+    end
+    
     def participants
       return [] if attendees.count == 0
       attendees.all.collect do |attendee|
@@ -46,46 +63,7 @@ class Event < ActiveRecord::Base
       end
     end
 
-    def self.existing_event_types
-      select('DISTINCT event_type').map(&:event_type).reject { |ev| ev.blank? }.sort
-    end
-    
-    # def update_roster
-    #   self.attendee_roster = attendees.collect{|a| a.contact_id}.join(',')
-    # end
-
-    # def drop_attendees(drop_contact_ids)
-    #   drop_contact_ids = [*drop_contact_ids].compact.map(&:to_i)
-    #   changeset! do |event|
-    #     event.attendees.find(:all, {
-    #       :select => 'id',
-    #       :conditions => ["contact_id IN (?)", drop_contact_ids]
-    #     }).each{|a| a.destroy && !a.destroyed?}
-    #     event.update_roster
-    #     event.save
-    #   end
-    # end
-    
-    # def add_attendees(from_contact_ids)
-    #   changeset! do |event|
-    #     from_contact_ids.each do |c_id|
-    #       event.attendees.build(:contact_id => c_id)
-    #     end
-    #     event.update_roster
-    #     event.save
-    #   end
-    # end
-
     def to_s
       "#{name} (#{start_on} #{end_on ? ' - ' + end_on.to_s : ''})"
     end
-
-    # list all groups that had least one member in attendance at this event
-    # def contact_groups_represented
-    #   @contact_groups_represented ||= contacts.map(&:contact_groups).flatten.uniq
-    # end
-    
-    # def name_and_file_count
-    #   "#{name} (#{pluralize(file_attachments.count, 'file')})"
-    # end
 end