activerecord-mysql-reconnect 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa9520e56f0c5726a4abb72bd8bdc719e94d709f
-  data.tar.gz: fb4302265396c109b2be9f328be48aa4f4351b35
+  metadata.gz: edc9b88122246d91bb12caad426b895a663b3ac3
+  data.tar.gz: 4d33d7b9b4aca402c5548ecd972cc7fe944dab06
 SHA512:
-  metadata.gz: 7ab2e9a0f7aed38b65408fa5f9c7077047617c5c9275c753c9f6fd195cf4ef37708622bf8165be4a77d347694085e3cecc925e2db95aa6a986b2ff1ab181f6d3
-  data.tar.gz: bce551e66baf1dd0a6e6717d15d2a53206d05c1698602ab6921375ab6b18082d3c85fcf4f540099a53508d1444ab643ba617dba4175dd1d495c66b3e58813dd7
+  metadata.gz: c12fbc120985b3f3d8f6b9b4fdcf0fa34ae431ca149ae152f8951f3f372b65f322398b5d8e33c261a66156654cc9645ab42714d5a5d866065badb234015b18c1
+  data.tar.gz: 08adf77b43b394d8e96a896ff0c17506743e0688cc2eae2feaf518276c96ac14e1d1bd3256e7edac1701bf9831b0a971210fa6e063fbec859f27b725c90db4f0

data/README.md

@@ -90,7 +90,11 @@ gem 'activerecord-mysql-reconnect'
 MyApp::Application.configure do
   ...
   config.active_record.enable_retry = true
-  #config.active_record.retry_databases = :employees # or [:employees], ['employees']
+  #config.active_record.retry_databases = :employees
+  # e.g. [:employees]
+  #      ['employees', 'localhost:test', '192.168.1.1:users']
+  #      ['192.168.%:emp\_all']
+  #      ['emp%']
   # retry_databases -> nil: retry all databases (default)
   config.active_record.execution_tries = 10 # times
   # execution_tries -> 0: retry indefinitely

data/activerecord-mysql-reconnect.gemspec

@@ -23,6 +23,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'mysql2'
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec', '>= 2.14.1', '< 3.0.0'
+  spec.add_development_dependency 'rspec', '>= 3.0.0'
   spec.add_development_dependency 'rspec-instafail'
 end

data/lib/activerecord/mysql/reconnect.rb

@@ -1,6 +1,7 @@
 require 'mysql2'
 require 'logger'
 require 'bigdecimal'
+require 'strscan'
 
 require 'active_record'
 require 'active_record/connection_adapters/abstract_adapter'
@@ -85,7 +86,21 @@ module Activerecord::Mysql::Reconnect
         v = [v]
       end
 
-      @activerecord_mysql_reconnect_retry_databases = v.map {|i| i.to_s }
+      @activerecord_mysql_reconnect_retry_databases = v.map do |database|
+        if database.instance_of?(Symbol)
+          database = Regexp.escape(database.to_s)
+          [/.*/, /\A#{database}\z/]
+        else
+          host = '%'
+          database = database.to_s
+
+          if database =~ /:/
+            host, database = database.split(':', 2)
+          end
+
+          [create_pattern_match_regex(host), create_pattern_match_regex(database)]
+        end
+      end
     end
 
     def retry_databases
@@ -185,7 +200,12 @@ module Activerecord::Mysql::Reconnect
 
       if conn and not retry_databases.empty?
         conn_info = connection_info(conn)
-        return false unless retry_databases.include?(conn_info[:database])
+
+        included = retry_databases.any? do |host, database|
+          host =~ conn_info[:host] and database =~ conn_info[:database]
+        end
+
+        return false unless included
       end
 
       unless HANDLE_ERROR.any? {|i| e.kind_of?(i) }
@@ -220,5 +240,28 @@ module Activerecord::Mysql::Reconnect
 
       return conn_info
     end
+
+    private
+
+    def create_pattern_match_regex(str)
+      ss = StringScanner.new(str)
+      buf = []
+
+      until ss.eos?
+        if (tok = ss.scan(/[^\\%_]+/))
+          buf << Regexp.escape(tok)
+        elsif (tok = ss.scan(/\\/))
+          buf << Regexp.escape(ss.getch)
+        elsif (tok = ss.scan(/%/))
+          buf << '.*'
+        elsif (tok = ss.scan(/_/))
+          buf << '.'
+        else
+          raise 'must not happen'
+        end
+      end
+
+      /\A#{buf.join}\z/
+    end
   end # end of class methods
 end

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

@@ -1,7 +1,7 @@
 module Activerecord
   module Mysql
     module Reconnect
-      VERSION = '0.3.6'
+      VERSION = '0.3.7'
     end
   end
 end

data/spec/activerecord-mysql-reconnect_spec.rb

@@ -369,19 +369,41 @@ describe 'activerecord-mysql-reconnect' do
     end
   end
 
-  it 'retry specific database' do
-    retry_databases(:employees2) do
+  [
+    :employees2,
+    '127.0.0.2:employees',
+    '127.0.0.\_:employees',
+  ].each do |db|
+    it "retry specific database: #{db}" do
+      retry_databases(db) do
+        expect {
+          expect(Employee.all.length).to eq(300024)
+          mysql_restart
+          expect(Employee.all.length).to eq(300024)
+        }.to raise_error(ActiveRecord::StatementInvalid)
+      end
+
       expect {
         expect(Employee.all.length).to eq(300024)
         mysql_restart
         expect(Employee.all.length).to eq(300024)
-      }.to raise_error(ActiveRecord::StatementInvalid)
+      }.to_not raise_error
     end
+  end
 
-    expect {
-      expect(Employee.all.length).to eq(300024)
-      mysql_restart
-      expect(Employee.all.length).to eq(300024)
-    }.to_not raise_error
+  [
+    :employees,
+    '127.0.0.1:employees',
+    '127.0.0._:e%',
+  ].each do |db|
+    it "retry specific database: #{db}" do
+      retry_databases(db) do
+        expect {
+          expect(Employee.all.length).to eq(300024)
+          mysql_restart
+          expect(Employee.all.length).to eq(300024)
+        }.to_not raise_error
+      end
+    end
   end
 end

data/spec/spec_helper.rb

@@ -119,8 +119,8 @@ RSpec.configure do |config|
     system("git checkout #{employees_sql}")
   end
 
-  config.before(:each) do
-    desc = RSpec.current_example.metadata[:full_description]
+  config.before(:each) do |context|
+    desc = context.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.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-23 00:00:00.000000000 Z
+date: 2014-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -71,9 +71,6 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
-      - !ruby/object:Gem::Version
-        version: 2.14.1
-    - - <
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :development
@@ -81,9 +78,6 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
-      - !ruby/object:Gem::Version
-        version: 2.14.1
-    - - <
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency