radiant-tags-extension 1.5.1 → 1.6.0

data/README

@@ -3,7 +3,6 @@
 Created by: Keith Bingman - keithbingman.com
 Revived by: Benny Degezelle - gorilla-webdesign.be
 New features by: Jim Gay - saturnflyer.com
-Version: 1.5
 
 This extension enhances the page model with tagging capabilities, tagging as in "2.0" and tagclouds.
 
@@ -15,7 +14,16 @@ You can change the load order of extensions in config/environment.rb (see http:/
 
 == Installation
 
-1. Copy the extension to your vendor/extensions directory as you would any other extension.
+=== Using RubyGems
+
+`gem install radiant-tags-extension`
+
+add the following line to your environment.rb
+config.gem 'radiant-tags-extension'
+
+=== Classic style
+
+1. Copy the extension to your vendor/extensions directory as you would any other extension or use `script/extension install tags`
 2. Run 'rake radiant:extensions:tags:install'
 3. Make a page to sit in /search/by-tag, and give it the "Tag Search" pagetype.
 	If you want to change this location, it's in Radiant::Config['tags.results_page_url'].
@@ -35,4 +43,4 @@ Here's a sample results page to get you started;
 	    <li><r:link/> - <r:author/> - <r:date/></li>
 	  </r:search:results:each>
 	  </ul>
-	</r:search:results>
+	</r:search:results>

data/app/models/meta_tag.rb

@@ -36,18 +36,38 @@ class MetaTag < ActiveRecord::Base
     end
 
     def cloud(args = {})
+      args = {:by => 'popularity', :order => 'desc', :limit => 5}.merge(args)
+
       find(:all, :select => 'meta_tags.*, count(*) as popularity',
-      :limit => args[:limit] || 5,
+      :limit => args[:limit],
       :joins => "JOIN taggings ON taggings.meta_tag_id = meta_tags.id",
       :conditions => args[:conditions],
       :group => "meta_tags.id, meta_tags.name",
-      :order => "popularity DESC" )
+      :order => order_string(args) )
+    end
+
+    def order_string(attr)
+      by = (attr[:by]).strip
+        order = (attr[:order]).strip
+        order_string = ''
+        if self.new.attributes.keys.dup.push("popularity").include?(by)
+          order_string << by
+        else
+          raise TagError.new("`by' attribute of `each' tag must be set to a valid field name")
+        end
+        if order =~ /^(asc|desc)$/i
+          order_string << " #{$1.upcase}"
+        else
+          raise TagError.new(%{`order' attribute of `each' tag must be set to either "asc" or "desc"})
+        end
+
     end
+
   end
   
   def <=>(other)
     # To be able to sort an array of tags
     name <=> other.name
   end
-  
+
 end

data/app/models/radius_tags.rb

@@ -85,7 +85,7 @@ module RadiusTags
     The results_page attribute will default to #{Radiant::Config['tags.results_page_url']}
     
     *Usage:*
-    <pre><code><r:tag_cloud_list [limit="number"] [results_page="/some/url"] [scope="/some/url"]/></code></pre>
+    <pre><code><r:tag_cloud [limit="number"] [results_page="/some/url"] [scope="/some/url"]/></code></pre>
   }
   tag "tag_cloud" do |tag|
     tag_cloud = MetaTag.cloud(:limit => tag.attr['limit'] || 5).sort
@@ -98,10 +98,33 @@ module RadiusTags
     		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>"
     	end
     else
-    	return "<p>No tags found.</p>"
+    	return I18n.t('tags_extension.no_tags_found')
     end
     output += "</ol>"
   end
+
+  desc %{
+    Render a Tag cloud with div-tags
+    The results_page attribute will default to #{Radiant::Config['tags.results_page_url']}
+    
+    *Usage:*
+    <pre><code><r:tag_cloud_div [limit="number"] [results_page="/some/url"] [scope="/some/url"]/></code></pre>
+  }
+  tag "tag_cloud_div" do |tag|
+    tag_cloud = MetaTag.cloud(:limit => tag.attr['limit'] || 10).sort
+    tag_cloud = filter_tags_to_url_scope(tag_cloud, tag.attr['scope']) unless tag.attr['scope'].nil?
+    
+    results_page = tag.attr['results_page'] || Radiant::Config['tags.results_page_url']
+    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"
+    	end
+    else
+    	return I18n.t('tags_extension.no_tags_found')
+    end
+    output += "</div>"
+  end
  
   desc %{
     Render a Tag list, more for 'categories'-ish usage, i.e.: Cats (2) Logs (1) ...
@@ -121,7 +144,7 @@ module RadiusTags
           output += "<li class=\"#{cloud_class}\"><a href=\"#{results_page}/#{tag}\" class=\"tag\">#{tag} (#{amount})</a></li>"
         end
     else
-        return "<p>No tags found.</p>"
+        return I18n.t('tags_extension.no_tags_found')
     end
     output += "</ul>"
   end
@@ -174,18 +197,14 @@ module RadiusTags
     Iterates through each tag and allows you to specify the order: by popularity or by name.
     The default is by name. You may also limit the search; the default is 5 results.
     
-    Usage: <pre><code><r:all_tags:each order="popularity" limit="5">...</r:all_tags:each></code></pre>
+    Usage: <pre><code><r:all_tags:each [order="asc|desc"] [by="name|popularity"] limit="5">...</r:all_tags:each></code></pre>
   }
   tag "all_tags:each" do |tag|
-    order = tag.attr['order'] || 'name'
+    by = tag.attr['by'] || 'name'
+    order = tag.attr['order'] || 'asc'
     limit = tag.attr['limit'] || '5'
     result = []
-    case order
-    when 'name'
-      all_tags = MetaTag.find(:all, :limit => limit)
-    else
-      all_tags = MetaTag.cloud(:limit => limit)
-    end
+    all_tags = MetaTag.cloud(:limit => limit, :order => order, :by => by)
     all_tags.each do |t|
       next if t.pages.empty? # skip unused tags
       tag.locals.meta_tag = t
@@ -202,9 +221,18 @@ 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
-    return "<a href=\"#{results_page}/#{name}\" class=\"tag\">#{name}</a>"
+    "<a href=\"#{results_page}/#{name}\" class=\"tag\">#{name}</a>"
+  end
+
+  tag "all_tags:each:popularity" do |tag|
+    (tag.locals.meta_tag.respond_to?(:popularity)) ? tag.locals.meta_tag.popularity : ""
+  end
+
+  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}"
   end
-  
   
   desc "Set the scope for the tag's pages"
   tag "all_tags:each:pages" do |tag|

data/app/models/tag_search_page.rb

@@ -1,7 +1,28 @@
 class TagSearchPage < Page
 
   attr_accessor :requested_tag
+
   #### Tags ####
+
+  desc %{ The namespace for all tagsearch tags.}
+  tag 'tagsearch' do |tag|
+    tag.expand
+  end
+
+  desc %{ to show a index page, if the page was not able to find a tag, it is considered to be a index page}
+  tag 'tagsearch:if_index' do |tag|
+    if requested_tag.nil? || (requested_tag && requested_tag.blank?)
+      tag.expand
+    end
+  end
+
+  desc %{ resultpage, if the page got a tag, it is considered to be a result page}
+  tag 'tagsearch:unless_index' do |tag|
+    if requested_tag && ! requested_tag.blank?
+      tag.expand
+    end
+  end
+
   desc %{    The namespace for all search tags.}
   tag 'search' do |tag|
     tag.expand
@@ -68,8 +89,8 @@ class TagSearchPage < Page
   end
   
   def render
-    self.requested_tag = @request.parameters[:tag] unless requested_tag
-    self.title = "Tagged with #{requested_tag}" if requested_tag
+    self.requested_tag = @request.parameters[:tag] if @request.parameters[:tag]
+    self.title = "#{self.title} #{requested_tag}" if requested_tag
     
     super
   end

data/app/views/admin/pages/_tag_field.html.haml

@@ -1,8 +1,14 @@
-%tr
+= render 'tag_field_javascript' if Radiant::Config['tags.complex_strings'] == 'true'
+
+%tr.tags
   %th.label
     %label{:for => "page_meta_tags"}
-      Tags
+      = t('tags_extension.tags')
   %td.field
     = f.text_field :meta_tags, :value => @page.tag_list, :class => 'textbox'
+    #tag_container{:style => "display: none"}
+      .default
+        = t('tags_extension.type_a_tag')
+      %ul
     - unless model.errors.on_base.nil?
       %span.error= model.errors.on_base

data/app/views/admin/pages/_tag_field_javascript.html.erb

@@ -0,0 +1,17 @@
+<% 
+  include_javascript 'admin/protomultiselect.js'
+  include_stylesheet 'admin/tags.css'
+%>
+
+<% content_for 'page_scripts' do %>
+  document.observe('dom:loaded', function() {
+    var taglist = new FacebookList('page_meta_tags', 'tag_container', {
+      newValues: true, 
+      separator: ';',
+      separatorKeyCode: 186
+    })
+    
+    var tags = <%= MetaTag.all.map {|tag| {:caption => tag.name, :value => tag.name} }.to_json %>
+    tags.each(function(t) { taglist.autoFeed(t) })  
+  });
+<% end %>

data/config/locales/de.yml

@@ -0,0 +1,7 @@
+---
+de:
+  tags_extension:
+    no_tags_found: "<p>Es wurden keine Schlagworte gefunden.</p>"
+    tags: "Schlagworte"
+    type_a_tag: Separate tags with ;
+

data/config/locales/en.yml

@@ -0,0 +1,5 @@
+en:
+  tags_extensions:
+    no_tags_found: "<p>No tags found.</p>"
+    tags: Tags
+    type_a_tag: Separate tags with ;

data/config/locales/nl.yml

@@ -0,0 +1,5 @@
+nl:
+  tags_extension:
+    no_tags_found: "<p>Geen tags gevonden.</p>"
+    tags: Tags
+    type_a_tag: Onderscheid tags met ;

data/config/routes.rb

@@ -0,0 +1,20 @@
+ActionController::Routing::Routes.draw do |map|
+  if Radiant::Config['tags.results_page_url'].blank?
+    Radiant::Config['tags.results_page_url'] = TagsExtension::DEFAULT_RESULTS_URL if Radiant::Config['tags.results_page_url'].blank?
+  end
+  begin
+    if defined?(SiteLanguage) && SiteLanguage.count > 0
+      include Globalize
+      SiteLanguage.codes.each do |code|
+        langname = Locale.new(code).language.code
+        map.connect "#{langname}#{Radiant::Config['tags.results_page_url']}/:tag", :controller => 'site', :action => 'show_page', :url => Radiant::Config['tags.results_page_url'], :language => code
+      end
+    else if defined?(VhostExtension)
+      map.connect "#{Radiant::Config['tags.results_page_url']}/:tag", :controller => 'site', :action => 'show_page', :url => Radiant::Config['tags.results_page_url']
+    end
+      map.connect "#{Radiant::Config['tags.results_page_url']}/:tag", :controller => 'site', :action => 'show_page', :url => Radiant::Config['tags.results_page_url']
+    end
+  rescue
+    # dirty hack; need to get trough here to allow migrations to run..
+  end
+end

data/lib/radiant-tags-extension.rb

@@ -0,0 +1,3 @@
+module RadiantTagsExtension
+  VERSION = '1.6.0'
+end

data/lib/tagging_methods.rb

@@ -58,9 +58,7 @@ TaggingMethods = Proc.new do
      sql << "AND taggings.meta_tag_id = meta_tags.id "
      sql << "AND pages.site_id = #{current_site.id} " if self.respond_to?(:current_site)
      
-     tag_list_condition = tag_list.map {|name| "\"#{name.strip.squeeze(' ')}\""}.join(", ")
-   
-     sql << "AND (meta_tags.name IN (#{sanitize_sql(tag_list_condition)})) "
+     sql << "AND (#{sanitize_sql(['meta_tags.name IN (?)', tag_list.map{|name| name.strip.squeeze(' ')}])}) "
      sql << "AND #{sanitize_sql(options[:conditions])} " if options[:conditions]
       
      columns = column_names.map do |column| 

data/public/javascripts/admin/protomultiselect.js

@@ -0,0 +1,527 @@
+/*
+  Proto!MultiSelect
+  Copyright: InteRiders <http://interiders.com/> - Distributed under MIT - Keep this message! 
+*/
+
+// Added key contstant for COMMA watching happiness
+Object.extend(Event, { KEY_COMMA: 188, KEY_SPACE: 32 });
+
+var ResizableTextbox = Class.create({  
+  initialize: function(element, options) {
+    var that = this;
+    this.options = $H({
+      min: 5,
+      max: 500,
+      step: 7
+    });
+    this.options.update(options);
+    this.el = $(element);
+    this.width = this.el.offsetWidth;
+    this.el.observe(
+      'keyup', function() {
+        var newsize = that.options.get('step') * $F(this).length;
+        if(newsize <= that.options.get('min')) newsize = that.options.get('mix');
+        if(! ($F(this).length == this.retrieveData('rt-value') || newsize <= that.options.min || newsize >= that.options.max))
+          this.setStyle({'width': newsize});
+      }).observe('keydown', function() {
+        this.cacheData('rt-value', $F(this).length);
+      }
+    );
+  }
+});
+
+var TextboxList = Class.create({
+  initialize: function(element, options) {
+    this.options = $H({/*
+      onFocus: $empty,
+      onBlur: $empty,
+      onInputFocus: $empty,
+      onInputBlur: $empty,
+      onBoxFocus: $empty,
+      onBoxBlur: $empty,
+      onBoxDispose: $empty,*/
+      resizable: {},
+      className: 'bit',
+      separator: ',',
+      separatorKeyCode: Event.KEY_COMMA,
+      extrainputs: true,
+      startinput: true,
+      hideempty: true,
+      newValues: false,
+      newValueDelimiters: ['[',']'],
+      spaceReplace: '',
+      fetchFile: undefined,
+      fetchMethod: 'get',
+      results: 10,
+      maxResults: 0, // 0 = set to default (which is 10 (see FacebookList class)),
+      wordMatch: false,
+      onEmptyInput: function(input){},
+      caseSensitive: false,
+      regexSearch: true
+    });
+    this.current_input = "";
+    this.options.update(options);
+    this.element = $(element).hide();    
+    this.bits = new Hash();
+    this.events = new Hash();
+    this.count = 0;
+    this.current = false;
+    this.maininput = this.createInput({'class': 'maininput'});
+    this.holder = new Element('ul', {
+      'class': 'holder'
+    }).insert(this.maininput);
+    this.element.insert({'before':this.holder});
+    this.holder.observe('click', function(event){
+      event.stop();
+      if(this.maininput != this.current) this.focus(this.maininput);     
+    }.bind(this));
+    this.makeResizable(this.maininput);
+    this.setEvents();
+  },
+  
+  setEvents: function() {
+    document.observe(Prototype.Browser.IE ? 'keydown' : 'keypress', function(e) {      
+      if(! this.current) return;
+      if(this.current.retrieveData('type') == 'box' && e.keyCode == Event.KEY_BACKSPACE) e.stop();
+    }.bind(this));      
+         
+    document.observe(
+      'keyup', function(e) {
+        e.stop();
+        if(! this.current) return;
+        switch(e.keyCode){
+          case Event.KEY_LEFT: return this.move('left');
+          case Event.KEY_RIGHT: return this.move('right');
+          case Event.KEY_DELETE:
+          case Event.KEY_BACKSPACE: return this.moveDispose();
+        }
+      }.bind(this)).observe(  
+      'click', function() { document.fire('blur'); }.bindAsEventListener(this)
+    );
+  },
+  
+  update: function() {
+    this.element.value = this.bits.values().join(this.options.get('separator'));
+    if (!this.current_input.blank()){
+      this.element.value += (this.element.value.blank() ? "" : this.options.get('separator')) + this.current_input;
+    }
+    return this;
+  },
+  
+  add: function(text, html) {
+    var id = this.id_base + '-' + this.count++;
+    var el = this.createBox($pick(html, text), {'id': id, 'class': this.options.get('className'), 'newValue' : text.newValue ? 'true' : 'false'});
+    (this.current || this.maininput).insert({'before':el});                                         
+    el.observe('click', function(e) {
+      e.stop();
+      this.focus(el);
+    }.bind(this));
+    this.bits.set(id, text.value);
+    // Dynamic updating... why not?
+    this.update();
+    if(this.options.get('extrainputs') && (this.options.get('startinput') || el.previous())) this.addSmallInput(el,'before');
+    return el;
+  },
+  
+  addSmallInput: function(el, where) {
+    var input = this.createInput({'class': 'smallinput'});
+    el.insert({}[where] = input);
+    input.cacheData('small', true);
+    this.makeResizable(input);
+    if(this.options.get('hideempty')) input.hide();
+    return input;
+  },
+  
+  dispose: function(el) {
+    this.bits.unset(el.id);
+    // Dynamic updating... why not?
+    this.update();
+    if(el.previous() && el.previous().retrieveData('small')) el.previous().remove();
+    if(this.current == el) this.focus(el.next());
+    if(el.retrieveData('type') == 'box') el.onBoxDispose(this);
+    el.remove();    
+    return this;
+  },
+  
+  focus: function(el, nofocus) {
+    if(! this.current) el.fire('focus');
+    else if(this.current == el) return this;
+    this.blur();
+    el.addClassName(this.options.get('className') + '-' + el.retrieveData('type') + '-focus');
+    if(el.retrieveData('small')) el.setStyle({'display': 'block'});
+    if(el.retrieveData('type') == 'input') {
+      el.onInputFocus(this);      
+      if(! nofocus) this.callEvent(el.retrieveData('input'), 'focus');
+    }
+    else el.fire('onBoxFocus');
+    this.current = el;    
+    return this;
+  },
+  
+  blur: function(noblur) {
+    if(! this.current) return this;
+    if(this.current.retrieveData('type') == 'input') {
+      var input = this.current.retrieveData('input');
+      if(! noblur) this.callEvent(input, 'blur');   
+      input.onInputBlur(this);
+    }
+    else this.current.fire('onBoxBlur');
+    if(this.current.retrieveData('small') && ! input.get('value') && this.options.get('hideempty')) 
+      this.current.hide();
+    this.current.removeClassName(this.options.get('className') + '-' + this.current.retrieveData('type') + '-focus');
+    this.current = false;
+    return this;
+  },
+  
+  createBox: function(text, options) {
+    return new Element('li', options).addClassName(this.options.get('className') + '-box').update(text.caption).cacheData('type', 'box');
+  },
+  
+  createInput: function(options) {
+    var li = new Element('li', {'class': this.options.get('className') + '-input'});
+    var el = new Element('input', Object.extend(options,{'type': 'text', 'autocomplete':'off'}));
+    el.observe('click', function(e) { e.stop(); }).observe('focus', function(e) { if(! this.isSelfEvent('focus')) this.focus(li, true); }.bind(this)).observe('blur', function() { if(! this.isSelfEvent('blur')) this.blur(true); }.bind(this)).observe('keydown', function(e) { this.cacheData('lastvalue', this.value).cacheData('lastcaret', this.getCaretPosition()); });
+    var tmp = li.cacheData('type', 'input').cacheData('input', el).insert(el);
+    return tmp;
+  },
+  
+  callEvent: function(el, type) {
+    this.events.set(type, el);
+    el[type]();
+  },
+  
+  isSelfEvent: function(type) {
+    return (this.events.get(type)) ? !! this.events.unset(type) : false;
+  },
+  
+  makeResizable: function(li) {
+    var el = li.retrieveData('input');
+    el.cacheData('resizable', new ResizableTextbox(el, Object.extend(this.options.get('resizable'),{min: 150, max: 500})));
+    return this;
+  },
+  
+  checkInput: function() {
+    var input = this.current.retrieveData('input');
+    return (! input.retrieveData('lastvalue') || (input.getCaretPosition() === 0 && input.retrieveData('lastcaret') === 0));
+  },
+  
+  move: function(direction) {
+    var el = this.current[(direction == 'left' ? 'previous' : 'next')]();
+    if(el && (! this.current.retrieveData('input') || ((this.checkInput() || direction == 'right')))) this.focus(el);
+    return this;
+  },
+  
+  moveDispose: function() {
+    if(this.current.retrieveData('type') == 'box') return this.dispose(this.current);
+    if(this.checkInput() && this.bits.keys().length && this.current.previous()) return this.focus(this.current.previous());
+  }
+});
+
+//helper functions 
+Element.addMethods({
+  getCaretPosition: function() {
+    if (this.createTextRange) {
+      var r = document.selection.createRange().duplicate();
+      r.moveEnd('character', this.value.length);
+      if (r.text === '') return this.value.length;
+      return this.value.lastIndexOf(r.text);
+    } else return this.selectionStart;
+  },
+  cacheData: function(element, key, value) { 
+    if (Object.isUndefined(this[$(element).identify()]) || !Object.isHash(this[$(element).identify()]))
+      this[$(element).identify()] = $H();
+    this[$(element).identify()].set(key,value);
+    return element;
+  },
+  retrieveData: function(element,key) {
+    return this[$(element).identify()].get(key);
+  }  
+});
+
+function $pick(){for(var B=0,A=arguments.length;B<A;B++){if(!Object.isUndefined(arguments[B])){return arguments[B];}}return null;}
+
+var FacebookList = Class.create(TextboxList, { 
+  initialize: function($super,element, autoholder, options, func) {
+    $super(element, options);
+    this.loptions = $H({    
+      autocomplete: {
+        'opacity': 1,
+        'maxresults': 10,
+        'minchars': 1
+      }
+    });
+
+    this.id_base = $(element).identify() + "_" + this.options.get("className");
+
+    this.data = [];
+    this.data_searchable = [];
+    this.autoholder = $(autoholder).setOpacity(this.loptions.get('autocomplete').opacity);
+    this.autoholder.observe('mouseover',function() {this.curOn = true;}.bind(this)).observe('mouseout',function() {this.curOn = false;}.bind(this));
+    this.autoresults = this.autoholder.select('ul').first();
+	  var children = this.autoresults.select('li');
+    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});
+    }, this)
+
+    // Loading the options list only once at initialize. 
+    // This would need to be further extended if the list was exceptionally long
+    if (!Object.isUndefined(this.options.get('fetchFile'))) {
+      new Ajax.Request(this.options.get('fetchFile'), {
+        method: this.options.get('fetchMethod'),
+        onSuccess: function(transport) {
+          transport.responseText.evalJSON(true).each(function(t) { 
+            this.autoFeed(t) }.bind(this));
+          }.bind(this)
+        }
+      );
+    }
+  },
+  
+  autoShow: function(search) {
+    this.autoholder.setStyle({'display': 'block'});
+    this.autoholder.descendants().each(function(e) { e.hide() });
+    if(! search || ! search.strip() || (! search.length || search.length < this.loptions.get('autocomplete').minchars)) {
+      this.autoholder.select('.default').first().setStyle({'display': 'block'});
+      this.resultsshown = false;
+    } else {
+      this.resultsshown = true;
+      this.autoresults.setStyle({'display': 'block'}).update('');
+      if (!this.options.get('regexSearch')) {
+        var matches = new Array();
+        if (search) {
+          if (!this.options.get('caseSensitive')) {
+            search = search.toLowerCase();
+          }
+          var matches_found = 0;
+          for (var i=0,len=this.data_searchable.length; i<len; i++) {
+            if (this.data_searchable[i].indexOf(search) >= 0) {
+              matches[matches_found++] = this.data[i];
+            }
+          }
+        }
+      } else {
+        if (this.options.get('wordMatch')) {
+          var regexp = new RegExp("(^|\\s)"+search,(!this.options.get('caseSensitive') ? 'i' : ''));
+        } else {
+          var regexp = new RegExp(search,(!this.options.get('caseSensitive') ? 'i' : ''));
+          var matches = this.data.filter( 
+            function(str) { 
+            return str ? regexp.test(str.evalJSON(true).caption) : false;
+          });
+        }
+      }
+      var count = 0;
+      matches.each(
+        function(result, ti) {
+          count++;
+          if(ti >= (this.options.get('maxResults') ? this.options.get('maxResults') : this.loptions.get('autocomplete').maxresults)) return;
+          var that = this;
+          var el = new Element('li');
+          el.observe('click',function(e) { 
+              e.stop();
+              that.current_input = "";
+              that.autoAdd(this); 
+            }
+          ).observe('mouseover', function() { that.autoFocus(this); } ).update(
+            this.autoHighlight(result.evalJSON(true).caption, search)
+          );
+          this.autoresults.insert(el);
+          el.cacheData('result', result.evalJSON(true));
+          if(ti == 0) this.autoFocus(el);
+        }, 
+        this
+      );
+    }
+    if (count == 0) {
+      // if there are no results, hide everything so that KEY_ENTER has no effect
+      this.autoHide();
+    } else {
+      if (count > this.options.get('results'))
+        this.autoresults.setStyle({'height': (this.options.get('results')*24)+'px'});
+      else
+        this.autoresults.setStyle({'height': (count?(count*24):0)+'px'});
+    }
+    
+    return this;
+  },
+
+  autoHighlight: function(html, highlight) {
+    return html.gsub(new RegExp(highlight,'i'), function(match) {
+      return '<em>' + match[0] + '</em>';
+    });
+  },
+
+  autoHide: function() {    
+    this.resultsshown = false;
+    this.autoholder.hide();
+    return this;
+  },
+
+  autoFocus: function(el) {
+    if(! el) return;
+    if(this.autocurrent) this.autocurrent.removeClassName('auto-focus');
+    this.autocurrent = el.addClassName('auto-focus');
+    return this;
+  },
+
+  autoMove: function(direction) {    
+    if(!this.resultsshown) return;
+    this.autoFocus(this.autocurrent[(direction == 'up' ? 'previous' : 'next')]());
+    this.autoresults.scrollTop = this.autocurrent.positionedOffset()[1]-this.autocurrent.getHeight();         
+    return this;
+  },
+
+  autoFeed: function(text) {
+    var with_case = this.options.get('caseSensitive');
+    if (this.data.indexOf(Object.toJSON(text)) == -1) {
+      this.data.push(Object.toJSON(text));
+      this.data_searchable.push(with_case ? Object.toJSON(text).evalJSON(true).caption : Object.toJSON(text).evalJSON(true).caption.toLowerCase());
+    }
+    return this;
+  },
+
+  autoAdd: function(el) {
+    if(this.newvalue && this.options.get("newValues")) {
+      this.add({caption: el.value, value: el.value, newValue: true});
+      var input = el;
+    } else if(!el || ! el.retrieveData('result')) {
+      return;
+    } else {
+      this.add(el.retrieveData('result'));
+      delete this.data[this.data.indexOf(Object.toJSON(el.retrieveData('result')))];
+      var input = this.lastinput || this.current.retrieveData('input');
+    }
+    this.autoHide();
+    input.clear().focus();
+    return this;
+  },
+
+  createInput: function($super,options) {
+    var li = $super(options);
+    var input = li.retrieveData('input');
+    input.observe('keydown', function(e) {
+      this.dosearch = false;
+      this.newvalue = false;
+
+      switch(e.keyCode) {
+        case Event.KEY_UP: e.stop(); return this.autoMove('up');
+        case Event.KEY_DOWN: e.stop(); return this.autoMove('down');        
+        
+        case Event.KEY_RETURN:
+          // If the text input is blank and the user hits Enter call the
+          // onEmptyInput callback.
+          if (String('').valueOf() == String(this.current.retrieveData('input').getValue()).valueOf()) {
+            this.options.get("onEmptyInput")();
+          }
+          e.stop();
+          if(!this.autocurrent || !this.resultsshown) break;
+          this.current_input = "";
+          this.autoAdd(this.autocurrent);
+          this.autocurrent = false;
+          this.autoenter = true;
+          break;
+        case Event.KEY_ESC: 
+          this.autoHide();
+          if(this.current && this.current.retrieveData('input'))
+            this.current.retrieveData('input').clear();
+          break;
+        default: 
+          this.dosearch = true;
+      }
+    }.bind(this));
+    input.observe('keyup',function(e) {
+      switch(e.keyCode) {
+        case this.options.get('separatorKeyCode'):
+          if(this.options.get('newValues')) {
+            var separator = this.options.get('separator');
+            new_value_el = this.current.retrieveData('input');
+            if (!new_value_el.value.endsWith('<')) {
+              keep_input = "";
+              new_value_el.value = new_value_el.value.strip();
+              if (new_value_el.value.indexOf(separator) < (new_value_el.value.length - 1)){
+                comma_pos = new_value_el.value.indexOf(separator);
+                keep_input = new_value_el.value.substr(comma_pos + 1);
+                new_value_el.value = new_value_el.value.substr(0,comma_pos).escapeHTML().strip();
+              } else {
+                new_value_el.value = new_value_el.value.gsub(separator,"").escapeHTML().strip();
+              }
+              if(!this.options.get("spaceReplace").blank()) new_value_el.value.gsub(" ", this.options.get("spaceReplace"));
+              if(!new_value_el.value.blank()) {
+                e.stop();
+                this.newvalue = true;
+                this.current_input = keep_input.escapeHTML().strip();
+                this.autoAdd(new_value_el);
+                input.value = keep_input;
+                this.update();			
+              }
+            }
+          }
+          break;
+        case Event.KEY_UP: 
+        case Event.KEY_DOWN: 
+        case Event.KEY_RETURN:
+        case Event.KEY_ESC: 
+          break;              
+        default: 
+          // If the user doesn't add comma after, the value is discarded upon submit
+          this.current_input = input.value.strip().escapeHTML();
+          this.update();
+          
+          // Removed Ajax.Request from here and moved to initialize, 
+          // now doesn't create server queries every search but only 
+          // refreshes the list on initialize (page load) 
+          if(this.searchTimeout) clearTimeout(this.searchTimeout);
+            this.searchTimeout = setTimeout(function(){
+              var sanitizer = new RegExp("[({[^$*+?\\\]})]","g");
+              if(this.dosearch) this.autoShow(input.value.replace(sanitizer,"\\$1"));
+          }.bind(this), 250);
+      }        
+    }.bind(this));
+    input.observe(Prototype.Browser.IE ? 'keydown' : 'keypress', function(e) { 
+      if ((e.keyCode == Event.KEY_RETURN) && this.autoenter) e.stop();
+      this.autoenter = false;
+    }.bind(this));
+    return li;
+  },
+
+  createBox: function($super,text, options) {
+    var li = $super(text, options);
+    li.observe('mouseover',function() { 
+      this.addClassName('bit-hover');
+    }).observe('mouseout',function() { 
+      this.removeClassName('bit-hover') 
+    });
+    var a = new Element('a', {
+      'href': '#',
+      'class': 'closebutton'
+    });
+    a.observe('click',function(e) {
+      e.stop();
+      if(! this.current) this.focus(this.maininput);
+      this.dispose(li);
+    }.bind(this));
+    li.insert(a).cacheData('text', Object.toJSON(text));
+    return li;
+  }
+});
+
+Element.addMethods({
+  onBoxDispose: function(item,obj) { 
+  // Set to not to "add back" values in the drop-down upon delete if they were new values
+	item = item.retrieveData('text').evalJSON(true);
+	if(!item.newValue)
+    	obj.autoFeed(item); 
+  },
+  onInputFocus: function(el,obj) { obj.autoShow(); },    
+  onInputBlur: function(el,obj) { 
+    obj.lastinput = el;
+    if(!obj.curOn) {
+        obj.blurhide = obj.autoHide.bind(obj).delay(0.1);
+    }
+  },
+  filter: function(D,E) { var C=[];for(var B=0,A=this.length;B<A;B++){if(D.call(E,this[B],B,this)){C.push(this[B]);}} return C; }
+});
+  
+/* Copyright: InteRiders <http://interiders.com/> - Distributed under MIT - Keep this message! */

data/public/stylesheets/admin/tags.css

@@ -0,0 +1,21 @@
+tr.tags ul.holder { width: 99.5%; margin: 0; border: 1px solid #999; overflow: hidden; height: auto !important; height: 1%; padding: 4px 5px 0; background-color: white; display: block !important; }
+*:first-child+html ul.holder { padding-bottom: 2px; } * html ul.holder { padding-bottom: 2px; } /* ie7 and below */
+tr.tags ul.holder li { float: left; list-style-type: none; margin: 0 5px 4px 0;}
+tr.tags ul.holder li.bit-box { -moz-border-radius: 6px; -webkit-border-radius: 6px; border-radius: 6px; border: 1px solid #CAD8F3; background: #DEE7F8; padding: 1px 5px 2px; }
+tr.tags ul.holder li.bit-box-focus { border-color: #598BEC; background: #598BEC; color: #fff; }
+tr.tags ul.holder li.bit-input input { width: 150px; margin: 0; border: none; outline: 0; padding: 3px 0 2px; } /* no left/right padding here please */
+tr.tags ul.holder li.bit-box { padding-right: 15px !important; position: relative; color: #000 !important;}
+tr.tags ul.holder li.bit-input { margin: 0;}
+
+tr.tags ul.holder li.bit-box a.closebutton { position: absolute; right: 4px; top: 5px; display: block; width: 7px; height: 7px; font-size: 1px; background: url('/images/admin/tagclose.gif'); }
+tr.tags ul.holder li.bit-box a.closebutton:hover { background-position: 7px; }
+tr.tags ul.holder li.bit-box-focus a.closebutton, tr.tags ul.holder li.bit-box-focus a.closebutton:hover { background-position: bottom; }
+
+
+#tag_container { display: none; position: relative; background: #eee; width: 101%; }
+#tag_container .default { padding: 5px 7px; border: 1px solid #ccc; border-width: 0 1px 1px; color: black; text-align: left; }
+#tag_container ul { display: none; margin: 0; padding: 0; overflow: auto }
+#tag_container ul li { display: block; padding: 5px 12px; z-index: 1000; cursor: pointer; margin: 0; list-style-type: none; border: 1px solid #ccc; border-width: 0 1px 1px; font: 11px "Lucida Grande", "Verdana"; text-align: left; color: black;}
+#tag_container ul li em { font-weight: bold; font-style: normal; background: #ccc; }
+#tag_container ul li.auto-focus { background: #4173CC; color: #fff; }
+#tag_container ul li.auto-focus em { background: none; }

data/radiant-tags-extension.gemspec

@@ -0,0 +1,28 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path('../lib', __FILE__)
+require 'radiant-tags-extension'
+
+Gem::Specification.new do |s|
+  s.name        = 'radiant-tags-extension'
+  s.version     = RadiantTagsExtension::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ['Benny Degezelle']
+  s.email       = ['benny@gorilla-webdesign.be']
+  s.homepage    = 'http://ext.radiantcms.org/extensions/195-tags'
+  s.summary     = %q{Tagging for Radiant CMS}
+  s.description = %q{This extension enhances the page model with tagging capabilities, tagging as in \"2.0" and tagclouds.}
+  
+  # TODO: add gem dependency on this instead of bundling it
+  # s.add_dependency 'has_many_polymorphs'
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features,vendor/plugins/*/test,vendor/plugins/*/spec,vendor/plugins/*/features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+  
+  # TODO: update for usage with Bundler/Gemfile once Radiant gets that capability
+  s.post_install_message = %{
+  Add this to your radiant project by adding the following line to your environment.rb:
+    config.gem 'radiant-tags-extension', :version => '#{RadiantTagsExtension::VERSION}'
+  }
+end

data/tags_extension.rb

@@ -9,27 +9,6 @@ class TagsExtension < Radiant::Extension
   
   DEFAULT_RESULTS_URL = '/search/by-tag'
 
-  define_routes do |map|
-    if Radiant::Config['tags.results_page_url'].blank?
-      Radiant::Config['tags.results_page_url'] = TagsExtension::DEFAULT_RESULTS_URL if Radiant::Config['tags.results_page_url'].blank?
-    end
-    begin
-      if defined?(SiteLanguage) && SiteLanguage.count > 0
-        include Globalize
-        SiteLanguage.codes.each do |code|
-          langname = Locale.new(code).language.code
-          map.connect "#{langname}#{Radiant::Config['tags.results_page_url']}/:tag", :controller => 'site', :action => 'show_page', :url => Radiant::Config['tags.results_page_url'], :language => code
-        end
-      else if defined?(VhostExtension)
-        map.connect "#{Radiant::Config['tags.results_page_url']}/:tag", :controller => 'site', :action => 'show_page', :url => Radiant::Config['tags.results_page_url']
-      end
-        map.connect "#{Radiant::Config['tags.results_page_url']}/:tag", :controller => 'site', :action => 'show_page', :url => Radiant::Config['tags.results_page_url']
-      end
-    rescue
-      # dirty hack; need to get trough here to allow migrations to run..
-    end  
-  end
-  
   def activate
     raise "The Shards extension is required and must be loaded first!" unless defined?(admin.page)
     if Radiant::Config.table_exists?

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-tags-extension
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 15
   prerelease: false
   segments: 
   - 1
-  - 5
-  - 1
-  version: 1.5.1
+  - 6
+  - 0
+  version: 1.6.0
 platform: ruby
 authors: 
 - Benny Degezelle
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-19 00:00:00 +00:00
+date: 2011-03-29 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -39,10 +39,20 @@ files:
 - app/models/tagging.rb
 - app/views/admin/help/_using_tags.html.haml
 - app/views/admin/pages/_tag_field.html.haml
+- app/views/admin/pages/_tag_field_javascript.html.erb
+- config/locales/de.yml
+- config/locales/en.yml
+- config/locales/nl.yml
+- config/routes.rb
 - db/migrate/001_add_tag_support.rb
+- lib/radiant-tags-extension.rb
 - lib/tagging_methods.rb
 - lib/tasks/tags_extension_tasks.rake
+- public/images/admin/tagclose.gif
+- public/javascripts/admin/protomultiselect.js
+- public/stylesheets/admin/tags.css
 - public/stylesheets/tags.css
+- radiant-tags-extension.gemspec
 - tags_extension.rb
 - test/fixtures/meta_tags.yml
 - test/fixtures/page_parts.yml
@@ -232,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 with:\n    config.gem 'radiant-tags-extension', :version => '1.5.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.0'\n  "
 rdoc_options: []
 
 require_paths: