radiant-tags-extension 1.6.1 → 1.6.2

data/app/models/radius_tags.rb

@@ -95,7 +95,7 @@ module RadiusTags
     output = "<ol class=\"tag_cloud\">"
     if tag_cloud.length > 0
     	build_tag_cloud(tag_cloud, %w(size1 size2 size3 size4 size5 size6 size7 size8 size9)) do |tag, cloud_class, amount|
-    		output += "<li class=\"#{cloud_class}\"><span>#{pluralize(amount, 'page is', 'pages are')} tagged with </span><a href=\"#{results_page}/#{tag}\" class=\"tag\">#{tag}</a></li>"
+    		output += "<li class=\"#{cloud_class}\"><span>#{pluralize(amount, 'page is', 'pages are')} tagged with </span><a href=\"#{results_page}/#{url_encode(tag)}\" class=\"tag\">#{tag}</a></li>"
     	end
     else
     	return I18n.t('tags_extension.no_tags_found')
@@ -118,7 +118,7 @@ module RadiusTags
     output = "<div class=\"tag_cloud\">"
     if tag_cloud.length > 0
     	build_tag_cloud(tag_cloud, %w(size1 size2 size3 size4 size5 size6 size7 size8 size9)) do |tag, cloud_class, amount|
-    		output += "<div class=\"#{cloud_class}\"><a href=\"#{results_page}/#{tag}\" class=\"tag\">#{tag}</a></div>\n"
+    		output += "<div class=\"#{cloud_class}\"><a href=\"#{results_page}/#{url_encode(tag)}\" class=\"tag\">#{tag}</a></div>\n"
     	end
     else
     	return I18n.t('tags_extension.no_tags_found')
@@ -141,7 +141,7 @@ module RadiusTags
     output = "<ul class=\"tag_list\">"
     if tag_cloud.length > 0
         build_tag_cloud(tag_cloud, %w(size1 size2 size3 size4 size5 size6 size7 size8 size9)) do |tag, cloud_class, amount|
-          output += "<li class=\"#{cloud_class}\"><a href=\"#{results_page}/#{tag}\" class=\"tag\">#{tag} (#{amount})</a></li>"
+          output += "<li class=\"#{cloud_class}\"><a href=\"#{results_page}/#{url_encode(tag)}\" class=\"tag\">#{tag} (#{amount})</a></li>"
         end
     else
         return I18n.t('tags_extension.no_tags_found')
@@ -175,7 +175,7 @@ module RadiusTags
     Usage: <pre><code><r:tags:each [limit="4"]>...</r:tags:each></code></pre>
   }
   tag "tags:each" do |tag|
-    selected_tags = tag.locals.page.meta_tags
+    selected_tags = tag.locals.page.ordered_meta_tags
     if tag.attr['limit']
       selected_tags = selected_tags.first(tag.attr['limit'].to_i)
     end
@@ -194,7 +194,7 @@ module RadiusTags
   tag "tags:each:link" do |tag|
     results_page = tag.attr['results_page'] || Radiant::Config['tags.results_page_url']
     name = tag.locals.meta_tag.name
-    return "<a href=\"#{results_page}/#{name}\" class=\"tag\">#{name}</a>"
+    return "<a href=\"#{results_page}/#{url_encode(name)}\" class=\"tag\">#{name}</a>"
   end
   
   tag 'tags:each:if_first' do |tag|
@@ -246,7 +246,7 @@ module RadiusTags
   tag "all_tags:each:link" do |tag|
     results_page = tag.attr['results_page'] || Radiant::Config['tags.results_page_url']
     name = tag.locals.meta_tag.name
-    "<a href=\"#{results_page}/#{name}\" class=\"tag\">#{name}</a>"
+    "<a href=\"#{results_page}/#{url_encode(name)}\" class=\"tag\">#{name}</a>"
   end
 
   tag "all_tags:each:popularity" do |tag|
@@ -256,7 +256,7 @@ module RadiusTags
   tag "all_tags:each:url" do |tag|
     results_page = tag.attr['results_page'] || Radiant::Config['tags.results_page_url']
     name = tag.locals.meta_tag.name
-    "#{results_page}/#{name}"
+    "#{results_page}/#{url_encode(name)}"
   end
   
   desc "Set the scope for the tag's pages"
@@ -304,7 +304,8 @@ module RadiusTags
     raise TagError, "`tagged' tag must contain a `with' attribute." unless (tag.attr['with'] || tag.locals.page.class_name = TagSearchPage)
     ttag = tag.attr['with'] || @request.parameters[:tag]
     
-    scope = scope_attr == 'current_page' ? Page.find_by_url(@request.request_uri) : Page.find_by_url(scope_attr)
+    scope_path = scope_attr == 'current_page' ? @request.request_uri : scope_attr
+    scope = Page.find_by_path scope_path
     return "The scope attribute must be a valid url to an existing page." if scope.nil? || scope.class_name.eql?('FileNotFoundPage')
     
     if with_any

data/app/models/tag_search_page.rb

@@ -95,7 +95,7 @@ class TagSearchPage < Page
     super
   end
 
-  def find_by_url(url, live = true, clean = false)
+  def find_by_path(url, live = true, clean = false)
     url = clean_url(url).chop # chop off trailing slash added by clean_url
     if url =~ /^#{self.url}([a-zA-Z0-9,\_\-\s\/()'.&]*)\/?$/
       self.requested_tag = $1

data/lib/radiant-tags-extension.rb

@@ -1,3 +1,3 @@
 module RadiantTagsExtension
-  VERSION = '1.6.1'
+  VERSION = '1.6.2'
 end

data/lib/tagging_methods.rb

@@ -5,15 +5,15 @@ TaggingMethods = Proc.new do
   end
   alias_method_chain :valid?, :tags
   
-  def tag_with tags
+  def tag_with new_tags
     self.save if self.new_record?
     # just skip the whole method if the tags string hasn't changed
-    return if tags == tag_list
-    # do we need to delete any tags?
-    tags_to_delete = tag_list.split(MetaTag::DELIMITER) - tags.split(MetaTag::DELIMITER)
-    tags_to_delete.select{|t| meta_tags.delete(MetaTag.find_by_name(t))}
+    return if new_tags == tag_list
     
-    tags.split(MetaTag::DELIMITER).each do |tag|
+    # tags have changed, so we delete all taggings and re-create to preserve order
+    taggings.clear
+    
+    new_tags.split(MetaTag::DELIMITER).each do |tag|
       begin
         tag = MetaTag.find_or_initialize_by_name(tag.strip.squeeze(" "))
         meta_tags << tag unless meta_tags.include?(tag)
@@ -29,8 +29,14 @@ TaggingMethods = Proc.new do
   
   alias :meta_tags= :tag_with
 
+  def ordered_meta_tags
+    # HACK: need to order by tagging to preserve creation order, otherwise
+    # list gets ordered by tag.id
+    meta_tags.find(:all, :order => 'taggings.id')
+  end
+
   def tag_list
-    meta_tags.map(&:name).join(MetaTag::DELIMITER)
+    ordered_meta_tags.map(&:name).join(MetaTag::DELIMITER)
   end
 
    # 

data/public/javascripts/admin/protomultiselect.js

@@ -262,7 +262,8 @@ var FacebookList = Class.create(TextboxList, {
     children.each(function(el) { this.add({value:el.readAttribute('value'),caption:el.innerHTML}); }, this);
     
     $F(this.element).split(this.options.get('separator')).each(function(item) {
-      this.add({value:item,caption:item});
+      if (item != "")
+      	this.add({value:item,caption:item});
     }, this)
 
     // Loading the options list only once at initialize. 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-tags-extension
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: false
   segments: 
   - 1
   - 6
-  - 1
-  version: 1.6.1
+  - 2
+  version: 1.6.2
 platform: ruby
 authors: 
 - Benny Degezelle
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-29 00:00:00 +02:00
+date: 2011-06-12 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -242,7 +242,7 @@ has_rdoc: true
 homepage: http://ext.radiantcms.org/extensions/195-tags
 licenses: []
 
-post_install_message: "\n  Add this to your radiant project by adding the following line to your environment.rb:\n    config.gem 'radiant-tags-extension', :version => '1.6.1'\n  "
+post_install_message: "\n  Add this to your radiant project by adding the following line to your environment.rb:\n    config.gem 'radiant-tags-extension', :version => '1.6.2'\n  "
 rdoc_options: []
 
 require_paths: