refinerycms-calendar 1.0.4 → 1.1.0

data/app/controllers/event_categories_controller.rb

@@ -5,6 +5,11 @@ class EventCategoriesController < ApplicationController
     @event_category = EventCategory.find(params[:id])
     @event_categories = EventCategory.all
     @other_events = Event.live.limit(5)
+    # @events = @event_category.events.paginate({
+    #       :page => params[:page],
+    #       :per_page => RefinerySetting.find_or_set(:events_per_page, 10)
+    #     })
+    #     render :template => 'events/index'
   end
   
 end

data/app/controllers/events_controller.rb

@@ -37,6 +37,7 @@ class EventsController < ApplicationController
         :per_page => RefinerySetting.find_or_set(:events_per_page, 10)
       })
     end
+    #render :template => 'events/index'
   end
 
 protected

data/app/helpers/events_helper.rb

@@ -1,4 +1,10 @@
 module EventsHelper
+  
+  def custom_url_for(event, format = nil)
+    port = request.port == 80 ? nil : ":#{request.port}"
+    "#{request.protocol}#{request.host}#{port}/events/#{event.friendly_id}#{format}"
+  end
+
   def events_archive_list
     events = Event.select('start_at').for_archive_list
     return nil if events.blank?

data/app/models/event.rb

@@ -16,7 +16,7 @@ class Event < ActiveRecord::Base
   
   acts_as_indexed :fields => [:title, :venue_name, :venue_address, :ticket_link, :description]
 
-  validates :title, :presence => true, :uniqueness => true
+  validates :title, :presence => true
   validates :ticket_price, :numericality => true, :allow_blank => true
   validates :ticket_link, :format => /^(http|https):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(([0-9]{1,5})?\/.*)?$/ix, :allow_blank => true
   validate :ends_after_start
@@ -48,11 +48,19 @@ class Event < ActiveRecord::Base
   end
   
   def next
-    Event.where(['end_at >= ? AND start_at > ?', Time.now, self.start_at]).first
+    Event.where(['start_at > ?', start_at]).first
   end
   
   def prev
-    Event.where(['end_at >= ? AND start_at < ?', Time.now, self.start_at]).reverse.first
+    Event.where(['start_at < ?', start_at]).reverse.first
+  end
+
+  def single_day?
+    end_at.blank? || start_at.blank? || (end_at - start_at) < 24*60*60
+  end
+
+  def multi_day?
+    !single_day?
   end
   
   def self.archive

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

@@ -1,6 +1,6 @@
 <li class='clearfix record <%= cycle("on", "on-hover") %>' id="<%= dom_id(event) -%>">
   <span class='title'>
-    <%= event.title %>
+    <%= truncate strip_tags(event.title), :length => 60 %>
     <span class="preview">(<%= event.start_at.strftime('%b %d, %Y') %>) <%= '***Featured***' if event.featured? %></span>
   </span>
   <span class='actions'>

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

@@ -79,7 +79,7 @@
   
   <div class='field'>
     <%= f.label :ticket_price -%>
-    $<%= f.text_field :ticket_price, :size => 3 -%>
+    $<%= f.text_field :ticket_price -%>
   </div>
   
   <div class='field'>

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

@@ -27,11 +27,19 @@
 		<%= event.venue_name %></p>
   </section>
 
-  <section class="address">
-		<p>Address:<br/>
-      <%= event.venue_address %>
-    </p>
-  </section>
+  
+  
+  <% if event.venue_address.present? -%>
+    <section class="address">
+  		<p>Address:<br/>
+        <%= event.venue_address %>
+      </p>
+    </section>
+
+	  <section id="event_map">
+			<iframe width="400" height="200" frameborder="0" scrolling="no" marginheight="0" marginwidth="0" src="http://maps.google.com/maps?q=<%= CGI::escape(event.venue_address) %>&amp;z=14&amp;output=embed"></iframe>
+		</section><!-- #event_map -->
+  <% end -%>
 
 <% unless archive -%>
 	<% unless event.ticket_price.blank? -%>

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

@@ -0,0 +1,16 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//iCalendar export//EN
+BEGIN:VEVENT
+UID:<%= @event.id %>@<%= request.host %>
+SUMMARY:<%= @event.title %>
+DESCRIPTION:<%= truncate(strip_tags(@event.description.gsub(/\n/," ").gsub(/\r/," ")), :length => 200) %>
+LOCATION:<%= @event.venue_address %>
+URL:<%= custom_url_for @event %>
+STATUS:CONFIRMED
+CLASS:PUBLIC
+DTSTART:<%= @event.start_at.strftime('%Y%m%dT%H%M%S') %>
+DTEND:<%= @event.end_at.strftime('%Y%m%dT%H%M%S') %>
+DTSTAMP:<%= @event.start_at.strftime('%Y%m%dT%H%M%S') %>
+END:VEVENT
+END:VCALENDAR

data/changelog.md

@@ -1,3 +1,12 @@
+## 1.2 [UNRELEASED]
+
+## 1.1 [07 July 2011]
+* No more unique titles [joemsak](https://github.com/joemsak)
+* Cached slugs for performance boost [joemsak](https://github.com/joemsak)
+* Controller & view template refactoring [joemsak](https://github.com/joemsak)
+* Easy multi-day or single-day detection for date formatting [mdoel](https://github.com/mdoel)
+* iCal (ics) export [joemsak](https://github.com/joemsak)
+* Google map of venue address [joemsak](https://github.com/joemsak)
 
 ## 1.0.4 [02 June 2011]
 * Archive listing should be reversed

data/config/routes.rb

@@ -1,7 +1,9 @@
 Refinery::Application.routes.draw do
   resources :events do
-    get 'archive/:year(/:month)' => 'events#archive', :as => 'archive', :on => :collection
-    get 'category/:id' => 'event_categories#show', :as => 'category', :on => :collection
+    collection do
+      get 'archive/:year(/:month)' => 'events#archive', :as => 'archive'
+      get 'category/:id' => 'event_categories#show', :as => 'category'
+    end
   end
   
   scope(:path => 'refinery', :as => 'admin', :module => 'admin') do

data/db/migrate/04_add_cached_slugs.rb

@@ -0,0 +1,11 @@
+class AddCachedSlugs < ActiveRecord::Migration
+  def self.up
+    add_column :event_categories, :cached_slug, :string
+    add_column :events, :cached_slug, :string
+  end
+
+  def self.down
+    remove_column :event_categories, :cached_slug
+    remove_column :events, :cached_slug
+  end
+end

data/features/manage_events.feature

@@ -44,16 +44,6 @@ Feature: Events
     And I should be on the list of events
     And I should not see "A title"
 
-  @events-duplicate @duplicate
-  Scenario: Create Duplicate Event
-    Given I only have events titled UniqueTitleOne, UniqueTitleTwo
-    When I go to the list of events
-    And I follow "Add New Event"
-    And I fill in "Title" with "UniqueTitleTwo"
-    And I press "Save"
-    Then I should see "There were problems"
-    And I should have 2 events
-
   @events-delete @delete
   Scenario: Delete Event
     Given I only have events titled UniqueTitleOne

data/readme.md

@@ -15,7 +15,7 @@
 
 Using Rails 3 / Bundler Gemfile:
 
-    gem 'refinerycms-calendar', '~>1.0'
+    gem 'refinerycms-calendar', '~>1.1.0'
 
 bash:
 
@@ -29,16 +29,11 @@ bash:
 
 Maintained by [joemsak](http://github.com/joemsak)
 
-## TODO for 1.1 Release:
+## TODO for 1.2 Release:
 
 * Import events from Facebook fan page?
 * JS datepicker in admin backend
 * Calendar grid view? (can be kinda gross, honestly)
-* iCal export
-
-## TODO for 1.2
-
-* Google map of address
 * Address finder?
 
 ## Acknowledgements

data/refinerycms-calendar.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.platform          = Gem::Platform::RUBY
   s.name              = 'refinerycms-calendar'
-  s.version           = '1.0.4'
+  s.version           = '1.1.0'
   s.description       = 'Ruby on Rails Events engine for Refinery CMS'
   s.date              = Time.now.strftime('%Y-%m-%d')
   s.summary           = 'Events engine for Refinery CMS'

data/spec/models/event_spec.rb

@@ -22,11 +22,6 @@ describe Event do
     it "rejects empty title" do
       Event.new(@valid_attributes.merge(:title => "")).should_not be_valid
     end
-
-    it "rejects non unique title" do
-      # as one gets created before each spec by reset_event
-      Event.new(@valid_attributes).should_not be_valid
-    end
     
     it "rejects a non-numerical ticket price" do
       Event.new({
@@ -79,4 +74,4 @@ describe Event do
     
   end
 
-end
+end

metadata

@@ -2,7 +2,7 @@
 name: refinerycms-calendar
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.4
+  version: 1.1.0
 platform: ruby
 authors: 
 - Neoteric Design
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-02 00:00:00 -05:00
+date: 2011-07-07 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -65,6 +65,7 @@ files:
 - app/views/events/index.html.erb
 - app/views/events/index.rss.builder
 - app/views/events/show.html.erb
+- app/views/events/show.ics.erb
 - changelog.md
 - config/locales/en.yml
 - config/locales/fr.yml
@@ -75,6 +76,7 @@ files:
 - db/migrate/01_create_events.rb
 - db/migrate/02_create_event_categories.rb
 - db/migrate/03_create_event_categorizations.rb
+- db/migrate/04_add_cached_slugs.rb
 - db/seeds/events.rb
 - features/manage_events.feature
 - features/step_definitions/event_steps.rb
@@ -86,6 +88,7 @@ files:
 - lib/tasks/events.rake
 - public/stylesheets/refinerycms-events.css
 - readme.md
+- refinerycms-calendar-1.0.4.gem
 - refinerycms-calendar.gemspec
 - spec/controllers/events_controller_spec.rb
 - spec/helpers/events_helper_spec.rb