acts-as-taggable-on-for-domains 0.1.0 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/acts-as-taggable-on-for-domains.gemspec

@@ -1,28 +1,26 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{acts-as-taggable-on-for-domains}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Bleigh", "Josh N. Abbott"]
-  s.date = %q{2009-11-13}
+  s.date = %q{2009-11-20}
   s.description = %q{Same as ActsAsTaggableOn but tagging happens within the context of a domain id. This means an object could be tagged with something for one domain, but the same object, in the context of a different domain id, could have completely different taggings.}
   s.email = %q{joshnabbott@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README",
-     "README.rdoc"
+     "README"
   ]
   s.files = [
     ".document",
      ".gitignore",
      "LICENSE",
      "README",
-     "README.rdoc",
      "Rakefile",
      "VERSION",
      "acts-as-taggable-on-for-domains.gemspec",
@@ -77,3 +75,4 @@ Gem::Specification.new do |s|
   else
   end
 end
+

data/lib/acts_as_taggable_on/acts_as_taggable_on.rb

@@ -143,29 +143,31 @@ module ActiveRecord
           if options.delete(:exclude)
             tags_conditions = tags.map { |t| sanitize_sql(["#{Tag.table_name}.name LIKE ?", t]) }.join(" OR ")
             conditions << "#{table_name}.#{primary_key} NOT IN (SELECT #{Tagging.table_name}.taggable_id FROM #{Tagging.table_name} JOIN #{Tag.table_name} ON #{Tagging.table_name}.tag_id = #{Tag.table_name}.id AND (#{tags_conditions}) WHERE #{Tagging.table_name}.taggable_type = #{quote_value(base_class.name)})"
-          
-          else          
+
+          else
             tags.each do |tag|
               safe_tag = tag.gsub(/[^a-zA-Z0-9]/, '')
               prefix   = "#{safe_tag}_#{rand(1024)}"
-  
+
               taggings_alias = "#{table_name}_taggings_#{prefix}"
               tags_alias     = "#{table_name}_tags_#{prefix}"
-            
+
               tagging_join  = "JOIN #{Tagging.table_name} #{taggings_alias}" +
                               "  ON #{taggings_alias}.taggable_id = #{table_name}.#{primary_key}" +
                               " AND #{taggings_alias}.taggable_type = #{quote_value(base_class.name)}"
               tagging_join << " AND " + sanitize_sql(["#{taggings_alias}.context = ?", context.to_s]) if context
-          
+
+              tagging_join << " AND #{taggings_alias}.domain_id = #{Domain.current_domain_id}"
+
               tag_join     = "JOIN #{Tag.table_name} #{tags_alias}" +
                              "  ON #{tags_alias}.id = #{taggings_alias}.tag_id" +
                              " AND " + sanitize_sql(["#{tags_alias}.name like ?", tag])
-          
+
               joins << tagging_join
               joins << tag_join
-            end            
+            end
           end
-          
+
           taggings_alias, tags_alias = "#{table_name}_taggings_group", "#{table_name}_tags_group"
 
           if options.delete(:match_all)

data/lib/acts_as_taggable_on/acts_as_taggable_on_scoped_by_domain.rb

@@ -1,15 +1,18 @@
 module ActsAsTaggableOnScopedByDomain
-  ActiveRecord::Acts::TaggableOn::SingletonMethods.module_eval do
-    RAILS_DEFAULT_LOGGER.info "** Extended acts_as_taggable_on for domain scoping."
+  RAILS_DEFAULT_LOGGER.info "** Extended acts_as_taggable_on for domain scoping."
 
-    def find_options_for_find_tagged_with_with_domain_id(tags, options = {})
-      options = options.reverse_merge!(:conditions => ['domain_id = ?', Domain.current_domain_id])
-      find_options_for_find_tagged_with_without_domain_id(tags, options)
-    end
-    alias_method_chain :find_options_for_find_tagged_with, :domain_id
+  ActiveRecord::Acts::TaggableOn::SingletonMethods.module_eval do
+    # Had to not use this method of scoping by domain because there's no way here to use the same 
+    # table alias as what's being used for the tagging.
+    #
+    # def find_options_for_find_tagged_with_with_domain_id(tags, options = {})
+    #   options = options.reverse_merge!(:conditions => ["domain_id = ?", Domain.current_domain_id])
+    #   find_options_for_find_tagged_with_without_domain_id(tags, options)
+    # end
+    # alias_method_chain :find_options_for_find_tagged_with, :domain_id
 
     def find_options_for_tag_counts_with_domain_id(options = {})
-      options = options.reverse_merge!(:conditions => "domain_id = #{Domain.current_domain_id}")
+      options = options.reverse_merge!(:conditions => "`taggings`.domain_id = #{Domain.current_domain_id}")
       find_options_for_tag_counts_without_domain_id(options)
     end
     alias_method_chain :find_options_for_tag_counts, :domain_id

data/lib/acts_as_taggable_on/tag.rb

@@ -3,6 +3,10 @@ class Tag < ActiveRecord::Base
   
   validates_presence_of :name
   validates_uniqueness_of :name
+
+  # Find all tags for a specific context.
+  # USAGE: Tag.for_context('collection_tags') #=> Would return an array of unique tags used in the specified context
+  named_scope :for_context, lambda { |context| { :select => 'DISTINCT `tags`.`id`, `tags`.`name`', :joins => 'INNER JOIN taggings ON `taggings`.`tag_id` = `tags`.`id`', :conditions => ['`taggings`.`context` = ?', context] } }
   
   # LIKE is used for cross-database case-insensitivity
   def self.find_or_create_with_like_by_name(name)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: acts-as-taggable-on-for-domains
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Michael Bleigh
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-13 00:00:00 -08:00
+date: 2009-11-20 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -23,13 +23,11 @@ extensions: []
 extra_rdoc_files: 
 - LICENSE
 - README
-- README.rdoc
 files: 
 - .document
 - .gitignore
 - LICENSE
 - README
-- README.rdoc
 - Rakefile
 - VERSION
 - acts-as-taggable-on-for-domains.gemspec

data/README.rdoc

@@ -1,18 +0,0 @@
-= acts-as-taggable-on-for-domains
-
-Description goes here.
-
-== Note on Patches/Pull Requests
- 
-* Fork the project.
-* Make your feature addition or bug fix.
-* Add tests for it. This is important so I don't break it in a
-  future version unintentionally.
-* Commit, do not mess with rakefile, version, or history.
-  (if you want to have your own version, that is fine but
-   bump version in a commit by itself I can ignore when I pull)
-* Send me a pull request. Bonus points for topic branches.
-
-== Copyright
-
-Copyright (c) 2009 Josh N. Abbott. See LICENSE for details.