radiant-event_calendar-extension 1.1.0 → 1.1.1

data/README.md

@@ -72,8 +72,6 @@ The events controller uses `share_layouts` to define various page parts that you
 * `pagination` is the usual will_paginate block.
 * `faceting` here only gives the option to remove any date filters that have been applied. If you add the `taggable_events` extension it gets more useful.
 
-You will find minimal styling of some of these parts in `/stylesheets/sass/calendar.sass`,
-
 Set the config entry `event_calendar.layout` to the name of your layout and point a browser at /calendar to see what you've got.
 
 Here's a basic sample layout that should just work:

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.1.1

data/app/controllers/admin/events_controller.rb

@@ -1,15 +1,24 @@
 class Admin::EventsController < Admin::ResourceController
   paginate_models :per_page => 20
+  prepend_before_filter :get_venue
   
   def load_models
     pp = pagination_parameters
+    finder = @event_venue ? Event.at_venue(@event_venue) : Event.scoped
     unless params[:p]
-      first_event = Event.future_and_current.first
-      i = Event.all.index(first_event)
+      first_event = finder.future_and_current.first
+      i = finder.index(first_event) || 0    # if there are no future events we revert to the first page
       p = (i / pp[:per_page].to_i) + 1
       pp[:page] = p if p && p > 1
     end
-    self.models = Event.paginate(pp)
+    self.models = finder.paginate(pp)
+  end
+
+protected
+  
+  def get_venue
+    @event_venue = EventVenue.find_by_id(params[:event_venue_id]) if params[:event_venue_id]
+    Rails.logger.warn "@event_venue is #{@event_venue.inspect}"
   end
 
 end

data/app/controllers/admin/icals_controller.rb

@@ -15,8 +15,8 @@ class Admin::IcalsController < Admin::ResourceController
   
   def refresh
     ical = Ical.find(params[:id])
-    if events = ical.refresh
-      flash[:notice] = ical.calendar.name + " calendar refreshed from iCal subscription."
+    if response = ical.refresh
+      flash[:notice] = ical.calendar.name + " calendar refreshed. #{response}"
     else
       flash[:notice] = "Error parsing " + ical.calendar.name + " calendar from iCal subscription."
     end

data/app/models/calendar.rb

@@ -53,5 +53,5 @@ class Calendar < ActiveRecord::Base
   def to_ical
     self.to_ri_cal.to_s
   end
-
+  
 end

data/app/models/event.rb

@@ -13,7 +13,7 @@ class Event < ActiveRecord::Base
   
   belongs_to :master, :class_name => 'Event'
   has_many :occurrences, :class_name => 'Event', :foreign_key => 'master_id', :dependent => :destroy
-  has_many :recurrence_rules, :class_name => 'EventRecurrenceRule', :dependent => :destroy, :conditions => {:active => 1}
+  has_many :recurrence_rules, :class_name => 'EventRecurrenceRule', :dependent => :destroy, :conditions => {:active => true}
   accepts_nested_attributes_for :recurrence_rules, :allow_destroy => true, :reject_if => lambda { |attributes| attributes['active'].to_s != '1' }
 
   validates_presence_of :uuid, :title, :start_date, :status_id
@@ -65,6 +65,14 @@ class Event < ActiveRecord::Base
 
   named_scope :by_end_date,  { :order => "end_date ASC" }
 
+  named_scope :at_venue, lambda { |venue| # EventVenue object
+    { :conditions => ["event_venue_id = ?", venue.id] }
+  }
+  
+  named_scope :except_these, lambda { |uuids| # array of uuid strings
+    { :conditions => ["uuid not in (#{uuids.map{'?'}.join(',')})", *uuids] }
+  }
+
   def self.in_the_last(period)           # seconds. eg calendar.occurrences.in_the_last(1.week)
     finish = Time.now
     start = finish - period
@@ -183,6 +191,10 @@ class Event < ActiveRecord::Base
     start_date.mday
   end
   
+  def mday_padded
+    "%02d" % mday
+  end
+  
   def short_date
     start_date.to_datetime.strftime(short_date_format)
   end
@@ -418,8 +430,4 @@ protected
     Radiant::Config['event_calendar.round_time_format'] || "%-1I%p"
   end
   
-  def dates_are_in_order
-    
-  end
-
 end

data/app/models/ical.rb

@@ -5,6 +5,7 @@ require 'date'
 require 'ftools'
 
 class Ical < ActiveRecord::Base
+  include ActionView::Helpers::TextHelper
   belongs_to :calendar
   validates_presence_of :url
   has_site if respond_to? :has_site
@@ -45,7 +46,8 @@ class Ical < ActiveRecord::Base
     begin
       Ical.transaction do
         self.last_refresh_count = 0
-        event_count = 0
+        count = { :created => 0, :updated => 0, :deleted => 0 }
+        uuids_seen = []
         File.open(thisfile, "r") do |file|
           components = RiCal.parse(file)
           cal = components.first
@@ -53,22 +55,30 @@ class Ical < ActiveRecord::Base
             if event = Event.find_by_uuid(cal_event.uid)
               if cal_event.dtstamp > event.updated_at
                 affected.push event.update_from(cal_event) 
+                count[:updated] += 1
               else
               end
-              event_count += 1
             else
               event = Event.create_from(cal_event)
               event.site = self.calendar.site if event.respond_to? :site=
               self.calendar.events << event
               event.save!
-              affected.push event
+              count[:created] += 1
             end
+            uuids_seen.push(cal_event.uid)
           end
         end
-        self.last_refresh_count = event_count
+        self.last_refresh_count = uuids_seen.length
         self.last_refresh_date = Time.now.utc
         self.save!
-        affected
+        
+        self.calendar.events.except_these(uuids_seen).each do |event| 
+          event.destroy 
+          count[:deleted] += 1
+        end
+        response = [:created, :updated, :deleted].collect { |counter| 
+          "#{pluralize(count[counter], 'event')} #{counter}. "
+        }.join('')
       end
     rescue => error
       logger.error "RiCal parse error with: #{self.calendar.name}: #{error}."

data/app/views/admin/calendars/edit.html.haml

@@ -1,3 +1,6 @@
+- @page_title = @calendar.name
+- @page_title += ' - Calendar - ' + default_page_title
+
 - include_stylesheet('admin/event_calendar')
 
 - render_region :main do |main|

data/app/views/admin/calendars/index.html.haml

@@ -1,3 +1,6 @@
+- @page_title = 'Calendars'
+- @page_title += ' - Calendar - ' + default_page_title
+
 - include_stylesheet 'admin/event_calendar'
 = render_region :top 
 

data/app/views/admin/calendars/new.html.haml

@@ -1,4 +1,7 @@
-- include_stylesheet('admin/calendar')
+- @page_title = 'New calendar'
+- @page_title += ' - Calendar - ' + default_page_title
+
+- include_stylesheet('admin/event_calendar')
 
 - render_region :main do |main|
   - main.edit_header do

data/app/views/admin/event_venues/_event_venue.html.haml

@@ -5,7 +5,7 @@
         %h3.title
           = link_to event_venue.title, edit_admin_event_venue_url(event_venue)
         %p.description
-          = truncate(event_venue.description, 128)
+          = link_to "#{event_venue.events.count} #{pluralize(event_venue.events.count, 'event')}", admin_event_venue_events_url(event_venue)
     - tbody.location_cell do
       %td.location
         = event_venue.address
@@ -14,5 +14,6 @@
         - if event_venue.url
           = link_to truncate(event_venue.url, 48), event_venue.url
     - tbody.modify_cell do
-      %td.remove
-        = link_to 'remove', remove_admin_event_venue_url(event_venue)
+      %td.actions
+        - confirmation = "Are you sure you want to delete entirely the event venue '#{event_venue.title}'?"
+        = link_to image('minus') + ' remove', remove_admin_event_venue_url(event_venue), :class => 'action'

data/app/views/admin/event_venues/_form.html.haml

@@ -43,6 +43,6 @@
       This is only required if your address is unusual or you want these events to show on a map in a particular place.
 
   %p.url
-    = f.label :url, "Venue url"
+    = f.label :url, "Location url"
     = f.text_field :url, :class => 'textbox'
 

data/app/views/admin/event_venues/edit.html.haml

@@ -1,3 +1,6 @@
+- @page_title = @event_venue.title
+- @page_title += ' - Calendar - ' + default_page_title
+
 - include_stylesheet "admin/event_calendar"
 - include_javascript "admin/event_calendar"
 - if defined? TinyMceFilter

data/app/views/admin/event_venues/index.html.haml

@@ -1,3 +1,6 @@
+- @page_title = 'Locations'
+- @page_title += ' - Calendar - ' + default_page_title
+
 - include_stylesheet "admin/event_calendar"
 
 #event_venues_table.outset      

data/app/views/admin/event_venues/new.html.haml

@@ -1,5 +1,9 @@
+- @page_title = 'Add a location'
+- @page_title += ' - Calendar - ' + default_page_title
+
 - include_stylesheet "admin/event_calendar"
 - include_javascript "admin/event_calendar"
+
 - if defined? TinyMceFilter
   - include_javascript "tiny_mce/tiny_mce"
   - include_javascript "tiny_mce/tiny_mce_settings"

data/app/views/admin/event_venues/remove.html.haml

@@ -1,17 +1,39 @@
-%h1 Remove event
+- include_stylesheet "admin/event_calendar"
+
+%h1 Remove location
 
 %p 
   Are you sure you want to 
   %strong.warning 
     remove permanently
-  the following event?
+  the location
+  = link_to @event_venue.title + '?', edit_admin_event_venue_url(@event_venue)
 
-%table.index#events
-  %tbody
-    = render :partial => 'event', :object => @event
+  - if @event_venue.events.any?
+    %br
+    It is associated with 
+    = @event_venue.events.count
+    = pluralize(@event_venue.events.count, 'event')
+    that will remain in the calendar without a location:
+  - else
+    It has no events.
 
-- form_for [:admin, @event], :html => {:method => :delete} do
+- if @event_venue.events.any?
+  %ul
+    - @event_venue.events.each do |event|
+      %li
+        = link_to event.title, edit_admin_event_url(event)
+        %span.note
+          = event.summarize_start
+        
+- form_for [:admin, @event_venue], :html => {:method => :delete} do
   %p.buttons
-    %input.button{:type=>"submit", :value=>"Delete event"}/
+    %input.button{:type=>"submit", :value=>"Delete location"}
     or
-    = link_to 'Cancel', admin_events_url
+    = link_to 'Cancel', admin_event_venues_url
+
+#actions
+  %ul
+    %li= link_to "event list", admin_events_url
+    %li= link_to "calendar list", admin_calendars_url
+    %li= link_to "venue list", admin_event_venues_url

data/app/views/admin/events/_event.html.haml

@@ -9,18 +9,13 @@
       %td.datemark
         %a{:href => admin_event_url(master_event), :class => event.occurrence? ? 'occurrence' : 'master'}
           %span.month= Date::ABBR_MONTHNAMES[event.start_date.month]
-          %span.day= event.start_date.mday
+          %span.day= event.mday_padded
     - tbody.title_cell do
       %td.event
         %h3.title
           = link_to event.title, edit_admin_event_url(master_event), :class => event.occurrence? ? 'occurrence' : 'master'
         %p.description
-          = truncate(event.description, 128)
-        - unless event.keywords.blank?
-          %p.keywords
-            %strong
-              tags: 
-            = event.keywords
+          = truncate(event.description, :length => 128)
     - tbody.calendar_cell do
       %td.calendar
         = link_to event.calendar.name, admin_calendar_url(event.calendar) if event.calendar
@@ -30,13 +25,10 @@
     - tbody.location_cell do
       %td.location
         - if event.event_venue
-          = event.event_venue.title
+          = link_to event.event_venue.title, edit_admin_event_venue_url(event.event_venue)
     - tbody.modify_cell do
-      %td.remove
+      %td.actions
         - if event.editable?
           - confirmation = "Are you sure you want to delete entirely the event '#{event.title}'"
           - confirmation << " and all its recurrences" if event.recurs?
-          = link_to "remove", admin_event_url(event.master || event), :confirm => "#{confirmation}?", :method => 'delete'
-        - else
-          %span.ineditable{:title => "subscribed events can't be removed here"}
-            remove
+          = link_to image('minus') + ' remove', remove_admin_event_url(event.master || event), :class => 'action'

data/app/views/admin/events/_form.html.haml

@@ -86,7 +86,7 @@
 
     - form_bottom.edit_venue do
       - toggle_precedence = %w{venue new_venue}
-      - toggle_precedence.reverse! if @venues.empty? || @event.event_venue.new_record?
+      - toggle_precedence.reverse! if @venues.empty?
   
       - if imported
         - f.fields_for :event_venue, @event.event_venue do |ef|
@@ -96,13 +96,13 @@
         -if @venues.any?
           #venue.main
             %p#existing_venue
-              = f.label :event_venue_id, "Choose a place"
+              = f.label :event_venue_id, "Choose a location"
               = f.select :event_venue_id, @venues.map {|v| [v.title, v.id]}, {:include_blank => true}, :class => 'textbox', :disabled => imported
               - if imported
                 = link_to "edit this location", admin_event_venue_url(@event.event_venue)
                 to add title, description and directions
               - else
-                = link_to "add a new place", new_admin_event_venue_url, :class => 'swapper', :rel => "toggle[#{toggle_precedence.join(',')}]"
+                = link_to "add a new location", new_admin_event_venue_url, :class => 'swapper', :rel => "toggle[#{toggle_precedence.join(',')}]"
         #new_venue
           - @event.build_event_venue unless @event.event_venue
           - f.fields_for :event_venue, @event.event_venue do |ef|

data/app/views/admin/events/edit.html.haml

@@ -1,3 +1,6 @@
+- @page_title = @event.title
+- @page_title += ' - Calendar - ' + default_page_title
+
 - include_stylesheet "admin/event_calendar"
 - include_javascript "admin/event_calendar"
 

data/app/views/admin/events/index.html.haml

@@ -1,8 +1,34 @@
+- @page_title = 'Events'
+- @page_title += " at #{@event_venue.title}" if @event_venue
+- @page_title += ' - Calendar - ' + default_page_title
+
 - include_stylesheet "admin/event_calendar"
 
 #events_table.outset      
   %table#events.index{:cellspacing=>"0", :border=>"0", :cellpadding=>"0"}
-    = render :partial => 'list_head'
+    %thead
+      %tr
+        - render_region :thead do |thead|
+          - thead.date_header do
+            %th.date
+          - thead.title_header do
+            %th.event 
+              %strong 
+                Events
+                - if @event_venue
+                  at 
+                  = @event_venue.title
+                  = link_to "(show all)", admin_events_url
+          - thead.calendar_header do
+            %th.calendar Calendar
+          - thead.time_header do
+            %th.date Time
+          - thead.location_header do
+            %th.location Location
+          - thead.keywords_header do
+            %th.keywords Keywords
+          - thead.modify_header do
+            %th.modify Modify
   
     %tbody
       - if @events.any?
@@ -11,7 +37,7 @@
       - else
         %tr
           %td.note{:colspan => admin.event.index.tbody.length} 
-            No events coming up
+            No events to display
 
   - render_region :bottom do |bottom|
     - bottom.buttons do

data/app/views/admin/events/new.html.haml

@@ -1,3 +1,6 @@
+- @page_title = 'Add an event'
+- @page_title += ' - Calendar - ' + default_page_title
+
 - include_stylesheet "admin/event_calendar"
 - include_javascript "admin/event_calendar"
 

data/app/views/admin/events/remove.html.haml

@@ -1,17 +1,22 @@
-%h1 Remove event
+%h1 Delete event
 
 %p 
   Are you sure you want to 
   %strong.warning 
     remove permanently
-  the following event?
+  the event 
+  = link_to(@event.title, edit_admin_event_url(@event)) + '?'
+  
 
-%table.index#events
-  %tbody
-    = render :partial => 'event', :object => @event
 
 - form_for [:admin, @event], :html => {:method => :delete} do
   %p.buttons
     %input.button{:type=>"submit", :value=>"Delete event"}/
     or
-    = link_to 'Cancel', admin_events_url
+    = link_to 'Cancel', admin_events_url
+    
+#actions
+  %ul
+    %li= link_to "event list", admin_events_url
+    %li= link_to "calendar list", admin_calendars_url
+    %li= link_to "venue list", admin_event_venues_url

data/app/views/events/_event.html.haml

@@ -10,16 +10,14 @@
     - unless no_date
       .datemark
         .mon= event.short_month
-        .dom= event.mday
+        .dom= event.mday_padded
     .summary
       %h2
         - if event.url
           = link_to event.title, event.url, :class => 'title'
         - else
           = event.title
-        - event.attached_tags.each do |tag|
-          %span.tag
-            = tag.name
+        = event.keywords
           
       %p.practicalities
         = event.summarize_start

data/config/routes.rb

@@ -1,9 +1,9 @@
 ActionController::Routing::Routes.draw do |map|
   map.namespace :admin, :path_prefix => '/admin/event_calendar' do |cal|
-    cal.resources :calendars
+    cal.resources :calendars, :member => {:remove => :get}
     cal.resources :icals, :collection => {:refresh_all => :any}, :member => {:refresh => :put}
     cal.resources :events, :member => {:remove => :get}
-    cal.resources :event_venues, :member => {:remove => :get}
+    cal.resources :event_venues, :member => {:remove => :get}, :has_many => :events
     cal.calendars_home '/', :controller => 'events', :action => 'index'
   end
   map.calendar "/calendar.:format", :controller => 'events', :action => 'index'

data/event_calendar_extension.rb

@@ -1,5 +1,5 @@
 class EventCalendarExtension < Radiant::Extension
-  version "1.0.1"
+  version "1.1.1"
   description "An event calendar extension that administers events locally or draws them from any ical or CalDAV publishers (Google Calendar, .Mac, Darwin Calendar Server, etc.)"
   url "http://github.com/radiant/radiant-event_calendar-extension"