acts-as-taggable-on 2.0.5 → 2.0.6

data/Gemfile

@@ -4,5 +4,7 @@ source :gemcutter
 gem 'rails',        '3.0.0.beta3'
 gem 'rspec',        '2.0.0.beta.8'
 gem 'sqlite3-ruby', :require => 'sqlite3'
+gem 'mysql'
+gem 'pg'
 gem 'jeweler'
 gem 'rcov'

data/README.rdoc

@@ -139,7 +139,7 @@ to allow for dynamic tag contexts (this could be user generated tag contexts!)
     @user.save
     @user.tags_on(:customs) # => [<Tag name='same'>,...]
     @user.tag_counts_on(:customs)
-    User.find_tagged_with("same", :on => :customs) # => [@user]
+    User.tagged_with("same", :on => :customs) # => [@user]
 
 === Tag Ownership
 
@@ -174,7 +174,7 @@ Here is an example that generates a tag cloud.
 Helper:
 
   module PostsHelper
-    include TagsHelper
+    include ActsAsTaggableOn::TagsHelper
   end
 
 Controller:

data/VERSION

@@ -1 +1 @@
-2.0.5
+2.0.6

data/lib/acts_as_taggable_on/acts_as_taggable_on/collection.rb

@@ -87,7 +87,9 @@ module ActsAsTaggableOn::Taggable
           tagging_join,
           taggable_join,
           scope[:joins]
-        ].compact.reverse
+        ].compact
+
+        joins = joins.reverse if ActiveRecord::VERSION::MAJOR < 3
 
 
         ## Generate scope:

data/lib/acts_as_taggable_on/acts_as_taggable_on/core.rb

@@ -117,6 +117,7 @@ module ActsAsTaggableOn::Taggable
         scoped(:joins      => joins.join(" "),
                :group      => group,
                :conditions => conditions.join(" AND "),
+               :order      => options[:order],
                :readonly   => false)
       end
 
@@ -172,8 +173,11 @@ module ActsAsTaggableOn::Taggable
       ##
       # Returns all tags of a given context
       def all_tags_on(context)
-        opts =  ["#{ActsAsTaggableOn::Tagging.table_name}.context = ?", context.to_s]
-        base_tags.where(opts).order("#{ActsAsTaggableOn::Tagging.table_name}.created_at").group("#{ActsAsTaggableOn::Tagging.table_name}.tag_id").all
+        tag_table_name = ActsAsTaggableOn::Tag.table_name
+        tagging_table_name = ActsAsTaggableOn::Tagging.table_name
+
+        opts =  ["#{tagging_table_name}.context = ?", context.to_s]
+        base_tags.where(opts).order("max(#{tagging_table_name}.created_at)").group("#{tag_table_name}.id, #{tag_table_name}.name").all
       end
 
       ##

data/lib/acts_as_taggable_on/compatibility/Gemfile

@@ -3,4 +3,6 @@ source :gemcutter
 # Rails 2.3
 gem 'rails',        '2.3.5'
 gem 'rspec',        '1.3.0', :require => 'spec'
-gem 'sqlite3-ruby', '1.2.5', :require => 'sqlite3'
+gem 'sqlite3-ruby', '1.2.5', :require => 'sqlite3'
+gem 'mysql'
+gem 'pg'

data/lib/acts_as_taggable_on/compatibility/postgresql.rb

@@ -0,0 +1,44 @@
+module ActsAsTaggableOn
+  module Taggable
+    module PostgreSQL
+      def self.included(base)
+        base.send :include, ActsAsTaggableOn::Taggable::PostgreSQL::InstanceMethods
+        base.extend ActsAsTaggableOn::Taggable::PostgreSQL::ClassMethods
+      
+        ActsAsTaggableOn::Tag.class_eval do
+          def self.named(name)
+            where(["name ILIKE ?", name])
+          end
+
+          def self.named_any(list)
+            where(list.map { |tag| sanitize_sql(["name ILIKE ?", tag.to_s]) }.join(" OR "))
+          end
+
+          def self.named_like(name)
+            where(["name ILIKE ?", "%#{name}%"])
+          end
+
+          def self.named_like_any(list)
+            where(list.map { |tag| sanitize_sql(["name ILIKE ?", "%#{tag.to_s}%"]) }.join(" OR "))
+          end          
+        end
+      end
+      
+      module InstanceMethods
+      end
+      
+      module ClassMethods
+        # all column names are necessary for PostgreSQL group clause
+        def grouped_column_names_for(*objects)
+          object   = objects.shift
+          columns  = object.column_names.map { |column| "#{object.table_name}.#{column}" }
+          columns << objects.map do |object|
+                       "#{object.table_name}.created_at"
+                     end.flatten
+
+          columns.flatten.join(", ")
+        end
+      end
+    end
+  end
+end

data/lib/acts_as_taggable_on/tag.rb

@@ -16,19 +16,19 @@ module ActsAsTaggableOn
     ### SCOPES:
 
     def self.named(name)
-      where(["name LIKE ?", name])
+      where(["name #{like_operator} ?", name])
     end
   
     def self.named_any(list)
-      where(list.map { |tag| sanitize_sql(["name LIKE ?", tag.to_s]) }.join(" OR "))
+      where(list.map { |tag| sanitize_sql(["name #{like_operator} ?", tag.to_s]) }.join(" OR "))
     end
   
     def self.named_like(name)
-      where(["name LIKE ?", "%#{name}%"])
+      where(["name #{like_operator} ?", "%#{name}%"])
     end
 
     def self.named_like_any(list)
-      where(list.map { |tag| sanitize_sql(["name LIKE ?", "%#{tag.to_s}%"]) }.join(" OR "))
+      where(list.map { |tag| sanitize_sql(["name #{like_operator} ?", "%#{tag.to_s}%"]) }.join(" OR "))
     end
 
     ### CLASS METHODS:
@@ -63,5 +63,12 @@ module ActsAsTaggableOn
       read_attribute(:count).to_i
     end
 
+    class << self
+      private
+        def like_operator
+          connection.adapter_name == 'PostgreSQL' ? 'ILIKE' : 'LIKE'
+        end
+    end
+
   end
 end

data/spec/acts_as_taggable_on/acts_as_taggable_on_spec.rb

@@ -12,6 +12,8 @@ describe "Acts As Taggable On" do
   describe "Taggable Method Generation" do
     before(:each) do
       clean_database!
+      TaggableModel.write_inheritable_attribute(:tag_types, [])
+      TaggableModel.acts_as_taggable_on(:tags, :languages, :skills, :needs, :offerings)
       @taggable = TaggableModel.new(:name => "Bob Jones")
     end
 

data/spec/acts_as_taggable_on/taggable_spec.rb

@@ -108,7 +108,7 @@ describe "Taggable" do
     charlie = TaggableModel.create(:name => "Charlie", :skill_list => "ruby")
 
     TaggableModel.all_tag_counts.all.should_not be_empty
-    TaggableModel.all_tag_counts.first.count.should == 3 # ruby
+    TaggableModel.all_tag_counts(:order => 'tags.id').first.count.should == 3 # ruby
   end
 
   if ActiveRecord::VERSION::MAJOR >= 3
@@ -132,7 +132,7 @@ describe "Taggable" do
     frank = TaggableModel.create(:name => "Frank", :tag_list => "ruby, rails")
     charlie = TaggableModel.create(:name => "Charlie", :skill_list => "ruby")
 
-    TaggableModel.tagged_with("ruby").tag_counts.first.count.should == 2   # ruby
+    TaggableModel.tagged_with("ruby").tag_counts(:order => 'tags.id').first.count.should == 2   # ruby
     TaggableModel.tagged_with("ruby").skill_counts.first.count.should == 1 # ruby
   end
 
@@ -141,7 +141,7 @@ describe "Taggable" do
     frank = TaggableModel.create(:name => "Frank", :tag_list => "ruby, rails")
     charlie = TaggableModel.create(:name => "Charlie", :skill_list => "ruby")
 
-    TaggableModel.tagged_with("ruby").all_tag_counts.first.count.should == 3 # ruby
+    TaggableModel.tagged_with("ruby").all_tag_counts(:order => 'tags.id').first.count.should == 3 # ruby
   end
 
   it 'should only return tag counts for the available scope' do
@@ -298,9 +298,9 @@ describe "Taggable" do
       @inherited_different.tag_list = "fork, spoon"
       @inherited_different.save!
   
-      InheritingTaggableModel.tag_counts_on(:tags).map(&:name).should == %w(bob kelso)
-      AlteredInheritingTaggableModel.tag_counts_on(:tags).map(&:name).should == %w(fork spoon)
-      TaggableModel.tag_counts_on(:tags).map(&:name).should == %w(bob kelso fork spoon)
+      InheritingTaggableModel.tag_counts_on(:tags, :order => 'tags.id').map(&:name).should == %w(bob kelso)
+      AlteredInheritingTaggableModel.tag_counts_on(:tags, :order => 'tags.id').map(&:name).should == %w(fork spoon)
+      TaggableModel.tag_counts_on(:tags, :order => 'tags.id').map(&:name).should == %w(bob kelso fork spoon)
     end
   
     it 'should store same tag without validation conflict' do

data/spec/database.yml

@@ -0,0 +1,17 @@
+sqlite3:
+  adapter: sqlite3
+  database: acts_as_taggable_on.sqlite3
+
+mysql:
+  adapter: mysql
+  hostname: localhost
+  username: root
+  password:
+  database: acts_as_taggable_on
+
+postgresql:
+  adapter: postgresql
+  hostname: localhost
+  username: postgres
+  password:
+  database: acts_as_taggable_on

data/spec/database.yml.sample

@@ -0,0 +1,17 @@
+sqlite3:
+  adapter: sqlite3
+  database: acts_as_taggable_on.sqlite3
+
+mysql:
+  adapter: mysql
+  hostname: localhost
+  username: root
+  password:
+  database: acts_as_taggable_on
+
+postgresql:
+  adapter: postgresql
+  hostname: localhost
+  username: postgres
+  password:
+  database: acts_as_taggable_on

data/spec/spec_helper.rb

@@ -29,21 +29,24 @@ unless [].respond_to?(:freq)
   end
 end
 
-# Setup a database
-TEST_DATABASE_FILE = File.join(File.dirname(__FILE__), '..', 'test.sqlite3')
-File.unlink(TEST_DATABASE_FILE) if File.exist?(TEST_DATABASE_FILE)
-
-ActiveRecord::Base.establish_connection(
-  "adapter" => "sqlite3", "database" => TEST_DATABASE_FILE
-)
-
-ActiveRecord::Base.logger = Logger.new(File.join(File.dirname(__FILE__), "debug.log"))
-ActiveRecord::Base.establish_connection :adapter => 'sqlite3', :database => TEST_DATABASE_FILE
-
-ActiveRecord::Base.silence do
-  ActiveRecord::Migration.verbose = false
-  load(File.dirname(__FILE__) + '/schema.rb')
-  load(File.dirname(__FILE__) + '/models.rb')
+ENV['DB'] ||= 'sqlite3'
+
+database_yml = File.expand_path('../database.yml', __FILE__)
+if File.exists?(database_yml)
+  active_record_configuration = YAML.load_file(database_yml)[ENV['DB']]
+  
+  ActiveRecord::Base.establish_connection(active_record_configuration)
+  ActiveRecord::Base.logger = Logger.new(File.join(File.dirname(__FILE__), "debug.log"))
+  
+  ActiveRecord::Base.silence do
+    ActiveRecord::Migration.verbose = false
+    
+    load(File.dirname(__FILE__) + '/schema.rb')
+    load(File.dirname(__FILE__) + '/models.rb')
+  end  
+  
+else
+  raise "Please create #{database_yml} first to configure your database. Take a look at: #{database_yml}.sample"
 end
 
 def clean_database!

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 2
   - 0
-  - 5
-  version: 2.0.5
+  - 6
+  version: 2.0.6
 platform: ruby
 authors: 
 - Michael Bleigh
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-30 00:00:00 +02:00
+date: 2010-05-19 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -45,6 +45,7 @@ files:
 - lib/acts_as_taggable_on/acts_as_tagger.rb
 - lib/acts_as_taggable_on/compatibility/Gemfile
 - lib/acts_as_taggable_on/compatibility/active_record_backports.rb
+- lib/acts_as_taggable_on/compatibility/postgresql.rb
 - lib/acts_as_taggable_on/tag.rb
 - lib/acts_as_taggable_on/tag_list.rb
 - lib/acts_as_taggable_on/tagging.rb
@@ -61,6 +62,8 @@ files:
 - spec/acts_as_taggable_on/tagging_spec.rb
 - spec/acts_as_taggable_on/tags_helper_spec.rb
 - spec/bm.rb
+- spec/database.yml
+- spec/database.yml.sample
 - spec/models.rb
 - spec/schema.rb
 - spec/spec_helper.rb