radiant-tags-extension 1.6.3 → 1.6.4

data/app/models/meta_tag.rb

@@ -35,34 +35,28 @@ class MetaTag < ActiveRecord::Base
       find_by_name(name) || create!(:name => name)
     end
 
-    def cloud(args = {})
-      args = {:by => 'popularity', :order => 'desc', :limit => 5}.merge(args)
-
-      find(:all, :select => 'meta_tags.*, count(*) as popularity',
-      :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 => order_string(args) )
+    def cloud(options = {})
+      options = {:by => 'popularity', :order => 'asc', :limit => 5}.merge(options)
+      validate_by options[:by]
+      validate_order options[:order]
+      all(
+        :select => 'meta_tags.*, count(*) as popularity',
+        :limit => options[:limit],
+        :joins => "JOIN taggings ON taggings.meta_tag_id = meta_tags.id",
+        :conditions => options[:conditions],
+        :group => "meta_tags.id, meta_tags.name",
+        :order => "#{options[:by]} #{options[:order].upcase}"
+      )
     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
-
+    
+    def validate_by(by)
+      valid_field_names = column_names + ['popularity']
+      valid_field_names.include?(by) or raise %Q{"by" must be one of #{valid_field_names.to_sentence}, was #{by}}
+    end
+    
+    def validate_order(order)
+      order =~ /^(asc|desc)$/i or raise %Q{"order" must be set to either "asc" or "desc"}
     end
-
   end
   
   def <=>(other)

data/app/models/radius_tags.rb

@@ -220,22 +220,24 @@ module RadiusTags
   
   desc %{
     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.
+    The default is by name. You may also limit the search; the default is 5 results.
     
     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|
-    by = tag.attr['by'] || 'name'
-    order = tag.attr['order'] || 'asc'
+    by = (tag.attr['by'] || 'name').strip
+    order = (tag.attr['order'] || 'asc').strip
     limit = tag.attr['limit'] || '5'
-    result = []
-    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
-      result << tag.expand
+    begin
+      all_tags = MetaTag.cloud(:limit => limit, :order => order, :by => by)
+    rescue => e
+      raise TagError, "all_tags:each: "+e.message
     end
-    result
+    used_tags = all_tags.reject { |t| t.pages.empty? }
+    used_tags.collect do |t|
+      tag.locals.meta_tag = t
+      tag.expand
+    end.join
   end
   
   desc "Renders the tag's name"

data/lib/radiant-tags-extension.rb

@@ -1,3 +1,3 @@
 module RadiantTagsExtension
-  VERSION = '1.6.3'
+  VERSION = '1.6.4'
 end

metadata

@@ -1,34 +1,24 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: radiant-tags-extension
-version: !ruby/object:Gem::Version 
-  hash: 9
-  prerelease: false
-  segments: 
-  - 1
-  - 6
-  - 3
-  version: 1.6.3
+version: !ruby/object:Gem::Version
+  version: 1.6.4
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Benny Degezelle
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-21 00:00:00 +02:00
-default_executable: 
+date: 2012-01-11 00:00:00.000000000Z
 dependencies: []
-
-description: This extension enhances the page model with tagging capabilities, tagging as in \"2.0" and tagclouds.
-email: 
+description: This extension enhances the page model with tagging capabilities, tagging
+  as in \"2.0" and tagclouds.
+email:
 - benny@gorilla-webdesign.be
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - HELP.md
 - HELP_admin.md
 - README
@@ -238,41 +228,33 @@ files:
 - vendor/plugins/has_many_polymorphs/test/setup.rb
 - vendor/plugins/has_many_polymorphs/test/test_helper.rb
 - vendor/plugins/has_many_polymorphs/test/unit/has_many_polymorphs_test.rb
-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.3'\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.4'\n  "
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Tagging for Radiant CMS
-test_files: 
+test_files:
 - test/fixtures/meta_tags.yml
 - test/fixtures/page_parts.yml
 - test/fixtures/pages.yml