esse 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74a999f5083a3e258834ca27ac444c63e8f10e20940106f1415331d8a5e772b7
-  data.tar.gz: e7e2853b5fe1296795e6a5d306d12e2ac5c91e88cba671e2cd980ee1b1edfb2e
+  metadata.gz: a31d2a1c181dccd9c2acd7256d958010e7c636016b1d5a267597f7aec9ed3334
+  data.tar.gz: cdb390a10b0492833a9360d4fd39df0c18df114a44b37554cba1dd39d229f75b
 SHA512:
-  metadata.gz: 04a5efa492606d9385b07d8f076966b85bf825ffb49d37c9e35edd8fa5be5c4d283ac193097733f16583f920472aa83e2f1c05a00188649932c2c63ce6f14e53
-  data.tar.gz: 34b4426c3014edfcfe2c1320da019ba6b5c2566842baeb78e14e73df1df173f7a3a7298505b94128180a094aa953ee83dbf09a0e48791d65aa70f04f9e2c5fd9
+  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/index/import.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require_relative 'base_operation'
+
+module Esse
+  module CLI
+    class Index::Import < Index::BaseOperation
+      def run
+        validate_options!
+        indices.each do |index|
+          index.elasticsearch.import!(**options)
+        end
+      end
+
+      private
+
+      def options
+        @options.slice(*@options.keys - CLI_IGNORE_OPTS)
+      end
+
+      def validate_options!
+        validate_indices_option!
+      end
+    end
+  end
+end

data/lib/esse/cli/index.rb

@@ -77,6 +77,14 @@ module Esse
         require_relative 'index/open'
         Open.new(indices: index_classes, **options.to_h.transform_keys(&:to_sym)).run
       end
+
+      desc 'import *INDEX_CLASSES', 'Import documents from the given classes'
+      option :suffix, type: :string, default: nil, aliases: '-s', desc: 'Suffix to append to index name'
+      option :context, type: :hash, default: {}, required: true, desc: 'List of options to pass to the index class'
+      def import(*index_classes)
+        require_relative 'index/import'
+        Import.new(indices: index_classes, **HashUtils.deep_transform_keys(options.to_h, &:to_sym)).run
+      end
     end
   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/cli/templates/type_collection.rb.erb

@@ -26,15 +26,15 @@ class <%= @index_name %> < <%= @base_class %>
 
           yield(rows, **params)
         end
+      end
 
-        protected
+      protected
 
-        attr_reader :params
+      attr_reader :params
 
-        # @param offset [Number] Offset to start from
-        def find_all(offset)
-          # @TODO load data from persistent store
-        end
+      # @param offset [Number] Offset to start from
+      def find_all(offset)
+        # @TODO load data from persistent store
       end
     end
   end

data/lib/esse/object_document_mapper.rb

@@ -86,10 +86,24 @@ 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
+
+    # Wrap collection data into serialized documents
+    #
+    # Example:
+    #    GeosIndex.documents(id: 1).first
+    #
+    # @return [Enumerator] All serialized entries
+    def documents(**kwargs)
+      Enumerator.new do |yielder|
+        each_serialized_batch(**kwargs) do |documents, **_collection_kargs|
+          documents.each { |document| yielder.yield(document) }
+        end
       end
     end
   end

data/lib/esse/primitives/hash_utils.rb

@@ -6,6 +6,17 @@ module Esse
   module HashUtils
     module_function
 
+    def deep_transform_keys(hash, &block)
+      hash.each_with_object({}) do |(key, value), result|
+        result[yield(key)] = \
+          if value.is_a?(Hash)
+            deep_transform_keys(value, &block)
+          else
+            value
+          end
+      end
+    end
+
     def deep_merge(target, source)
       target.merge(source) do |key, oldval, newval|
         if oldval.is_a?(Hash) && newval.is_a?(Hash)

data/lib/esse/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: esse
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Marcos G. Zimmermann
 autorequire: 
 bindir: exec
 cert_chain: []
-date: 2022-01-27 00:00:00.000000000 Z
+date: 2022-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elasticsearch
@@ -246,6 +246,7 @@ files:
 - lib/esse/cli/index/close.rb
 - lib/esse/cli/index/create.rb
 - lib/esse/cli/index/delete.rb
+- lib/esse/cli/index/import.rb
 - lib/esse/cli/index/open.rb
 - lib/esse/cli/index/reset.rb
 - lib/esse/cli/index/update_aliases.rb