Changed model names to singular

geemus · Sep 20, 2008 · a20db32 · a20db32
1 parent b44d69b
commit a20db32
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/lib/acts_as_taggable.rb b/lib/acts_as_taggable.rb
@@ -40,8 +40,8 @@ def tagged_with_scope(tags, options={})
           conditions += sanitize_sql([" AND #{table_name}_taggings.user_id = ?", options[:user]]) if options[:user]
 
           find_parameters = {
-            :joins  =>  "LEFT OUTER JOIN #{Taggings.table_name} #{table_name}_taggings ON #{table_name}_taggings.taggable_id = #{table_name}.#{primary_key} AND #{table_name}_taggings.taggable_type = '#{name}' " +
-                        "LEFT OUTER JOIN #{Tags.table_name} #{table_name}_tags ON #{table_name}_tags.id = #{table_name}_taggings.tag_id",
+            :joins  =>  "LEFT OUTER JOIN #{Tagging.table_name} #{table_name}_taggings ON #{table_name}_taggings.taggable_id = #{table_name}.#{primary_key} AND #{table_name}_taggings.taggable_type = '#{name}' " +
+                        "LEFT OUTER JOIN #{Tag.table_name} #{table_name}_tags ON #{table_name}_tags.id = #{table_name}_taggings.tag_id",
             :conditions => conditions,
             :group  =>  group            
           }

diff --git a/lib/acts_as_tagger.rb b/lib/acts_as_tagger.rb
@@ -8,7 +8,7 @@ def self.included(base)
       module ClassMethods
         def acts_as_tagger(options = {})
           has_many :taggings
-          has_many :tags, :through => :taggings, :select => "DISTINCT #{Tags.table_name}.*"
+          has_many :tags, :through => :taggings, :select => "DISTINCT #{Tag.table_name}.*"
 
           extend ActiveRecord::Acts::Tagger::SingletonMethods
           include ActiveRecord::Acts::Tagger::InstanceMethods

diff --git a/lib/tag.rb b/lib/tag.rb
@@ -37,7 +37,7 @@ def self.parse(list)
 
   def self.with_type_scope(taggable_type)
     if taggable_type
-      with_scope(:find => {:select => 'distinct *', :joins => "left outer join #{Taggings.table_name} on #{Taggings.table_name}.tag_id = #{Tags.table_name}.id", :conditions => ["taggable_type = ?", taggable_type], :group => "name"}) { yield }
+      with_scope(:find => {:select => 'distinct *', :joins => "left outer join #{Tagging.table_name} on #{Tagging.table_name}.tag_id = #{Tag.table_name}.id", :conditions => ["taggable_type = ?", taggable_type], :group => "name"}) { yield }
     else
       yield
     end