activerecord-transactionable 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23dd2012182b1767de176fbf2f5bd9225285b7bc5549ff479430ea62b5fe2a72
-  data.tar.gz: 794ce01d1a9d3d4b04259c316c3bfbfe3021552a6cd5721810461cfbc9129e89
+  metadata.gz: b7d5f0d70200bcd62ca45dd9639614241ad9922c69e26e5e60db1e8c19724ce6
+  data.tar.gz: de2e9d597d44673930c041d7765178e901dceb540461badcde91370b1576e22a
 SHA512:
-  metadata.gz: 9435ef3d0c5ca100c1a4fffa1b1d0c9c284b5965bb6aaf36b85da81116a4e7d5338394e52b48c09f709924fc6370e1115e074fcca400bfeec911885d4a2dcad4
-  data.tar.gz: 5a9b93e0897d9f5b384258d8ee8634cb10a99893db308deb61443649050a815f9dbc12db0ce0248d12545e366339d395096c96445637e14587a2b4426d707c75
+  metadata.gz: 29aca93fae0610d28954de9fd702d0df342445ff51b70849d4fdea3d18618e818a0cf16b87f800d67519b9719f746786492698595c1ae99fab6b9f61c3945281
+  data.tar.gz: efe950e407b33d34189abeac8aa1c17e527f29bb2c9c331843fac698f6a017792f8263ad65ac151e47bc718dd429de070a31dfe38115461d214d2db9a0d3151d

data/.github/workflows/supported.yml

@@ -47,6 +47,7 @@ jobs:
       - name: Run tests
         run: bundle exec rake test
       - uses: codecov/codecov-action@v2
+        if: matrix.ruby == '2.6' && github.event_name != 'pull_request' && always()
         with:
           flags: unittests
           name: codecov-upload

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2021-11-09 16:50:27 UTC using RuboCop version 1.22.3.
+# on 2021-11-10 07:27:25 UTC using RuboCop version 1.22.3.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -81,6 +81,17 @@ RSpec/ContextWording:
   Exclude:
     - 'spec/activerecord/transactionable_spec.rb'
 
+# Offense count: 1
+# Configuration parameters: CountAsOne.
+RSpec/ExampleLength:
+  Max: 10
+
+# Offense count: 1
+# Configuration parameters: AssignmentOnly.
+RSpec/InstanceVariable:
+  Exclude:
+    - 'spec/activerecord/transactionable_spec.rb'
+
 # Offense count: 5
 RSpec/LeakyConstantDeclaration:
   Exclude:
@@ -102,7 +113,7 @@ RSpec/NamedSubject:
   Exclude:
     - 'spec/activerecord/transactionable_spec.rb'
 
-# Offense count: 49
+# Offense count: 54
 RSpec/NestedGroups:
   Max: 8
 
@@ -124,15 +135,15 @@ Style/GuardClause:
     - 'README.md'
     - 'spec/activerecord/transactionable_spec.rb'
 
-# Offense count: 2
+# Offense count: 5
 ThreadSafety/InstanceVariableInClassMethod:
   Exclude:
     - 'spec/activerecord/transactionable_spec.rb'
 
-# Offense count: 68
+# Offense count: 70
 # Cop supports --auto-correct.
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
 # IgnoredPatterns: (?-mix:^\#)
 Layout/LineLength:
-  Max: 272
+  Max: 278

data/.simplecov

@@ -1,5 +1,37 @@
 # frozen_string_literal: true
 
-SimpleCov.start do
-  add_filter "/spec/"
+ruby_version = Gem::Version.new(RUBY_VERSION)
+actual_version = lambda do |major, minor|
+  actual = Gem::Version.new(ruby_version)
+  major == actual.segments[0] && minor == actual.segments[1] && RUBY_ENGINE == "ruby"
+end
+coverage = actual_version.call(2, 6)
+
+if coverage
+  require "simplecov-cobertura"
+  require "simplecov_json_formatter"
+  require "codecov"
+
+  SimpleCov.start do
+    add_filter "/spec/"
+    add_filter "/lib/activerecord/transactionable/version.rb"
+
+    if ENV["CI"]
+      # Disambiguate individual test runs
+      command_name "#{ENV["GITHUB_WORKFLOW"]} Job #{ENV["GITHUB_RUN_ID"]}:#{ENV["GITHUB_RUN_NUMBER"]}"
+      formatters = []
+      formatters << SimpleCov::Formatter::HTMLFormatter
+      formatters << SimpleCov::Formatter::CoberturaFormatter
+      formatters << SimpleCov::Formatter::JSONFormatter # For CodeClimate
+      formatters << SimpleCov::Formatter::Codecov # For CodeCov
+      formatter SimpleCov::Formatter::MultiFormatter.new(formatters)
+    else
+      # Use default
+      formatter SimpleCov::Formatter::HTMLFormatter
+    end
+
+    track_files "**/*.rb"
+  end
+else
+  puts "Not running coverage on #{RUBY_ENGINE} #{RUBY_VERSION}"
 end

data/activerecord-transactionable.gemspec

@@ -23,8 +23,13 @@ Gem::Specification.new do |spec|
 
   ruby_version = Gem::Version.new(RUBY_VERSION)
   minimum_version = ->(version) { ruby_version >= Gem::Version.new(version) && RUBY_ENGINE == "ruby" }
+  actual_version = lambda do |major, minor|
+    actual = Gem::Version.new(ruby_version)
+    major == actual.segments[0] && minor == actual.segments[1] && RUBY_ENGINE == "ruby"
+  end
+  coverage = actual_version.call(2, 6)
   linting = minimum_version.call("2.6")
-  coverage = minimum_version.call("2.6")
+  stream = minimum_version.call("2.3")
 
   spec.add_dependency "activemodel", ">= 4.0.0"
   spec.add_dependency "activerecord", ">= 4.0.0"
@@ -36,6 +41,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec-benchmark", "~> 0.6"
   spec.add_development_dependency "rspec-block_is_expected", "~> 1.0"
   spec.add_development_dependency "rspec-pending_for", "~> 0.1"
+  spec.add_development_dependency "silent_stream", "~> 1.0" if stream
   if linting
     spec.add_development_dependency("rubocop", "~> 1.22")
     spec.add_development_dependency("rubocop-md", "~> 1.0")
@@ -47,6 +53,7 @@ Gem::Specification.new do |spec|
     spec.add_development_dependency("rubocop-thread_safety", "~> 0.4")
   end
   if coverage
+    spec.add_development_dependency("codecov", "~> 0.6")
     spec.add_development_dependency("simplecov", "~> 0.21")
     spec.add_development_dependency("simplecov-cobertura", "~> 1.4")
   end

data/lib/activerecord/transactionable/version.rb

@@ -2,6 +2,6 @@
 
 module Activerecord
   module Transactionable
-    VERSION = "3.0.0"
+    VERSION = "3.0.1"
   end
 end

data/lib/activerecord/transactionable.rb

@@ -63,6 +63,7 @@ module Activerecord
         lock = args.delete(:lock)
         inside_args = extract_args(args, INSIDE_TRANSACTION_ERROR_HANDLERS)
         outside_args = extract_args(args, OUTSIDE_TRANSACTION_ERROR_HANDLERS)
+        transaction_args = extract_args(args, TRANSACTION_METHOD_ARG_NAMES)
         transaction_open = ActiveRecord::Base.connection.transaction_open?
         unless args.keys.empty?
           raise ArgumentError,
@@ -75,13 +76,12 @@ module Activerecord
                 "#{self} should not rescue #{ERRORS_TO_DISALLOW_INSIDE_TRANSACTION.inspect} inside a transaction: #{inside_args.keys.inspect}"
         end
 
-        transaction_args = extract_args(args, TRANSACTION_METHOD_ARG_NAMES)
         if transaction_open
           if transaction_args[REQUIRES_NEW]
             logger.debug("[#{self}.transaction_wrapper] Will start a nested transaction.")
           else
             transaction_args[REQUIRES_NEW] = true
-            logger.warn("[#{self}.transaction_wrapper] Opening a nested transaction. Setting require_new: true")
+            logger.warn("[#{self}.transaction_wrapper] Opening a nested transaction. Setting #{REQUIRES_NEW}: true")
           end
         end
         error_handler_outside_transaction(object: object, transaction_open: transaction_open,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-transactionable
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Peter Boling
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-11-09 00:00:00.000000000 Z
+date: 2021-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -136,6 +136,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: silent_stream
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -248,34 +262,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.21'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.21'
-- !ruby/object:Gem::Dependency
-  name: simplecov-cobertura
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -353,7 +339,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Do ActiveRecord transactions the right way.