gb_dispatch 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff34ac0be45aa71f7e09c89d335546f4aab2619f7ee733259545c86a5d24e995
-  data.tar.gz: 2091aeafb3409669fdafb83758304595fb280e924d93fc93c87941619410fd8c
+  metadata.gz: 1c59ba469fa518ae4155cc6bd0f47054e71015e5e945250cf8db53ee09cb67ad
+  data.tar.gz: 276468d56b40a9aea7753d62196273956e24145a2a0398b8d6c7a3c48c4b7b31
 SHA512:
-  metadata.gz: f18f2688b5818c364a2930017583933e91ef4cd39013b3273e0a25bf27580c72cce19d712ff2ded7d86790a03c1f4e8070f2b7d462b2027d8f9fda2319f4de79
-  data.tar.gz: 8be0d22b75b006dac434bc330224bc507e07a8ea4d8f1a8ade1e8b60bd8b283700b18728a10ed082e393d888f06abddd391bcae34c1bd46b630153342dac5f15
+  metadata.gz: 2da4897ce97fef40cb183aa62cfc742a4e0df4c17a3f538ea8769c85fa1983ac6d4cc08ae715aaec2cb5244b5d2d640478525e125fe1e30ea8da8306a833b78e
+  data.tar.gz: d3943ef7a5a087a2fd5f2a816c09a727ce0b710d202c4eaba3f59f15678ce26dfb5d0e417e6711effefba7a81fbdf405facc767b433914e4ffa0e8fab2e41a77

data/.github/workflows/pull_request.yml

@@ -4,7 +4,6 @@ on:
   - workflow_dispatch
 env:
   RACK_ENV: test
-  ImageOS: ubuntu20
 jobs:
   test:
     name: Run test
@@ -14,36 +13,26 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '2.5', '2.6', '2.7', '3.0' ]
+        ruby: [ '3.2', '3.3', '3.4', '4.0' ]
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v6
       - name: Setup ruby
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-      - name: Cache gems
-        uses: actions/cache@v2
-        with:
-          path: vendor/bundle
-          key: ${{ runner.os }}-gems-${{ matrix.ruby }}-${{ hashFiles('**/Gemfile.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-gems-${{ matrix.ruby }}
       - name: Install gems
         run: |
           gem install bundler
-          bundle install --with development test --deployment --jobs 16
+          bundle config set with 'development test'
+          bundle install
       - name: Runs tests
         run: |
           bundle exec rspec -f j -o rspec_results.json -f p
       - name: RSpec Report
         if: always()
-        uses: SonicGarden/rspec-report-action@v1
+        uses: SonicGarden/rspec-report-action@v6
+        continue-on-error: true
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           json-path: rspec_results.json
-      - name: Simplecov Report
-        uses: aki77/simplecov-report-action@v1
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          failedThreshold: 80

data/Gemfile

@@ -1,11 +1,12 @@
-  source 'https://rubygems.org'
+source 'https://rubygems.org'
 
 # Specify your gem's dependencies in gb_dispatch.gemspec
 gemspec
 
 gem 'concurrent-ruby-ext'
+gem 'rake', '>= 13.2'
 
 group :test do
-  gem 'rspec'
+  gem 'rspec', '~> 3.10'
   gem 'simplecov', :require => false
 end

data/Gemfile.lock

@@ -1,18 +1,18 @@
 PATH
   remote: .
   specs:
-    gb_dispatch (0.1.2)
-      concurrent-ruby (~> 1.0)
+    gb_dispatch (0.1.3)
+      concurrent-ruby (>= 1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    concurrent-ruby (1.1.9)
-    concurrent-ruby-ext (1.1.9)
-      concurrent-ruby (= 1.1.9)
+    concurrent-ruby (1.3.6)
+    concurrent-ruby-ext (1.3.6)
+      concurrent-ruby (= 1.3.6)
     diff-lcs (1.4.4)
     docile (1.4.0)
-    rake (13.0.6)
+    rake (13.3.1)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
@@ -37,12 +37,11 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 2.2)
   concurrent-ruby-ext
   gb_dispatch!
-  rake (~> 13.0)
-  rspec
+  rake (>= 13.2)
+  rspec (~> 3.10)
   simplecov
 
 BUNDLED WITH
-   2.2.30
+  4.0.3

data/gb_dispatch.gemspec

@@ -18,9 +18,5 @@ Gem::Specification.new do |spec|
   spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'concurrent-ruby', '~> 1.0'
-  spec.add_development_dependency 'bundler', '~> 2.2'
-  spec.add_development_dependency 'rake', '~> 13.0'
-  spec.add_development_dependency 'rspec', '~> 3.10'
-  spec.add_development_dependency 'simplecov'
+  spec.add_runtime_dependency 'concurrent-ruby', '>= 1.0'
 end

data/lib/gb_dispatch/queue.rb

@@ -20,27 +20,12 @@ module GBDispatch
     # @return [Object, Exception] returns value of executed block or exception if block execution failed.
     def perform_now(block=nil)
       Thread.current[:name] ||= name
-      if defined?(Rails) && defined?(ActiveRecord::Base)
-        require 'gb_dispatch/active_record_patch'
-        thread_block = ->() do
-          if Rails::VERSION::MAJOR < 5
-            begin
-              ActiveRecord::Base.connection_pool.force_new_connection do
-                block ? block.call : yield
-              end
-            ensure
-              ActiveRecord::Base.clear_active_connections!
-            end
-          else
-            Rails.application.executor.wrap do
-              ActiveRecord::Base.connection_pool.force_new_connection do
-                block ? block.call : yield
-              end
-            end
+      thread_block = ->() do
+        with_rails_executor do
+          with_connection_pool do
+            block ? block.call : yield
           end
         end
-      else
-        thread_block = block ? block : ->() { yield }
       end
       begin
         Runner.execute thread_block, name: name
@@ -56,8 +41,9 @@ module GBDispatch
     # @return [Concurrent::ScheduledTask]
     def perform_after(time, block=nil)
       task = Concurrent::ScheduledTask.new(time) do
-        block = ->(){ yield } unless block
-        self.async.perform_now block
+        self.async.perform_now do
+          block ? block.call : yield
+        end
       end
       task.execute
       task
@@ -66,5 +52,24 @@ module GBDispatch
     def to_s
       self.name.to_s
     end
+
+    private
+
+    def with_connection_pool
+      return yield unless defined?(ActiveRecord::Base)
+
+      require 'gb_dispatch/active_record_patch'
+      ActiveRecord::Base.connection_pool.with_connection do
+        yield
+      end
+    end
+
+    def with_rails_executor
+      return yield unless defined?(Rails) && Rails::VERSION::MAJOR >= 5
+
+      Rails.application.executor.wrap do
+        yield
+      end
+    end
   end
 end

data/lib/gb_dispatch/version.rb

@@ -1,3 +1,3 @@
 module GBDispatch
-  VERSION = '0.1.2'
+  VERSION = '0.1.4'
 end

data/spec/queue_spec.rb

@@ -140,11 +140,77 @@ describe GBDispatch::Queue do
       a = :foo
       queue = GBDispatch::Queue.new(:test)
       expect(ActiveRecord::Base.connection_pool).to receive(:with_connection).and_call_original
-      expect(ActiveRecord::Base).to receive(:clear_active_connections!)
       queue.await.perform_now do
         a = :bar
       end
       expect(a).to eq :bar
     end
   end
-end
+
+  context 'activerecord without rails' do
+    before(:each) do
+      module ActiveRecord
+        class Base
+          class DummyConnectionPool
+            def with_connection
+              yield
+            end
+
+            def force_new_connection
+              with_connection do
+                yield
+              end
+            end
+          end
+
+          def self.connection_pool
+            @pool ||= DummyConnectionPool.new
+          end
+
+          def self.clear_active_connections!
+            true
+          end
+        end
+      end
+    end
+
+    after(:each) do
+      begin
+        Kernel.send :remove_const, 'ActiveRecord'
+      rescue
+        nil
+      end
+      begin
+        Object.send :remove_const, 'ActiveRecord'
+      rescue
+        nil
+      end
+    end
+
+    it 'should wrap execution with connection pool when activerecord is present without rails' do
+      a = :foo
+      queue = GBDispatch::Queue.new(:test)
+      expect(ActiveRecord::Base.connection_pool).to receive(:with_connection).and_call_original
+      queue.await.perform_now do
+        a = :bar
+      end
+      expect(a).to eq :bar
+    end
+
+    it 'should execute lambda and wrap with connection pool' do
+      a = :foo
+      queue = GBDispatch::Queue.new(:test)
+      expect(ActiveRecord::Base.connection_pool).to receive(:with_connection).and_call_original
+      queue.await.perform_now ->() { a = :bar }
+      expect(a).to eq :bar
+    end
+
+    it 'should return exception object on failure without rails' do
+      queue = GBDispatch::Queue.new(:test)
+      a = queue.perform_now ->() do
+        raise StandardError.new 'Test error'
+      end
+      expect(a).to be_kind_of StandardError
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -17,7 +17,6 @@
 #
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 require 'simplecov'
-require 'ostruct'
 SimpleCov.start do
   add_filter '/spec/'
 end

metadata

@@ -1,85 +1,28 @@
 --- !ruby/object:Gem::Specification
 name: gb_dispatch
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Kacper Kawecki
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-09 00:00:00.000000000 Z
+date: 2026-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.2'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.10'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.10'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  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'
+        version: '1.0'
 description: 'Grand central dispatch (GCD) emulation for ruby. It allows to easily
   run asynchronous code. '
 email:
@@ -119,7 +62,6 @@ homepage: https://github.com/letsbuilders/gb-dispatch
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -134,8 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
-signing_key: 
+rubygems_version: 3.6.2
 specification_version: 4
 summary: GCD emulation for ruby
 test_files: