isolator 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c44e9964b126ff2ef69eaf93b21ad6535061cca8c85e916022046c1854c89cb
-  data.tar.gz: 9dd67179bc96aca803313422d02e55ae57a3ac5fcb17c217aed97c3bda5f1250
+  metadata.gz: 36b44d69162aa2c6450298b45b30c824e129448be00ff92ffb0835da654cdf15
+  data.tar.gz: f5179d3d98ef52b3dd2c52c022da6e61cd1ea9472619d8350545756014ad9c3f
 SHA512:
-  metadata.gz: b01364d05a5d1521760b83c50f5e2ff98b2045baec1756c4b12128143786c3b856c462997eebbb0bdac7e3881581f15ebb52e927ae04641114038f299aa3e358
-  data.tar.gz: 8b469a00794532b7aa31c7a79af486f8c6d27beb5bda56d253adb56637ca54b641218dab9961f9a83a253a33d295a31edb0f7129154a39d2b10dfeb211e7928c
+  metadata.gz: b0194b763fac7ed01c229bac83985770c0ac9ba6da6448706a4bfa70d6f578b044b1d280cdb78e1fa7eebab6961979ddd937d914486f96cac067368f586b5f04
+  data.tar.gz: c9015bf6498684d09188a535fae608e02939a0cec7eb63f5ada0e705881d56f72f0971c55674e4e6a7448d6da3a933d54e8ed4a1c50fa5a9a906b0f09e36a381

data/.rubocop.yml

@@ -1,70 +1,51 @@
 require:
+  - standard/cop/semantic_blocks
   - rubocop-md
 
+inherit_gem:
+  standard: config/base.yml
+
 AllCops:
-  Include:
-    - 'lib/**/*.rb'
-    - 'lib/**/*.rake'
-    - 'spec/**/*.rb'
   Exclude:
-    - 'bin/**/*'
-    - 'gemfiles/**/*'
-    - 'spec/dummy/**/*'
-    - 'vendor/**/*'
+    - 'bin/*'
     - 'tmp/**/*'
-    - 'Rakefile'
     - 'Gemfile'
-    - '*.gemspec'
+    - 'vendor/**/*'
+    - 'gemfiles/**/*'
+    - 'lib/generators/**/templates/**/*'
   DisplayCopNames: true
-  StyleGuideCopsOnly: false
-  TargetRubyVersion: 2.2.2
+  TargetRubyVersion: 2.5
 
-Rails:
+Standard/SemanticBlocks:
   Enabled: false
 
-Bundler/OrderedGems:
-  Enabled: false
+Style/FrozenStringLiteralComment:
+  Enabled: true
 
-Naming/UncommunicativeMethodParamName:
-  Enabled: false
+Style/TrailingCommaInArrayLiteral:
+  EnforcedStyleForMultiline: no_comma
 
-Style/SymbolArray:
-  Enabled: false
+Style/TrailingCommaInHashLiteral:
+  EnforcedStyleForMultiline: no_comma
 
-Style/Documentation:
+Lint/Void:
   Exclude:
-    - 'spec/**/*.rb'
-
-Style/StringLiterals:
-  EnforcedStyle: double_quotes
-
-Style/RegexpLiteral:
-  Enabled: false
-
-Style/Lambda:
-  Enabled: false
+    - '**/*.md'
 
-Style/BlockDelimiters:
+# See https://github.com/rubocop-hq/rubocop/issues/4222
+Lint/AmbiguousBlockAssociation:
   Exclude:
-    - 'spec/**/*.rb'
-
-Style/NumericPredicate:
-  Enabled: false
+    - 'spec/**/*'
+    - '**/*.md'
 
-Layout/SpaceInsideStringInterpolation:
-  EnforcedStyle: no_space
-
-Lint/AmbiguousRegexpLiteral:
-  Enabled: false
-
-Metrics/LineLength:
-  Max: 100
+Lint/DuplicateMethods:
   Exclude:
-    - 'spec/**/*.rb'
+    - '**/*.md'
 
-Metrics/BlockLength:
+Naming/FileName:
   Exclude:
-    - 'spec/**/*.rb'
+   - '**/*.md'
 
-Style/MutableConstant:
-  Enabled: false
+Layout/InitialIndentation:
+  Exclude:
+    - 'CHANGELOG.md'

data/.travis.yml

@@ -1,8 +1,6 @@
 sudo: false
 language: ruby
 cache: bundler
-rvm:
-  - 2.5.3
 
 notifications:
   email: false
@@ -12,20 +10,18 @@ matrix:
   include:
     - rvm: ruby-head
       gemfile: gemfiles/railsmaster.gemfile
-    - rvm: jruby-9.2.8.0
+    - rvm: jruby-9.2.10.0
       gemfile: gemfiles/jruby.gemfile
-    - rvm: 2.6.2
-      gemfile: gemfiles/rails6.gemfile
-    - rvm: 2.5.0
+    - rvm: 2.7
       gemfile: Gemfile
-    - rvm: 2.4.3
+    - rvm: 2.6
+      gemfile: gemfiles/rails6.gemfile
+    - rvm: 2.5
       gemfile: Gemfile
-    - rvm: 2.3.1
+    - rvm: 2.5
       gemfile: gemfiles/activerecord42.gemfile
-    - rvm: 2.2.2
-      gemfile: gemfiles/ruby_2.2.2.gemfile
   allow_failures:
     - rvm: ruby-head
       gemfile: gemfiles/railsmaster.gemfile
-    - rvm: jruby-9.2.8.0
+    - rvm: jruby-9.2.10.0
       gemfile: gemfiles/jruby.gemfile

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## master
 
+## 0.6.2 (2020-03-20)
+
+- Make Sniffer version requirement open-ended. ([@palkan][])
+
+- **Support Ruby 2.5+** ([@palkan][])
+
 ## 0.6.1 (2019-09-06)
 
 - Fix Sniffer integration. ([@palkan][])

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2018 Vladimir Dementyev
+Copyright (c) 2018-2020 Vladimir Dementyev
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -110,7 +110,7 @@ Isolator relys on [uniform_notifier][] to send custom notifications.
 ### Supported ORMs
 
 - `ActiveRecord` >= 4.1
-- `ROM::SQL` (only if Active Support instrumentation extenstion is loaded)
+- `ROM::SQL` (only if Active Support instrumentation extension is loaded)
 
 ### Adapters
 
@@ -194,12 +194,12 @@ Possible `options` are:
 
 ```ruby
 Isolator.isolate :active_job,
-                 target: ActiveJob::Base,
-                 method_name: :enqueue,
-                 exception_class: Isolator::BackgroundJobError,
-                 details_message: ->(obj, _args) {
-                   "#{obj.class.name}(#{obj.arguments})"
-                 }
+  target: ActiveJob::Base,
+  method_name: :enqueue,
+  exception_class: Isolator::BackgroundJobError,
+  details_message: ->(obj, _args) {
+    "#{obj.class.name}(#{obj.arguments})"
+  }
 ```
 
 You can also add some callbacks to be run before and after the transaction:

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 require "rubocop/rake_task"

data/gemfiles/jruby.gemfile

@@ -1,8 +1,8 @@
 source "https://rubygems.org"
 
-gem "activerecord-jdbcsqlite3-adapter", "~> 50.0"
+gem "activerecord-jdbcsqlite3-adapter", "~> 60.0"
 gem "jdbc-sqlite3"
-gem "rails", "~> 5.0"
+gem "rails", "~> 6.0.0"
 gem 'uniform_notifier', '~> 1.11'
 
 gemspec path: ".."

data/isolator.gemspec

@@ -1,21 +1,23 @@
+# frozen_string_literal: true
+
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "isolator/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = "isolator"
-  spec.version       = Isolator::VERSION
-  spec.authors       = ["Vladimir Dementyev"]
-  spec.email         = ["dementiev.vm@gmail.com"]
+  spec.name = "isolator"
+  spec.version = Isolator::VERSION
+  spec.authors = ["Vladimir Dementyev"]
+  spec.email = ["dementiev.vm@gmail.com"]
 
-  spec.summary       = "Detect non-atomic interactions within DB transactions"
-  spec.description   = "Detect non-atomic interactions within DB transactions"
-  spec.homepage      = "https://github.com/palkan/isolator"
-  spec.license       = "MIT"
+  spec.summary = "Detect non-atomic interactions within DB transactions"
+  spec.description = "Detect non-atomic interactions within DB transactions"
+  spec.homepage = "https://github.com/palkan/isolator"
+  spec.license = "MIT"
 
-  spec.required_ruby_version = ">= 2.2.2"
+  spec.required_ruby_version = ">= 2.5.0"
 
-  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+  spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
 
@@ -29,15 +31,15 @@ Gem::Specification.new do |spec|
 
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "sniffer", "~> 0.3.1"
+  spec.add_runtime_dependency "sniffer", ">= 0.3.1"
 
   spec.add_development_dependency "bundler", ">= 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "rspec-rails", "~> 3.0"
   spec.add_development_dependency "minitest", "~> 5.10.0"
-  spec.add_development_dependency "rubocop", "~> 0.56.0"
-  spec.add_development_dependency "rubocop-md", "~> 0.2"
+  spec.add_development_dependency "standard", "~> 0.2.0"
+  spec.add_development_dependency "rubocop-md", "~> 0.3"
 
   spec.add_development_dependency "sidekiq", "~> 5.0"
   spec.add_development_dependency "webmock", "~> 3.1"
@@ -47,4 +49,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "resque-scheduler"
   spec.add_development_dependency "sucker_punch"
   spec.add_development_dependency "database_cleaner"
+  spec.add_development_dependency "database_cleaner-active_record"
 end

data/lib/isolator/adapters/background_jobs/active_job.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 Isolator.isolate :active_job,
-                 target: ActiveJob::Base,
-                 method_name: :enqueue,
-                 exception_class: Isolator::BackgroundJobError,
-                 details_message: ->(obj, _args) {
-                   "#{obj.class.name}" \
-                   "#{obj.arguments.any? ? " (#{obj.arguments.join(', ')})" : ''}"
-                 }
+  target: ActiveJob::Base,
+  method_name: :enqueue,
+  exception_class: Isolator::BackgroundJobError,
+  details_message: ->(obj, _args) {
+    "#{obj.class.name}" \
+    "#{obj.arguments.any? ? " (#{obj.arguments.join(", ")})" : ""}"
+  }

data/lib/isolator/adapters/background_jobs/resque.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 Isolator.isolate :resque,
-                 target: Resque.singleton_class,
-                 method_name: :enqueue,
-                 exception_class: Isolator::BackgroundJobError,
-                 details_message: ->(_obj, args) {
-                   args.join(", ")
-                 }
+  target: Resque.singleton_class,
+  method_name: :enqueue,
+  exception_class: Isolator::BackgroundJobError,
+  details_message: ->(_obj, args) {
+    args.join(", ")
+  }

data/lib/isolator/adapters/background_jobs/resque_scheduler.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 Isolator.isolate :resque_scheduler,
-                 target: Resque.singleton_class,
-                 method_name: :enqueue_at,
-                 exception_class: Isolator::BackgroundJobError,
-                 details_message: ->(_obj, (ts, *args)) {
-                   "#{args.join(', ')} (at #{ts})"
-                 }
+  target: Resque.singleton_class,
+  method_name: :enqueue_at,
+  exception_class: Isolator::BackgroundJobError,
+  details_message: ->(_obj, (ts, *args)) {
+    "#{args.join(", ")} (at #{ts})"
+  }

data/lib/isolator/adapters/background_jobs/sidekiq.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
 Isolator.isolate :sidekiq,
-                 target: Sidekiq::Client,
-                 method_name: :raw_push,
-                 exception_class: Isolator::BackgroundJobError,
-                 details_message: ->(_obj, args) {
-                   args.first.map do |job|
-                     "#{job['class']} (#{job['args']})"
-                   end.join("\n")
-                 }
+  target: Sidekiq::Client,
+  method_name: :raw_push,
+  exception_class: Isolator::BackgroundJobError,
+  details_message: ->(_obj, args) {
+    args.first.map do |job|
+      "#{job["class"]} (#{job["args"]})"
+    end.join("\n")
+  }

data/lib/isolator/adapters/background_jobs/sucker_punch.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 Isolator.isolate :sucker_punch,
-                 target: SuckerPunch::Queue.singleton_class,
-                 method_name: :find_or_create,
-                 exception_class: Isolator::BackgroundJobError,
-                 details_message: ->(_obj, args) {
-                   args.compact.join(", ")
-                 }
+  target: SuckerPunch::Queue.singleton_class,
+  method_name: :find_or_create,
+  exception_class: Isolator::BackgroundJobError,
+  details_message: ->(_obj, args) {
+    args.compact.join(", ")
+  }

data/lib/isolator/adapters/base.rb

@@ -31,8 +31,8 @@ module Isolator
         enabled? && Isolator.enabled? && Isolator.within_transaction? && !ignored?(*args)
       end
 
-      def ignore_if
-        ignores << Proc.new
+      def ignore_if(&block)
+        ignores << block
       end
 
       def ignores

data/lib/isolator/adapters/http/webmock.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 adapter = Isolator.isolate :webmock,
-                           exception_class: Isolator::HTTPError,
-                           details_message: ->(obj, _args) {
-                                              "#{obj.method.to_s.upcase} #{obj.uri}"
-                                            }
+  exception_class: Isolator::HTTPError,
+  details_message: ->(obj, _args) {
+                     "#{obj.method.to_s.upcase} #{obj.uri}"
+                   }
 
 WebMock.after_request do |*args|
   adapter.notify(caller, *args)

data/lib/isolator/configuration.rb

@@ -13,7 +13,7 @@ module Isolator
   #   defauls to false
   class Configuration
     attr_accessor :raise_exceptions, :logger, :send_notifications,
-                  :backtrace_filter
+      :backtrace_filter
 
     def initialize
       @logger = nil

data/lib/isolator/ignorer.rb

@@ -20,7 +20,7 @@ module Isolator
       ignores = build_ignore_list(ignored_paths)
       return if ignores.blank?
 
-      regex = Regexp.new("^.*(#{ignores.join('|')}):.*$")
+      regex = Regexp.new("^.*(#{ignores.join("|")}):.*$")
       adapter.ignore_if { caller.any? { |row| regex =~ row } }
     end
 

data/lib/isolator/isolate.rb

@@ -5,7 +5,7 @@ module Isolator
   module Isolate
     def isolate(id, **options)
       raise "Adapter already registered: #{id}" if Isolator.adapters.key?(id.to_s)
-      adapter = AdapterBuilder.call(options)
+      adapter = AdapterBuilder.call(**options)
       Isolator.adapters[id.to_s] = adapter
     end
   end

data/lib/isolator/orm_adapters/active_support_subscriber.rb

@@ -9,8 +9,8 @@ module Isolator
 
     def self.subscribe!(event)
       ::ActiveSupport::Notifications.subscribe(event) do |_name, _start, _finish, _id, query|
-        Isolator.incr_transactions! if query[:sql] =~ START_PATTERN
-        Isolator.decr_transactions! if query[:sql] =~ FINISH_PATTERN
+        Isolator.incr_transactions! if START_PATTERN.match?(query[:sql])
+        Isolator.decr_transactions! if FINISH_PATTERN.match?(query[:sql])
       end
     end
   end

data/lib/isolator/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Isolator
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: isolator
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Vladimir Dementyev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-06 00:00:00.000000000 Z
+date: 2020-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sniffer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.1
 - !ruby/object:Gem::Dependency
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -95,33 +95,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 5.10.0
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: standard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.56.0
+        version: 0.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.56.0
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: rubocop-md
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
@@ -234,6 +234,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: database_cleaner-active_record
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Detect non-atomic interactions within DB transactions
 email:
 - dementiev.vm@gmail.com
@@ -255,7 +269,6 @@ files:
 - gemfiles/jruby.gemfile
 - gemfiles/rails6.gemfile
 - gemfiles/railsmaster.gemfile
-- gemfiles/ruby_2.2.2.gemfile
 - isolator.gemspec
 - lib/isolator.rb
 - lib/isolator/adapter_builder.rb
@@ -305,14 +318,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.2
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Detect non-atomic interactions within DB transactions

data/gemfiles/ruby_2.2.2.gemfile

@@ -1,8 +0,0 @@
-source "https://rubygems.org"
-
-gem "rails", "~> 4.2"
-gem "sqlite3", "~> 1.3.0"
-gem 'uniform_notifier', '1.11'
-gem 'anyway_config', '1.2'
-
-gemspec path: ".."