radiant-taggable_events-extension 1.1.0 → 1.2.0

data/README.md

@@ -2,6 +2,8 @@
 
 This is a tiny bit of glue to associate taggable's tags with event_calendar's events. It also provides a few useful radius tags for your calendar pages.
 
+
+
 ## Author & Copyright
 
 * William Ross, for spanner. will at spanner.org

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.2.0

data/lib/taggable_event.rb

@@ -0,0 +1,19 @@
+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

@@ -14,7 +14,7 @@ module TaggableEventTags
     options = tag.attr.dup
     tag.locals.events ||= get_events(tag)
     limit = options.delete('limit') || 100
-    tag.locals.tags = Tag.banded(Tag.attached_to(tag.locals.events).most_popular(limit))
+    tag.locals.tags = Tag.sized(Tag.attached_to(tag.locals.events).most_popular(limit))
     tag.render('tags:cloud', options)
   end
   
@@ -29,7 +29,7 @@ module TaggableEventTags
   tag 'all_events:tag_cloud' do |tag|
     options = tag.attr.dup
     limit = options.delete('limit') || 100
-    tag.locals.tags = Tag.banded(Tag.attached_to(tag.locals.events).most_popular(limit))
+    tag.locals.tags = Tag.sized(Tag.attached_to(tag.locals.events).most_popular(limit))
     tag.render('tags:cloud', options)
   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.1.0"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["spanner"]
-  s.date = %q{2010-09-10}
+  s.date = %q{2010-10-04}
   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 = [
@@ -26,13 +26,16 @@ Gem::Specification.new do |s|
      "db/migrate/20100301074622_import_keywords.rb",
      "features/support/env.rb",
      "features/support/paths.rb",
+     "lib/taggable_event.rb",
      "lib/taggable_event_tags.rb",
-     "lib/tagged_event_finder.rb",
      "lib/tagged_events_controller.rb",
      "lib/tasks/taggable_events_extension_tasks.rake",
      "pkg/radiant-taggable_events-extension-1.1.0.gem",
      "public/images/furniture/detag.png",
      "radiant-taggable_events-extension.gemspec",
+     "spec/datasets/events_dataset.rb",
+     "spec/datasets/tags_dataset.rb",
+     "spec/lib/taggable_event_spec.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb",
      "taggable_events_extension.rb"
@@ -43,7 +46,10 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Tagging Extension for the Radiant CMS Event_Calendar}
   s.test_files = [
-    "spec/spec_helper.rb"
+    "spec/datasets/events_dataset.rb",
+     "spec/datasets/tags_dataset.rb",
+     "spec/lib/taggable_event_spec.rb",
+     "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then

data/spec/datasets/events_dataset.rb

@@ -0,0 +1,94 @@
+class EventsDataset < Dataset::Base  
+  uses :tags
+  
+  def load
+    create_venue "Elsewhere"
+    create_venue "Somewhere" do
+      add_tags"colourless, green"
+      create_calendar :local do
+        add_tags "ideas"
+        create_event 'simple', :title => "Simple", :start_date => "2009-11-03 18:30:00" do
+          add_tags "sleep, furiously"
+        end
+        create_event 'other', :title => "Another", :start_date => "2009-11-03 18:30:00" do
+          add_tags "furiously"
+        end
+      end
+    end
+  end
+
+  helpers do
+    def create_venue(title, attributes={})
+      attributes = event_venue_attributes(attributes.update(:title => title))
+      venue = create_model EventVenue, title.symbolize, attributes
+      if block_given?
+        @venue = venue
+        yield
+      end
+    end
+
+    def create_calendar(name, attributes={})
+      attributes = calendar_attributes(attributes.update(:name => name))
+      calendar = create_model Calendar, name.symbolize, attributes
+      calendar.ical = calendar.build_ical(:url => 'stubbed')
+      if block_given?
+        @calendar = calendar
+        yield
+      end
+    end
+    
+    def create_event(title, attributes={})
+      attributes = event_attributes(attributes.update(:title => title))
+      event = create_model Event, title.symbolize, attributes
+      if block_given?
+        @event = event
+        yield
+      end
+      event
+    end
+    
+    def add_tags(tags)
+      (@event || @calendar || @venue).attached_tags << Tag.from_list(tags)
+    end
+  end
+  
+  def event_venue_attributes(attributes={})
+    title = attributes[:title] || "Default"
+    symbol = title.symbolize
+    attributes = {
+      :title => title,
+      :description => 'A venue'
+    }.merge(attributes)
+    attributes
+  end
+
+  def calendar_attributes(attributes={})
+    name = attributes[:name] || "Default"
+    symbol = name.symbolize
+    attributes = {
+      :name => name,
+      :description => 'A calendar',
+      :category => 'test',
+      :slug => name.to_s
+    }.merge(attributes)
+    attributes
+  end
+
+  def event_attributes(attributes={})
+    title = attributes[:title] || "Default"
+    symbol = title.symbolize
+    attributes = {
+      :calendar => @calendar,
+      :event_venue => @venue,
+      :title => title,
+      :description => 'An event'
+    }.merge(attributes)
+    attributes
+  end
+
+  
+  def add_recurrence(attributes={})
+    @event.recurrence_rules.create(attributes)
+  end
+  
+end

data/spec/datasets/tags_dataset.rb

@@ -0,0 +1,43 @@
+require 'digest/sha1'
+
+class TagsDataset < Dataset::Base
+  datasets = [:pages]
+  datasets << :tag_sites if defined? Site
+  uses *datasets
+  
+  def load
+    create_tag "colourless"
+    create_tag "green"
+    create_tag "ideas"
+    create_tag "sleep"
+    create_tag "furiously"
+    
+    apply_tag :colourless, pages(:first)
+    apply_tag :ideas, pages(:first), pages(:another), pages(:grandchild)
+    apply_tag :sleep, pages(:first)
+    apply_tag :furiously, pages(:first)
+  end
+  
+  helpers do
+    def create_tag(title, attributes={})
+      attributes = tag_attributes(attributes.update(:title => title))
+      tag = create_model Tag, title.symbolize, attributes
+    end
+    
+    def tag_attributes(attributes={})
+      title = attributes[:name] || "Tag"
+      attributes = { 
+        :title => title
+      }.merge(attributes)
+      attributes[:site] = sites(:test) if defined? Site
+      attributes
+    end
+        
+    def apply_tag(tag, *items)
+      tag = tag.is_a?(Tag) ? tag : tags(tag)
+      items.each { |i| i.attached_tags << tag }
+    end
+    
+  end
+ 
+end

data/spec/lib/taggable_event_spec.rb

@@ -0,0 +1,50 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe Calendar do
+  dataset :events
+
+  it "should report itself taggable" do
+    Calendar.is_taggable?.should be_true
+  end
+
+  it "should have attached tags" do
+    calendars(:local).attached_tags.should == Tag.from_list("ideas")
+  end
+end
+
+describe EventVenue do
+  dataset :events
+
+  it "should report itself taggable" do
+    EventVenue.is_taggable?.should be_true
+  end
+
+  it "should have attached tags" do
+    event_venues(:somewhere).attached_tags.should == Tag.from_list("colourless, green")
+  end
+end
+
+describe Event do
+  dataset :events
+  
+  it "should report itself taggable" do
+    Event.is_taggable?.should be_true
+  end
+
+  it "should have attached tags" do
+    events(:other).attached_tags.include?(Tag.for('furiously')).should be_true
+  end
+  
+  it "should inherit tags from its calendar" do
+    events(:simple).attached_tags.include?(Tag.for('ideas')).should be_true
+  end
+
+  it "should inherit tags from its venue" do
+    events(:simple).attached_tags.include?(Tag.for('colourless')).should be_true
+  end
+  
+  it "should return a list of all its tags" do
+    events(:simple).attached_tags.should == Tag.from_list("colourless, green, ideas, sleep, furiously")
+  end
+
+end

data/taggable_events_extension.rb

@@ -2,13 +2,16 @@
 require_dependency 'application_controller'
 
 class TaggableEventsExtension < Radiant::Extension
-  version "1.1.0"
+  version "1.2.0"
   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"
     
   def activate
-    Event.send :is_taggable
-    EventsController.send :include, TaggedEventsController
+    Calendar.send :is_taggable                                    # make calendars taggable 
+    EventVenue.send :is_taggable                                  # make event venues taggable 
+    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
   end
   
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-taggable_events-extension
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 31
   prerelease: false
   segments: 
   - 1
-  - 1
+  - 2
   - 0
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - spanner
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-10 00:00:00 +01:00
+date: 2010-10-04 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -81,13 +81,16 @@ files:
 - db/migrate/20100301074622_import_keywords.rb
 - features/support/env.rb
 - features/support/paths.rb
+- lib/taggable_event.rb
 - lib/taggable_event_tags.rb
-- lib/tagged_event_finder.rb
 - lib/tagged_events_controller.rb
 - lib/tasks/taggable_events_extension_tasks.rake
 - pkg/radiant-taggable_events-extension-1.1.0.gem
 - public/images/furniture/detag.png
 - radiant-taggable_events-extension.gemspec
+- spec/datasets/events_dataset.rb
+- spec/datasets/tags_dataset.rb
+- spec/lib/taggable_event_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - taggable_events_extension.rb
@@ -126,4 +129,7 @@ signing_key:
 specification_version: 3
 summary: Tagging Extension for the Radiant CMS Event_Calendar
 test_files: 
+- spec/datasets/events_dataset.rb
+- spec/datasets/tags_dataset.rb
+- spec/lib/taggable_event_spec.rb
 - spec/spec_helper.rb

data/lib/tagged_event_finder.rb

@@ -1,25 +0,0 @@
-module TaggedEventFinder
-  
-  def self.included(base)
-    base.class_eval {
-      alias_method_chain :event_finder, :tags
-      alias_method_chain :filters_applied, :tags
-    }
-  end
-
-  def event_finder_with_tags(tag)
-    ef = event_finder_without_tags(tag)
-    ef = ef.from_all_tags(calendar_tags) if tags_applied?
-    ef
-  end
-
-  def filters_applied_with_tags(tag)
-    filters = filters_applied_without_tags(tag)
-    if tags_applied?
-      tags = @calendar_tags.map { |t| %{<a href="#{tag.locals.page.url(:tags => tags_without(t))}" class="defilter">#{t}</a> } }.to_sentence
-      filters << %{tagged with #{tags}}
-    end
-    filters
-  end
-
-end