semantically-taggable 0.1.11 → 0.1.12

data/lib/railtie.rb

@@ -6,19 +6,5 @@ module SemanticallyTaggable
     rake_tasks do
       load File.join(File.dirname(__FILE__), 'tasks/import.rake')
     end
-
-    unless defined? SEMANTICALLYTAGGABLE_SPECRUNNING
-      # No idea why this loads too late if it's a railtie initializer
-      ActiveSupport.on_load :active_record do
-        # Workaround for semantically-taggable's habtm
-        database_yml = File.expand_path('config/database.yml')
-        if File.exists?(database_yml)
-          active_record_configuration = YAML.load_file(database_yml)[Rails.env]
-          ActiveRecord::Base.establish_connection(active_record_configuration)
-        else
-          raise "Please create #{database_yml} first to configure your database."
-        end
-      end
-    end
   end
 end

data/lib/semantically-taggable.rb

@@ -1,5 +1,10 @@
 module SemanticallyTaggable
   require "railtie" if defined?(Rails)
+  # Tag has a HABTM which causes all sorts of ructions
+  # https://rails.lighthouseapp.com/projects/8994/tickets/6233-habtm-join-requires-an-active-connection
+  # So we defer the availability of tag. Hopefully nothing references it during startup.
+  # (this, if you hadn't guessed, is properly hacky)
+  autoload :Tag, "semantically_taggable/tag"
 end
 
 require 'active_record'
@@ -11,7 +16,6 @@ require "semantically_taggable/semantically_taggable/core"
 require "semantically_taggable/semantically_taggable/collection"
 require "semantically_taggable/semantically_taggable/cache"
 
-require "semantically_taggable/tag"
 require "semantically_taggable/synonym"
 require "semantically_taggable/tag_parentage"
 require "semantically_taggable/scheme"
@@ -27,5 +31,5 @@ if defined?(ActiveRecord::Base)
 end
 
 if defined?(ActionView::Base)
-  # ActionView::Base.send :include, SemanticallyTaggable::TagsHelper
+  ActionView::Base.send :include, SemanticallyTaggable::TagsHelper
 end