activerecord-pedantmysql2-adapter 0.1.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e590eeb3922b4dec13eb497568619d252decce72
-  data.tar.gz: 4fe690e1ea1684d749c0c97e0c9a7b6dc5bc1bdb
+  metadata.gz: ae59f56c8a3de9383b3b3adf3dac205a6f78f7be
+  data.tar.gz: 481ff991e458d0637294de4b8c410e23f4198df4
 SHA512:
-  metadata.gz: 6808c691edaf9a7c01ee54180b5fc48a4fd4d390046c0898841a4645f8ff6bf7f0de62f10fd1a0a22b8531db42f3f30205a0f8bed97feb9c18059b50662fbed9
-  data.tar.gz: e1a521d2c7b817059695f6442839daaf77c66cb7208e06e6bac97ba255fbf59a4b9c04c034c649bde00ec21c7ec49d15b9d397ec2d114ef01cfbf6567a4c186f
+  metadata.gz: 25ca80f3663d71ae4fec636c74de5b832828136fff457c01c35de5c21cf5f403734a3759b13936ca84aa52aaf366b60b51c2c30d37c0affa0981127c4a6820a3
+  data.tar.gz: e1824ac53a863b29d8f0da7104dfc1157d92c246a822d6ed4b8e72b8d7791ea6f5097c5feef35889df9c9ce07fe5879ae055be16a0dc8cd5fe8b98f97c12f633

data/Gemfile

@@ -1,4 +1,7 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in activerecord-pedantmysql2-adapter.gemspec
+if RUBY_VERSION >= '2.0.0'
+  gem 'byebug', group: :development
+end
+
 gemspec

data/README.md

@@ -29,18 +29,18 @@ Finally in your `database.yml`:
 
 ## Usage
 
-By default it do nothing with the warnings, you have to define the behaviour yourself in an initializer.
+By default it will raise warnings as errors. But you can define any behaviour yourself in an initializer.
 
-You can either raise on all errors:
+You can report them to your exception tracker:
 
 ```ruby
-  PedantMysql2.on_warning = lambda { |warning| raise warning }
+  PedantMysql2.on_warning = lambda { |warning| Airbrake.notify(warning) }
 ```
 
-Or report them to your exception tracker:
+or totally silence them:
 
 ```ruby
-  PedantMysql2.on_warning = lambda { |warning| Airbrake.notify(warning) }
+  PedantMysql2.on_warning = lambda { |*| }
 ```
 
 Or whatever else behaviour you want (logging).
@@ -48,28 +48,13 @@ Or whatever else behaviour you want (logging).
 You can easilly whitelist some types of warnings:
 
 ```ruby
-
-PedantMysql2.on_warning = lambda do |warning|
-  raise warning unless WARNINGS_WHITELIST.any? { |pattern| pattern =~ warning.message }
-end
-
+PedantMysql2.ignore(/Some warning I don't care about/i)
 ```
 
-If you want to be able to have some queries react silently to MySQL warnings you can
-do the following:
+If you want to silence warnings for a limited scope, you can capture the warnings:
 
 ```ruby
-
-PedantMysql2.on_warning = lambda do |warning|
-  if PedantMysql2.silence_warnings?
-    # handle the warning a certain way or return
-  else
-    # simply pass the warning to the caller
-    raise warning
-  end
-end
-
-PedantMysql2.silence_warnings do
+warnings = PedantMysql2.capture_warnings do
   # perform query that may raise an error you want to stifle
 end
  ```

data/activerecord-pedantmysql2-adapter.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'activerecord'
-  spec.add_dependency 'mysql2', '>= 0.3.11'
+  spec.add_dependency 'mysql2', '>= 0.3.12'
   spec.add_development_dependency 'bundler', '~> 1.5'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '>= 3.0'

data/lib/active_record/connection_adapters/pedant_mysql2_adapter.rb

@@ -64,7 +64,7 @@ class ActiveRecord::ConnectionAdapters::PedantMysql2Adapter < ActiveRecord::Conn
     result = @connection.query('SHOW WARNINGS')
     result.each do |level, code, message|
       warning = MysqlWarning.new(message, code, level, sql)
-      ::PedantMysql2.on_warning.call(warning)
+      ::PedantMysql2.on_warning.call(warning) unless PedantMysql2.ignored?(warning)
     end
   end
 

data/lib/pedant_mysql2.rb

@@ -2,18 +2,43 @@ module PedantMysql2
   class << self
     attr_accessor :on_warning
 
-    def silence_warnings
-      previous_value = Thread.current[:silence_warnings]
-      Thread.current[:silence_warnings] = true
+    def capture_warnings
+      previous_callback = on_warning
+      previous_warnings = Thread.current[:mysql_warnings]
+      Thread.current[:mysql_warnings] = []
+      self.on_warning = lambda { |warning| Thread.current[:mysql_warnings] << warning }
       yield
+      warnings = Thread.current[:mysql_warnings]
+      warnings
     ensure
-      Thread.current[:silence_warnings] = previous_value
+      Thread.current[:mysql_warnings] = previous_warnings
+      self.on_warning = previous_callback
     end
 
-    def silence_warnings?
-      Thread.current[:silence_warnings]
+    def raise_warnings!
+      self.on_warning = lambda{ |warning| raise warning }
+    end
+
+    def silence_warnings!
+      self.on_warning = nil
+    end
+
+    def ignore(*matchers)
+      self.whitelist.concat(matchers.flatten)
+    end
+
+    def ignored?(warning)
+      on_warning.nil? || whitelist.any? { |matcher| matcher =~ warning.message }
+    end
+
+    protected
+
+    def whitelist
+      @whitelist ||= []
     end
 
   end
-  self.on_warning = lambda{ |*| }
+
+  raise_warnings!
+
 end

data/lib/pedant_mysql2/version.rb

@@ -1,3 +1,3 @@
 module PedantMysql2
-  VERSION = '0.1.1'
+  VERSION = '1.0.0'
 end

data/spec/adapter_spec.rb

@@ -5,8 +5,12 @@ describe PedantMysql2 do
   let(:connection) { ActiveRecord::Base.connection }
 
   before :each do
+    PedantMysql2.raise_warnings!
+    PedantMysql2.instance_variable_set(:@whitelist, nil)
     connection.execute('SET SESSION binlog_format = "STATEMENT"')
-    connection.execute('CREATE TABLE IF NOT EXISTS comment (id int)')
+    if connection.execute('SHOW TABLES LIKE "comment"').size == 0
+      connection.execute('CREATE TABLE comment (id int)')
+    end
     connection.execute('TRUNCATE TABLE comment')
     @original_callback = PedantMysql2.on_warning
   end
@@ -15,13 +19,21 @@ describe PedantMysql2 do
     PedantMysql2.on_warning = @original_callback
   end
 
-  it 'just do nothing by default' do
+  it 'raises warnings by default' do
+    expect {
+      connection.execute('SELECT 1 + "foo"')
+    }.to raise_error(MysqlWarning, "Truncated incorrect DOUBLE value: 'foo'")
+  end
+
+  it 'can have a whitelist of warnings' do
+    PedantMysql2.ignore(/Truncated incorrect DOUBLE value/i)
     expect {
       connection.execute('SELECT 1 + "foo"')
     }.to_not raise_error
   end
 
   it 'do not change the returned value' do
+    PedantMysql2.silence_warnings!
     result = connection.execute('SELECT 1 + "foo"')
     expect(result.to_a).to be == [[1.0]]
   end
@@ -43,25 +55,26 @@ describe PedantMysql2 do
     }.to raise_error(MysqlWarning)
   end
 
-  it 'can allow blocks of queries to be silenced' do
-    PedantMysql2.on_warning = lambda do |warning|
-      raise warning unless PedantMysql2.silence_warnings?
-    end
+  it 'can capture the warnings generated in a block' do
+    warnings = nil
     expect {
-      PedantMysql2.silence_warnings do
-        expect(PedantMysql2.silence_warnings?).to be true
+      warnings = PedantMysql2.capture_warnings do
         connection.execute('SELECT 1 + "foo"')
       end
     }.to_not raise_error
+    
+    expect(warnings.size).to be == 1
+    expect(warnings.first).to be_a MysqlWarning
+    expect(warnings.first.message).to be == "Truncated incorrect DOUBLE value: 'foo'"
   end
 
-  it 'restores the old value that was stored in the thread_local silence_warnings' do
-    Thread.current[:silence_warnings] = 'abracadabra'
-    PedantMysql2.silence_warnings do
-      expect(Thread.current[:silence_warnings]).to be true
+  it 'restores the old value that was stored in the thread_local capture_warnings' do
+    Thread.current[:mysql_warnings] = 'abracadabra'
+    PedantMysql2.capture_warnings do
+      expect(Thread.current[:mysql_warnings]).to be_an Array
       connection.execute('SELECT 1 + "foo"')
     end
-    expect(Thread.current[:silence_warnings]).to be == 'abracadabra'
+    expect(Thread.current[:mysql_warnings]).to be == 'abracadabra'
   end
 
   describe MysqlWarning do

data/spec/spec_helper.rb

@@ -15,7 +15,6 @@ require 'activerecord-pedantmysql2-adapter'
 Dir[File.expand_path(File.join(File.dirname(__FILE__), 'support', '**', '*.rb'))].each { |f| require f }
 
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
   config.order = 'random'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-pedantmysql2-adapter
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Jean Boussier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-05 00:00:00.000000000 Z
+date: 2014-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.11
+        version: 0.3.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.11
+        version: 0.3.12
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement