elasticord 1.0.1 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5e4119d7285ad68f49090e7b9344e88c24561c8
-  data.tar.gz: 9cbf209b6d0dc56674975cbe9672dcfbba414444
+  metadata.gz: fbe255262b51c074ad05a210ae821894cae53710
+  data.tar.gz: f5fa702ceffbb7051937446166e919fcf9f6204f
 SHA512:
-  metadata.gz: 1f6a9926758e9ffdafc6439208ddd82fb96480e7102f1f91914407f7c30be698572703b95d6939c49ae9625a2407403dca8f9510e4a8170ee55982d1703ea018
-  data.tar.gz: 845a169cd4b027b00d26cc7aa76acf5c634fb45d675e55ce6d2c08179003b5f6d1b5df798987975b480f61a6a70db3e2d838f1a246abfbf7fd0f9f40d0e7b840
+  metadata.gz: c350937a3105ac455fd96fa0c4bc8238551ea759732c58a7ebea5672f89efe1e56a0abb68b357603751ee9f07aa9e21b0b819da64369c03f1db8a65d79b0dc9d
+  data.tar.gz: eb4694da749d2a315a3d5458ccac26afa5aff1346224ab2d65079e3e5aeecdea2c41e5731d02d3b56b8eff219f26a5dca941994310f68f1b6c021e75ada66c85

data/Gemfile.lock

@@ -12,7 +12,7 @@ PATH
       object_attorney (>= 3.0.7)
       pg (>= 0.17)
       ransack (>= 1.7.0)
-    elasticord (1.0.1)
+    elasticord (1.0.3)
       elasticsearch (~> 5.0)
 
 GEM

data/lib/dash_overlord/use_cases/v1/shared/search_and_paginate/apply_filters.rb

@@ -14,6 +14,8 @@ module DashOverlord
 
               context.search_builder = resources.ransack(filter_query.presence)
 
+              return unless context.search_builder.respond_to?(:result)
+
               context.resources = context.search_builder.result(distinct: true)
             end
           end

data/lib/elasticord.rb

@@ -1,3 +1,4 @@
+require 'forwardable'
 require 'elasticsearch'
 
 require_relative 'elasticord/base'
@@ -5,12 +6,12 @@ require_relative 'elasticord/config'
 require_relative 'elasticord/version'
 
 module Elasticord
-  def self.client
-    @client ||= reset_client
+  def self.elastic_search_client
+    @elastic_search_client ||= reset_elastic_search_client
   end
 
-  def self.reset_client
-    @client = Elasticsearch::Client.new \
+  def self.reset_elastic_search_client
+    @elastic_search_client = Elasticsearch::Client.new \
       log: Elasticord::Config.get(:log)
   end
 

data/lib/elasticord/base.rb

@@ -1,51 +1,27 @@
 require 'ostruct'
 
-require 'elasticord/orm/get'
-require 'elasticord/orm/index'
-require 'elasticord/orm/create'
-require 'elasticord/orm/delete'
-require 'elasticord/orm/search_builder'
+require 'elasticord/client/base'
 
 module Elasticord
   class Base < OpenStruct
     module ClassMethods
-      def create(attributes = {})
-        result = ORM::Create.one(index, type, attributes)
+      extend Forwardable
 
-        return false unless result
+      def client(sub_type = nil)
+        full_type = [type, sub_type].compact.join('_')
 
-        attributes[:id] ||= result['_id']
-
-        self.new(attributes)
-      end
-
-      def get(id)
-        result = ORM::Get.one(index, type, id)
-
-        return false unless result
-
-        self.new(result.merge({ 'id' => id }))
-      end
-
-      def search(body = {})
-        none.load(body)
+        Client::Base.new \
+          Elasticord.elastic_search_client, self, index, full_type
       end
 
-      def none
-        ORM::SearchBuilder.new(self, index, type)
-      end
-
-      def delete_by_query(attributes = {})
-        ORM::Delete.by_query(index, type, attributes)
-      end
-
-      def delete_all
-        ORM::Delete.all(index)
-      end
-
-      def refresh_index
-        ORM::Index.refresh(index)
-      end
+      def_delegators :client,
+                     :get,
+                     :none,
+                     :create,
+                     :search,
+                     :delete_all,
+                     :refresh_index,
+                     :delete_by_query
 
       def index
         return @index if defined?(@index)

data/lib/elasticord/{entities → client}/array_with_meta_data.rb

@@ -1,5 +1,5 @@
 module Elasticord
-  module Entities
+  module Client
     class ArrayWithMetaData < SimpleDelegator
       attr_accessor :per_page, :current_page, :total_results
 
@@ -26,12 +26,6 @@ module Elasticord
       def from
         (current_page - 1) * size
       end
-
-      protected
-
-      def parse_string_number(number)
-        number.class == String ? number.presence : number
-      end
     end
   end
 end

data/lib/elasticord/client/base.rb

@@ -0,0 +1,57 @@
+require 'ostruct'
+
+require 'elasticord/client/get'
+require 'elasticord/client/index'
+require 'elasticord/client/create'
+require 'elasticord/client/delete'
+require 'elasticord/client/search_builder'
+
+module Elasticord
+  module Client
+    class Base
+      def initialize(elastic_search_client, entity, index, type)
+        @elastic_search_client, @entity, @index, @type =
+          elastic_search_client, entity, index, type
+      end
+
+      def create(attributes = {})
+        result = Client::Create.one \
+          elastic_search_client, index, type, attributes
+
+        return false unless result
+
+        attributes[:id] ||= result['_id']
+
+        entity.new(attributes)
+      end
+
+      def get(id)
+        result = Client::Get.one(elastic_search_client, index, type, id)
+
+        return false unless result
+
+        entity.new(result.merge({ 'id' => id }))
+      end
+
+      def search(body_params = {})
+        none.load(body_params)
+      end
+
+      def none
+        Client::SearchBuilder.new(elastic_search_client, entity, index, type)
+      end
+
+      def delete_all
+        Client::Delete.all(elastic_search_client, index)
+      end
+
+      def refresh_index
+        Client::Index.refresh(elastic_search_client, index)
+      end
+
+      protected
+
+      attr_reader :elastic_search_client, :entity, :index, :type
+    end
+  end
+end

data/lib/elasticord/{orm → client}/create.rb

@@ -1,15 +1,15 @@
 module Elasticord
-  module ORM
+  module Client
     module Create
       module_function
 
       REFRESH_INDEX_AFTER_CREATE = true
 
-      def one(index, type, attributes = {})
+      def one(elastic_search_client, index, type, attributes = {})
         params = build_params(index, type, attributes)
 
         begin
-          Elasticord.client.index params
+          elastic_search_client.index params
         rescue Elasticsearch::Transport::Transport::Errors::Conflict
           return false
         end

data/lib/elasticord/client/delete.rb

@@ -0,0 +1,23 @@
+module Elasticord
+  module Client
+    module Delete
+      module_function
+
+      def all(elastic_search_client, index)
+        begin
+          elastic_search_client.indices.delete index: index
+        rescue Elasticsearch::Transport::Transport::Errors::NotFound
+          return true
+        end
+      end
+
+      # def by_query(elastic_search_client, index, type, attributes = {})
+      #   params = { index: index, body: attributes }
+      #
+      #   params[:type] = type unless type == '_all'
+      #
+      #   elastic_search_client.delete_by_query params
+      # end
+    end
+  end
+end

data/lib/elasticord/client/get.rb

@@ -0,0 +1,34 @@
+module Elasticord
+  module Client
+    module Get
+      module_function
+
+      def one(elastic_search_client, index, type, id)
+        result = elastic_search_client.get \
+          index: index, type: type, ignore: 404, id: id
+
+        (result && result['found']) ? result['_source'] : false
+      end
+
+      # def by_query(elastic_search_client, index, type, body = {})
+      #   data = { total_results: 0, data: [] }
+      #   params = { index: index, type: type, body: body }
+      #
+      #   begin
+      #     results = elastic_search_client.search(params)
+      #
+      #     hits = results['hits']
+      #
+      #     return data if !hits || hits['total'].to_i < 1
+      #
+      #     data[:data] = hits['hits'].map { |result| result['_source'] }
+      #     data[:total_results] = hits['total']
+      #   rescue Elasticsearch::Transport::Transport::Errors::NotFound
+      #     nil
+      #   end
+      #
+      #   data
+      # end
+    end
+  end
+end

data/lib/elasticord/{orm → client}/index.rb

@@ -1,11 +1,11 @@
 module Elasticord
-  module ORM
+  module Client
     module Index
       module_function
 
-      def refresh(index)
+      def refresh(elastic_search_client, index)
         begin
-          Elasticord.client.indices.refresh index: index
+          elastic_search_client.indices.refresh index: index
         rescue Elasticsearch::Transport::Transport::Errors::NotFound
           return true
         end

data/lib/elasticord/{orm → client}/search_builder.rb

@@ -1,16 +1,16 @@
-require 'forwardable'
-require 'elasticord/entities/array_with_meta_data'
+require 'elasticord/client/array_with_meta_data'
 
 module Elasticord
-  module ORM
+  module Client
     class SearchBuilder
       extend Forwardable
 
       PAGE_DEFAULT = 1
       PER_PAGE_DEFAULT = 10
 
-      def initialize(entity, index, type)
-        @entity, @index, @type = entity, index, type
+      def initialize(elastic_search_client, entity, index, type)
+        @elastic_search_client, @entity, @index, @type =
+          elastic_search_client, entity, index, type
       end
 
       def_delegators :results, :current_page, :per_page, :size, :from
@@ -71,25 +71,21 @@ module Elasticord
         self
       end
 
-      def result(*_args)
-        self
-      end
-
       def body_params
         @body_params ||= { size: size, from: from, query: { bool: {} } }
       end
 
       protected
 
-      attr_reader :type, :index, :entity
+      attr_reader :elastic_search_client, :entity, :index, :type
 
       def results
-        @results ||= Entities::ArrayWithMetaData.new \
+        @results ||= ArrayWithMetaData.new \
           PAGE_DEFAULT, PER_PAGE_DEFAULT
       end
 
       def execute_search(body)
-        elastic_results = Elasticord.client.search \
+        elastic_results = elastic_search_client.search \
           index: index, type: type, body: body_params.merge(body)
 
         hits = elastic_results['hits']

data/lib/elasticord/version.rb

@@ -1,3 +1,3 @@
 module Elasticord
-  VERSION = '1.0.1'.freeze
+  VERSION = '1.0.3'.freeze
 end

data/spec/elasticord/base_spec.rb

@@ -1,129 +1,167 @@
 require 'spec_helper'
-require 'elasticsearch'
 
 describe Elasticord::Base, elasticsearch: true do
-  ElasticordChildClass1 = Class.new(described_class)
-
-  def elastic_search_client
-    @elastic_search_client ||= Elasticsearch::Client.new
-  end
-
-  def get_one_elastic_search_record(id)
-    result = elastic_search_client.get \
-      id: id,
-      type: ElasticordChildClass1.type,
-      index: ElasticordChildClass1.index,
-      ignore: 404
-
-    result
-  end
-
   describe '.index' do
     it 'described_class should return the current env' do
       expect(described_class.index).to eq ENV['ENV']
     end
 
     context 'given a child class' do
-      it 'ElasticordChildClass1 should return the same current env' do
-        expect(ElasticordChildClass1.index).to eq ENV['ENV']
+      let(:child_class) { Class.new(described_class) }
+
+      it 'child_class should return the same current env' do
+        expect(child_class.index).to eq ENV['ENV']
       end
 
       context 'given that the child class sets a new index' do
-        before { ElasticordChildClass1.index = 'child_class_new_index' }
+        before do
+          child_class.index = 'child_class_new_index'
+        end
 
         it 'described_class should return the current env' do
           expect(described_class.index).to eq ENV['ENV']
         end
 
-        it 'ElasticordChildClass1 should return "child_class_new_index"' do
-          expect(ElasticordChildClass1.index).to eq 'child_class_new_index'
+        it 'child_class should return "child_class_new_index"' do
+          expect(child_class.index).to eq 'child_class_new_index'
         end
       end
     end
   end
 
   describe '.type' do
-    it 'described_class should return "_all"' do
+    it 'should return "_all"' do
       expect(described_class.type).to eq '_all'
     end
 
-    context 'given a child class' do
-      it 'ElasticordChildClass1 should return "elasticord_child_class1"' do
-        expect(ElasticordChildClass1.type).to eq 'elasticord_child_class1'
+    context 'given a child class with a name' do
+      let(:child_class) do
+        Class.new(described_class) do
+          def self.name
+            'ChildClass'
+          end
+        end
+      end
+
+      it 'should return that child class name' do
+        expect(child_class.type).to eq 'child_class'
       end
     end
   end
 
-  describe '.create' do
-    context 'given an ID' do
-      let(:id) { '123' }
-
+  describe '.client' do
+    context 'without params' do
       before do
-        @child_class = ElasticordChildClass1.create id: id, title: 'child class'
+        @client = described_class.client
       end
 
-      it 'ElasticSearch should contain a record with that specific id' do
-        result = get_one_elastic_search_record id
+      it 'should reaturn an instance of Client::Base' do
+        expect(@client).to be_an_instance_of Elasticord::Client::Base
+      end
 
-        expect(result['found']).to be true
+      it 'reaturned client should have a protected #entity set up' do
+        expect(@client.send(:entity)).to eq described_class
       end
 
-      it '@child_class.id should match' do
-        expect(@child_class.id).to eq id
+      it 'reaturned client should have a protected #index set up' do
+        expect(@client.send(:index)).to eq ENV['ENV']
       end
 
-      it '@child_class should be an instance of ElasticordChildClass1' do
-        expect(@child_class).to be_an_instance_of ElasticordChildClass1
+      it 'reaturned client should have a protected #type set up' do
+        expect(@client.send(:type)).to eq '_all'
       end
     end
 
-    context 'given no ID' do
+    context 'with "project_1"' do
       before do
-        @child_class = ElasticordChildClass1.create title: 'child class'
+        @client = described_class.client 'project_1'
       end
 
-      it 'ElasticSearch DB should contain a record with that specific id' do
-        result = get_one_elastic_search_record @child_class.id
+      it 'should reaturn an instance of Client::Base' do
+        expect(@client).to be_an_instance_of Elasticord::Client::Base
+      end
 
-        expect(result['found']).to be true
+      it 'reaturned client should have a protected #entity set up' do
+        expect(@client.send(:entity)).to eq described_class
+      end
+
+      it 'reaturned client should have a protected #index set up' do
+        expect(@client.send(:index)).to eq ENV['ENV']
+      end
+
+      it 'reaturned client should have a protected #type set up' do
+        expect(@client.send(:type)).to eq '_all_project_1'
       end
     end
   end
 
   describe '.search' do
-    it 'should pass all params to a SearchBuilder instance' do
-      attributes = { query: { match: { brand: 'oficial' } } }
+    it 'should pass all params to a Client::Base instance' do
+      attributes = [{ name: 'test' }]
 
-      expect_any_instance_of(Elasticord::ORM::SearchBuilder).to \
-        receive(:load).with(attributes)
+      expect_any_instance_of(Elasticord::Client::Base).to \
+        receive(:search).with(*attributes)
 
-      ElasticordChildClass1.search(attributes)
+      described_class.search(*attributes)
     end
   end
 
   describe '.get' do
-    context 'when the record does not exist' do
-      it 'should return false' do
-        result = ElasticordChildClass1.get '-1'
+    it 'should pass all params to a Client::Base instance' do
+      attributes = [1]
 
-        expect(result).to be false
-      end
+      expect_any_instance_of(Elasticord::Client::Base).to \
+        receive(:get).with(*attributes)
+
+      described_class.get(*attributes)
     end
+  end
 
-    context 'when the record exists' do
-      before do
-        @child_class = ElasticordChildClass1.create title: 'child class'
+  describe '.none' do
+    it 'should pass all params to a Client::Base instance' do
+      expect_any_instance_of(Elasticord::Client::Base).to receive(:none)
 
-        @result = ElasticordChildClass1.get @child_class.id
-      end
+      described_class.none
+    end
+  end
 
-      it 'should return an instance of ElasticordChildClass1' do
-        expect(@result).to be_an_instance_of ElasticordChildClass1
-      end
+  describe '.create' do
+    it 'should pass all params to a Client::Base instance' do
+      attributes = [{ name: 'test' }]
 
-      it 'should return the same ID it requested' do
-        expect(@result.id).to be @child_class.id
-      end
+      expect_any_instance_of(Elasticord::Client::Base).to \
+        receive(:create).with(*attributes)
+
+      described_class.create(*attributes)
+    end
+  end
+
+  describe '.delete_all' do
+    it 'should pass all params to a Client::Base instance' do
+      expect_any_instance_of(Elasticord::Client::Base).to \
+        receive(:delete_all)
+
+      described_class.delete_all
+    end
+  end
+
+  describe '.refresh_index' do
+    it 'should pass all params to a Client::Base instance' do
+      expect_any_instance_of(Elasticord::Client::Base).to \
+        receive(:refresh_index)
+
+      described_class.refresh_index
+    end
+  end
+
+  describe '.delete_by_query' do
+    it 'should pass all params to a Client::Base instance' do
+      attributes = [{ name: 'test' }]
+
+      expect_any_instance_of(Elasticord::Client::Base).to \
+        receive(:delete_by_query).with(*attributes)
+
+      described_class.delete_by_query(*attributes)
     end
   end
 end

data/spec/elasticord/client/base_spec.rb

@@ -0,0 +1,112 @@
+require 'spec_helper'
+
+describe Elasticord::Client::Base, elasticsearch: true do
+  def get_one_elastic_search_record(id)
+    Elasticord.elastic_search_client.get \
+      id: id, type: 'child_class', index: ENV['ENV'], ignore: 404
+  end
+
+  let(:described_instance) do
+    described_class.new \
+      Elasticord.elastic_search_client,
+      OpenStruct,
+      ENV['ENV'],
+      'child_class'
+  end
+
+  describe '#create' do
+    context 'given an ID' do
+      let(:id) { '123' }
+
+      before do
+        @child_class = described_instance.create id: id, title: 'child class'
+      end
+
+      it 'ElasticSearch should contain a record with that specific id' do
+        result = get_one_elastic_search_record id
+
+        expect(result['found']).to be true
+      end
+
+      it '@child_class.id should match' do
+        expect(@child_class.id).to eq id
+      end
+
+      it '@child_class should be an instance of OpenStruct' do
+        expect(@child_class).to be_an_instance_of OpenStruct
+      end
+    end
+
+    context 'given no ID' do
+      before do
+        @child_class = described_instance.create title: 'child class'
+      end
+
+      it 'ElasticSearch DB should contain a record with that specific id' do
+        result = get_one_elastic_search_record @child_class.id
+
+        expect(result['found']).to be true
+      end
+    end
+  end
+
+  describe '#search' do
+    it 'should pass all params to a SearchBuilder instance' do
+      attributes = { query: { match: { brand: 'oficial' } } }
+
+      expect_any_instance_of(Elasticord::Client::SearchBuilder).to \
+        receive(:load).with(attributes)
+
+      described_instance.search(attributes)
+    end
+  end
+
+  describe '#get' do
+    context 'when the record does not exist' do
+      it 'should return false' do
+        result = described_instance.get '-1'
+
+        expect(result).to be false
+      end
+    end
+
+    context 'when the record exists' do
+      before do
+        @child_class = described_instance.create title: 'child class'
+
+        @result = described_instance.get @child_class.id
+      end
+
+      it 'should return an instance of OpenStruct' do
+        expect(@result).to be_an_instance_of OpenStruct
+      end
+
+      it 'should return the same ID it requested' do
+        expect(@result.id).to be @child_class.id
+      end
+    end
+  end
+
+  describe '#none' do
+    before do
+      @search_builder = described_instance.none
+    end
+
+    it 'should reaturn an instance of Client::SearchBuilder' do
+      expect(@search_builder).to \
+        be_an_instance_of Elasticord::Client::SearchBuilder
+    end
+
+    it 'reaturned search_builder should have a protected #entity set up' do
+      expect(@search_builder.send(:entity)).to eq OpenStruct
+    end
+
+    it 'reaturned search_builder should have a protected #index set up' do
+      expect(@search_builder.send(:index)).to eq ENV['ENV']
+    end
+
+    it 'reaturned search_builder should have a protected #type set up' do
+      expect(@search_builder.send(:type)).to eq 'child_class'
+    end
+  end
+end

data/spec/elasticord/{orm → client}/search_builder_spec.rb

@@ -1,33 +1,33 @@
 require 'spec_helper'
-require 'elasticsearch'
 
-describe Elasticord::ORM::SearchBuilder, elasticsearch: true do
-  ElasticordChildClass2 = Class.new(Elasticord::Base)
-
-  def new_search_builder
-    described_class.new \
-      ElasticordChildClass2,
-      ElasticordChildClass2.index,
-      ElasticordChildClass2.type
+describe Elasticord::Client::SearchBuilder, elasticsearch: true do
+  let(:client_base) do
+    Elasticord::Client::Base.new \
+      Elasticord.elastic_search_client,
+      OpenStruct,
+      ENV['ENV'],
+      'child_class'
   end
 
+  let(:described_instance) { client_base.none }
+
   describe '#current_page' do
     it 'should have a default value set' do
-      expect(new_search_builder.current_page).to \
+      expect(described_instance.current_page).to \
         be described_class::PAGE_DEFAULT
     end
   end
 
   describe '#per_page' do
     it 'should have a default value set' do
-      expect(new_search_builder.per_page).to \
+      expect(described_instance.per_page).to \
         be described_class::PER_PAGE_DEFAULT
     end
   end
 
   describe '#body_params' do
     it 'should have pagination params set' do
-      expect(new_search_builder.body_params).to match a_hash_including({
+      expect(described_instance.body_params).to match a_hash_including({
         size: described_class::PER_PAGE_DEFAULT,
         from: 0
       })
@@ -35,7 +35,7 @@ describe Elasticord::ORM::SearchBuilder, elasticsearch: true do
 
     context 'when setting #page with 2' do
       before do
-        @search_builder = new_search_builder
+        @search_builder = described_instance
         @search_builder.page(2)
       end
 
@@ -54,16 +54,9 @@ describe Elasticord::ORM::SearchBuilder, elasticsearch: true do
     end
   end
 
-  describe '#result' do
-    it 'should return a SearchBuilder instance' do
-      expect(new_search_builder.result(distinct: true)).to \
-        be_an_instance_of described_class
-    end
-  end
-
   describe '#page' do
     def search_builder
-      @search_builder ||= new_search_builder
+      @search_builder ||= described_instance
     end
 
     context 'sending 3 as an argument' do
@@ -87,7 +80,7 @@ describe Elasticord::ORM::SearchBuilder, elasticsearch: true do
 
   describe '#per' do
     def search_builder
-      @search_builder ||= new_search_builder
+      @search_builder ||= described_instance
     end
 
     context 'sending 15 as an argument' do
@@ -111,13 +104,13 @@ describe Elasticord::ORM::SearchBuilder, elasticsearch: true do
 
   context 'given that no record has been created' do
     before do
-      ElasticordChildClass2.delete_all
-      ElasticordChildClass2.refresh_index
+      client_base.delete_all
+      client_base.refresh_index
     end
 
     describe '#load' do
       before do
-        @search_result = new_search_builder.load
+        @search_result = described_instance.load
       end
 
       it 'should return a pagination object with empty resources' do
@@ -129,14 +122,14 @@ describe Elasticord::ORM::SearchBuilder, elasticsearch: true do
 
   context 'given that 5 records have been created' do
     before do
-      ElasticordChildClass2.delete_all
-      5.times { ElasticordChildClass2.create(title: 'child class')  }
-      ElasticordChildClass2.refresh_index
+      client_base.delete_all
+      5.times { client_base.create(title: 'child class')  }
+      client_base.refresh_index
     end
 
     describe '#load' do
       before do
-        @search_result = new_search_builder.load
+        @search_result = described_instance.load
       end
 
       it 'should find 5 total_results' do
@@ -147,7 +140,7 @@ describe Elasticord::ORM::SearchBuilder, elasticsearch: true do
         expect(@search_result.length).to be 5
 
         @search_result.each do |child_class|
-          expect(child_class).to be_an_instance_of ElasticordChildClass2
+          expect(child_class).to be_an_instance_of OpenStruct
         end
       end
     end
@@ -155,26 +148,26 @@ describe Elasticord::ORM::SearchBuilder, elasticsearch: true do
 
   context 'given that 30 records have been created' do
     before do
-      ElasticordChildClass2.delete_all
+      client_base.delete_all
 
       24.times do
-        ElasticordChildClass2.create \
+        client_base.create \
           title: 'child class', brand: 'oficial', locked: false
       end
 
-      ElasticordChildClass2.create(title: 'class', brand: 'oficial', locked: true)
+      client_base.create(title: 'class', brand: 'oficial', locked: true)
 
       5.times do
-        ElasticordChildClass2.create(title: 'child', brand: 'unoficial', locked: false)
+        client_base.create(title: 'child', brand: 'unoficial', locked: false)
       end
 
-      ElasticordChildClass2.refresh_index
+      client_base.refresh_index
     end
 
     describe '#load' do
       context 'when no pagination params are passed' do
         before do
-          @search_result = new_search_builder.load({})
+          @search_result = described_instance.load({})
         end
 
         it 'should find 30 total_results' do
@@ -185,14 +178,14 @@ describe Elasticord::ORM::SearchBuilder, elasticsearch: true do
           expect(@search_result.length).to be 10
 
           @search_result.each do |child_class|
-            expect(child_class).to be_an_instance_of ElasticordChildClass2
+            expect(child_class).to be_an_instance_of OpenStruct
           end
         end
       end
 
       context 'when #page(2) was called' do
         before do
-          @search_builder = new_search_builder.page(2)
+          @search_builder = described_instance.page(2)
         end
 
         context 'when #per(15) was called' do
@@ -207,8 +200,6 @@ describe Elasticord::ORM::SearchBuilder, elasticsearch: true do
                 locked_eq: false
               })
 
-              @search_builder = @search_builder.result(distinct: true)
-
               @search_result = @search_builder.load
             end
 
@@ -225,7 +216,7 @@ describe Elasticord::ORM::SearchBuilder, elasticsearch: true do
 
       context 'when single query params are passed' do
         before do
-          @search_result = new_search_builder.load \
+          @search_result = described_instance.load \
             query: {
               match: { brand: 'oficial' }
             }
@@ -242,7 +233,7 @@ describe Elasticord::ORM::SearchBuilder, elasticsearch: true do
 
       context 'when multi query params are passed' do
         before do
-          @search_result = new_search_builder.load \
+          @search_result = described_instance.load \
             query: {
               bool: {
                 must: [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elasticord
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.3
 platform: ruby
 authors:
 - StreetBees Dev Team
@@ -231,13 +231,14 @@ files:
 - lib/dash_overlord/version.rb
 - lib/elasticord.rb
 - lib/elasticord/base.rb
+- lib/elasticord/client/array_with_meta_data.rb
+- lib/elasticord/client/base.rb
+- lib/elasticord/client/create.rb
+- lib/elasticord/client/delete.rb
+- lib/elasticord/client/get.rb
+- lib/elasticord/client/index.rb
+- lib/elasticord/client/search_builder.rb
 - lib/elasticord/config.rb
-- lib/elasticord/entities/array_with_meta_data.rb
-- lib/elasticord/orm/create.rb
-- lib/elasticord/orm/delete.rb
-- lib/elasticord/orm/get.rb
-- lib/elasticord/orm/index.rb
-- lib/elasticord/orm/search_builder.rb
 - lib/elasticord/version.rb
 - lib/tasks/create_dummy_data.rake
 - spec/dash_overlord/use_cases/v1/admins/log_in_spec.rb
@@ -264,7 +265,8 @@ files:
 - spec/dash_overlord/use_cases/v1/videos/index/elastic_search_spec.rb
 - spec/dash_overlord/use_cases/v1/videos/index/postgres_spec.rb
 - spec/elasticord/base_spec.rb
-- spec/elasticord/orm/search_builder_spec.rb
+- spec/elasticord/client/base_spec.rb
+- spec/elasticord/client/search_builder_spec.rb
 - spec/factories/v1/admins.rb
 - spec/factories/v1/bee_videos.rb
 - spec/factories/v1/chart_configs.rb
@@ -324,7 +326,8 @@ test_files:
 - spec/dash_overlord/use_cases/v1/videos/index/elastic_search_spec.rb
 - spec/dash_overlord/use_cases/v1/videos/index/postgres_spec.rb
 - spec/elasticord/base_spec.rb
-- spec/elasticord/orm/search_builder_spec.rb
+- spec/elasticord/client/base_spec.rb
+- spec/elasticord/client/search_builder_spec.rb
 - spec/factories/v1/admins.rb
 - spec/factories/v1/bee_videos.rb
 - spec/factories/v1/chart_configs.rb

data/lib/elasticord/orm/delete.rb

@@ -1,23 +0,0 @@
-module Elasticord
-  module ORM
-    module Delete
-      module_function
-
-      def by_query(index, type, attributes = {})
-        params = { index: index, body: attributes }
-
-        params[:type] = type unless type == '_all'
-
-        Elasticord.client.delete_by_query params
-      end
-
-      def all(index)
-        begin
-          Elasticord.client.indices.delete index: index
-        rescue Elasticsearch::Transport::Transport::Errors::NotFound
-          return true
-        end
-      end
-    end
-  end
-end

data/lib/elasticord/orm/get.rb

@@ -1,34 +0,0 @@
-module Elasticord
-  module ORM
-    module Get
-      module_function
-
-      def one(index, type, id)
-        result = Elasticord.client.get \
-          index: index, type: type, ignore: 404, id: id
-
-        (!result || !result['found']) ? false : result['_source']
-      end
-
-      def by_query(index, type, body = {})
-        data = { total_results: 0, data: [] }
-        params = { index: index, type: type, body: body }
-
-        begin
-          results = Elasticord.client.search(params)
-
-          hits = results['hits']
-
-          return data if !hits || hits['total'].to_i < 1
-
-          data[:data] = hits['hits'].map { |result| result['_source'] }
-          data[:total_results] = hits['total']
-        rescue Elasticsearch::Transport::Transport::Errors::NotFound
-          nil
-        end
-
-        data
-      end
-    end
-  end
-end