activerecord_dynamic_scope 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6eb64158792856027c2ea947644754e8fd7c32d162385208149c62fd0c87494e
-  data.tar.gz: 3b635b095e6f35de9fbd58c581b958020fd9605a1cf2dee07e8065a34ab2c7bb
+  metadata.gz: 58669ddbcf6468bf56edc3324683ffe9750773e48bc17f1292046dcf4b666b32
+  data.tar.gz: 38dfde30cdd440f962bce2e39b5eb7590ae83678ba8494a0947d4061059bbd0c
 SHA512:
-  metadata.gz: '0199ce1fe872c4ea92af29095175f2e74029f247437cbd31176905cf1ccd9fbc1e4f9553c3efa8a79a9833fefc448cd1405d1f03ca0c4c4a90ff43a1dc86f8ba'
-  data.tar.gz: 7b846780182438e27a4ce9c6fae6ee6adecbcf5c456c1afdef6abc823efd3662318af7471d8c4ce020a346620cca1d882eca3bf21941225a631dc5f02ada7150
+  metadata.gz: 0a02b3153765f18b05fa3a230d692949b40c2b8738bfe72ef313c782658aa16faac3cb6b02056853fe09246dc244d96d2c7a6196585695ad14f40e4944c97ff9
+  data.tar.gz: 1b428d850a43542dd84e89e5f6ab5eb2b1ffd7cb0282be329c2ffcb08a57334e9fbe5c96b56c0ec12e71e43118cf289aab94bea8f1932650555b5b1306ecd74d

data/.github/workflows/ci.yml

@@ -4,7 +4,7 @@ on: [push, pull_request]
 
 jobs:
   test:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     services:
       postgres:
         image: postgres:15
@@ -48,7 +48,7 @@ jobs:
       BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v7
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 1.2.0
+
+* Add `with!` and `without!` for unsafe dynamic scope switching.
+* Support both array and variadic arguments for `without` method.
+
 ## 1.1.0
 
 * Drop suupport for ruby <= 2.7, rails <= 6.1.

data/gemfiles/rails70.gemfile

@@ -14,4 +14,8 @@ if RUBY_VERSION >= "3.4"
   gem "mutex_m"
 end
 
+if RUBY_VERSION >= "4.0"
+  gem "tsort"
+end
+
 gemspec path: "../"

data/lib/activerecord_dynamic_scope/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveRecordDynamicScope
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

data/lib/activerecord_dynamic_scope.rb

@@ -22,12 +22,20 @@ module ActiveRecordDynamicScope
       Thread.current[KEY] = old
     end
 
-    def without(keys)
+    def without(*keys)
       old = Thread.current[KEY]
-      Thread.current[KEY] = Thread.current[KEY].to_h.except(keys)
+      Thread.current[KEY] = Thread.current[KEY].to_h.except(*keys.flatten)
       yield
     ensure
       Thread.current[KEY] = old
     end
+
+    def with!(hash = {})
+      Thread.current[KEY] = Thread.current[KEY].to_h.merge(hash)
+    end
+
+    def without!(*keys)
+      Thread.current[KEY] = Thread.current[KEY].to_h.except(*keys.flatten)
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord_dynamic_scope
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Yoshikazu Kaneta
@@ -107,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.10
 specification_version: 4
 summary: Handling dynamic scope for ActiveRecord.
 test_files: []