amber_odm 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3fd8519f176d5e86f6ddb8307e77864de6511ee3af28e0f89873bb57a4ac51e7
-  data.tar.gz: 3684de6f1e2f52c1da8b04c55fb47b6e5e13da36fbe3eb843c0929cf5ab49dc6
+  metadata.gz: 81c02da4d649aa4475fb8c412d1c208343a0acca6a4bc36e5441b75531b4043c
+  data.tar.gz: efdf4716b9eed68706e0fae926b173fe9ae3dabeed1d0b89265a3bb2e40c7b1c
 SHA512:
-  metadata.gz: e0fb595ffd51eb627493a777347636200c06713041802d65aa41968140bc0ed361e74e23a0c4d6b73cf8925d2994f4fddcdf52a1fb55541b56572d2912f53da9
-  data.tar.gz: 2f36be5406925f55a1f2329518891982da4263543526c1d01e244d853b30207a555be16201c685eeb8caa8a0e5b1faacb07b79ba094d70f77ee843edac0f98bc
+  metadata.gz: f286e84d6745918f9a57b3ca6024f84d7a78575d722b2ffc227130db74f066b1964cd07c61a1ad3b2a986eb7d8bf9b215d2834d752d9f908fead6cd204a9e14e
+  data.tar.gz: f8c658abd1ff7204eea472803cbe5a2b84ba5c4b9ea5a444317f7403a9f5f651c5f4624a7d2c86854773d4d4710220efb0bd9d76c2a994c5729826480c162509

data/lib/amber_odm/version.rb

@@ -1,3 +1,3 @@
 module AmberODM
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

data/lib/amber_odm.rb

@@ -25,7 +25,7 @@ module AmberODM
   end
 
   class AttrInitializer
-    attr_reader :document
+    attr_reader :_document
 
     def initialize(document)
       self.class.fields.each do |field|
@@ -49,7 +49,7 @@ module AmberODM
     end
 
     def nil?
-      document.nil? || document.empty?
+      _document.nil? || _document.empty?
     end
 
     def self.array_to_h(array)
@@ -67,7 +67,7 @@ module AmberODM
     def to_h
       hash = {}
       known_fields = self.class.fields
-      unknown_fields = document.keys - known_fields
+      unknown_fields = _document.keys - known_fields
       unknown_fields.reject! { |field| field.start_with?('_') }
       known_fields.each do |field|
         value = send(field)
@@ -80,7 +80,7 @@ module AmberODM
         end
       end
       unknown_fields.each do |field|
-        value = document[field]
+        value = _document[field]
         hash[field] = value
       end
 
@@ -90,17 +90,19 @@ module AmberODM
 
   class Document < AttrInitializer
 
-    attr_reader :_id, :_score, :sort
+    attr_reader :_id, :_score, :sort, :_seq_no, :_primary_term
 
     def initialize(document)
       @_id = document&.dig('_id').dup
       @_score = document&.dig('_score').dup
       @sort = document&.dig('sort').dup
+      @_seq_no = document&.dig('_seq_no').dup
+      @_primary_term = document&.dig('_primary_term').dup
       self.class.fields.each do |field|
         document_value = document&.dig('_source')&.dig(field).dup
-        send("#{field}=", document_value) unless document_value.nil?
+        send("#{field}=", document_value)
       end
-      instance_variable_set('@document', document)
+      instance_variable_set('@_document', document)
     end
 
     # @return [Symbol, nil]
@@ -113,6 +115,10 @@ module AmberODM
       nil
     end
 
+    def self.use_seq_verification
+      true
+    end
+
     # @return [Elasticsearch::Client] The ES client
     def self.client
       Connector.database(db_name&.to_sym)
@@ -129,7 +135,6 @@ module AmberODM
     # @return [Array<self>] The documents
     def search(query, _source: [], sort: [], search_after: [], size: 0)
       # self.class.validate_fields_from_stages(query, _source, sort)
-
       if _source.empty?
         _source = self.class.fields
       end
@@ -139,6 +144,7 @@ module AmberODM
       end
 
       body = { _source: _source, query: query }
+      body[:seq_no_primary_term] = true if self.class.use_seq_verification
       body[:sort] = sort unless sort.empty?
       body[:search_after] = search_after unless search_after.empty?
       body[:size] = size unless size.zero?
@@ -174,13 +180,18 @@ module AmberODM
         end
       end
 
-      {
+      update_hash = {
         update: {
           _index: self.class.index_name&.to_s,
           _id: _id,
           data: { doc: aggregation_hash }
         }
       }
+      if use_seq_verification
+        update_hash[:update][:if_seq_no] = _seq_no
+        update_hash[:update][:if_primary_term] = _primary_term
+      end
+      update_hash
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: amber_odm
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - mikael
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-01-28 00:00:00.000000000 Z
+date: 2023-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -145,8 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.4.1
 signing_key: 
 specification_version: 4
 summary: ElasticSearch ODM