radiant-event_calendar-extension 1.5.0 → 1.5.1

data/app/models/event_calendar_page.rb

@@ -11,14 +11,14 @@ class EventCalendarPage < Page
     true
   end
 
-  def find_by_url(url, live = true, clean = false)
-    url = clean_url(url) if clean
-    my_url = self.url_without_parts
-    if url =~ /^#{Regexp.quote(my_url)}(.*)/
+  def find_by_path(path, live = true, clean = true)
+    path = clean_path(path) if clean
+    my_path = self.path_without_parts
+    if path =~ /^#{Regexp.quote(my_path)}(.*)/
       read_parameters($1)
       self
     else
-      super
+      nil
     end
   end
   
@@ -62,9 +62,9 @@ class EventCalendarPage < Page
     end
   end
   
-  def url_parts
+  def path_parts
     {
-      :path => url_without_parts,
+      :path => path_without_parts,
       :day => @calendar_day,
       :month => @calendar_month,
       :year => @calendar_year,
@@ -73,14 +73,14 @@ class EventCalendarPage < Page
     }
   end
   
-  def url_with_parts(overrides={})
-    parts = url_parts.merge(overrides)
+  def path_with_parts(overrides={})
+    parts = path_parts.merge(overrides)
     page = parts.delete(:page)
     path = parts.delete(:path)
     parts[:month] = month_names[parts[:month]].downcase unless parts[:month].blank? || parts[:month] =~ /[a-zA-Z]/
-    clean_url([path, parts.values, page].select{|p| !p.blank?}.join('/'))
+    clean_path([path, parts.values, page].select{|p| !p.blank?}.join('/'))
   end
-  alias_method_chain :url, :parts
+  alias_method_chain :path, :parts
 
   def month_names
     @month_names ||= (I18n.t 'date.month_names').dup
@@ -109,7 +109,7 @@ class EventCalendarPage < Page
     nolinks = (tag.attr['nolinks'] == 'true')
     
     if calendar_category
-      crumbs = nolinks ? [page.breadcrumb] : [%{<a href="#{url}">#{tag.render('breadcrumb')}</a>}]
+      crumbs = nolinks ? [page.breadcrumb] : [%{<a href="#{path}">#{tag.render('breadcrumb')}</a>}]
       if calendar_slug
         crumbs << (nolinks ? calendar_category : %{<a href="#{url}/#{calendar_category}">#{calendar_category}</a>})
         crumbs << calendar_slug

data/lib/radiant-event_calendar-extension.rb

@@ -1,5 +1,5 @@
 module RadiantEventCalendarExtension
-  VERSION = '1.5.0'
+  VERSION = '1.5.1'
   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"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-event_calendar-extension
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 1
   - 5
-  - 0
-  version: 1.5.0
+  - 1
+  version: 1.5.1
 platform: ruby
 authors: 
 - Loren Johnson
@@ -17,8 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-02 00:00:00 +01:00
-default_executable: 
+date: 2011-09-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ri_cal
@@ -183,6 +182,7 @@ files:
 - public/stylesheets/sass/admin/event_calendar.sass
 - public/stylesheets/sass/admin/event_calendar_dashboard.sass
 - public/stylesheets/sass/event_calendar.sass
+- radiant-event_calendar-extension-1.5.0.gem
 - radiant-event_calendar-extension.gemspec
 - Rakefile
 - README.md
@@ -201,11 +201,10 @@ files:
 - spec/models/recurrence_rule_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-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.5.0'\n\n  "
+post_install_message: "\n  Add this to your radiant project with:\n\n    config.gem 'radiant-event_calendar-extension', :version => '~> 1.5.1'\n\n  "
 rdoc_options: []
 
 require_paths: 
@@ -231,7 +230,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.3
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Event Calendar Extension for Radiant CMS