activerecord-mysql-reconnect 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9feafc3ddcaeba6d385f2d99565689efcaa3c46b
-  data.tar.gz: 5c74370dd16ba0e406eccd436140da9c74c62cf7
+  metadata.gz: ae0956c41a7eeb006c0eb44216a288db43d76d4e
+  data.tar.gz: f14f9a4216ce0bbe51dcb9d04040082915520eda
 SHA512:
-  metadata.gz: 3166411ed87951ce3c42cb8626b4378b2da20c6d87a79963632b00fc74f819e9aa7fa1880760c9fdcb86462a3b15bf4cbb2443258282f051f44bcf25a4160e20
-  data.tar.gz: 98212109f565974bc9f4a04731d7fbe754bfbfedf453ac02cf8cc7588d1b437321a918de915d728cb49aaa0cc6c13047c95603b29aef9a1e525303be00c2e888
+  metadata.gz: 296b46697e351bce23eaf245777683d4cc25bd6ea273b4481bab4165a747a6b3daed6723a999aa74bd8f89a01d44ef648dfa76cbe44640c15dc506846d6eede1
+  data.tar.gz: ad5d74f3fd662d64d1abd98ff57b6948da3c8758623c8f1782e575c50d70258e54b9941f7e29ab98fc48f535c5688a194571564139ef0872fe5dcd40c6aa7574

data/README.md

@@ -53,7 +53,7 @@ Stopping mysqld:                                           [  OK  ]
 Starting mysqld:                                           [  OK  ]
    (0.4ms)  SELECT COUNT(*) FROM `employees`
 Mysql2::Error: MySQL server has gone away: SELECT COUNT(*) FROM `employees`
-MySQL server has gone away. Trying to reconnect in 0.5 seconds.
+MySQL server has gone away. Trying to reconnect in 0.5 seconds. (cause: Mysql2::Error: MySQL server has gone away: SELECT COUNT(*) FROM `employees` [ActiveRecord::StatementInvalid], connection: host=127.0.0.1;database=employees;username=root)
    (101.5ms)  SELECT COUNT(*) FROM `employees`
 300024
 ```
@@ -91,7 +91,7 @@ MyApp::Application.configure do
   ...
   config.active_record.enable_retry = true
   #config.active_record.retry_databases = :employees # or [:employees], ['employees']
-  # retry_databases -> 0: retry all databases (default)
+  # retry_databases -> nil: retry all databases (default)
   config.active_record.execution_tries = 10 # times
   # execution_tries -> 0: retry indefinitely
   config.active_record.execution_retry_wait = 1.5 # sec

data/activerecord-mysql-reconnect.gemspec

@@ -18,12 +18,11 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  # '~> 3.2.14' or '~> 4.0.2'
+  # '~> 3.2.19' or '~> 4.0.8' or '~> 4.1.4'
   spec.add_dependency 'activerecord'
-  spec.add_dependency 'activesupport'
   spec.add_dependency 'mysql2'
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec', '>= 2.14.1'
+  spec.add_development_dependency 'rspec', '>= 2.14.1', '< 3.0.0'
   spec.add_development_dependency 'rspec-instafail'
 end

data/lib/activerecord/mysql/reconnect.rb

@@ -40,6 +40,8 @@ module Activerecord::Mysql::Reconnect
     'Query execution was interrupted',
     'Access denied for user',
     'The MySQL server is running with the --read-only option',
+    "Can't connect to local MySQL server", # When running in local sandbox, or using a socket file
+    'Unknown MySQL server host', # For DNS blips
   ]
 
   HANDLE_ERROR_MESSAGES = HANDLE_R_ERROR_MESSAGES + HANDLE_RW_ERROR_MESSAGES

data/lib/activerecord/mysql/reconnect/version.rb

@@ -1,7 +1,7 @@
 module Activerecord
   module Mysql
     module Reconnect
-      VERSION = '0.3.4'
+      VERSION = '0.3.5'
     end
   end
 end

data/spec/activerecord-mysql-reconnect_spec.rb

@@ -270,12 +270,14 @@ describe 'activerecord-mysql-reconnect' do
   end
 
   it 'force retry' do
-    sql = "INSERT INTO `employees` (`birth_date`, `emp_no`, `first_name`, `hire_date`, `last_name`) VALUES ('2014-01-09 03:22:25', 1, '' + sleep(10) + '', '2014-01-09 03:22:25', 'Tiger')"
+    sql = "INSERT INTO `employees` (`birth_date`, `emp_no`, `first_name`, `hire_date`, `last_name`) VALUES ('2014-01-09 03:22:25', 1, 'Scott', '2014-01-09 03:22:25', 'Tiger')"
 
     expect {
       ActiveRecord::Base.connection.execute(sql)
     }.to_not raise_error
 
+    lock_table
+
     mysql2_error('Lost connection to MySQL server during query') do
       expect {
         th = thread_run {|do_stop|

data/spec/spec_helper.rb

@@ -39,7 +39,7 @@ end
 
 def disable_retry
   begin
-    expect(ActiveRecord::Base.enable_retry).to be_true
+    expect(ActiveRecord::Base.enable_retry).to be_truthy
     ActiveRecord::Base.enable_retry = false
     yield
   ensure
@@ -89,7 +89,7 @@ def thread_run
 
   th.abort_on_exception = true
   sleep 3
-  expect(thread_running).to be_true
+  expect(thread_running).to be_truthy
 
   return th
 end
@@ -120,7 +120,7 @@ RSpec.configure do |config|
   end
 
   config.before(:each) do
-    desc = example.metadata[:full_description]
+    desc = RSpec.current_example.metadata[:full_description]
     puts <<-EOS
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-mysql-reconnect
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-30 00:00:00.000000000 Z
+date: 2014-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -24,20 +24,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -87,6 +73,9 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 2.14.1
+    - - <
+      - !ruby/object:Gem::Version
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -94,6 +83,9 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 2.14.1
+    - - <
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rspec-instafail
   requirement: !ruby/object:Gem::Requirement