gb_dispatch 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a862dc8780ad6decbaea35a7f89f8bbda8602ad08d4f877d74b103189ba7970b
-  data.tar.gz: 045b91702a8da368d239966176ba8ea0cd6406a9ee6b27e2f068558e00cc3e9e
+  metadata.gz: ba5c5e7feb6bbcbd32177295f9b4c94445cf3f00fccf2bf526191974b2a9cc44
+  data.tar.gz: 31d741e2c2df908b4ace1ce692ac778922332eb8a661ad744f6a5383e9b9cd8f
 SHA512:
-  metadata.gz: 33e1f4e415014e82a81fb1741579b0916f1210463b399f516d2470354759eaf46e9941ede376385c1549bdf8ed424f9e986aa3e06f0ea7c4919a2af99c36cb10
-  data.tar.gz: ee4846fdaa8187b355077d0086c9a0c209d8d9d0d9b45023e0b03bcc7d1b5da164bcd50236b73b723c9d7b0201b410308e494928d82c7b73a0f8a6b683b78021
+  metadata.gz: e00972fa6b4df1b8a3bc02f3a884ed44ae684d3f473c345939ca58484d4fcc7b58b842f72d4591ffad77dc5bc79480a4c6822d945f7babba9d45919dcd10d481
+  data.tar.gz: 2fa31828e4f3c11b0a81f57c83ce64a0e561f2f3018ab2829f68ac62a9c92419c3da89dd7107984498f4b7de34427a9ff81e3379ed6a8fc60799ec49356523aa

data/.github/workflows/pull_request.yml

@@ -0,0 +1,38 @@
+name: Pull Request check
+on:
+  - pull_request
+  - workflow_dispatch
+env:
+  RACK_ENV: test
+jobs:
+  test:
+    name: Run test
+    runs-on: ubuntu-latest
+    env:
+      SIMPLECOV: json
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [ '3.2', '3.3', '3.4', '4.0' ]
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v6
+      - name: Setup ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - name: Install gems
+        run: |
+          gem install bundler
+          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@v6
+        continue-on-error: true
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          json-path: rspec_results.json

data/CHANGELOG.txt

@@ -1,3 +1,7 @@
+v0.1.2
+    - Update gemspec and build with bundler 2.x
+v0.1.1
+    - Fix bug with logger.
 v0.1.0
     - Added support for rails 5 - fixed deadlock issues.
     - Added force_new_connection method to ActiveRecord connection pool for rails >= 5

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,48 +1,47 @@
 PATH
   remote: .
   specs:
-    gb_dispatch (0.1.1)
-      concurrent-ruby (~> 1.0)
+    gb_dispatch (0.1.3)
+      concurrent-ruby (>= 1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    concurrent-ruby (1.0.5)
-    concurrent-ruby-ext (1.0.5)
-      concurrent-ruby (= 1.0.5)
-    diff-lcs (1.3)
-    docile (1.3.1)
-    json (2.1.0)
-    rake (10.5.0)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+    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.3.1)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
-    simplecov (0.16.1)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.3)
+    simplecov (0.21.2)
       docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.6)
   concurrent-ruby-ext
   gb_dispatch!
-  rake (~> 10.0)
-  rspec
+  rake (>= 13.2)
+  rspec (~> 3.10)
   simplecov
 
 BUNDLED WITH
-   1.16.1
+  4.0.3

data/gb_dispatch.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email = ['kacper@geniebelt.com']
   spec.summary = %q{GCD emulation for ruby}
   spec.description = %q{Grand central dispatch (GCD) emulation for ruby. It allows to easily run asynchronous code. }
-  spec.homepage = 'https://github.com/GenieBelt/gb-dispatch'
+  spec.homepage = 'https://github.com/letsbuilders/gb-dispatch'
   spec.license = 'MIT'
 
   spec.files = `git ls-files -z`.split("\x0")
@@ -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_dependency 'concurrent-ruby', '~> 1.0'
-  spec.add_development_dependency 'bundler', '~> 1.6'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 3.4'
-  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,28 @@ 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'
+      begin
+      ActiveRecord::Base.connection_pool.with_connection do
+        yield
+      end
+      ensure
+        ActiveRecord::Base.clear_active_connections!
+      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.1'
+  VERSION = '0.1.3'
 end

data/spec/queue_spec.rb

@@ -147,4 +147,73 @@ describe GBDispatch::Queue do
       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
+      expect(ActiveRecord::Base).to receive(:clear_active_connections!)
+      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
+      expect(ActiveRecord::Base).to receive(:clear_active_connections!)
+      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.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Kacper Kawecki
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-29 00:00:00.000000000 Z
+date: 2026-03-17 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: '1.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.4'
-- !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:
@@ -88,6 +31,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/pull_request.yml"
 - ".gitignore"
 - ".idea/.name"
 - ".idea/encodings.xml"
@@ -114,11 +58,10 @@ files:
 - spec/queue_spec.rb
 - spec/runner_spec.rb
 - spec/spec_helper.rb
-homepage: https://github.com/GenieBelt/gb-dispatch
+homepage: https://github.com/letsbuilders/gb-dispatch
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -133,9 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.6.2
 specification_version: 4
 summary: GCD emulation for ruby
 test_files: