gouda 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0fa853c78222eb23897ccb31ed465fc231aa5894641fe0d1991ade90a5e3fc8d
-  data.tar.gz: e9680b441d3fe9c3da7fadf50272c033db712296104870d016b278da2c1d92bd
+  metadata.gz: cbebec9ae881152e66d8a8e763d74e2314c6694cc46a1b547323bb4fe01fd505
+  data.tar.gz: f9836ba9594cf2473485efbe6be8dd6b001e0e514315cb84170a62d525adbaf3
 SHA512:
-  metadata.gz: 9a64544cd45d14400ab949a848e0325ee5d5305d648f7f38239279f93e1f8d2d32dac368708317aafbf470b48e16f88a0ffe4bad6890798ef53adea0566da5f6
-  data.tar.gz: e2140d4da50c4afe8edadd51bb3049b60935e4c0273d235dcb1988efa2900362ea81451a58df04ba3f4db58209380ea9a58ccedd42972806bd5be2cd9f19d7d4
+  metadata.gz: 2bf05ef7dcfe8cc682f54da18f8ad8a415f5db3f103928188ad04ab714f4a2799b4998b25c5d53432776d4f913e22fe0a761bd1fe11ea2eb17763f89201cb809
+  data.tar.gz: 636a2aa356b4fed48dece844dec2f26d46a430d6e4a0d956c56d5c5121d30f8d3fb8f87174b82e4d7ab6a58f3e0bcd99d3e07c18c631390cc6233b8cac2d48ba

data/.ruby-version

@@ -1 +1 @@
-3.3.1
+3.3.3

data/CHANGELOG.md

@@ -11,3 +11,15 @@
 ## [0.1.2] - 2023-06-11
 
 - Updated readme and method renaming in Scheduler
+
+## [0.1.3] - 2023-06-11
+
+- Allow the Rails app to boot even if there is no database yet
+
+## [0.1.4] - 2023-06-14
+
+- Rescue NoDatabaseError at scheduler update.
+- Include tests in gem, for sake of easier debugging.
+- Reduce logging in local test runs.
+- Bump local ruby version to 3.3.3
+

data/gouda.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.metadata["changelog_uri"] = "https://github.com/cheddar-me/gouda/CHANGELOG.md"
 
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{\A(?:test|spec|features)/}) }
+    `git ls-files -z`.split("\x0")
   end
 
   spec.add_dependency "activerecord", "~> 7"

data/lib/gouda/railtie.rb

@@ -52,7 +52,15 @@ module Gouda
       end
 
       Gouda::Scheduler.build_scheduler_entries_list!
-      Gouda::Scheduler.upsert_workloads_from_entries_list!
+      begin
+        Gouda::Scheduler.upsert_workloads_from_entries_list!
+      rescue ActiveRecord::NoDatabaseError
+        # Do nothing. On a freshly checked-out Rails app, running even unrelated Rails tasks
+        # (such as asset compilation) - or, more importantly, initial db:create -
+        # will cause a NoDatabaseError, as this is a chicken-and-egg problem. That error
+        # is safe to ignore in this instance - we should let the outer task proceed,
+        # because if there is no database we should allow it to get created.
+      end
     end
   end
 end

data/lib/gouda/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Gouda
-  VERSION = "0.1.2"
+  VERSION = "0.1.4"
 end

data/test/gouda/concurrency_extension_test.rb

@@ -0,0 +1,160 @@
+# frozen_string_literal: true
+
+require "gouda/test_helper"
+
+class GoudaConcurrencyExtensionTest < ActiveSupport::TestCase
+  include AssertHelper
+  class TestJobWithoutConcurrency < ActiveJob::Base
+    self.queue_adapter = Gouda::Adapter.new
+  end
+
+  class TestJobWithPerformConcurrency < ActiveJob::Base
+    self.queue_adapter = Gouda::Adapter.new
+    include Gouda::ActiveJobExtensions::Concurrency
+    gouda_control_concurrency_with(perform_limit: 1)
+
+    def perform(*args)
+    end
+  end
+
+  setup do
+    @adapter ||= Gouda::Adapter.new
+    Gouda::Railtie.initializers.each(&:run)
+  end
+
+  test "gouda_control_concurrency_with with just perform_limit sets a perform concurrency key and no enqueue concurrency key" do
+    job = TestJobWithPerformConcurrency.new
+    assert_nil job.enqueue_concurrency_key
+    assert job.execution_concurrency_key
+  end
+
+  test "gouda_control_concurrency_with with just perform_limit makes the perform concurrency key dependent on job params" do
+    job1 = TestJobWithPerformConcurrency.new(1, 2, :something)
+    assert job1.execution_concurrency_key
+
+    job2 = TestJobWithPerformConcurrency.new(1, 2, :something)
+    assert_equal job2.execution_concurrency_key, job1.execution_concurrency_key
+
+    job3 = TestJobWithPerformConcurrency.new(1, 2, :something_else)
+    refute_equal job3.execution_concurrency_key, job1.execution_concurrency_key
+  end
+
+  class TestJobWithCommonConcurrency < ActiveJob::Base
+    self.queue_adapter = Gouda::Adapter.new
+    include Gouda::ActiveJobExtensions::Concurrency
+    gouda_control_concurrency_with(total_limit: 1)
+
+    def perform(*args)
+    end
+  end
+
+  test "gouda_control_concurrency_with with total_limit sets a perform concurrency key and an enqueue concurrency key" do
+    job = TestJobWithCommonConcurrency.new
+    assert job.enqueue_concurrency_key
+    assert job.execution_concurrency_key
+  end
+
+  test "gouda_control_concurrency_with with total_limit makes the perform concurrency key dependent on job params" do
+    job1 = TestJobWithCommonConcurrency.new(1, 2, :something)
+    assert job1.execution_concurrency_key
+
+    job2 = TestJobWithCommonConcurrency.new(1, 2, :something)
+    assert_equal job2.execution_concurrency_key, job1.execution_concurrency_key
+
+    job3 = TestJobWithCommonConcurrency.new(1, 2, :something_else)
+    refute_equal job3.execution_concurrency_key, job1.execution_concurrency_key
+  end
+
+  test "gouda_control_concurrency_with with total_limit makes the enqueue concurrency key dependent on job params" do
+    job1 = TestJobWithCommonConcurrency.new(1, 2, :something)
+    assert job1.enqueue_concurrency_key
+
+    job2 = TestJobWithCommonConcurrency.new(1, 2, :something)
+    assert_equal job2.enqueue_concurrency_key, job1.enqueue_concurrency_key
+
+    job3 = TestJobWithCommonConcurrency.new(1, 2, :something_else)
+    refute_equal job3.enqueue_concurrency_key, job1.enqueue_concurrency_key
+  end
+
+  class TestJobWithEnqueueConcurrency < ActiveJob::Base
+    self.queue_adapter = Gouda::Adapter.new
+    include Gouda::ActiveJobExtensions::Concurrency
+    gouda_control_concurrency_with(enqueue_limit: 1)
+
+    def perform(*args)
+    end
+  end
+
+  test "gouda_control_concurrency_with with enqueue_limit sets a perform concurrency key and an enqueue concurrency key" do
+    job = TestJobWithEnqueueConcurrency.new
+    assert job.enqueue_concurrency_key
+    assert_nil job.execution_concurrency_key
+  end
+
+  test "gouda_control_concurrency_with with enqueue_limit makes the enqueue concurrency key dependent on job params" do
+    job1 = TestJobWithEnqueueConcurrency.new(1, 2, :something)
+    assert job1.enqueue_concurrency_key
+
+    job2 = TestJobWithEnqueueConcurrency.new(1, 2, :something)
+    assert_equal job2.enqueue_concurrency_key, job1.enqueue_concurrency_key
+
+    job3 = TestJobWithEnqueueConcurrency.new(1, 2, :something_else)
+    refute_equal job3.enqueue_concurrency_key, job1.enqueue_concurrency_key
+  end
+
+  class TestJobWithCustomKey < ActiveJob::Base
+    self.queue_adapter = Gouda::Adapter.new
+    include Gouda::ActiveJobExtensions::Concurrency
+    gouda_control_concurrency_with total_limit: 1, key: "42"
+  end
+
+  test "can use an arbitrary string as the custom key" do
+    job = TestJobWithCustomKey.new
+    assert_equal "42", job.enqueue_concurrency_key
+    assert_equal "42", job.execution_concurrency_key
+  end
+
+  class TestJobWithCustomKeyProc < ActiveJob::Base
+    self.queue_adapter = Gouda::Adapter.new
+    include Gouda::ActiveJobExtensions::Concurrency
+    gouda_control_concurrency_with total_limit: 1, key: -> { @ivar }
+
+    def initialize(...)
+      super
+      @ivar = "123"
+    end
+  end
+
+  test "can use a proc that gets instance_exec'd as the custom key" do
+    job = TestJobWithCustomKeyProc.new
+    assert_equal "123", job.enqueue_concurrency_key
+    assert_equal "123", job.execution_concurrency_key
+  end
+
+  class TestJobWithWithUnconfiguredConcurrency < ActiveJob::Base
+    self.queue_adapter = Gouda::Adapter.new
+    include Gouda::ActiveJobExtensions::Concurrency
+  end
+
+  test "validates arguments" do
+    assert_raises ArgumentError do
+      TestJobWithWithUnconfiguredConcurrency.gouda_control_concurrency_with
+    end
+
+    assert_raises ArgumentError do
+      TestJobWithWithUnconfiguredConcurrency.gouda_control_concurrency_with total_limit: 2
+    end
+
+    assert_raises ArgumentError do
+      TestJobWithWithUnconfiguredConcurrency.gouda_control_concurrency_with perform_limit: 2
+    end
+
+    assert_raises ArgumentError do
+      TestJobWithWithUnconfiguredConcurrency.gouda_control_concurrency_with enqueue_limit: 2
+    end
+
+    assert_raises ArgumentError do
+      TestJobWithWithUnconfiguredConcurrency.gouda_control_concurrency_with total_limit: 2, bollocks: 4
+    end
+  end
+end