acts-as-taggable-on 1.0.11 → 1.0.12

data/VERSION

@@ -1 +1 @@
-1.0.11
+1.0.12

data/lib/acts-as-taggable-on.rb

@@ -1,3 +1,4 @@
+require 'acts_as_taggable_on/group_helper'
 require 'acts_as_taggable_on/acts_as_taggable_on'
 require 'acts_as_taggable_on/acts_as_tagger'
 require 'acts_as_taggable_on/tag'

data/lib/acts_as_taggable_on/acts_as_taggable_on.rb

@@ -109,6 +109,7 @@ module ActiveRecord
       end
 
       module SingletonMethods
+        include ActiveRecord::Acts::TaggableOn::GroupHelper
         # Pass either a tag string, or an array of strings or tags
         #
         # Options:
@@ -177,7 +178,7 @@ module ActiveRecord
                      "  ON #{taggings_alias}.taggable_id = #{table_name}.#{primary_key}" +
                      " AND #{taggings_alias}.taggable_type = #{quote_value(base_class.name)}"
 
-            group = "#{column_names_for_tagging_group} HAVING COUNT(#{taggings_alias}.taggable_id) = #{tags.size}"
+            group = "#{grouped_column_names_for(self)} HAVING COUNT(#{taggings_alias}.taggable_id) = #{tags.size}"
           end
 
           { :joins      => joins.join(" "),
@@ -232,7 +233,7 @@ module ActiveRecord
           at_least  = sanitize_sql(['COUNT(*) >= ?', options.delete(:at_least)]) if options[:at_least]
           at_most   = sanitize_sql(['COUNT(*) <= ?', options.delete(:at_most)]) if options[:at_most]
           having    = [at_least, at_most].compact.join(' AND ')
-          group_by  = "#{column_names_for_tag_group} HAVING COUNT(*) > 0"
+          group_by  = "#{grouped_column_names_for(Tag)} HAVING COUNT(*) > 0"
           group_by << " AND #{having}" unless having.blank?
 
           { :select     => "#{Tag.table_name}.*, COUNT(*) AS count",
@@ -247,17 +248,10 @@ module ActiveRecord
         def is_taggable?
           true
         end
-
-        def column_names_for_tag_group
-          Tag.column_names.map { |column| "#{Tag.table_name}.#{column}" }.join(", ")
-        end
-
-        def column_names_for_tagging_group
-          column_names.map { |column| "#{table_name}.#{column}" }.join(", ")
-        end
       end
 
       module InstanceMethods
+        include ActiveRecord::Acts::TaggableOn::GroupHelper
 
         def tag_types
           self.class.tag_types
@@ -324,7 +318,7 @@ module ActiveRecord
           { :select     => "#{klass.table_name}.*, COUNT(#{Tag.table_name}.id) AS count",
             :from       => "#{klass.table_name}, #{Tag.table_name}, #{Tagging.table_name}",
             :conditions => ["#{exclude_self} #{klass.table_name}.id = #{Tagging.table_name}.taggable_id AND #{Tagging.table_name}.taggable_type = '#{klass.to_s}' AND #{Tagging.table_name}.tag_id = #{Tag.table_name}.id AND #{Tag.table_name}.name IN (?)", tags_to_find],
-            :group      => "#{klass.table_name}.id",
+            :group      => grouped_column_names_for(klass),
             :order      => "count DESC"
           }.update(options)
         end

data/lib/acts_as_taggable_on/group_helper.rb

@@ -0,0 +1,12 @@
+module ActiveRecord
+  module Acts
+    module TaggableOn
+      module GroupHelper
+        # all column names are necessary for PostgreSQL group clause
+        def grouped_column_names_for(object)
+          object.column_names.map { |column| "#{object.table_name}.#{column}" }.join(", ")
+        end
+      end
+    end
+  end
+end

data/spec/acts_as_taggable_on/acts_as_taggable_on_spec.rb

@@ -40,14 +40,6 @@ describe "Acts As Taggable On" do
       @taggable.should respond_to(:tag_list, :skill_list, :language_list)
       @taggable.should respond_to(:tag_list=, :skill_list=, :language_list=)
     end
-
-    it "should return all column names joined for Tag GROUP clause" do
-      TaggableModel.column_names_for_tag_group.should == "tags.id, tags.name"
-    end
-
-    it "should return all column names joined for TaggableModel GROUP clause" do
-      TaggableModel.column_names_for_tagging_group.should == "taggable_models.id, taggable_models.name, taggable_models.type"
-    end
   end
 
   describe "Single Table Inheritance" do

data/spec/acts_as_taggable_on/group_helper_spec.rb

@@ -0,0 +1,18 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe "Group Helper" do
+
+  describe "grouped_column_names_for method" do
+    before(:each) do
+      @taggable = TaggableModel.new(:name => "Bob Jones")
+    end
+
+    it "should return all column names joined for Tag GROUP clause" do
+      @taggable.grouped_column_names_for(Tag).should == "tags.id, tags.name"
+    end
+
+    it "should return all column names joined for TaggableModel GROUP clause" do
+      @taggable.grouped_column_names_for(TaggableModel).should == "taggable_models.id, taggable_models.name, taggable_models.type"
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: acts-as-taggable-on
 version: !ruby/object:Gem::Version 
-  version: 1.0.11
+  version: 1.0.12
 platform: ruby
 authors: 
 - Michael Bleigh
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-02 00:00:00 -05:00
+date: 2009-12-07 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -30,6 +30,7 @@ files:
 - lib/acts-as-taggable-on.rb
 - lib/acts_as_taggable_on/acts_as_taggable_on.rb
 - lib/acts_as_taggable_on/acts_as_tagger.rb
+- lib/acts_as_taggable_on/group_helper.rb
 - lib/acts_as_taggable_on/tag.rb
 - lib/acts_as_taggable_on/tag_list.rb
 - lib/acts_as_taggable_on/tagging.rb
@@ -37,6 +38,7 @@ files:
 - rails/init.rb
 - spec/acts_as_taggable_on/acts_as_taggable_on_spec.rb
 - spec/acts_as_taggable_on/acts_as_tagger_spec.rb
+- spec/acts_as_taggable_on/group_helper_spec.rb
 - spec/acts_as_taggable_on/tag_list_spec.rb
 - spec/acts_as_taggable_on/tag_spec.rb
 - spec/acts_as_taggable_on/taggable_spec.rb
@@ -76,6 +78,7 @@ summary: ActsAsTaggableOn is a tagging plugin for Rails that provides multiple t
 test_files: 
 - spec/acts_as_taggable_on/acts_as_taggable_on_spec.rb
 - spec/acts_as_taggable_on/acts_as_tagger_spec.rb
+- spec/acts_as_taggable_on/group_helper_spec.rb
 - spec/acts_as_taggable_on/tag_list_spec.rb
 - spec/acts_as_taggable_on/tag_spec.rb
 - spec/acts_as_taggable_on/taggable_spec.rb