esse 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0785bd8298d822b9778cbbbd98e8ae6b97063d0c18e11da57266e6cb8129c08a'
-  data.tar.gz: ea927277c5d497bf37127f4c0467253d6163cbc2e011cee9af2095a38162e339
+  metadata.gz: a31d2a1c181dccd9c2acd7256d958010e7c636016b1d5a267597f7aec9ed3334
+  data.tar.gz: cdb390a10b0492833a9360d4fd39df0c18df114a44b37554cba1dd39d229f75b
 SHA512:
-  metadata.gz: 11082f005792f640e9e731ae7b0709370b86c6d151773b8c514f9af87f764b0ba53dee2cf036c6f71168488993403d54b24e921ec75031a91c75f6580de239e8
-  data.tar.gz: 6f5d2ca3c8b9c2d2125560fcf9d1406210779743b28f0e58708e84dcd31ccad063d31b40f9ae9e5d4f1a6fdc8445e3897226db479fb5dfa96717adab09e2d0a9
+  metadata.gz: 59ae5dcafd8998c69e5705910b119f5f9d1333899a4320b8f7afa4c5782aa435d820dde222726de111cee00c6d3b4bbed9d6fdd18dac6a6f740cf64138b70d53
+  data.tar.gz: 84b876eaec5b090718e2d265dd5d9456c5dfaeedafdae6e9361ac790de91eab0ba46b9ceabee3c5e8a891c5027ff3ac8443217554219f8dce5f52c853912989c

data/lib/esse/backend/index/reset.rb

@@ -19,10 +19,10 @@ module Esse
           suffix ||= Esse.timestamp
           suffix = Esse.timestamp while exist?(suffix: suffix).tap { |exist| existing << suffix if exist }
 
-          create_index!(suffix: suffix, **options)
-          import!(suffix: suffix, **options)
+          create_index!(**options, suffix: suffix, alias: false)
+          import!(**options, suffix: suffix)
           update_aliases!(suffix: suffix)
-          existing.each { |_s| delete_index!(suffix: suffix, **options) }
+          existing.each { |_s| delete_index!(**options, suffix: suffix) }
           true
         end
       end

data/lib/esse/backend/index_type/documents.rb

@@ -11,7 +11,7 @@ module Esse
         # @option [Hash] :context The collection context. This value will be passed as argument to the collection
         #   May be SQL condition or any other filter you have defined on the collection.
         def import(context: {}, suffix: nil, **options)
-          each_serialized_batch(context || {}) do |batch|
+          each_serialized_batch(**(context || {})) do |batch|
             bulk(index: batch, suffix: suffix, **options)
           end
         end

data/lib/esse/cli/templates/index.rb.erb

@@ -22,8 +22,8 @@ class <%= @index_name %> < <%= @base_class %>
   #   collection Collections::DocumentCollection
   #
   # but you can also use block definition style:
-  #   collection do |_context, &block|
-  #     block.call [{ title: 'foo' }, { title: 'bar' }], context
+  #   collection do |**context, &block|
+  #     block.call [{ title: 'foo' }, { title: 'bar' }], extra: 'info'
   #   end
   #
   # Serializer block or class yielder should be called with an array of objects.
@@ -78,7 +78,7 @@ class <%= @index_name %> < <%= @base_class %>
     # Useful for eager loading data from database or any other repository. Below is an example of a rails like
     # application could load using activerecord.
     #
-    #   collection do |context, &block|
+    #   collection do |**context, &block|
     #     <%= type.camelize %>.where(context[:conditions]).find_in_batches(batch_size: 5000) do |batch|
     #       block.call batch, context
     #     end

data/lib/esse/object_document_mapper.rb

@@ -86,10 +86,10 @@ module Esse
     # @param args [*Object] Any argument is allowed here. The collection will be called with same arguments.
     #   And the serializer will be initialized with those arguments too.
     # @yield [Array, *Object] serialized collection and method arguments
-    def each_serialized_batch(*args, **kwargs, &block)
-      each_batch(*args, **kwargs) do |batch|
-        entries = batch.map { |entry| serialize(entry, *args, **kwargs) }.compact
-        block.call(entries, *args, **kwargs)
+    def each_serialized_batch(**kwargs, &block)
+      each_batch(**kwargs) do |*batch, **collection_kwargs|
+        entries = batch.flatten.map { |entry| serialize(entry, **collection_kwargs) }.compact
+        block.call(entries, **kwargs)
       end
     end
 
@@ -99,9 +99,9 @@ module Esse
     #    GeosIndex.documents(id: 1).first
     #
     # @return [Enumerator] All serialized entries
-    def documents(*args, **kargs)
+    def documents(**kwargs)
       Enumerator.new do |yielder|
-        each_serialized_batch(*args, **kargs) do |documents, *_inner_args, **_inner_kargs|
+        each_serialized_batch(**kwargs) do |documents, **_collection_kargs|
           documents.each { |document| yielder.yield(document) }
         end
       end

data/lib/esse/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Esse
-  VERSION = '0.1.3'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: esse
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Marcos G. Zimmermann
 autorequire: 
 bindir: exec
 cert_chain: []
-date: 2022-03-21 00:00:00.000000000 Z
+date: 2022-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elasticsearch
@@ -260,7 +260,6 @@ files:
 - lib/esse/cluster.rb
 - lib/esse/config.rb
 - lib/esse/core.rb
-- lib/esse/document.rb
 - lib/esse/errors.rb
 - lib/esse/events.rb
 - lib/esse/events/bus.rb

data/lib/esse/document.rb

@@ -1,43 +0,0 @@
-# frozen_string_literal: true
-
-module Esse
-  # @abstract
-  #
-  # A document is a class that represents a single JSON document to be indexed
-  class Document
-    def initialize(entry, **context)
-      @source = item
-      @context = context
-    end
-
-    # Returns the Elasticsearch `_id` for the document.
-    #
-    # @return [String, Number] The Elasticsearch `_id` for the document
-    # @abstract
-    def id
-      raise NotImplementedError
-    end
-
-    # Returns the Elasticsearch `_routing` for the item. Elasticsearch
-    # default if this value is not provided is to use the `_id`.
-    # Setting this value to `false` or `nil` will omit sending the
-    # meta-field with your requests and use default routing behaviour.
-    #
-    # @return [String, NilClass, Boolean] The Elasticsearch `_routing` for the document
-    # @abstract
-    def routing
-    end
-
-    def attributes
-      {}
-    end
-
-    def to_h
-      {
-        _id: id,
-      }.tap do |hash|
-        hash[:_routing] = routing if routing
-      end
-    end
-  end
-end