peek-mysql2 1.1.0 → 1.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ee53493c776374c07c77390ac98d76ca24e23496
+  data.tar.gz: 74bfa39967913d656e169825edf831108bef5ab4
+SHA512:
+  metadata.gz: 8770d130da99acb7917883e0a5be57b6b75d482eb79c2960d9b36a23dc8c4143c46c9fa5754d6bfc80ed238431bb78a94164868c0b60c684cb7a4acdb924781c
+  data.tar.gz: 03fe0064756b56672b390f62be6653501b41f0fa92c2b548376c4186c739674412eb2178592b265e1a0f5800a2cbbc5860fa3b4a70df3aa06aee35bccefcf788

data/CHANGELOG.md

@@ -5,3 +5,7 @@
 # 1.1.0
 
 - Query count and Query time are now threadsafe.
+
+# 1.2.0
+
+- Rails 5 compatibility fixes.

data/lib/peek-mysql2/timing.rb

@@ -0,0 +1,15 @@
+module Peek
+  module Mysql2
+    module Timing
+      def query(*args)
+        start = Time.now
+        super(*args)
+      ensure
+        duration = (Time.now - start)
+        ::Mysql2::Client.query_time.update { |value| value + duration }
+        ::Mysql2::Client.query_count.update { |value| value + 1 }
+      end
+    end
+  end
+end
+

data/lib/peek-mysql2/version.rb

@@ -1,5 +1,5 @@
 module Peek
   module Mysql2
-    VERSION = '1.1.0'
+    VERSION = '1.2.0'
   end
 end

data/lib/peek/views/mysql2.rb

@@ -1,23 +1,28 @@
 require 'mysql2'
-require 'atomic'
+require 'concurrent/atomics'
 
 # Instrument SQL time
 class Mysql2::Client
   class << self
     attr_accessor :query_time, :query_count
   end
-  self.query_count = Atomic.new(0)
-  self.query_time = Atomic.new(0)
-
-  def query_with_timing(*args)
-    start = Time.now
-    query_without_timing(*args)
-  ensure
-    duration = (Time.now - start)
-    Mysql2::Client.query_time.update { |value| value + duration }
-    Mysql2::Client.query_count.update { |value| value + 1 }
+  self.query_count = Concurrent::AtomicReference.new(0)
+  self.query_time = Concurrent::AtomicReference.new(0)
+
+  if defined? Rails::VERSION::MAJOR && Rails::VERSION::MAJOR >= 5
+    require 'peek-mysql2/timing'
+    prepend ::Peek::Mysql2::Timing
+  else
+    def call_with_timing(*args, &block)
+      start = Time.now
+      call_without_timing(*args, &block)
+    ensure
+      duration = (Time.now - start)
+      Mysql2::Client.query_time.update { |value| value + duration }
+      Mysql2::Client.query_count.update { |value| value + 1 }
+    end
+    alias_method_chain :call, :timing
   end
-  alias_method_chain :query, :timing
 end
 
 module Peek

data/peek-mysql2.gemspec

@@ -11,6 +11,7 @@ Gem::Specification.new do |gem|
   gem.description   = %q{Take a peek into the MySQL queries made during your application's requests.}
   gem.summary       = %q{Take a peek into the MySQL queries made during your application's requests.}
   gem.homepage      = 'https://github.com/peek/peek-mysql2'
+  gem.license       = 'MIT'
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
@@ -19,5 +20,6 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'peek'
   gem.add_dependency 'mysql2'
-  gem.add_dependency 'atomic', '>= 1.0.0'
+  gem.add_dependency 'concurrent-ruby'
+  gem.add_dependency 'concurrent-ruby-ext'
 end

metadata

@@ -1,64 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: peek-mysql2
 version: !ruby/object:Gem::Version
-  version: 1.1.0
-  prerelease: 
+  version: 1.2.0
 platform: ruby
 authors:
 - Garrett Bjerkhoel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-28 00:00:00.000000000 Z
+date: 2017-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: peek
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: atomic
+  name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby-ext
+  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'
 description: Take a peek into the MySQL queries made during your application's requests.
 email:
 - me@garrettbjerkhoel.com
@@ -66,7 +73,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -75,31 +82,32 @@ files:
 - app/views/peek/views/_mysql2.html.erb
 - lib/peek-mysql2.rb
 - lib/peek-mysql2/railtie.rb
+- lib/peek-mysql2/timing.rb
 - lib/peek-mysql2/version.rb
 - lib/peek/views/mysql2.rb
 - peek-mysql2.gemspec
 homepage: https://github.com/peek/peek-mysql2
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.4.5.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Take a peek into the MySQL queries made during your application's requests.
 test_files: []