lib/octopus.rb in ar-octopus-0.6.1 vs lib/octopus.rb in ar-octopus-0.7.0

@@ -62,14 +62,10 @@
 
   def self.environments
     @environments ||= config['environments'] || ['production']
   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?
@@ -103,21 +99,13 @@
 require "octopus/has_and_belongs_to_many_association"
 require "octopus/association"
 require "octopus/rails3/persistence"
 require "octopus/rails3/log_subscriber"
 require "octopus/rails3/abstract_adapter"
+require "octopus/rails3/singular_association"
 
 if defined?(::Rails)
   require "octopus/railtie"
-end
-
-if Octopus.rails30?
-  require "octopus/rails3.0/arel"
-  require "octopus/rails3.0/association"
-end
-
-if Octopus.rails31? || Octopus.rails32?
-  require "octopus/rails3.1/singular_association"
 end
 
 if Octopus.rails32?
   require "octopus/rails3.2/persistence"
 end