mongoid-locking 0.1.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2c6191141885a2f6a15d09a8ab111240dc9fea9a3f7a88328204606fdea66ec
-  data.tar.gz: fa595b089cda173fdcc4c2597f027d8db904aa79db716d269e64db8aaf99d240
+  metadata.gz: d6150316b83b781d4f26eff62a82a593aff8f7a7a81791ae7b003801e9cc2f44
+  data.tar.gz: 57a84b81757d94e4d4bfaceaea0f98f8437bd61bf7832be9e030fcb37fd5146c
 SHA512:
-  metadata.gz: 40608a2e608a2200346b7aa83a983dbe91339d68403e60c5271ab71bb5740d5828028f13ae60898a9d858de4a0735fc2e500f158f272216946b92b35c58490bb
-  data.tar.gz: 1a2a8ae267745644d35b755c99ad820f7ecbc69df4c468fc851efaac76ba589085a62a2085da2be56160077fdcfcfc010601d88cb51d19a97585b4b6bfade44c
+  metadata.gz: 743b07e99b92af64d0d209580f2a5851c44800a51c7c33e794cc655661abfeb86c65e1f8df66cd7eb42197466020cae038c85dd9dfd2656b7e187204cddcd3a1
+  data.tar.gz: c14fb5d640c3bf4b6a4edfab3929aae1244a13f62ebe40641bd5a7a354357203f8f7e8add1e396ca07917d57cc3f4fd9af3ea3f3b5d589c3ceef17fa595de043

data/.tool-versions

@@ -1 +1 @@
-ruby 2.6.7
+ruby 3.1.4

data/Gemfile

@@ -5,4 +5,4 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in mongoid-locking.gemspec
 gemspec
 
-gem "mongoid", "~> 6.0"
+gem "mongoid", "~> 7.2"

data/Gemfile.lock

@@ -1,33 +1,35 @@
 PATH
   remote: .
   specs:
-    mongoid-locking (0.1.2)
-      mongoid (> 6.0)
+    mongoid-locking (1.0.0)
+      mongoid (~> 7.2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.2.8.1)
-      activesupport (= 5.2.8.1)
-    activesupport (5.2.8.1)
+    activemodel (6.1.7.6)
+      activesupport (= 6.1.7.6)
+    activesupport (6.1.7.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     ast (2.4.2)
     bson (4.15.0)
     byebug (11.1.3)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.2)
     diff-lcs (1.5.0)
-    i18n (1.12.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     json (2.6.2)
-    minitest (5.16.3)
-    mongo (2.18.1)
+    minitest (5.20.0)
+    mongo (2.19.2)
       bson (>= 4.14.1, < 5.0.0)
-    mongoid (6.4.8)
-      activemodel (>= 5.1, < 6.0.0)
-      mongo (>= 2.5.1, < 3.0.0)
+    mongoid (7.2.6)
+      activemodel (>= 5.1, < 6.2)
+      mongo (>= 2.10.5, < 3.0.0)
+      ruby2_keywords (~> 0.0.5)
     parallel (1.22.1)
     parser (3.1.2.1)
       ast (~> 2.4.1)
@@ -63,17 +65,19 @@ GEM
     rubocop-rspec (2.12.1)
       rubocop (~> 1.31)
     ruby-progressbar (1.11.0)
-    thread_safe (0.3.6)
-    tzinfo (1.2.10)
-      thread_safe (~> 0.1)
+    ruby2_keywords (0.0.5)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
     unicode-display_width (2.2.0)
+    zeitwerk (2.6.12)
 
 PLATFORMS
   arm64-darwin-21
+  arm64-darwin-22
 
 DEPENDENCIES
   byebug
-  mongoid (~> 6.0)
+  mongoid (~> 7.2.0)
   mongoid-locking!
   rake (~> 13.0)
   rspec

data/README.md

@@ -55,3 +55,11 @@ The gem is available as open source under the terms of the [MIT License](https:/
 ## Code of Conduct
 
 Everyone interacting in the Mongoid::Locking project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/fullhealthmedical/fhweb/mongoid-locking/blob/master/CODE_OF_CONDUCT.md).
+
+## Version Compability
+
+| Gem version | Mongoid version |
+| -------- | ------- |
+| 0.1.2 | >= 6.0, < 7.2 |
+| 1.0.0 | ~> 7.2.0 |
+| 1.1.0 | ~> 7.2 |

data/gemfiles/{mongoid6.gemfile → mongoid7_2.gemfile}

@@ -3,4 +3,4 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in mongoid-locking.gemspec
 gemspec path: ".."
 
-gem "mongoid", "~> 6.0"
+gem "mongoid", "~> 7.2.0"

data/gemfiles/{mongoid7.gemfile → mongoid7_3.gemfile}

@@ -3,4 +3,4 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in mongoid-locking.gemspec
 gemspec path: ".."
 
-gem "mongoid", "~> 7.0"
+gem "mongoid", "~> 7.3.0"

data/lib/mongoid/locking/reloadable.rb

@@ -0,0 +1,40 @@
+# encoding: utf-8
+module Mongoid
+  module Locking
+    # This module handles reloading behaviour of documents.
+    #
+    # @since 4.0.0
+    module Reloadable
+
+      # Reloads the +Document+ attributes from the database. If the document has
+      # not been saved then an error will get raised if the configuration option
+      # was set. This can reload root documents or embedded documents.
+      #
+      # @example Reload the document.
+      #   person.reload
+      #
+      # @raise [ Errors::DocumentNotFound ] If the document was deleted.
+      #
+      # @return [ Document ] The document, reloaded.
+
+      private
+
+      # Reload the root document.
+      #
+      # @example Reload the document.
+      #   document.reload_root_document
+      #
+      # @return [ Hash ] The reloaded attributes.
+      #
+      # @since 2.3.2
+      # Starting from Mongoid version 7.2, the reload method now utilizes the
+      # `atomic_selector` to locate the current document.
+      #
+      # As the lock_version can be disregarded during a reload, this method
+      # has been overridden to bypass the lock version.
+      def reload_root_document
+        {}.merge(collection.find(atomic_selector(skip_lock_version: true)).read(mode: :primary).first || {})
+      end
+    end
+  end
+end

data/lib/mongoid/locking/selectable.rb

@@ -5,13 +5,25 @@ module Mongoid
       # its result.
       #
       # It is required when saving the same object multiple times in a row.
-      def atomic_selector
-        embedded? ? embedded_atomic_selector : root_atomic_selector
+      def atomic_selector(skip_lock_version: false)
+        embedded? ? embedded_atomic_selector : root_atomic_selector(skip_lock_version: skip_lock_version)
       end
 
-      # https://github.com/mongodb/mongoid/blob/e03120a56894bc773dcf1e51209eb2f3e6f2b61f/lib/mongoid/selectable.rb#L55
-      def root_atomic_selector
-        { "_id" => id, "lock_version" => lock_version }
+      # Get the atomic selector for a root document.
+      #
+      # @api private
+      #
+      # @example Get the root atomic selector.
+      #   document.root_atomic_selector
+      #
+      # @return [ Hash ] The root document selector.
+      #
+      # @since 4.0.0
+      # https://github.com/mongodb/mongoid/blob/7.2-stable/lib/mongoid/selectable.rb#L57
+      def root_atomic_selector(skip_lock_version: false)
+        return { "_id" => id, "lock_version" => lock_version }.merge!(shard_key_selector) unless skip_lock_version
+
+        { "_id" => id }.merge!(shard_key_selector)
       end
     end
   end

data/lib/mongoid/locking/version.rb

@@ -2,6 +2,6 @@
 
 module Mongoid
   module Locking
-    VERSION = "0.1.2"
+    VERSION = "1.1.0"
   end
 end

data/lib/mongoid/locking.rb

@@ -4,6 +4,7 @@ require_relative "stale_object_error"
 require_relative "locking/contextual/atomic"
 require_relative "locking/contextual/mongo"
 require_relative "locking/selectable"
+require_relative "locking/reloadable"
 require_relative "locking/persistable/creatable"
 require_relative "locking/persistable/updatable"
 require_relative "locking/persistable"
@@ -19,6 +20,7 @@ module Mongoid
       base.before_create { self.lock_version = 0 }
 
       base.include Mongoid::Locking::Selectable
+      base.include Mongoid::Locking::Reloadable
       # base.include Mongoid::Locking::Reloadable if Mongoid::VERSION >= "7"
     end
   end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-locking
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Rodrigo RA
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-05 00:00:00.000000000 Z
+date: 2023-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.2'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -111,14 +111,15 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- gemfiles/mongoid6.gemfile
-- gemfiles/mongoid7.gemfile
+- gemfiles/mongoid7_2.gemfile
+- gemfiles/mongoid7_3.gemfile
 - lib/mongoid/locking.rb
 - lib/mongoid/locking/contextual/atomic.rb
 - lib/mongoid/locking/contextual/mongo.rb
 - lib/mongoid/locking/persistable.rb
 - lib/mongoid/locking/persistable/creatable.rb
 - lib/mongoid/locking/persistable/updatable.rb
+- lib/mongoid/locking/reloadable.rb
 - lib/mongoid/locking/selectable.rb
 - lib/mongoid/locking/version.rb
 - lib/mongoid/stale_object_error.rb
@@ -131,7 +132,7 @@ metadata:
   homepage_uri: https://github.com/fullhealthmedical/mongoid-locking
   source_code_uri: https://github.com/fullhealthmedical/mongoid-locking
   changelog_uri: https://github.com/fullhealthmedical/blob/main/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -139,15 +140,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
-signing_key: 
+rubygems_version: 3.3.26
+signing_key:
 specification_version: 4
 summary: Implements optimistic locking for Mongoid objects.
 test_files: []