elasticsearch_hermes 0.0.4.2 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3923c6822a3a4f1f1fff0d0ba1bce68cbdda83c2
-  data.tar.gz: d15724eb798e20cfecbb0b641a71a8383eb516ff
+  metadata.gz: b316c65bf4c95f6855434198e9961b1c7be60a06
+  data.tar.gz: 1385dc3839fbede3bdf1780b052bd3bf7596e402
 SHA512:
-  metadata.gz: a7172c9c57053c493ec15d79b0ad302c71dc9ad2b4cb0151f1cdcab2cab1bfaa956445c73adf25651d2013e1154cbf112fe7e475c1cd34f920a02e22a3f772d5
-  data.tar.gz: 40e4a5ef7d2462610a57ad4fd5ea574345f414f9ade32e4921337ed63e7a7dd0ea5d8ab54470dda05a86937ab0a89efa083d6842fa3eefda3af3734a5f14ba1b
+  metadata.gz: c1f77c052089896350412915642063cd9afa4606320e4c0c61fa4490a1553275f631709f8b4aba6fd71245ccd09805bd55f89656a2de1e687e15e184ba18e44f
+  data.tar.gz: 33ba96fdd202c3ca06b70923f4e3ec997fbb680e8e0e557f417df3f54162c94ddcf3567274610f949d9d312cd32040ba6258ae6337f41d632d2a87c36dff939e

data/lib/elasticsearch_hermes.rb

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

data/lib/elasticsearch_hermes/configuration.rb

@@ -3,15 +3,14 @@
 module ElasticsearchHermes
   class Configuration
     attr_accessor :request_timeout, :retry_on_failure, :es_user, :es_password
-    attr_accessor :es_url, :enable_logs, :fields
+    attr_accessor :es_url, :enable_logs
     def initialize
       @request_timeout = nil
       @retry_on_failure = nil
       @es_user = nil
       @es_password = nil
       @es_url = nil
-      @enable_logs = nil
-      @fields = nil
+      @enable_logs = false
     end
   end
 end

data/lib/elasticsearch_hermes/elasticsearch_hermes.rb

@@ -22,7 +22,11 @@ module ElasticsearchHermes
   def self.default_connect_options
     base_es_urls = configuration.es_url
     urls = base_es_urls.split(',').compact.uniq
-    options = { url: urls, retry_on_failure: 2, log: true }
+    options = {
+      url: urls,
+      retry_on_failure: configuration.retry_on_failure,
+      log: configuration.enable_logs
+    }
     options
   end
 
@@ -34,19 +38,9 @@ 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?
-    end
-
     info = @client.info
     cluster_version = info['version']['number']
     msg = "Connected to Elastic version #{cluster_version}."

data/lib/elasticsearch_hermes/hook.rb

@@ -2,8 +2,5 @@
 
 module ElasticsearchHermes
   module Hook
-    class << self
-
-    end
   end
 end

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/query.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module ElasticsearchHermes
+  module Query
+    def search(query: '', index_name: to_s.underscore, fields: @hermes_search_on)
+      @results = ElasticsearchHermes.client.search query_payload(
+        query: query,
+        index_name: index_name,
+        fields: fields
+      )
+      ElasticsearchHermes::Result::Base.new(@results.symbolize_keys)
+    end
+
+    def hermes_search_on(fields: [])
+      @hermes_search_on ||= fields.map(&:to_s)
+    end
+
+    def search_type; end
+
+    def field_type; end
+
+    def minimum_match; end
+
+    def query_payload(query:, index_name:, fields:)
+      {
+        index: index_name,
+        body: {
+          query: {
+            multi_match: {
+              query: query,
+              fields: fields
+            }
+          }
+        }
+      }
+    end
+  end
+end

data/lib/elasticsearch_hermes/result/base.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module ElasticsearchHermes
+  module Result
+    class Base
+      attr_reader :took, :timed_out, :shards, :hits
+
+      def initialize(took:, timed_out:, hits:, _shards:)
+        @took = took
+        @timed_out = timed_out
+        @shards = _shards
+        @hits = hits
+      end
+
+      def ids
+        @ids ||= @hits['hits'].map { |hit| hit['_id'] }
+      end
+
+      def models
+        @models ||= ''
+      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.4.2'
+  VERSION = '0.0.8'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch_hermes
 version: !ruby/object:Gem::Version
-  version: 0.0.4.2
+  version: 0.0.8
 platform: ruby
 authors:
 - Ronald Ekambi
@@ -42,8 +42,13 @@ files:
 - lib/elasticsearch_hermes/errors.rb
 - lib/elasticsearch_hermes/hook.rb
 - lib/elasticsearch_hermes/index.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
+- lib/elasticsearch_hermes/result/base.rb
+- lib/elasticsearch_hermes/result/hit.rb
 - lib/elasticsearch_hermes/version.rb
 homepage: https://github.com/roncodingenthusiast/elasticsearch_hermes
 licenses:
@@ -68,6 +73,5 @@ rubyforge_project:
 rubygems_version: 2.6.14.3
 signing_key: 
 specification_version: 4
-summary: elasticsearch_hermes is a layer on top of elasticsearch-ruby to handle the
-  complicated configuration of elastic
+summary: I will fix this eventually
 test_files: []