genki-dm-is-taggable 0.1.2 → 0.1.3

data/lib/dm-is-taggable/is/taggable.rb

@@ -55,6 +55,16 @@ module DataMapper
            options.merge!(:on => self, :by =>tagger, :with => tags)
           Tag.find_taggables(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
+        end
       end # ClassMethods
 
       module TaggableInstanceMethods

data/lib/dm-is-taggable/is/version.rb

@@ -1,7 +1,7 @@
 module DataMapper
   module Is
     module Taggable
-      VERSION = "0.1.2"
+      VERSION = "0.1.3"
       DEPENDENCY_VERSION = ">= 0.9.6"
     end
   end

data/lib/dm-is-taggable.rb

@@ -9,13 +9,15 @@ require 'dm-core'
 require 'dm-aggregates'
 
 # Require plugin-files
-require Pathname(__FILE__).dirname.expand_path / 'dm-is-taggable' / 'tag_list.rb'
-require Pathname(__FILE__).dirname.expand_path / 'dm-is-taggable' / 'aggregate_patch.rb'
-require Pathname(__FILE__).dirname.expand_path / 'dm-is-taggable' / 'is' / 'shared.rb'
-require Pathname(__FILE__).dirname.expand_path / 'dm-is-taggable' / 'is' / 'taggable.rb'
-require Pathname(__FILE__).dirname.expand_path / 'dm-is-taggable' / 'is' / 'tag.rb'
-require Pathname(__FILE__).dirname.expand_path / 'dm-is-taggable' / 'is' / 'tagging.rb'
-require Pathname(__FILE__).dirname.expand_path / 'dm-is-taggable' / 'is' / 'tagger.rb'
+base_dir = Pathname(__FILE__).dirname.expand_path
+require base_dir / 'dm-is-taggable' / 'tag_list.rb'
+require base_dir / 'dm-is-taggable' / 'aggregate_patch.rb'
+require base_dir / 'dm-is-taggable' / 'do_adapter_ext.rb'
+require base_dir / 'dm-is-taggable' / 'is' / 'shared.rb'
+require base_dir / 'dm-is-taggable' / 'is' / 'taggable.rb'
+require base_dir / 'dm-is-taggable' / 'is' / 'tag.rb'
+require base_dir / 'dm-is-taggable' / 'is' / 'tagging.rb'
+require base_dir / 'dm-is-taggable' / 'is' / 'tagger.rb'
 
 # Include the plugin in Resource
 module DataMapper

data/spec/integration/taggable_spec.rb

@@ -285,5 +285,17 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
       related_tags.include?([2,Tag.get("tag1")]).should be_true
       related_tags.include?([2,Tag.get("tag2")]).should be_true
     end
+
+    it "should be able to total tags" do
+      total = Picture.total(:limit => 10)
+      total.should be_a(Array)
+      total.should_not be_empty
+      total.each do |item|
+        item.should be_a(Array)
+        item.size.should == 2
+        item[0].should be_a(Tag)
+        item[1].should be_a(Integer)
+      end
+    end
   end
 end

data/spec/spec_helper.rb

@@ -21,7 +21,7 @@ def load_driver(name, default_uri)
   end
 end
 
-ENV['ADAPTER'] ||= 'mysql'
+ENV['ADAPTER'] ||= 'sqlite3'
 
 HAS_SQLITE3  = load_driver(:sqlite3,  'sqlite3::memory:')
 HAS_MYSQL    = load_driver(:mysql,    'mysql://root@localhost/dm_is_taggable_test')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: genki-dm-is-taggable
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Aaron Qian, Maxime Guilbot
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-25 00:00:00 -07:00
+date: 2009-05-08 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -104,7 +104,7 @@ requirements: []
 rubyforge_project: dm-is-taggable
 rubygems_version: 1.2.0
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Tagging implementation for DataMapper
 test_files: []