radiant-taggable-extension 2.0.4 → 2.0.5

data/db/migrate/20111011075109_keywords_field.rb

@@ -2,10 +2,10 @@ class KeywordsField < ActiveRecord::Migration
   def self.up
     Page.find(:all).each do |page|
       if keywords = page.field(:keywords).try(:content)
-        page.attached_tags = Tag.from_list(keywords)
-        page.save
+        page.attached_tags = Tag.from_list(keywords) if keywords.any?
+        page.save if page.changed?
+        page.field(:keywords).delete
       end
-      page.field(:keywords).delete
     end
   end
 

data/lib/radiant-taggable-extension.rb

@@ -1,5 +1,5 @@
 module RadiantTaggableExtension
-  VERSION = '2.0.4'
+  VERSION = '2.0.5'
   SUMMARY = %q{Tagging, clouding and faceting extension for Radiant CMS}
   DESCRIPTION = %q{General purpose tagging and retrieval extension: more versatile but less focused than the tags extension. A good way to support faceted search.}
   URL = "http://spanner.org/radiant/taggable"

data/lib/radius/library_tags.rb

@@ -24,6 +24,8 @@ module Radius
         <r:library:tags:list />
         <r:library:tags:cloud />
       </code></pre>
+      
+      A cloud is the default.
 
       To show only those tags attached to a particular kind of object, supply a 'for' parameter. 
       The parameter can be 'pages', 'assets' or the plural of any asset type. If you're displaying an image gallery,
@@ -37,7 +39,11 @@ module Radius
     }
     tag "library:tags" do |tag|
       tag.locals.tags = _get_coincident_tags(tag).sort
-      tag.expand
+      if tag.double?
+        tag.expand
+      else
+        tag.render("library:tags:cloud", tag.attr.dup, &tag.block)
+      end
     end
     tag "library:tags:each" do |tag|
       tag.render('each_tag', tag.attr.dup, &tag.block)
@@ -193,6 +199,18 @@ module Radius
       tag.expand if _get_assets(tag).any?
     end
 
+    desc %{
+      Expands if there are any assets associated with all of the current tag set.
+      
+      *Usage:* 
+      <pre><code>
+        <r:library:unless_assets><h2>No assets</h2>...</r:library:unless_assets>
+      </code></pre>
+    }
+    tag "library:unless_assets" do |tag|
+      tag.expand unless _get_assets(tag).any?
+    end
+
     Asset.known_types.each do |type|
       these = type.to_s.pluralize
       
@@ -225,6 +243,18 @@ module Radius
         tag.locals.assets = _get_assets(tag).send(these.to_sym)
         tag.expand if tag.locals.assets.any?
       end
+      desc %{
+        Expands unless there are any #{these} associated with all of the current tag set.
+
+        *Usage:* 
+        <pre><code>
+          <r:library:unless_#{these}><h2>#{these.titlecase}</h2>...</r:library:unless_#{these}>
+        </code></pre>
+      }
+      tag "library:unless_#{these}" do |tag|
+        tag.locals.assets = _get_assets(tag).send(these.to_sym)
+        tag.expand unless tag.locals.assets.any?
+      end
     end
 
     ############### extra tags:* tags that only make sense on library or other faceting pages

data/lib/radius/taggable_tags.rb

@@ -169,13 +169,13 @@ module Radius
       *Usage:* 
       <pre><code><r:tag_cloud /></code></pre>
     
-      You can supply a url parameter to work from a page other than the present one. 
+      You can supply a path parameter to work from a page other than the present one. 
     
-      <pre><code><r:tag_cloud url="/elsewhere" /></code></pre>
+      <pre><code><r:tag_cloud path="/elsewhere" /></code></pre>
 
       So if you want to show all the tags attached to any page (but ignore their attachment to anything else):
     
-      <pre><code><r:tag_cloud url="/" /></code></pre>
+      <pre><code><r:tag_cloud path="/" /></code></pre>
         
       As usual you can limit the size of the cloud (the most popular will be shown) and set the destination of tag links:
     
@@ -185,9 +185,9 @@ module Radius
       tag.locals.tags ||= _get_tags(tag)
       options = tag.attr.dup
       limit = options.delete('limit')
-      if url = options.delete('url')
-        found = Page.find_by_url(absolute_path_for(tag.locals.page.url, url))
-        raise TagError, "no page at url #{url}" unless page_found?(found)
+      if path = options.delete('path') || options.delete('url')
+        found = Page.find_by_path(absolute_path_for(tag.locals.page.path, path))
+        raise TagError, "no page at path #{path}" unless page_found?(found)
         tag.locals.page = found
       end
       raise TagError, "no page for tag_cloud" unless tag.locals.page
@@ -210,9 +210,9 @@ module Radius
       tag.locals.tags ||= _get_tags(tag)
       options = tag.attr.dup
       limit = options.delete('limit')
-      if url = options.delete('url')
-        found = Page.find_by_url(absolute_path_for(tag.locals.page.url, url))
-        raise TagError, "no page at url #{url}" unless page_found?(found)
+      if path = options.delete('path') || options.delete('url')
+        found = Page.find_by_path(absolute_path_for(tag.locals.page.path, path))
+        raise TagError, "no page at path #{path}" unless page_found?(found)
         tag.locals.page = found
       end
       raise TagError, "no page for tag_list" unless tag.locals.page
@@ -417,9 +417,9 @@ module Radius
       text = tag.double? ? tag.expand : tag.render('tag:name')
       if tag.locals.page.is_a? LibraryPage
         tagset = tag.locals.page.requested_tags + [tag.locals.tag]
-        destination = tag.locals.page.url(tagset)
-      elsif page_url = (options.delete('linkto') || Radiant::Config['library.path'])
-        destination = clean_url(page_url + '/' + tag.locals.tag.clean_title)
+        destination = tag.locals.page.path(tagset)
+      elsif page_path = (options.delete('linkto') || Radiant::Config['library.path'])
+        destination = clean_path(page_path + '/' + tag.locals.tag.clean_title)
       else
         # note that this only works if you're at a url with a trailing slash...
         destination = Rack::Utils.escape("#{tag.locals.tag.title}") + '/'

data/lib/taggable/faceted_page.rb

@@ -21,15 +21,6 @@ module Taggable
     end
 
     module InstanceMethods
-
-      # Faceted pages map nicely onto urls and are cacheable. 
-      # There can be redundancy if tags are specified in varying order,
-      # but the site controller tries to normalize everything.
-      #
-      def cache?
-        true
-      end
-
       # We override the normal Page#find_by_path mechanism and treat nonexistent child paths
       # are understood as tag sets. Note that the extended site_controller will add to this set
       # any tags that have been supplied in query string parameters. This may trigger a redirect

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-taggable-extension
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 2
   - 0
-  - 4
-  version: 2.0.4
+  - 5
+  version: 2.0.5
 platform: ruby
 authors: 
 - William Ross
@@ -15,7 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-11 00:00:00 Z
+date: 2011-10-17 00:00:00 +01:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sanitize
@@ -89,6 +90,7 @@ files:
 - public/javascripts/autocomplete.js
 - public/stylesheets/sass/admin/taggable.sass
 - public/stylesheets/sass/tagcloud.sass
+- radiant-taggable-extension-2.0.4.gem
 - radiant-taggable-extension.gemspec
 - Rakefile
 - README.md
@@ -101,10 +103,11 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 - taggable_extension.rb
+has_rdoc: true
 homepage: http://spanner.org/radiant/taggable
 licenses: []
 
-post_install_message: "\n  Add this to your Gemfile with:\n\n    gem 'radiant-taggable-extension', '~> 2.0.4'\n\n  "
+post_install_message: "\n  Add this to your Gemfile with:\n\n    gem 'radiant-taggable-extension', '~> 2.0.5'\n\n  "
 rdoc_options: []
 
 require_paths: 
@@ -130,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.5.3
 signing_key: 
 specification_version: 3
 summary: Tagging, clouding and faceting extension for Radiant CMS