lib/octopus.rb in ar-octopus-0.4.0 vs lib/octopus.rb in ar-octopus-0.5.0

@@ -1,5 +1,9 @@
+require 'active_record'
+require 'active_support/version'
+require 'active_support/core_ext/class'
+
 require "yaml"
 require "erb"
 
 module Octopus
   def self.env()
@@ -8,30 +12,43 @@
 
   def self.rails_env()
     @rails_env ||= self.rails? ? Rails.env.to_s : 'shards'
   end
 
-  def self.config()
-    file_name = Octopus.directory() + "/config/shards.yml"
+  def self.config
+    @config ||= begin
+      file_name = Octopus.directory() + "/config/shards.yml"
 
-    if File.exists? file_name
-      @config ||= HashWithIndifferentAccess.new(YAML.load(ERB.new(File.open(file_name).read()).result))[Octopus.env()]
-
-      if @config && @config['environments']
-        self.environments = @config['environments']
+      if File.exists?(file_name)
+        config ||= HashWithIndifferentAccess.new(YAML.load(ERB.new(File.read(file_name)).result))[Octopus.env()]
+      else
+        config ||= HashWithIndifferentAccess.new
       end
-    else
-      @config ||= HashWithIndifferentAccess.new
+
+      config
     end
+  end
 
-    @config
+  # Public: Whether or not Octopus is configured and should hook into the
+  # current environment. Checks the environments config option for the Rails
+  # environment by default.
+  #
+  # Returns a boolean
+  def self.enabled?
+    if defined?(::Rails)
+      Octopus.environments.include?(Rails.env.to_s)
+    else
+      # TODO: This doens't feel right but !Octopus.config.blank? is breaking a
+      #       test. Also, Octopus.config is always returning a hash.
+      Octopus.config
+    end
   end
 
   # Returns the Rails.root_to_s when you are using rails
   # Running the current directory in a generic Ruby process
   def self.directory()
-    @directory ||= defined?(Rails) ?  Rails.root.to_s : Dir.pwd     
+    @directory ||= defined?(Rails) ?  Rails.root.to_s : Dir.pwd
   end
 
   # This is the default way to do Octopus Setup
   # Available variables:
   # :enviroments => the enviroments that octopus will run. default: 'production'
@@ -42,53 +59,84 @@
   def self.environments=(environments)
     @environments = environments.map { |element| element.to_s }
   end
 
   def self.environments
-    @environments || ['production']
+    @environments ||= config['environments'] || ['production']
   end
 
+  def self.rails2?
+    ActiveRecord::VERSION::MAJOR == 2
+  end
+
   def self.rails3?
     ActiveRecord::VERSION::MAJOR == 3
   end
 
+  def self.rails30?
+    ActiveRecord::VERSION::MAJOR == 3 && ActiveRecord::VERSION::MINOR == 0
+  end
+
+  def self.rails31?
+    ActiveRecord::VERSION::MAJOR == 3 && ActiveRecord::VERSION::MINOR == 1
+  end
+
+  def self.rails32?
+    ActiveRecord::VERSION::MAJOR == 3 && ActiveRecord::VERSION::MINOR == 2
+  end
+
   def self.rails?
-    defined?(Rails) 
+    defined?(Rails)
   end
-  
+
   def self.shards=(shards)
-    @config ||= HashWithIndifferentAccess.new
-    @config[rails_env()] = HashWithIndifferentAccess.new(shards)
+    config[rails_env()] = HashWithIndifferentAccess.new(shards)
     ActiveRecord::Base.connection.initialize_shards(@config)
   end
-  
+
   def self.using(shard, &block)
-    ActiveRecord::Base.hijack_initializer()
     conn = ActiveRecord::Base.connection
-    
+
     if conn.is_a?(Octopus::Proxy)
       conn.run_queries_on_shard(shard, &block)
     else
       yield
     end
-  end  
+  end
 end
 
 
 require "octopus/model"
 require "octopus/migration"
 require "octopus/association_collection"
 require "octopus/has_and_belongs_to_many_association"
 require "octopus/association"
 
+if Octopus.rails2?
+  require "octopus/rails2/association"
+  require "octopus/rails2/persistence"
+  require "octopus/rails2/scope"
+end
+
 if Octopus.rails3?
-  require "octopus/rails3/association"
   require "octopus/rails3/persistence"
-  require "octopus/rails3/arel"
-else
+  require "octopus/rails3/log_subscriber"
+  require "octopus/rails3/abstract_adapter"
+  require "octopus/railtie"
+end
+
+if Octopus.rails30?
   require "octopus/rails2/association"
-  require "octopus/rails2/persistence"
+  require "octopus/rails3/arel"
 end
 
+if Octopus.rails31? || Octopus.rails32?
+  require "octopus/rails3.1/singular_association"
+end
+
+if Octopus.rails32?
+  require "octopus/rails3.2/persistence"
+end
+
 require "octopus/proxy"
 require "octopus/scope_proxy"
-require "octopus/logger"
\ No newline at end of file
+require "octopus/logger"