radiant-taggable_events-extension 2.0.0 → 2.0.1

data/lib/radiant-taggable_events-extension.rb

@@ -1,5 +1,5 @@
 module RadiantTaggableEventsExtension
-  VERSION = '2.0.0'
+  VERSION = '2.0.1'
   SUMMARY = %q{Adds event tags, tag clouds and faceted search to the event_calendar extension.}
   DESCRIPTION = %q{A tiny bit of glue to attach tags to event_calendar events and put tag clouds and faceted retrieval on event calendar pages.}
   URL = "http://spanner.org/radiant/taggable_event"

data/lib/taggable/event.rb

@@ -0,0 +1,20 @@
+module Taggable
+  module Event
+    def self.included(base)
+      base.class_eval {
+        before_validation_on_create :inherit_tags
+      }
+    end
+    
+  private
+  
+    # tags are inherited from context on creation but subsequently editable
+  
+    def inherit_tags
+      self.attached_tags += calendar.attached_tags if calendar
+      self.attached_tags += event_venue.attached_tags if event_venue
+      self.attached_tags.uniq!
+    end
+    
+  end
+end

data/lib/taggable/event_tags.rb

@@ -0,0 +1,80 @@
+module Taggable
+  module EventTags
+    include Radiant::Taggable
+    include EventCalendarTags
+  
+    class TagError < StandardError; end
+
+    desc %{
+      Cycles through all tags attached to present event.
+  
+      *Usage:* 
+      <pre><code><r:assets:tags><r:tag:title /></r:assets:tags></code></pre>
+    }    
+    tag 'event:tags' do |tag|
+      tag.locals.tags = tag.locals.event.attached_tags
+      tag.expand
+    end
+    # tag 'event:tags:each' do |tag|
+    #   tag.render('tags:each', tag.attr.dup, &tag.block)
+    # end
+  
+    desc %{
+      Expands if the present event has any tags.
+    }    
+    tag 'event:if_tags' do |tag|
+      tag.expand if tag.locals.event.attached_tags.any?
+    end
+
+    desc %{
+      Expands if the present event has no tags.
+    }    
+    tag 'event:unless_tags' do |tag|
+      tag.expand unless tag.locals.event.attached_tags.any?
+    end
+  
+    desc %{ 
+      Presents a tag cloud built from the current set of events.
+  
+      See r:tag_cloud for formatting and linking parameters. By default we show the top 50 most used tags.
+  
+      *Usage:*
+      <pre><code><r:events:tag_cloud /></code></pre>
+    }
+    tag 'events:tag_cloud' do |tag|
+      options = tag.attr.dup
+      tag.locals.events ||= get_events(tag)
+      limit = options.delete('limit') || 50
+      tag.locals.tags = Tag.sized(Tag.attached_to(tag.locals.events).most_popular(limit))
+      tag.render('tag_cloud', options)
+    end
+  
+    desc %{ 
+      Presents a tag cloud built from the entire population of events.
+  
+      See r:tag_cloud for formatting and linking parameters. By default we show the top 50 most used tags.
+  
+      *Usage:*
+      <pre><code><r:all_events:tag_cloud /></code></pre>
+    }
+    tag 'all_events:tag_cloud' do |tag|
+      options = tag.attr.dup
+      limit = options.delete('limit') || 50
+      tag.locals.tags = Tag.sized(Tag.attached_to(tag.locals.events).most_popular(limit))
+      tag.render('tags:cloud', options)
+    end
+  
+    def event_finder_with_tags(tag)
+      ef = event_finder_without_tags(tag)
+      ef = ef.from_all_tags(Tag.from_list(tag.attr['tags'])) unless tag.attr['tags'].blank?
+      ef
+    end
+
+    def self.included(base)
+      base.class_eval {
+        alias_method_chain :event_finder, :tags
+      }
+    end
+  
+  end
+end

data/lib/taggable/events_controller.rb

@@ -0,0 +1,46 @@
+module Taggable
+  module EventsController
+
+    def self.included(base)
+      base.class_eval {
+        helper_method :tags, :url_with_tag, :url_without_tag
+        alias_method_chain :event_finder, :tags
+        alias_method_chain :continuing_events, :tags
+        alias_method_chain :calendar_parameter_names, :tags
+      }
+    end
+
+    def tags
+      @tags ||= Tag.from_list(params[:tags], false) || []
+    end
+    
+    def event_finder_with_tags
+      ef = event_finder_without_tags
+      ef = ef.from_all_tags(tags) if tags.any?
+      ef
+    end
+  
+    def continuing_events_with_tags
+      continuing_events_without_tags
+      @continuing_events = @continuing_events.from_all_tags(tags) if tags.any?
+      @continuing_events
+    end
+  
+    def calendar_parameter_names_with_tags
+      calendar_parameter_names_without_tags + [:tags]
+    end
+  
+    def url_without_tag(tag)
+      url_for(url_parts({
+        :tags => Tag.to_list(tags - [tag])
+      }))
+    end
+  
+    def url_with_tag(tag)
+      url_for(url_parts({
+        :tags => Tag.to_list(tags + [tag])
+      }))
+    end
+
+  end
+end

data/radiant-taggable_events-extension.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.description = RadiantTaggableEventsExtension::DESCRIPTION
 
   s.add_dependency "radiant-event_calendar-extension", "~> 1.5.0"
-  s.add_dependency "radiant-taggable-extension", "~> 2.0.0.rc4"
+  s.add_dependency "radiant-taggable-extension", "~> 2.0.1"
 
   ignores = if File.exist?('.gitignore')
     File.read('.gitignore').split("\n").inject([]) {|a,p| a + Dir[p] }

data/taggable_events_extension.rb

@@ -11,9 +11,10 @@ class TaggableEventsExtension < Radiant::Extension
     Calendar.send :has_tags                                       # make calendars taggable 
     EventVenue.send :has_tags                                     # make event venues taggable 
     Event.send :has_tags                                          # make events taggable 
-    Event.send :include, TaggableEvent                            # ...and inherit tags from venue and calendar
-    EventsController.send :include, TaggableEventsController      # further complicate the retrieval of events by adding tag-filters
-    Page.send :include, TaggableEventTags                         # support tag conditions on r:events:* radius tags
+    Event.send :include, Taggable::Event                          # ...and inherit attached tags from venue and calendar on creation
+    EventsController.send :include, Taggable::EventsController    # further complicate the retrieval of events by adding tag-filters
+    Page.send :include, Taggable::EventTags                       # support tag conditions on r:events:* radius tags
+    EventCalendarPage.send :include, Taggable::FacetedPage        # faceting tags are understood by calendar pages
   end
   
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-taggable_events-extension
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 2
   - 0
-  - 0
-  version: 2.0.0
+  - 1
+  version: 2.0.1
 platform: ruby
 authors: 
 - William Ross
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-06 00:00:00 +01:00
+date: 2011-10-05 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,14 +42,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15424093
+        hash: 13
         segments: 
         - 2
         - 0
-        - 0
-        - rc
-        - 4
-        version: 2.0.0.rc4
+        - 1
+        version: 2.0.1
   type: :runtime
   version_requirements: *id002
 description: A tiny bit of glue to attach tags to event_calendar events and put tag clouds and faceted retrieval on event calendar pages.
@@ -71,9 +69,9 @@ files:
 - features/support/env.rb
 - features/support/paths.rb
 - lib/radiant-taggable_events-extension.rb
-- lib/taggable_event.rb
-- lib/taggable_event_tags.rb
-- lib/taggable_events_controller.rb
+- lib/taggable/event.rb
+- lib/taggable/event_tags.rb
+- lib/taggable/events_controller.rb
 - lib/tasks/taggable_events_extension_tasks.rake
 - public/images/furniture/detag.png
 - radiant-taggable_events-extension.gemspec
@@ -89,7 +87,7 @@ has_rdoc: true
 homepage: http://spanner.org/radiant/taggable_event
 licenses: []
 
-post_install_message: "\n  Add this to your Gemfile with:\n\n    gem 'radiant-taggable_events-extension', '~> 2.0.0'\n\n  "
+post_install_message: "\n  Add this to your Gemfile with:\n\n    gem 'radiant-taggable_events-extension', '~> 2.0.1'\n\n  "
 rdoc_options: []
 
 require_paths: 

data/lib/taggable_event.rb

@@ -1,19 +0,0 @@
-module TaggableEvent      # for inclusion into Event
-  
-  def self.included(base)
-    base.class_eval {
-      before_validation_on_create :inherit_tags
-    }
-  end
-    
-private
-  
-  # tags are inherited from context on creation but subsequently editable
-  
-  def inherit_tags
-    self.attached_tags += calendar.attached_tags if calendar
-    self.attached_tags += event_venue.attached_tags if event_venue
-    self.attached_tags.uniq!
-  end
-    
-end

data/lib/taggable_event_tags.rb

@@ -1,50 +0,0 @@
-module TaggableEventTags
-  include Radiant::Taggable
-  include EventCalendarTags
-  
-  class TagError < StandardError; end
-
-  desc %{ 
-    Presents a tag cloud built from the current set of events.
-  
-    See r:tag_cloud for formatting and linking parameters. By default we show the top 50 most used tags.
-  
-    *Usage:*
-    <pre><code><r:events:tag_cloud /></code></pre>
-  }
-  tag 'events:tag_cloud' do |tag|
-    options = tag.attr.dup
-    tag.locals.events ||= get_events(tag)
-    limit = options.delete('limit') || 50
-    tag.locals.tags = Tag.sized(Tag.attached_to(tag.locals.events).most_popular(limit))
-    tag.render('tags:cloud', options)
-  end
-  
-  desc %{ 
-    Presents a tag cloud built from the entire population of events.
-  
-    See r:tag_cloud for formatting and linking parameters. By default we show the top 50 most used tags.
-  
-    *Usage:*
-    <pre><code><r:all_events:tag_cloud /></code></pre>
-  }
-  tag 'all_events:tag_cloud' do |tag|
-    options = tag.attr.dup
-    limit = options.delete('limit') || 50
-    tag.locals.tags = Tag.sized(Tag.attached_to(tag.locals.events).most_popular(limit))
-    tag.render('tags:cloud', options)
-  end
-  
-  def event_finder_with_tags(tag)
-    ef = event_finder_without_tags(tag)
-    ef = ef.from_all_tags(Tag.from_list(tag.attr['tags'])) unless tag.attr['tags'].blank?
-    ef
-  end
-
-  def self.included(base)
-    base.class_eval {
-      alias_method_chain :event_finder, :tags
-    }
-  end
-  
-end

data/lib/taggable_events_controller.rb

@@ -1,44 +0,0 @@
-module TaggableEventsController
-
-  def self.included(base)
-    base.class_eval {
-      helper_method :tags, :url_with_tag, :url_without_tag
-      alias_method_chain :event_finder, :tags
-      alias_method_chain :continuing_events, :tags
-      alias_method_chain :calendar_parameter_names, :tags
-    }
-  end
-
-  def tags
-    @tags ||= Tag.from_list(params[:tags], false) || []
-  end
-    
-  def event_finder_with_tags
-    ef = event_finder_without_tags
-    ef = ef.from_all_tags(tags) if tags.any?
-    ef
-  end
-  
-  def continuing_events_with_tags
-    continuing_events_without_tags
-    @continuing_events = @continuing_events.from_all_tags(tags) if tags.any?
-    @continuing_events
-  end
-  
-  def calendar_parameter_names_with_tags
-    calendar_parameter_names_without_tags + [:tags]
-  end
-  
-  def url_without_tag(tag)
-    url_for(url_parts({
-      :tags => Tag.to_list(tags - [tag])
-    }))
-  end
-  
-  def url_with_tag(tag)
-    url_for(url_parts({
-      :tags => Tag.to_list(tags + [tag])
-    }))
-  end
-
-end