radiant-taggable_events-extension 1.3.1 → 2.0.0.rc1

data/README.md

@@ -1,9 +1,21 @@
 # Taggable Events
 
-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 and adds a `tagcloud` page part to the main calendar view.
+This little extension combines [taggable](https://github.com/spanner/radiant-taggable-extension/) and the [event_calendar](https://github.com/radiant/radiant-event_calendar-extension/) to add event tags, tag clouds and faceted search to the event calendar and (if installed) event map.
+
+## Examples
+
+This extension is mostly invisible: it adds in small ways to the existing behaviour of the event_calendar controllers, so that for example the existing date-period faceting block that is displayed by:
+
+	<r:content part="faceting" />
+
+Now includes tagging facets. If you add add this to the calendar layout:
+
+	<events:tag_cloud />
+
+Then the usual cloud of tags will be displayed, and in a calendar view they will add to the filter set. Similar reducing links will be appended to each listed event.
 
 ## Author & Copyright
 
 * William Ross, for spanner. will at spanner.org
-* Copyright 2010 spanner ltd
+* Copyright 2009-11 spanner ltd
 * released under the same terms as Rails and/or Radiant

data/Rakefile

@@ -1,20 +1,3 @@
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "radiant-taggable_events-extension"
-    gem.summary = %Q{Tagging Extension for the Radiant CMS Event_Calendar}
-    gem.description = %Q{A tiny bit of glue to attach tags to event_calendar events and define some radius tags useful on calendar pages}
-    gem.email = "will@spanner.org"
-    gem.homepage = "http://github.com/spanner/radiant-taggable_events-extension"
-    gem.authors = ["spanner"]
-    gem.add_dependency "radiant", "~> 0.9.0"
-    gem.add_dependency "radiant-event_calendar-extension", "~> 1.3.0"
-    gem.add_dependency "radiant-taggable-extension", "~> 1.2.0"
-  end
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. This is only required if you plan to package taggable_events as a gem."
-end
-
 # In rails 1.2, plugins aren't available in the path until they're loaded.
 # Check to see if the rspec plugin is installed first and require
 # it if it is.  If not, use the gem version.

data/lib/radiant-taggable_events-extension.rb

@@ -0,0 +1,8 @@
+module RadiantTaggableEventsExtension
+  VERSION = '2.0.0.rc1'
+  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"
+  AUTHORS = ["William Ross"]
+  EMAIL = ["radiant@spanner.org"]
+end

data/lib/taggable_event_tags.rb

@@ -1,5 +1,7 @@
 module TaggableEventTags
   include Radiant::Taggable
+  include EventCalendarTags
+  
   class TagError < StandardError; end
 
   desc %{ 

data/lib/{tagged_events_controller.rb → taggable_events_controller.rb}

@@ -1,4 +1,4 @@
-module TaggedEventsController
+module TaggableEventsController
 
   def self.included(base)
     base.class_eval {

data/radiant-taggable_events-extension.gemspec

@@ -1,75 +1,34 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "radiant-taggable_events-extension"
 
 Gem::Specification.new do |s|
-  s.name = %q{radiant-taggable_events-extension}
-  s.version = "1.3.1"
+  s.name        = "radiant-taggable_events-extension"
+  s.version     = RadiantTaggableEventsExtension::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = RadiantTaggableEventsExtension::AUTHORS
+  s.email       = RadiantTaggableEventsExtension::EMAIL
+  s.homepage    = RadiantTaggableEventsExtension::URL
+  s.summary     = RadiantTaggableEventsExtension::SUMMARY
+  s.description = RadiantTaggableEventsExtension::DESCRIPTION
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["spanner"]
-  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 = [
-    "README.md"
-  ]
-  s.files = [
-    ".gitignore",
-     "README.md",
-     "Rakefile",
-     "VERSION",
-     "app/views/events/_defacet.html.haml",
-     "app/views/events/_keywords.html.haml",
-     "app/views/events/_other_page_parts.html.haml",
-     "config/locales/en.yml",
-     "cucumber.yml",
-     "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_events_controller.rb",
-     "lib/tasks/taggable_events_extension_tasks.rake",
-     "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"
-  ]
-  s.homepage = %q{http://github.com/spanner/radiant-taggable_events-extension}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Tagging Extension for the Radiant CMS Event_Calendar}
-  s.test_files = [
-    "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
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.add_dependency "radiant-event_calendar-extension", "~> 1.4.3"
+  s.add_dependency "radiant-taggable-extension", "~> 2.0.0.rc"
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<radiant>, ["~> 0.9.0"])
-      s.add_runtime_dependency(%q<radiant-event_calendar-extension>, ["~> 1.3.0"])
-      s.add_runtime_dependency(%q<radiant-taggable-extension>, ["~> 1.2.0"])
-    else
-      s.add_dependency(%q<radiant>, ["~> 0.9.0"])
-      s.add_dependency(%q<radiant-event_calendar-extension>, ["~> 1.3.0"])
-      s.add_dependency(%q<radiant-taggable-extension>, ["~> 1.2.0"])
-    end
+  ignores = if File.exist?('.gitignore')
+    File.read('.gitignore').split("\n").inject([]) {|a,p| a + Dir[p] }
   else
-    s.add_dependency(%q<radiant>, ["~> 0.9.0"])
-    s.add_dependency(%q<radiant-event_calendar-extension>, ["~> 1.3.0"])
-    s.add_dependency(%q<radiant-taggable-extension>, ["~> 1.2.0"])
+    []
   end
-end
+  s.files         = Dir['**/*'] - ignores
+  s.test_files    = Dir['test/**/*','spec/**/*','features/**/*'] - ignores
+  # s.executables   = Dir['bin/*'] - ignores
+  s.require_paths = ["lib"]
 
+  s.post_install_message = %{
+  Add this to your radiant project with:
+
+    config.gem 'radiant-taggable_events-extension', :version => '~> #{RadiantTaggableEventsExtension::VERSION}'
+
+  }
+end

data/spec/lib/taggable_event_spec.rb

@@ -4,7 +4,7 @@ describe Calendar do
   dataset :events
 
   it "should report itself taggable" do
-    Calendar.is_taggable?.should be_true
+    Calendar.has_tags?.should be_true
   end
 
   it "should have attached tags" do
@@ -16,7 +16,7 @@ describe EventVenue do
   dataset :events
 
   it "should report itself taggable" do
-    EventVenue.is_taggable?.should be_true
+    EventVenue.has_tags?.should be_true
   end
 
   it "should have attached tags" do
@@ -28,7 +28,7 @@ describe Event do
   dataset :events
   
   it "should report itself taggable" do
-    Event.is_taggable?.should be_true
+    Event.has_tags?.should be_true
   end
 
   it "should have attached tags" do

data/taggable_events_extension.rb

@@ -1,18 +1,19 @@
 # Uncomment this if you reference any of your controllers in activate
 require_dependency 'application_controller'
+require "radiant-taggable_events-extension"
 
 class TaggableEventsExtension < Radiant::Extension
-  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"
-    
+  version RadiantTaggableEventsExtension::VERSION
+  description RadiantTaggableEventsExtension::DESCRIPTION
+  url RadiantTaggableEventsExtension::URL
+
   def activate
-    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
-    Page.send :include, TaggableEventTags                         # supports tag conditions on r:events:* radius tags
+    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
   end
   
 end

metadata

@@ -1,84 +1,67 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-taggable_events-extension
 version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: false
+  hash: 15424087
+  prerelease: 6
   segments: 
+  - 2
+  - 0
+  - 0
+  - rc
   - 1
-  - 3
-  - 1
-  version: 1.3.1
+  version: 2.0.0.rc1
 platform: ruby
 authors: 
-- spanner
+- William Ross
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-12-09 00:00:00 +00:00
-default_executable: 
+date: 2011-07-05 00:00:00 Z
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: radiant
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 59
-        segments: 
-        - 0
-        - 9
-        - 0
-        version: 0.9.0
-  type: :runtime
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: radiant-event_calendar-extension
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 1
         segments: 
         - 1
+        - 4
         - 3
-        - 0
-        version: 1.3.0
+        version: 1.4.3
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: radiant-taggable-extension
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 7712058
         segments: 
-        - 1
         - 2
         - 0
-        version: 1.2.0
+        - 0
+        - rc
+        version: 2.0.0.rc
   type: :runtime
-  version_requirements: *id003
-description: A tiny bit of glue to attach tags to event_calendar events and define some radius tags useful on calendar pages
-email: will@spanner.org
+  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.
+email: 
+- radiant@spanner.org
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- README.md
+extra_rdoc_files: []
+
 files: 
-- .gitignore
-- README.md
-- Rakefile
-- VERSION
 - app/views/events/_defacet.html.haml
 - app/views/events/_keywords.html.haml
 - app/views/events/_other_page_parts.html.haml
@@ -87,25 +70,27 @@ files:
 - db/migrate/20100301074622_import_keywords.rb
 - features/support/env.rb
 - features/support/paths.rb
+- lib/radiant-taggable_events-extension.rb
 - lib/taggable_event.rb
 - lib/taggable_event_tags.rb
-- lib/tagged_events_controller.rb
+- lib/taggable_events_controller.rb
 - lib/tasks/taggable_events_extension_tasks.rake
 - public/images/furniture/detag.png
 - radiant-taggable_events-extension.gemspec
+- Rakefile
+- README.md
 - 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
-has_rdoc: true
-homepage: http://github.com/spanner/radiant-taggable_events-extension
+homepage: http://spanner.org/radiant/taggable_event
 licenses: []
 
-post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+post_install_message: "\n  Add this to your radiant project with:\n\n    config.gem 'radiant-taggable_events-extension', :version => '~> 2.0.0.rc1'\n\n  "
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -120,21 +105,26 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
-summary: Tagging Extension for the Radiant CMS Event_Calendar
+summary: Adds event tags, tag clouds and faceted search to the event_calendar extension.
 test_files: 
 - spec/datasets/events_dataset.rb
 - spec/datasets/tags_dataset.rb
 - spec/lib/taggable_event_spec.rb
+- spec/spec.opts
 - spec/spec_helper.rb
+- features/support/env.rb
+- features/support/paths.rb

data/.gitignore

@@ -1 +0,0 @@
-pkg/*

data/VERSION

@@ -1 +0,0 @@
-1.3.1