maria_db_cluster_pool 0.0.5 → 0.0.6

data/{README.rdoc → README.md}

@@ -1,15 +1,16 @@
-== Database Cluster
+# Database Cluster [![Build Status](https://travis-ci.org/renemadsen/maria_db_cluster_pool.png)](https://travis-ci.org/renemadsen/maria_db_cluster_pool)
 
 MariaDB Cluster Pool gem is designed for usage with Maria DB Galera Cluster, so this gem will only support a master/master setup
 
-= Configuration
+# Configuration
 
-== The pool configuration
+## The pool configuration
 
 The cluster connections are configured in database.yml using the maria_db_cluster_pool adapter. Any properties you configure for the connection will be inherited by all connections in the pool. In this way, you can configure ports, usernames, etc. once instead of for each connection. One exception is that you can set the pool_adapter property which each connection will inherit as the adapter property. Each connection in the pool uses all the same configuration properties as normal for the adapters.
 
-== Example configuration
+### Example configuration
 
+```ruby
   development:
       adapter: maria_db_cluster_pool
       database: mydb_development
@@ -23,22 +24,27 @@ The cluster connections are configured in database.yml using the maria_db_cluste
           pool_weight: 1
         - host: read-db-2.example.com
           pool_weight: 2
+```
 
-== Rails 2.3.x
+## Rails 2.3.x
 
 To make rake db:migrate, rake db:seed work, remember to put:
 
-config.gem 'maria_db_cluster_pool'
+```ruby
+  config.gem 'maria_db_cluster_pool'
+```
 
 in the environment.rb
 
-== Known issues:
+## Known issues:
 
-rake db:test:clone
+```ruby
+  rake db:test:clone
+```
 
 will not work.
 
-== License
+## License
 
 This software is a derived work of https://github.com/bdurand/seamless_database_pool the parts which derives from that codes is copyrighted by Brian Durand
 

data/Rakefile

@@ -11,49 +11,49 @@ begin
   desc 'Run the unit tests'
   RSpec::Core::RakeTask.new(:test)
   
-  #namespace :test do
-  #  desc "Run all tests including for all database adapters"
-  #  task :all do
-  #    save_val = ENV['TEST_ADAPTERS']
-  #    begin
-  #      ENV['TEST_ADAPTERS'] = YAML.load_file(File.expand_path("../spec/database.yml", __FILE__)).keys.join(' ')
-  #      Rake::Task["test"].execute
-  #    ensure
-  #      ENV['TEST_ADAPTERS'] = save_val
-  #    end
-  #  end
-  #
-  #  desc "Test all database adapters defined in database.yml or just the one specified in TEST_ADAPTERS"
-  #  task :adapters do
-  #    save_val = ENV['TEST_ADAPTERS']
-  #    begin
-  #      ENV['TEST_ADAPTERS'] ||= YAML.load_file(File.expand_path("../spec/database.yml", __FILE__)).keys.join(' ')
-  #      Rake::Task["test:adapters:specified"].execute
-  #    ensure
-  #      ENV['TEST_ADAPTERS'] = save_val
-  #    end
-  #  end
-  #
-  #  namespace :adapters do
-  #    desc "Internal task to run database adapter tests"
-  #    RSpec::Core::RakeTask.new(:specified) do |t|
-  #      t.pattern = FileList.new('spec/connection_adapters_spec.rb')
-  #    end
-  #
-  #    YAML.load_file(File.expand_path("../spec/database.yml", __FILE__)).keys.each do |adapter_name|
-  #      desc "Test the #{adapter_name} database adapter"
-  #      task adapter_name do
-  #        save_val = ENV['TEST_ADAPTERS']
-  #        begin
-  #          ENV['TEST_ADAPTERS'] = adapter_name
-  #          Rake::Task["test:adapters:specified"].execute
-  #        ensure
-  #          ENV['TEST_ADAPTERS'] = save_val
-  #        end
-  #      end
-  #    end
-  #  end
-  #end
+  namespace :test do
+    desc "Run all tests including for all database adapters"
+    task :all do
+      save_val = ENV['TEST_ADAPTERS']
+      begin
+        ENV['TEST_ADAPTERS'] = YAML.load_file(File.expand_path("../spec/database.yml", __FILE__)).keys.join(' ')
+        Rake::Task["test"].execute
+      ensure
+        ENV['TEST_ADAPTERS'] = save_val
+      end
+    end
+
+    desc "Test all database adapters defined in database.yml or just the one specified in TEST_ADAPTERS"
+    task :adapters do
+      save_val = ENV['TEST_ADAPTERS']
+      begin
+        ENV['TEST_ADAPTERS'] ||= YAML.load_file(File.expand_path("../spec/database.yml", __FILE__)).keys.join(' ')
+        Rake::Task["test:adapters:specified"].execute
+      ensure
+        ENV['TEST_ADAPTERS'] = save_val
+      end
+    end
+
+    namespace :adapters do
+      desc "Internal task to run database adapter tests"
+      RSpec::Core::RakeTask.new(:specified) do |t|
+        t.pattern = FileList.new('spec/connection_adapters_spec.rb')
+      end
+
+      YAML.load_file(File.expand_path("../spec/database.yml", __FILE__)).keys.each do |adapter_name|
+        desc "Test the #{adapter_name} database adapter"
+        task adapter_name do
+          save_val = ENV['TEST_ADAPTERS']
+          begin
+            ENV['TEST_ADAPTERS'] = adapter_name
+            Rake::Task["test:adapters:specified"].execute
+          ensure
+            ENV['TEST_ADAPTERS'] = save_val
+          end
+        end
+      end
+    end
+  end
 rescue LoadError
   task :test do
     STDERR.puts "You must have rspec >= 2.0 to run the tests"

data/lib/active_record/connection_adapters/maria_db_cluster_pool_adapter.rb

@@ -1,5 +1,3 @@
-require 'maria_db_cluster_pool/connect_timeout'
-
 module ActiveRecord
   class Base
     class << self
@@ -18,7 +16,7 @@ module ActiveRecord
           begin
             establish_adapter(server_config[:adapter])
             conn = send("#{server_config[:adapter]}_connection".to_sym, server_config)
-            conn.class.send(:include, MariaDBClusterPool::ConnectTimeout) unless conn.class.include?(MariaDBClusterPool::ConnectTimeout)
+            conn.class.send(:include, MariaDbClusterPool::ConnectTimeout) unless conn.class.include?(MariaDbClusterPool::ConnectTimeout)
             conn.connect_timeout = server_config[:connect_timeout]
             pool_connections << conn
             pool_weights[conn] = server_config[:pool_weight]
@@ -33,7 +31,7 @@ module ActiveRecord
         @maria_db_cluster_pool_classes ||= {}
         klass = @maria_db_cluster_pool_classes[pool_connections[0].class]
         unless klass
-          klass = ActiveRecord::ConnectionAdapters::MariaDBClusterPoolAdapter.adapter_class(pool_connections[0])
+          klass = ActiveRecord::ConnectionAdapters::MariaDbClusterPoolAdapter.adapter_class(pool_connections[0])
           @maria_db_cluster_pool_classes[pool_connections[0].class] = klass
         end
 
@@ -65,7 +63,7 @@ module ActiveRecord
   end
 
   module ConnectionAdapters
-    class MariaDBClusterPoolAdapter < AbstractAdapter
+    class MariaDbClusterPoolAdapter < AbstractAdapter
       
       attr_reader :connections # The total sum of connections
       attr_reader :master_connection # The current connection in use
@@ -109,7 +107,7 @@ module ActiveRecord
           # visitor. There is a note in the code indicating the method signatures should be updated.
           config = pool.spec.config.with_indifferent_access
           adapter = config[:master][:adapter] || config[:pool_adapter]
-          MariaDBClusterPool.adapter_class_for(adapter).visitor_for(pool)
+          MariaDbClusterPool.adapter_class_for(adapter).visitor_for(pool)
         end
       end
       
@@ -221,8 +219,8 @@ module ActiveRecord
               a.reconnect!
               rescue  => e
                 a.expires = 30.seconds.from_now
-                @logger.warn("Failed to reconnect to database when adding connection back to the pool")
-                @logger.warn(e)
+                @logger.warn("Failed to reconnect to database when adding connection back to the pool") if @logger
+                @logger.warn(e) if @logger
               end
             end
           end
@@ -281,7 +279,9 @@ module ActiveRecord
           rescue ArgumentError
             connection.send(method)
           end
-        rescue
+        rescue ActiveRecord::RecordInvalid => e
+          throw e
+        rescue => e
           # If the statement was a read statement and it wasn't forced against the master connection
           # try to reconnect if the connection is dead and then re-run the statement.
           unless connection.active?

data/lib/maria_db_cluster_pool/arel_compiler.rb

@@ -1,7 +1,7 @@
 module Arel
   module SqlCompiler
     # Hook into arel to use the compiler used by the master connection.
-    class MariaDBClusterPoolCompiler < GenericCompiler
+    class MariaDbClusterPoolCompiler < GenericCompiler
       def self.new(relation)
         @compiler_classes ||= {}
         master_adapter = relation.engine.connection.master_connection.adapter_name

data/lib/maria_db_cluster_pool/connect_timeout.rb

@@ -1,6 +1,6 @@
 require 'timeout'
 
-module MariaDBClusterPool
+module MariaDbClusterPool
   # This module is mixed into connection adapters to allow the reconnect! method to timeout if the
   # IP address becomes unreachable. The default timeout is 1 second, but you can change it by setting
   # the connect_timeout parameter in the adapter configuration.

data/lib/maria_db_cluster_pool.rb

@@ -14,7 +14,7 @@ $LOAD_PATH << File.dirname(__FILE__) unless $LOAD_PATH.include?(File.dirname(__F
 # will set the read connection type only within the block. Otherwise they will set the default
 # read connection type. If none is ever called, the read connection type will be :master.
 
-module MariaDBClusterPool
+module MariaDbClusterPool
     
   # Adapter name to class name map. This exists because there isn't an obvious way to translate things like
   # sqlite3 to SQLite3. The adapters that ship with ActiveRecord are defined here. If you use

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: maria_db_cluster_pool
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - "Ren\xC3\xA9 Schultz Madsen"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-04-10 00:00:00 +02:00
+date: 2013-07-18 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -86,10 +86,10 @@ extensions: []
 
 extra_rdoc_files: 
 - MIT-LICENSE
-- README.rdoc
+- README.md
 files: 
 - MIT-LICENSE
-- README.rdoc
+- README.md
 - Rakefile
 - lib/active_record/connection_adapters/maria_db_cluster_pool_adapter.rb
 - lib/maria_db_cluster_pool.rb