sidekiq-activerecord-shard 0.1.0 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2e44ce2e8eb14ffe2a5d28c3e09ded3aab7e90b113be16e9599c483e24880c6
-  data.tar.gz: '08cc893a7882520acd9a57e5d71e6166e635da77ca6c5e305e2789cf689c0a34'
+  metadata.gz: e5b2f3dd951bd57abc6d8c9751398ca0d1ce7463d9349afc3471bb3d9f1314d4
+  data.tar.gz: a2669c8431a5cb6c45bccb44f79b8c9efecbef1ed5e90e28c8b6f3551b499484
 SHA512:
-  metadata.gz: 6073afb41c1ff90745b5084e2a7482586c0fd7262d2152c42957635778cfdfd48fe5c343ebea5d69af721879d90f0a53923e7d8e58085c0d9ff61672a2c0075e
-  data.tar.gz: 0ee0dd719e024ca5559e1b8ce70159c806775b7ea4f9ae7851874990857e379aa54c10018a79b69c28d9fc007e98f797f61c6d4a602b1569048f235e0af5dee4
+  metadata.gz: 903d26936d8030a9a80308dd4c4b7eb135f284acfe08d853640d8a11c7b5895eaa7ce16033e1d80cb45dd38edff388166fc5605cf65b3a0293793326575120b3
+  data.tar.gz: 6bf6bdc902d59eebbc320ae7b84f1086a861c2786aa230664e951b52247dd5f7b88acc93b1c62ba50176d38d477941819bae4ee06e1500dc5001a8a62adeaf88

data/README.md

@@ -2,6 +2,8 @@
 
 A Sidekiq middleware for supports ActiveRecord Shard with [ActiveSupport:CurrentAttribute](https://api.rubyonrails.org/classes/ActiveSupport/CurrentAttributes.html).
 
+> NOTE: This gem can work with sidekiq-cron or other schedulers, because when Schedule perform a job, it can't know the shard name.
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -23,10 +25,10 @@ Add follow code into `config/initializers/sidekiq-activerecord-shard.rb`:
 SidekiqActiveRecordShard.configure do
   self.selected_shard = -> do
     case Current.tenant_id
-    when "company1"
-      :company1
+    when "other"
+      :other
     else
-      :default
+      :primary
     end
   end
 end
@@ -52,6 +54,20 @@ class ApplicationController < ActionController::Base
 end
 ```
 
+### Perform Job by set shared
+
+Some times, you want to perform a job without Request context, or start Job in schedulers.
+
+Now use can use `set(shard: "hard_name")` to set shared in directly.
+
+```rb
+# Call job with "other" shard db
+MyJob.set(shard: "other").perform_later
+
+# Call job with "primary" shard db
+MyJob.set(shard: "primary").perform_later
+```
+
 ## Contributing
 
 Contribution directions go here.

data/lib/sidekiq-activerecord-shard/middleware.rb

@@ -2,11 +2,12 @@ require "sidekiq"
 
 module SidekiqActiveRecordShard
   class Client
-    include ::Sidekiq::ClientMiddleware
+    include Sidekiq::ClientMiddleware
 
     def call(_jobclass, job, _queue, _redis)
       # Store shard value in Job arguments
-      job["_active_record_shard"] = SidekiqActiveRecordShard.selected_shard.call
+      job["shard"] ||= SidekiqActiveRecordShard.config.selected_shard.call
+
       yield
     end
   end
@@ -14,12 +15,16 @@ module SidekiqActiveRecordShard
   class Server
     include Sidekiq::ServerMiddleware
     def call(_jobclass, job, _queue, &block)
-      set_shard(job["_active_record_shard"], &block)
+      if job["shard"].nil?
+        yield
+      else
+        set_shard(job["shard"], &block)
+      end
     end
 
     # Inspired by ActiveRecord::Middleware::ShardSelector
     # https://github.com/rails/rails/blob/v7.0.3/activerecord/lib/active_record/middleware/shard_selector.rb#L54
-    def set_shard(shared, &block)
+    def set_shard(shard, &block)
       options = Rails.application.config.active_record.shard_selector
 
       ActiveRecord::Base.connected_to(shard: shard.to_sym) do

data/lib/sidekiq-activerecord-shard/version.rb

@@ -1,3 +1,3 @@
 module SidekiqActiveRecordShard
-  VERSION = "0.1.0"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-activerecord-shard
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.3
 platform: ruby
 authors:
 - Jason Lee