elasticsearch_hermes 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81930c441e75a5180feaf4c83e2bfd2c56c5b4ca
-  data.tar.gz: 68a12ce9d23fd52993aaa17107c7e0203c069a10
+  metadata.gz: ca49773931614d5ca56517d8d3944521fb1ee3a4
+  data.tar.gz: e9e012689bc7f94c8d9fb4d5d7001aff7653592c
 SHA512:
-  metadata.gz: b849aaf675784c2c9ea8c45add69a5d8d2a1ecb766b7b48e4587a98c4740533069623d1bd0142b303a5e37b3b2004d1587e93f0d1303a9a9aaaea321b4771d92
-  data.tar.gz: 6ff1279329c4e213b7e660e9c4b4960a0a3e9425ca76774152fa2906cc49d33b39903924cd09681b10e47df179029d117ca204c0467dc7215937f4b75a163486
+  metadata.gz: 119b0c54f87925b6b7b846e181a0797b4eccebebda877bc509f1b71ec40397510ea056b0d5f676ab2429f688dbd5cc9e122c930001df0b32d31c585d0ed15fab
+  data.tar.gz: 7fb77764cda5b9a10f4d6b5056494a354c25136c331f6e1eb27e6a6ec532168026233c26f1a3bf10fa911616e3768874799bf6cbe781cf9f6365e82fe4c215ef

data/lib/elasticsearch_hermes.rb

@@ -5,7 +5,8 @@ require 'elasticsearch_hermes/railtie'
 require 'elasticsearch_hermes/errors'
 require 'elasticsearch_hermes/configuration'
 require 'elasticsearch_hermes/index'
-require 'elasticsearch_hermes/indexing'
+require 'elasticsearch_hermes/indexing/model'
+require 'elasticsearch_hermes/indexing/helper'
 require 'elasticsearch_hermes/query'
 require 'elasticsearch_hermes/result/base'
 require 'elasticsearch_hermes/hook'

data/lib/elasticsearch_hermes/elasticsearch_hermes.rb

@@ -34,17 +34,15 @@ module ElasticsearchHermes
     configuration.fields
   end
 
-
   def self.connect!
     return unless client
 
-
     indices = fields.map { |field| field[:index_name] }.uniq
 
     indices.each do |index|
       Logger.log("Checking index #{index}")
-      index_s = ElasticsearchHermes::Index.new(index)
-      index_s.create unless index_s.exist?
+      index_s = ElasticsearchHermes::Index.new(name: index)
+      Logger.log "Missing Index #{index}" unless index_s.exist?
     end
 
     info = @client.info

data/lib/elasticsearch_hermes/index.rb

@@ -4,28 +4,30 @@ module ElasticsearchHermes
   class Index
     attr_reader :name
 
-    def initialize(name)
+    def initialize(name:, fields: [])
       @name = name
+      @fields = fields
     end
 
     def create
       ElasticsearchHermes.client.indices.create index: @name, body: index_options
     end
 
+    def delete
+      ElasticsearchHermes.client.indices.delete index: @name
+    end
+
     def exist?
       ElasticsearchHermes.client.indices.exists? index: @name
     end
 
-    def fields
-      ElasticsearchHermes.fields || []
-    end
+    private
 
     def build_field_mappings
-      fields_to_index = fields.select { |field| field[:index_name] == @name }
       properties = {}
       analyzer = {}
       tokenizer = {}
-      fields_to_index.each do |field|
+      @fields.each do |field|
         # add checks for full_match
         if field[:search_type] == :partial_match
           @field_token = ngram_builder(field[:minimum_match], field[:field_name])

data/lib/elasticsearch_hermes/indexing/helper.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module ElasticsearchHermes
+  module Indexing
+    module Helper
+      def re_index(index_name: to_s.underscore)
+        delete_index(index_name: index_name)
+        @index_object.create
+        all.find_each(&:touch)
+      end
+
+      def delete_index(index_name: to_s.underscore)
+        @index_object ||= ElasticsearchHermes::Index.new(name: index_name, fields: @fields)
+        @index_object.delete
+      rescue Elasticsearch::Transport::Transport::Errors::NotFound
+        Logger.log("No Such index: #{index_name}")
+      end
+
+      def index_on(fields: [])
+        @fields = fields
+      end
+    end
+  end
+end

data/lib/elasticsearch_hermes/indexing/model.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module ElasticsearchHermes
+  module Indexing
+    module Model
+      def elastic_update(type: '_doc', index_name: self.class.to_s.underscore, id:, body:)
+        ElasticsearchHermes.client.index index_payload(
+          index_name: index_name,
+          type: type,
+          body: body,
+          id: id
+        )
+      end
+
+      def index_payload(index_name:, type:, id:, body:)
+        {
+          type: type,
+          index: index_name,
+          id: id,
+          body: body
+        }
+      end
+    end
+  end
+end

data/lib/elasticsearch_hermes/result/hit.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module ElasticsearchHermes
+  module Result
+    class Hit
+      #TODO: abstract hits from results class
+    end
+  end
+end

data/lib/elasticsearch_hermes/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ElasticsearchHermes
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch_hermes
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Ronald Ekambi
@@ -42,7 +42,8 @@ files:
 - lib/elasticsearch_hermes/errors.rb
 - lib/elasticsearch_hermes/hook.rb
 - lib/elasticsearch_hermes/index.rb
-- lib/elasticsearch_hermes/indexing.rb
+- lib/elasticsearch_hermes/indexing/helper.rb
+- lib/elasticsearch_hermes/indexing/model.rb
 - lib/elasticsearch_hermes/logger.rb
 - lib/elasticsearch_hermes/query.rb
 - lib/elasticsearch_hermes/railtie.rb

data/lib/elasticsearch_hermes/indexing.rb

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-module ElasticsearchHermes
-  module Indexing
-    def elastic_update(type: '_doc', index_name: self.class.to_s.underscore, id:, body:)
-      ElasticsearchHermes.client.index index_payload(
-        index_name: index_name,
-        type: type,
-        body: body,
-        id: id
-      )
-    end
-
-    def index_payload(index_name:, type:, id:, body:)
-      {
-        type: type,
-        index: index_name,
-        id: id,
-        body: body
-      }
-    end
-  end
-end