Implemented Tagging.total

aq1018 · May 8, 2009 · eb14d9d · eb14d9d
1 parent 788ea81
commit eb14d9d
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 10 deletions.
diff --git a/dm-is-taggable.gemspec b/dm-is-taggable.gemspec
@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-is-taggable}
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aaron Qian, Maxime Guilbot"]
-  s.date = %q{2009-05-08}
+  s.date = %q{2009-05-09}
   s.description = %q{Tagging implementation for DataMapper}
   s.email = ["team [a] ekohe [d] com"]
   s.extra_rdoc_files = ["README.textile", "LICENSE", "TODO"]

diff --git a/lib/dm-is-taggable/is/taggable.rb b/lib/dm-is-taggable/is/taggable.rb
@@ -57,13 +57,7 @@ def find(options)
         end
 
         def total(options = {})
-          property = DataMapper::Property.new(Tagging, :"count(*)", Integer)
-          order = options[:order] || :desc
-          dir = DataMapper::Query::Direction.new(property, order)
-          tag_id_to_count = Tagging.aggregate(:all.count,
-            options.merge(:fields => [:tag_id], :order => [dir]))
-          tag_ids, counts = tag_id_to_count.transpose
-          Tag.all(:id => tag_ids).zip counts
+          Tagging.total(options.merge(:taggable_type => self.name))
         end
       end # ClassMethods
 

diff --git a/lib/dm-is-taggable/is/tagging.rb b/lib/dm-is-taggable/is/tagging.rb
@@ -21,6 +21,15 @@ def is_tagging(options=nil)
       end
 
       module TaggingClassMethods
+        def total(options = {})
+          property = DataMapper::Property.new(Tagging, :"count(*)", Integer)
+          order = options[:order] || :desc
+          dir = DataMapper::Query::Direction.new(property, order)
+          tag_id_to_count = Tagging.aggregate(:all.count,
+            options.merge(:fields => [:tag_id], :order => [dir]))
+          tag_ids, counts = tag_id_to_count.transpose
+          Tag.all(:id => tag_ids).zip counts
+        end
       end
 
       module TaggingInstanceMethods

diff --git a/lib/dm-is-taggable/is/version.rb b/lib/dm-is-taggable/is/version.rb
@@ -1,7 +1,7 @@
 module DataMapper
   module Is
     module Taggable
-      VERSION = "0.1.4"
+      VERSION = "0.1.5"
       DEPENDENCY_VERSION = ">= 0.9.6"
     end
   end