radiant-taggable_events-extension 1.3.0 → 1.3.1

data/VERSION

@@ -1 +1 @@
-1.3.0
+1.3.1

data/lib/taggable_event_tags.rb

@@ -5,7 +5,7 @@ module TaggableEventTags
   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 100 most used tags.
+    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>
@@ -13,7 +13,7 @@ module TaggableEventTags
   tag 'events:tag_cloud' do |tag|
     options = tag.attr.dup
     tag.locals.events ||= get_events(tag)
-    limit = options.delete('limit') || 100
+    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
@@ -21,15 +21,28 @@ module TaggableEventTags
   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 100 most used tags.
+    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') || 100
+    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/radiant-taggable_events-extension.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-taggable_events-extension}
-  s.version = "1.3.0"
+  s.version = "1.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["spanner"]
-  s.date = %q{2010-10-21}
+  s.date = %q{2010-12-09}
   s.description = %q{A tiny bit of glue to attach tags to event_calendar events and define some radius tags useful on calendar pages}
   s.email = %q{will@spanner.org}
   s.extra_rdoc_files = [

data/taggable_events_extension.rb

@@ -2,7 +2,7 @@
 require_dependency 'application_controller'
 
 class TaggableEventsExtension < Radiant::Extension
-  version "1.3.0"
+  version "1.3.1"
   description "A tiny bit of glue to attach tags to event_calendar events and define some radius tags useful on calendar pages"
   url "http://github.com/spanner/radiant-taggable_events-extension"
     
@@ -12,6 +12,7 @@ class TaggableEventsExtension < Radiant::Extension
     Event.send :is_taggable                                       # make events taggable 
     Event.send :include, TaggableEvent                            # and inherit tags from venue and calendar
     EventsController.send :include, TaggedEventsController        # further complicate the retrieval of events by adding tag-filters
+    Page.send :include, TaggableEventTags                         # supports tag conditions on r:events:* radius tags
   end
   
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-taggable_events-extension
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 1
   - 3
-  - 0
-  version: 1.3.0
+  - 1
+  version: 1.3.1
 platform: ruby
 authors: 
 - spanner
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-21 00:00:00 +01:00
+date: 2010-12-09 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency