has_many_polymorphs 2.11 → 2.12

data/lib/has_many_polymorphs.rb

@@ -21,7 +21,6 @@ end
 if defined? Rails and RAILS_ENV and RAILS_ROOT
   _logger_warn "rails environment detected"
   require 'has_many_polymorphs/configuration'
-  require 'has_many_polymorphs/dependencies'
   require 'has_many_polymorphs/autoload'
 end
 

data/lib/has_many_polymorphs/autoload.rb

@@ -1,7 +1,8 @@
 
-require 'initializer' unless defined? Rails::Initializer
+require 'initializer' unless defined? ::Rails::Initializer 
+require 'dispatcher' unless defined? ::ActionController::Dispatcher
 
-class Rails::Initializer #:nodoc:
+module HasManyPolymorphs
 
 =begin rdoc    
 Searches for models that use <tt>has_many_polymorphs</tt> or <tt>acts_as_double_polymorphic_join</tt> and makes sure that they get loaded during app initialization. This ensures that helper methods are injected into the target classes. 
@@ -11,52 +12,59 @@ Note that you can override DEFAULT_OPTIONS via Rails::Configuration#has_many_pol
     # your other configuration here
     
     config.after_initialize do
-      config.has_many_polymorphs_options['requirements'] << '/lib/my_extension'
+      config.has_many_polymorphs_options['requirements'] << 'lib/my_extension'
     end    
   end
   
 =end
 
-  module HasManyPolymorphsAutoload
-        
-    DEFAULT_OPTIONS = {
-      :file_pattern => "#{RAILS_ROOT}/app/models/**/*.rb",
-      :file_exclusions => ['svn', 'CVS', 'bzr'],
-      :methods => ['has_many_polymorphs', 'acts_as_double_polymorphic_join'],
-      :requirements => []}
-    
-    mattr_accessor :options
-    @@options = HashWithIndifferentAccess.new(DEFAULT_OPTIONS)      
+  DEFAULT_OPTIONS = {
+    :file_pattern => "#{RAILS_ROOT}/app/models/**/*.rb",
+    :file_exclusions => ['svn', 'CVS', 'bzr'],
+    :methods => ['has_many_polymorphs', 'acts_as_double_polymorphic_join'],
+    :requirements => []}
+  
+  mattr_accessor :options
+  @@options = HashWithIndifferentAccess.new(DEFAULT_OPTIONS)      
 
-    # Override for Rails::Initializer#after_initialize.
-    def after_initialize_with_autoload
-      after_initialize_without_autoload
+  # Dispatcher callback to load polymorphic relationships from the top down.
+  def self.autoload
 
-      _logger_debug "autoload hook invoked"
-      
-      HasManyPolymorphsAutoload.options[:requirements].each do |requirement|
-        require requirement
-      end
+    _logger_debug "autoload hook invoked"
     
-      Dir[HasManyPolymorphsAutoload.options[:file_pattern]].each do |filename|
-        next if filename =~ /#{HasManyPolymorphsAutoload.options[:file_exclusions].join("|")}/
-        open filename do |file|
-          if file.grep(/#{HasManyPolymorphsAutoload.options[:methods].join("|")}/).any?
-            begin
-              model = File.basename(filename)[0..-4].camelize
-              _logger_warn "preloading parent model #{model}"
-              model.constantize
-            rescue Object => e
-              _logger_warn "WARNING; possibly critical error preloading #{model}: #{e.inspect}"
-            end
+    options[:requirements].each do |requirement|
+      _logger_warn "forcing requirement load of #{requirement}"
+      require requirement
+    end
+  
+    Dir[options[:file_pattern]].each do |filename|
+      next if filename =~ /#{options[:file_exclusions].join("|")}/
+      open filename do |file|
+        if file.grep(/#{options[:methods].join("|")}/).any?
+          begin
+            model = File.basename(filename)[0..-4].camelize
+            _logger_warn "preloading parent model #{model}"
+            model.constantize
+          rescue Object => e
+            _logger_warn "#{model} could not be preloaded: #{e.inspect}"
           end
         end
       end
-    end  
+    end
+  end  
     
+end
+
+class Rails::Initializer #:nodoc:
+  # Make sure it gets loaded in the console, tests, and migrations
+  def after_initialize_with_autoload 
+    after_initialize_without_autoload
+    HasManyPolymorphs.autoload
   end
-  
-  include HasManyPolymorphsAutoload
-    
-  alias_method_chain :after_initialize, :autoload
+  alias_method_chain :after_initialize, :autoload 
+end
+
+Dispatcher.to_prepare(:has_many_polymorphs_autoload) do
+  # Make sure it gets loaded in the app
+  HasManyPolymorphs.autoload
 end

data/lib/has_many_polymorphs/class_methods.rb

@@ -340,11 +340,7 @@ Be aware, however, that <tt>NULL != 'Spot'</tt> returns <tt>false</tt> due to SQ
         options[:parent_extend] = spiked_create_extension_module(association_id, Array(options[:parent_extend]), "Parent") 
         
         # create the reflection object      
-        returning(create_reflection(:has_many_polymorphs, association_id, options, self)) do |reflection|
-          if defined? Dependencies and defined? RAILS_ENV and RAILS_ENV == "development"                    
-            inject_dependencies(association_id, reflection) if Dependencies.mechanism == :load
-          end
-          
+        returning(create_reflection(:has_many_polymorphs, association_id, options, self)) do |reflection|          
           # set up the other related associations      
           create_join_association(association_id, reflection)
           create_has_many_through_associations_for_parent_to_children(association_id, reflection)
@@ -381,16 +377,7 @@ Be aware, however, that <tt>NULL != 'Spot'</tt> returns <tt>false</tt> due to SQ
           "#{table} AS #{_alias}"
         end.sort).join(", ")
       end
-  
-      # model caching         
-      def inject_dependencies(association_id, reflection)
-        _logger_debug "injecting dependencies"
-        requirements = [self, reflection.klass].map{|klass| [klass, klass.base_class]}.flatten.uniq
-        (all_classes_for(association_id, reflection) - requirements).each do |target_klass|
-          Dependencies.inject_dependency(target_klass, *requirements)        
-        end
-      end
-     
+       
       # method sub-builders
    
       def create_join_association(association_id, reflection)

data/lib/has_many_polymorphs/configuration.rb

@@ -6,11 +6,11 @@ Access the <tt>has_many_polymorphs_options</tt> hash in your Rails::Initializer.
 class Rails::Configuration
 
   def has_many_polymorphs_options
-    Rails::Initializer::HasManyPolymorphsAutoload.options
+    ::HasManyPolymorphs.options
   end
   
   def has_many_polymorphs_options=(hash)
-    Rails::Initializer::HasManyPolymorphsAutoload.options = hash
+    ::HasManyPolymorphs.options = HashWithIndifferentAccess.new(hash)
   end
   
 end

data/lib/has_many_polymorphs/rake_task_redefine_task.rb

@@ -24,4 +24,12 @@ module Rake
       end
     end
   end
-end
+end
+
+class Object
+  def silently
+    stderr, stdout, $stderr, $stdout = $stderr, $stdout, StringIO.new, StringIO.new
+    yield
+    $stderr, $stdout = stderr, stdout
+  end
+end

data/test/generator/tagging_generator_test.rb

@@ -0,0 +1,42 @@
+require 'fileutils'
+require File.dirname(__FILE__) + '/../test_helper'
+
+class TaggingGeneratorTest < Test::Unit::TestCase
+  
+  def setup
+    Dir.chdir RAILS_ROOT do
+      truncate
+
+      # Revert environment lib requires
+      FileUtils.cp "config/environment.rb.canonical", "config/environment.rb"
+      
+      # Delete generator output
+      ["app/models/tag.rb", "app/models/tagging.rb", 
+        "test/unit/tag_test.rb", "test/unit/tagging_test.rb", 
+        "test/fixtures/tags.yml", "test/fixtures/taggings.yml",
+        "lib/tagging_extensions.rb",
+        "db/migrate/010_create_tags_and_taggings.rb"].each do |file|
+          File.delete file if File.exist? file
+      end
+      
+      # Rebuild database
+      Echoe.silence do
+        system("ruby #{HERE}/setup.rb")
+      end
+    end
+  end
+  
+  alias :teardown :setup
+
+  def test_generator
+    Dir.chdir RAILS_ROOT do
+      Echoe.silence do
+        assert system("script/generate tagging Stick Stone -q -f")
+        assert system("rake db:migrate")
+        assert system("rake db:fixtures:load")
+        assert system("rake test:units")      
+      end
+    end
+  end
+  
+end

data/test/integration/app/app/controllers/bones_controller.rb

@@ -0,0 +1,5 @@
+class BonesController < ApplicationController
+  def index
+    @bones = Bone.find(:all)  
+  end
+end

data/test/integration/app/app/helpers/bones_helper.rb

@@ -0,0 +1,2 @@
+module BonesHelper
+end

data/test/integration/app/app/models/bone.rb

@@ -0,0 +1,2 @@
+class Bone < OrganicSubstance
+end

data/test/integration/app/app/models/double_sti_parent.rb

@@ -0,0 +1,2 @@
+class DoubleStiParent < ActiveRecord::Base
+end

data/test/integration/app/app/models/double_sti_parent_relationship.rb

@@ -0,0 +1,2 @@
+class DoubleStiParentRelationship < ActiveRecord::Base
+end

data/test/integration/app/app/models/organic_substance.rb

@@ -0,0 +1,2 @@
+class OrganicSubstance < ActiveRecord::Base
+end

data/test/integration/app/app/models/single_sti_parent.rb

@@ -0,0 +1,4 @@
+
+class SingleStiParent < ActiveRecord::Base
+  has_many_polymorphs :the_bones, :from => [:bones], :through => :single_sti_parent_relationship
+end

data/test/integration/app/app/models/single_sti_parent_relationship.rb

@@ -0,0 +1,4 @@
+class SingleStiParentRelationship < ActiveRecord::Base
+  belongs_to :single_sti_parent
+  belongs_to :the_bone, :polymorphic => true
+end

data/test/integration/app/app/models/stick.rb

@@ -0,0 +1,2 @@
+class Stick < ActiveRecord::Base
+end

data/test/integration/app/app/models/stone.rb

@@ -0,0 +1,2 @@
+class Stone < ActiveRecord::Base
+end

data/test/integration/app/app/views/bones/index.rhtml

@@ -0,0 +1,5 @@
+
+<p>Bones: index</p>
+<% @bones.each do |bone| %>
+  <p>ID: <%= bone.id %></p>
+<% end %>

data/test/integration/app/config/boot.rb

@@ -1,45 +1,110 @@
-# Don't change this file. Configuration is done in config/environment.rb and config/environments/*.rb
+# Don't change this file!
+# Configure your app in config/environment.rb and config/environments/*.rb
 
-unless defined?(RAILS_ROOT)
-  root_path = File.join(File.dirname(__FILE__), '..')
+RAILS_ROOT = "#{File.dirname(__FILE__)}/.." unless defined?(RAILS_ROOT)
 
-  unless RUBY_PLATFORM =~ /(:?mswin|mingw)/
-    require 'pathname'
-    root_path = Pathname.new(root_path).cleanpath(true).to_s
-  end
+module Rails
+  class << self
+    def boot!
+      unless booted?
+        preinitialize
+        pick_boot.run
+      end
+    end
 
-  RAILS_ROOT = root_path
-end
+    def booted?
+      defined? Rails::Initializer
+    end
+
+    def pick_boot
+      (vendor_rails? ? VendorBoot : GemBoot).new
+    end
+
+    def vendor_rails?
+      File.exist?("#{RAILS_ROOT}/vendor/rails")
+    end
 
-unless defined?(Rails::Initializer)
-  if File.directory?("#{RAILS_ROOT}/vendor/rails")
-    require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
-  else
-    require 'rubygems'
+    def preinitialize
+      load(preinitializer_path) if File.exists?(preinitializer_path)
+    end
 
-    environment_without_comments = IO.readlines(File.dirname(__FILE__) + '/environment.rb').reject { |l| l =~ /^#/ }.join
-    environment_without_comments =~ /[^#]RAILS_GEM_VERSION = '([\d.]+)'/
-    rails_gem_version = $1
+    def preinitializer_path
+      "#{RAILS_ROOT}/config/preinitializer.rb"
+    end
+  end
 
-    if version = defined?(RAILS_GEM_VERSION) ? RAILS_GEM_VERSION : rails_gem_version
-      # Asking for 1.1.6 will give you 1.1.6.5206, if available -- makes it easier to use beta gems
-      rails_gem = Gem.cache.search('rails', "~>#{version}.0").sort_by { |g| g.version.version }.last
+  class Boot
+    def run
+      load_initializer
+      Rails::Initializer.run(:set_load_path)
+    end
+  end
 
-      if rails_gem
-        gem "rails", "=#{rails_gem.version.version}"
-        require rails_gem.full_gem_path + '/lib/initializer'
+  class VendorBoot < Boot
+    def load_initializer
+      require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
+    end
+  end
+
+  class GemBoot < Boot
+    def load_initializer
+      self.class.load_rubygems
+      load_rails_gem
+      require 'initializer'
+    end
+
+    def load_rails_gem
+      if version = self.class.gem_version
+        STDERR.puts "Boot.rb loading version #{version}"
+        gem 'rails', version
       else
-        STDERR.puts %(Cannot find gem for Rails ~>#{version}.0:
-    Install the missing gem with 'gem install -v=#{version} rails', or
-    change environment.rb to define RAILS_GEM_VERSION with your desired version.
-  )
+        STDERR.puts "Boot.rb loading latest available version"
+        gem 'rails'
+      end
+    rescue Gem::LoadError => load_error
+      $stderr.puts %(Missing the Rails #{version} gem. Please `gem install -v=#{version} rails`, update your RAILS_GEM_VERSION setting in config/environment.rb for the Rails version you do have installed, or comment out RAILS_GEM_VERSION to use the latest version installed.)
+      exit 1
+    end
+
+    class << self
+      def rubygems_version
+        Gem::RubyGemsVersion if defined? Gem::RubyGemsVersion
+      end
+
+      def gem_version
+        if defined? RAILS_GEM_VERSION
+          RAILS_GEM_VERSION
+        elsif ENV.include?('RAILS_GEM_VERSION')
+          ENV['RAILS_GEM_VERSION']
+        else
+          parse_gem_version(read_environment_rb)
+        end
+      end
+
+      def load_rubygems
+        require 'rubygems'
+
+        unless rubygems_version >= '0.9.4'
+          $stderr.puts %(Rails requires RubyGems >= 0.9.4 (you have #{rubygems_version}). Please `gem update --system` and try again.)
+          exit 1
+        end
+
+      rescue LoadError
+        $stderr.puts %(Rails requires RubyGems >= 0.9.4. Please install RubyGems and try again: http://rubygems.rubyforge.org)
         exit 1
       end
-    else
-      gem "rails"
-      require 'initializer'
+
+      def parse_gem_version(text)
+        $1 if text =~ /^[^#]*RAILS_GEM_VERSION\s*=\s*'([!~<>=]*\s*[\d.]+)'/
+      end
+
+      private
+        def read_environment_rb
+          File.read("#{RAILS_ROOT}/config/environment.rb")
+        end
     end
   end
-
-  Rails::Initializer.run(:set_load_path)
 end
+
+# All that for this:
+Rails.boot!

data/test/integration/app/config/database.yml

@@ -1,21 +1,17 @@
 
-development:
-  adapter: mysql
+defaults: &defaults
+  adapter: <%= ENV['DB'] || 'mysql' %>
   host: localhost
   database: hmp_development
   username: root
   password:
 
+development:
+  <<: *defaults
+
 test:
-  adapter: mysql
-  host: localhost
-  database: hmp_test
-  username: root
-  password:
+  <<: *defaults
 
 production:
-  adapter: mysql
-  host: localhost
-  database: hmp_production
-  username: root
-  password: 
+  <<: *defaults
+  

data/test/integration/app/config/environment.rb

@@ -1,13 +1,19 @@
-
 require File.join(File.dirname(__FILE__), 'boot')
+require 'action_controller'
 
 Rails::Initializer.run do |config|
   
-  if config.action_controller.respond_to? :"session="
-    config.action_controller.session = { :session_key => "_myapp_session", :secret => "this is a super secret phrase" }
+  if ActionController::Base.respond_to? 'session='
+    config.action_controller.session = {:session_key => '_app_session', :secret => '22cde4d5c1a61ba69a81795322cde4d5c1a61ba69a817953'}
   end
   
   config.load_paths << "#{RAILS_ROOT}/app/models/person" # moduleless model path
+  
+  config.after_initialize do
+    config.has_many_polymorphs_options['requirements'] << "#{RAILS_ROOT}/lib/library_model"
+  end      
 end
 
 # Dependencies.log_activity = true
+
+ENV['RAILS_ASSET_ID'] = Time.now.to_i.to_s