radiant-event_calendar-extension 1.4.10 → 1.4.12

data/app/controllers/events_controller.rb

@@ -35,14 +35,16 @@ class EventsController < SiteController
   
   def show
     @event = Event.find(params[:id])
-    format.html {
-      timeout = (Radiant::Config['event_calendar:cache_duration'] || self.class.cache_timeout || 3600).seconds
-      expires_in timeout.to_i, :public => true, :private => false
-    }
-    format.ics {
-      ical = RiCal.Calendar { |cal| cal.add_subcomponent(@event.to_ri_cal) }
-      send_data ical, :filename => "#{@event.title.slugify}.ics"	
-    }
+    respond_to do |format|
+      format.html {
+        timeout = (Radiant::Config['event_calendar:cache_duration'] || self.class.cache_timeout || 3600).seconds
+        expires_in timeout.to_i, :public => true, :private => false
+      }
+      format.ics {
+        ical = RiCal.Calendar { |cal| cal.add_subcomponent(@event.to_ri_cal) }
+        send_data ical.to_s, :filename => "#{@event.title.slugify}.ics"	
+      }
+    end
   end
   
   ### helper methods

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

@@ -1,4 +1,5 @@
 - no_date ||= false
+- @seen_events ||= []
 
 - if event
   - event_master_id = event.master_id || event.id

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

@@ -15,7 +15,7 @@
   = @event.facebook_id
 
 - content_for :facebook_url do
-  = event.facebook_url
+  = @event.facebook_url
 
 #events
   = yield :event

data/config/locales/en.yml

@@ -33,8 +33,10 @@ en:
       calendar_day_name: "%A"
       calendar_day_of_month: "%d"
   event_calendar_extension:
+    download_event: "Download event"
     view_on_facebook: "view on facebook"
     attend_on_facebook: "attend on facebook"
+    tweet_this: "Tweet this"
     
   # all this is going to be moved into the more conventional activerecord and event_calendar_extension namespaces when I get a chance.  
   refresh_calendar: "refresh calendar"

data/lib/event_calendar_tags.rb

@@ -1,4 +1,5 @@
 require 'chronic'
+require 'uri'
 
 module EventCalendarTags
   include Radiant::Taggable
@@ -399,6 +400,7 @@ module EventCalendarTags
   #### display attributes of a single event 
 
   tag "event" do |tag|
+    tag.locals.event ||= get_event(tag)
     raise TagError, "can't have r:event without an event" unless tag.locals.event
     tag.expand
   end
@@ -466,17 +468,36 @@ module EventCalendarTags
     tag.locals.event.facebook_url
   end
 
+  desc %{ 
+    Renders a link to the ical file for this single event. This is not a subscription link,
+    and updates to the event will not be propagated: for that you need the webcal link to 
+    a calendar or set of events. This is just a quick way to get an event in someone's diary.
+
+    Usage:
+    <pre><code><r:event:ical_link class="ical" /></code></pre> 
+  }
+  tag "event:ical_link" do |tag|
+    options = tag.attr.dup
+    options['title'] ||= I18n.t('event_calendar_extension.download_event')
+    attributes = options.inject('') { |s, (k, v)| s << %{#{k.downcase}="#{v}" } }.strip
+    attributes = " #{attributes}" unless attributes.empty?
+    text = tag.double? ? tag.expand : I18n.t('event_calendar_extension.download_event')
+    url = File.join(Radiant.config['event_calendar.path'], 'events', "#{tag.locals.event.id}.ics")
+    %{<a href="#{url}"#{attributes}>#{text}</a>}
+  end
+
   desc %{ 
     Renders a link to the facebook version of this event, if any. Attributes are 
     passed through in the usual way and if the tag is double its rendered contents
     will become the link text.
 
     Usage:
-    <pre><code><r:facebook_link class="facebook event" /></code></pre> 
+    <pre><code><r:event:facebook_link class="facebook event" /></code></pre> 
   }
   tag "event:facebook_link" do |tag|
     if tag.locals.event.facebook_id
       options = tag.attr.dup
+      options['title'] ||= I18n.t('event_calendar_extension.view_on_facebook')
       attributes = options.inject('') { |s, (k, v)| s << %{#{k.downcase}="#{v}" } }.strip
       attributes = " #{attributes}" unless attributes.empty?
       text = tag.double? ? tag.expand : I18n.t('event_calendar_extension.view_on_facebook')
@@ -484,6 +505,48 @@ module EventCalendarTags
     end
   end
 
+  desc %{ 
+    Renders a twitter 'tweet this' link poopulated with information about this event.
+    This links to a twitter 'intent' to give you more control over the presentation. 
+    If you want the basic tweet-this button with a counter, you don't need any radius tags.
+    
+    Twitter-specific attributes:
+    
+    * **text** is the prepared text you may want to suggest to your twitterer.
+    * **via** is the name of the account referred to in the link (ie yours, probably)
+    * **hashtags** is the hashtag(s) that will be included in the suggested tweet. Omit the hash.
+    * **related** is the (comma-separated) list of accounts the twitterer will be invited to 
+      follow. A justification can be :appended to each name.
+      
+    These attributes will be URL-encoded for you and appended to the twitter url. All other link 
+    attributes are passed through in the usual way and if the tag is double its rendered contents 
+    will become the link text.
+
+    Usage:
+    <pre><code><r:event:tweet_link class="twitter" via="spanner_org" hashtag="radiant:smart cms for small teams" /></code></pre> 
+    
+    For this to work your page must also include the twitter widgets javascript call:
+      
+      <script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
+    
+    For more information see https://dev.twitter.com/docs/intents#tweet-intent
+  }
+  tag "event:tweet_link" do |tag|
+    options = tag.attr.dup
+    options['title'] ||= I18n.t('event_calendar_extension.tweet_this')
+    event_url = "http://" + Radiant.config['site.host'] + tag.locals.page.url + "#event_" + tag.locals.event.id.to_s
+    qs = ["url=#{URI.escape(event_url)}"]
+    qs << "text=#{URI.escape(options.delete('text'))}" if options['text']
+    qs << "via=#{URI.escape(options.delete('via'))}" if options['via']
+    qs << "related=#{URI.escape(options.delete('related'))}" if options['related']
+    qs << "hashtags=#{URI.escape(options.delete('hashtags'))}" if options['hashtags']
+    twitter_url = "https://twitter.com/intent/tweet?" + qs.join('&amp;')
+    attributes = options.inject('') { |s, (k, v)| s << %{#{k.downcase}="#{v}" } }.strip
+    attributes = " #{attributes}" unless attributes.empty?
+    text = tag.double? ? tag.expand : I18n.t('event_calendar_extension.tweet_this')
+    %{<a href="#{twitter_url}"#{attributes}>#{text}</a>}
+  end
+
   #todo: venues:* tags
   
   desc %{ 
@@ -1026,6 +1089,16 @@ private
     ef.find(:all, standard_find_options(tag))
   end
   
+  # I don't suppose this is used much but it's useful in testing
+  
+  def get_event(tag)
+    if event_id = tag.attr.delete('id')
+      tag.locals.event = Event.find_by_id(event_id)
+    elsif event_title = tag.attr.delete('title')
+      tag.locals.event = Event.find_by_title(event_title)
+    end
+  end
+  
   # other extensions - eg taggable_events - will chain the event_finder to add more scopes
 
   def event_finder(tag)

data/lib/radiant-event_calendar-extension.rb

@@ -1,5 +1,5 @@
 module RadiantEventCalendarExtension
-  VERSION = '1.4.10'
+  VERSION = '1.4.12'
   SUMMARY = %Q{Event Calendar Extension for Radiant CMS}
   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"

data/spec/datasets/calendar_events_dataset.rb

@@ -9,6 +9,7 @@ class CalendarEventsDataset < Dataset::Base
       end
       create_event 'spanning', :title => "Simple Event", :start_date => "2009-11-03 09:00:00", :end_date => "2009-11-04 17:00:00"
       create_event 'allday', :title => "All Day Event", :start_date => "2009-11-03 09:00:00", :end_date => "2009-11-04 17:00:00", :all_day => true
+      create_event 'facebooked', :title => "Facebook Event", :start_date => "2009-11-03 09:00:00", :end_date => "2009-11-04 17:00:00", :facebook_id => "101"
     end
   end
 

data/spec/lib/event_calendar_tags_spec.rb

@@ -0,0 +1,41 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe EventCalendarTags do
+  dataset :calendar_pages, :calendar_events
+  let(:page) { pages(:calendar) }
+  let(:event) { events(:simple) }
+  let(:fbe) { events(:facebooked) }
+    
+  context "rendering event: tags" do
+    before do
+      Radiant.config['site.host'] = "test.host"
+      Radiant.config['event_calendar.path'] = "/test_calendar"
+    end
+    
+    [:id, :title, :description, :short_description, :location, :url, :facebook_id].each do |tag|
+      it "event:#{tag}" do
+        page.should render(%{<r:event id="#{event.id}"><r:event:#{tag} /></r:event>}).as( event.send(tag.to_sym).to_s )
+      end
+    end
+    
+    it "event:ical_link" do
+      page.should render(%{<r:event id="#{event.id}"><r:event:ical_link class="ical">I</r:event:ical_link></r:event>}).as( 
+        %{<a href="/test_calendar/events/#{event.id}.ics" title="Download event" class="ical">I</a>} 
+      )
+    end
+
+    it "event:facebook_link" do
+      page.should render(%{<r:event id="#{fbe.id}"><r:event:facebook_link class="fb">F</r:event:facebook_link></r:event>}).as( 
+        %{<a href="http://www.facebook.com/event.php?eid=#{fbe.facebook_id}" title="view on facebook" class="fb">F</a>} 
+      )
+      page.should render(%{<r:event id="#{event.id}"><r:event:facebook_link class="fb">F</r:event:facebook_link></r:event>}).as( "" )
+    end
+    
+    it "event:tweet_link" do
+      page.should render(%{<r:event id="#{event.id}"><r:event:tweet_link class="twit" text="foo: & bar" via="me" related="they">T</r:event:tweet_link></r:event>}).as( 
+        %{<a href="https://twitter.com/intent/tweet?url=http://test.host/calendar/%23event_#{event.id}&amp;text=foo:%20&%20bar&amp;via=me&amp;related=they" title="Tweet this" class="twit">T</a>} 
+      )
+    end
+  end
+  
+end

data/spec/models/event_spec.rb

@@ -29,6 +29,13 @@ describe Event do
       @event.duration.should == 0
     end
   end
+  
+  describe "A facebook event" do
+    it "should return a facebook url" do
+      events(:facebooked).facebook_url.should == "http://www.facebook.com/event.php?eid=101"
+      events(:simple).facebook_url.should be_nil
+    end
+  end
 
   describe "A spanning event" do
     before do 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-event_calendar-extension
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 31
   prerelease: 
   segments: 
   - 1
   - 4
-  - 10
-  version: 1.4.10
+  - 12
+  version: 1.4.12
 platform: ruby
 authors: 
 - Loren Johnson
@@ -191,6 +191,7 @@ files:
 - spec/files/dummy.ics
 - spec/files/ny.ics
 - spec/lib/event_calendar_page_spec.rb
+- spec/lib/event_calendar_tags_spec.rb
 - spec/models/calendar_spec.rb
 - spec/models/event_spec.rb
 - spec/models/ical_spec.rb
@@ -201,7 +202,7 @@ has_rdoc: true
 homepage: http://github.com/radiant/radiant-event_calendar-extension
 licenses: []
 
-post_install_message: "\n  Add this to your radiant project with:\n\n    config.gem 'radiant-event_calendar-extension', :version => '~> 1.4.10'\n\n  "
+post_install_message: "\n  Add this to your radiant project with:\n\n    config.gem 'radiant-event_calendar-extension', :version => '~> 1.4.12'\n\n  "
 rdoc_options: []
 
 require_paths: 
@@ -240,6 +241,7 @@ test_files:
 - spec/files/dummy.ics
 - spec/files/ny.ics
 - spec/lib/event_calendar_page_spec.rb
+- spec/lib/event_calendar_tags_spec.rb
 - spec/models/calendar_spec.rb
 - spec/models/event_spec.rb
 - spec/models/ical_spec.rb