johnsbrn-has_many_polymorphs 2.13.1 → 2.13.3

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 1
+:patch: 3
 :major: 2
 :minor: 13

data/generators/tagging/templates/tagging_extensions.rb

@@ -1,4 +1,3 @@
-
 class ActiveRecord::Base #:nodoc:
 
   # These extensions make models taggable. This file is automatically generated and required by your app if you run the tagging generator included with has_many_polymorphs.
@@ -13,7 +12,7 @@ class ActiveRecord::Base #:nodoc:
         begin
           tag = Tag.find_or_create_by_name(tag_name)
           raise Tag::Error, "tag could not be saved: #{tag_name}" if tag.new_record?
-          tag.taggables << self
+          tags << tag
         rescue ActiveRecord::StatementInvalid => e
           raise unless e.to_s =~ /duplicate/i
         end
@@ -66,7 +65,11 @@ class ActiveRecord::Base #:nodoc:
       <%= parent_association_name -%>s.to_s
       #:startdoc:
     end
-    
+
+    def tag_list=(value)
+        tag_with(value)
+    end    
+
     private 
     
     def tag_cast_to_string obj #:nodoc:
@@ -144,6 +147,47 @@ class ActiveRecord::Base #:nodoc:
       
       find_by_sql(sql)
     end
+   
+   def self.tagged_with_any(*tag_list)
+     options = tag_list.last.is_a?(Hash) ? tag_list.pop : {}
+     tag_list = parse_tags(tag_list)
+   
+     scope = scope(:find)
+     options[:select] ||= "#{table_name}.*"
+     options[:from] ||= "#{table_name}, meta_tags, taggings"
+   
+     sql  = "SELECT #{(scope && scope[:select]) || options[:select]} "
+     sql << "FROM #{(scope && scope[:from]) || options[:from]} "
+
+     add_joins!(sql, options, scope)
+   
+     sql << "WHERE #{table_name}.#{primary_key} = taggings.taggable_id "
+     sql << "AND taggings.taggable_type = '#{ActiveRecord::Base.send(:class_name_of_active_record_descendant, self).to_s}' "
+     sql << "AND taggings.meta_tag_id = meta_tags.id "
+     
+     sql << "AND ("
+     or_options = []
+     tag_list.each do |name|
+       or_options << "meta_tags.name = '#{name}'"
+     end
+     or_options_joined = or_options.join(" OR ")
+     sql << "#{or_options_joined}) "
+     
+     
+     sql << "AND #{sanitize_sql(options[:conditions])} " if options[:conditions]
+      
+     columns = column_names.map do |column| 
+       "#{table_name}.#{column}"
+     end.join(", ")
+      
+     sql << "GROUP BY #{columns} "
+   
+     add_order!(sql, options[:order], scope)
+     add_limit!(sql, options, scope)
+     add_lock!(sql, options, scope)
+   
+     find_by_sql(sql)
+   end
     
     def parse_tags(tags)
       return [] if tags.blank?

data/lib/has_many_polymorphs.rb

@@ -14,7 +14,7 @@ class ActiveRecord::Base
   extend ActiveRecord::Associations::PolymorphicClassMethods 
 end
 
-if ENV['HMP_DEBUG'] or ENV['RAILS_ENV'] =~ /development|test/ and ENV['USER'] == 'eweaver'
+if ENV['HMP_DEBUG'] || ENV['RAILS_ENV'] =~ /development|test/ && ENV['USER'] == 'eweaver'
   require 'has_many_polymorphs/debugging_tools' 
 end
 

data/lib/has_many_polymorphs/autoload.rb

@@ -1,6 +1,5 @@
-
 require 'initializer' unless defined? ::Rails::Initializer 
-require 'dispatcher' unless defined? ::ActionController::Dispatcher
+require 'action_controller/dispatcher' unless defined? ::ActionController::Dispatcher
 
 module HasManyPolymorphs
 
@@ -37,7 +36,7 @@ Note that you can override DEFAULT_OPTIONS via Rails::Configuration#has_many_pol
       require requirement
     end
   
-    Dir[options[:file_pattern]].each do |filename|
+    Dir.glob(options[:file_pattern]).each do |filename|
       next if filename =~ /#{options[:file_exclusions].join("|")}/
       open filename do |file|
         if file.grep(/#{options[:methods].join("|")}/).any?
@@ -64,7 +63,7 @@ class Rails::Initializer #:nodoc:
   alias_method_chain :after_initialize, :autoload 
 end
 
-Dispatcher.to_prepare(:has_many_polymorphs_autoload) do
+ActionController::Dispatcher.to_prepare(:has_many_polymorphs_autoload) do
   # Make sure it gets loaded in the app
   HasManyPolymorphs.autoload
 end

data/test/integration/app/config/environments/development.rb

@@ -3,6 +3,7 @@ config.cache_classes = ENV['PRODUCTION']
 config.whiny_nils = true
 config.action_controller.consider_all_requests_local = !ENV['PRODUCTION']
 config.action_controller.perform_caching = ENV['PRODUCTION']
-config.action_view.cache_template_extensions = ENV['PRODUCTION']
+# The following has been deprecated in Rails 2.1 and removed in 2.2
+config.action_view.cache_template_extensions = ENV['PRODUCTION'] if Rails::VERSION::MAJOR < 2 or Rails::VERSION::MAJOR == 2 && Rails::VERSION::MINOR < 1
 config.action_view.debug_rjs = !ENV['PRODUCTION']
 config.action_mailer.raise_delivery_errors = false

data/test/setup.rb

@@ -6,8 +6,8 @@ Dir.chdir "#{File.dirname(__FILE__)}/integration/app/" do
     system("rm has_many_polymorphs; ln -s ../../../../../ has_many_polymorphs")
   end
 
-  system "rake db:drop --trace RAILS_GEM_VERSION=2.0.2 "
-  system "rake db:create --trace RAILS_GEM_VERSION=2.0.2 "
+  system "rake db:drop   --trace RAILS_GEM_VERSION=2.2.2 "
+  system "rake db:create --trace RAILS_GEM_VERSION=2.2.2 "
   system "rake db:migrate --trace"
   system "rake db:fixtures:load --trace"  
 end

data/test/test_helper.rb

@@ -23,7 +23,7 @@ LOG = "#{HERE}/integration/app/log/development.log"
 require 'integration/app/config/environment'
 require 'test_help'
 
-Inflector.inflections {|i| i.irregular 'fish', 'fish' }
+ActiveSupport::Inflector.inflections {|i| i.irregular 'fish', 'fish' }
 
 $LOAD_PATH.unshift(Test::Unit::TestCase.fixture_path = HERE + "/fixtures")
 $LOAD_PATH.unshift(HERE + "/models")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: johnsbrn-has_many_polymorphs
 version: !ruby/object:Gem::Version 
-  version: 2.13.1
+  version: 2.13.3
 platform: ruby
 authors: 
 - Evan Weaver
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-25 00:00:00 -08:00
+date: 2009-02-02 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -202,6 +202,8 @@ files:
 - test/integration/app/test/unit/single_sti_parent_test.rb
 - test/integration/app/test/unit/stick_test.rb
 - test/integration/app/test/unit/stone_test.rb
+- test/integration/app/vendor
+- test/integration/app/vendor/plugins
 - test/integration/server_test.rb
 - test/models
 - test/models/aquatic