redhillonrails_core 1.0.3.1 → 1.0.4

data/CHANGELOG

@@ -1,6 +1,8 @@
+1.0.4
+    * Autoloading
 1.0.3
-    ActiveRecord 3.0beta compatibility
-    First ruby 1.9 fixes
+    * ActiveRecord 3.0beta compatibility
+    * First ruby 1.9 fixes
 1.0.2
     * added missing dependencies
 1.0.1

data/VERSION

@@ -1 +1 @@
-1.0.3.1
+1.0.4

data/lib/red_hill_consulting/core/active_record/connection_adapters/abstract_adapter.rb

@@ -7,13 +7,18 @@ module RedHillConsulting::Core::ActiveRecord::ConnectionAdapters
     
     def initialize_with_redhillonrails_core(*args)
       initialize_without_redhillonrails_core(*args)
+      adapter = nil
       case adapter_name
       when 'MySQL' 
-        self.class.send(:include, MySQLAdapter) unless self.class.include?(MySQLAdapter)
+        adapter = 'MysqlAdapter'
       when 'PostgreSQL' 
-        self.class.send(:include, PostgresqlAdapter) unless self.class.include?(PostgresqlAdapter)
+        adapter = 'PostgresqlAdapter'
       when 'SQLite' 
-        self.class.send(:include, SqliteAdapter) unless self.class.include?(SqliteAdapter)
+        adapter = 'SqliteAdapter'
+      end
+      if adapter 
+        adapter_module = RedHillConsulting::Core::ActiveRecord::ConnectionAdapters.const_get(adapter)
+        self.class.send(:include, adapter_module) unless self.class.include?(adapter_module)
       end
     end
     

data/lib/red_hill_consulting/core/active_record/connection_adapters/mysql4_adapter.rb

@@ -9,7 +9,7 @@ module RedHillConsulting::Core::ActiveRecord::ConnectionAdapters
       tables.each do |table|
         results = execute("SHOW CREATE TABLE #{table}")
         results.each do |row|
-          row[1].each do |line|
+          row[1].lines.each do |line|
             if line =~ /^  CONSTRAINT [`"](.+?)[`"] FOREIGN KEY \([`"](.+?)[`"]\) REFERENCES [`"](.+?)[`"] \((.+?)\)( ON DELETE (.+?))?( ON UPDATE (.+?))?,?$/
               name = $1
               column_names = $2
@@ -34,4 +34,4 @@ module RedHillConsulting::Core::ActiveRecord::ConnectionAdapters
       foreign_keys
     end
   end
-end
+end

data/lib/red_hill_consulting/core/active_record/connection_adapters/mysql_adapter.rb

@@ -10,9 +10,9 @@ module RedHillConsulting::Core::ActiveRecord::ConnectionAdapters
     def connect_with_redhillonrails_core(*args)
       returning connect_without_redhillonrails_core(*args) do 
         if version[0] < 5
-          self.class.send(:include, Mysql4Adapter) unless self.class.included?(Mysql4Adapter)
+          self.class.send(:include, Mysql4Adapter) unless self.class.include?(Mysql4Adapter)
         else
-          self.class.send(:include, Mysql5Adapter) unless self.class.included?(Mysql5Adapter)
+          self.class.send(:include, Mysql5Adapter) unless self.class.include?(Mysql5Adapter)
         end
       end
     end
@@ -42,7 +42,7 @@ module RedHillConsulting::Core::ActiveRecord::ConnectionAdapters
       foreign_keys = []
 
       results.each do |row|
-        row[1].each do |line|
+        row[1].lines.each do |line|
           if line =~ /^  CONSTRAINT [`"](.+?)[`"] FOREIGN KEY \([`"](.+?)[`"]\) REFERENCES [`"](.+?)[`"] \((.+?)\)( ON DELETE (.+?))?( ON UPDATE (.+?))?,?$/
             name = $1
             column_names = $2

data/lib/redhillonrails_core.rb

@@ -6,9 +6,6 @@ rescue
 end
 
 # TODO: only needed adapters should be required here
-require 'active_record/connection_adapters/postgresql_adapter'
-require 'active_record/connection_adapters/mysql_adapter'
-require 'active_record/connection_adapters/sqlite3_adapter'
 require 'red_hill_consulting/core'
 require 'red_hill_consulting/core/active_record'
 require 'red_hill_consulting/core/active_record/base'
@@ -18,13 +15,18 @@ require 'red_hill_consulting/core/active_record/connection_adapters/abstract_ada
 require 'red_hill_consulting/core/active_record/connection_adapters/foreign_key_definition'
 require 'red_hill_consulting/core/active_record/connection_adapters/column'
 require 'red_hill_consulting/core/active_record/connection_adapters/index_definition'
-require 'red_hill_consulting/core/active_record/connection_adapters/mysql_adapter'
 require 'red_hill_consulting/core/active_record/connection_adapters/mysql_column'
-require 'red_hill_consulting/core/active_record/connection_adapters/postgresql_adapter'
 require 'red_hill_consulting/core/active_record/connection_adapters/schema_statements'
-require 'red_hill_consulting/core/active_record/connection_adapters/sqlite3_adapter'
 require 'red_hill_consulting/core/active_record/connection_adapters/table_definition'
 
+module RedHillConsulting::Core::ActiveRecord::ConnectionAdapters
+  autoload :MysqlAdapter, 'red_hill_consulting/core/active_record/connection_adapters/mysql_adapter'
+  autoload :Mysql4Adapter, 'red_hill_consulting/core/active_record/connection_adapters/mysql4_adapter'
+  autoload :Mysql5Adapter, 'red_hill_consulting/core/active_record/connection_adapters/mysql5_adapter'
+  autoload :PostgresqlAdapter, 'red_hill_consulting/core/active_record/connection_adapters/postgresql_adapter'
+  autoload :Sqlite3Adapter, 'red_hill_consulting/core/active_record/connection_adapters/mysql_adapter'
+end
+
 ActiveRecord::Base.send(:include, RedHillConsulting::Core::ActiveRecord::Base)
 ActiveRecord::Schema.send(:include, RedHillConsulting::Core::ActiveRecord::Schema)
 ActiveRecord::SchemaDumper.send(:include, RedHillConsulting::Core::ActiveRecord::SchemaDumper)

data/redhillonrails_core.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{redhillonrails_core}
-  s.version = "1.0.3.1"
+  s.version = "1.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michał Łomnicki"]

metadata

@@ -5,9 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 3
-  - 1
-  version: 1.0.3.1
+  - 4
+  version: 1.0.4
 platform: ruby
 authors: 
 - "Micha\xC5\x82 \xC5\x81omnicki"