mongoid-locking 0.1.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d0e6fc6d5ee935327d525147b776e047a02c7a6e5d3333511c7970b9f3134e4
-  data.tar.gz: 82e6e6b8a51e311e8ce893ea90d33b0d484aef129dc8f119b0e3999fcc78e6d4
+  metadata.gz: 1be989a2d87d54412d3eafa95e4aeedb1bf9d0d97d5db712c5fdc190bc4f45ec
+  data.tar.gz: 8fea7cc8a65b2b331f7e692025e3cc0690a686024efb2d5e89528dc8205951cb
 SHA512:
-  metadata.gz: 98a30ae0a41505c9aefe8f9cf5d66e6412952e170c8c82fdfa158a785f5f523784fbdb1b288337430d6215eab72648a02b0789ba4d21b4f70d033b0c6928aa47
-  data.tar.gz: 7ce149336c4e7bff291ab3664af449e5d582e51124abda696e44e578d75745548c74c14361a52765bc8b99f9fd2283e49c2a90f2543772ab3378f92db9cb5255
+  metadata.gz: cac9e7692341645f57ab69863a724fac9773754f7f323bdf0e9c17cf311475a361d45c7495d1fc7db8e6784f71958b157d5f53edabde1dda6c1f569827955d40
+  data.tar.gz: ead4b76df6e9a5b8341bc8f842519f9545cea89ec6ffb00f25d4217881c16a757f85dfacc41f3fb1f571f501d831e7f959bef1c407d0a6be0312c7e74d6ee5c9

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.0"

data/Gemfile.lock

@@ -1,33 +1,35 @@
 PATH
   remote: .
   specs:
-    mongoid-locking (0.1.1)
-      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,10 @@ 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 | Ruby version |
+| -------- | ------- | ------- |
+| 0.1.2 | >= 6.0, < 7.2 | => 2.6 |
+| 1.0.0 | ~> 7.2 | => 3.0 |

data/gemfiles/mongoid7.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.2"

data/lib/mongoid/locking/persistable.rb

@@ -41,6 +41,7 @@ module Mongoid
         doc = embedded? ? _root : self
 
         doc.lock_version = (doc.lock_version || 0) + 1
+        doc.remove_change('lock_version')
       end
 
       def _locking?

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.1"
+    VERSION = "1.0.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.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Rodrigo RA
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-05 00:00:00.000000000 Z
+date: 2023-11-15 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.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: 7.2.0
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -111,7 +111,6 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- gemfiles/mongoid6.gemfile
 - gemfiles/mongoid7.gemfile
 - lib/mongoid/locking.rb
 - lib/mongoid/locking/contextual/atomic.rb
@@ -119,6 +118,7 @@ files:
 - 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 +131,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 +139,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: []

data/gemfiles/mongoid6.gemfile

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