elastic_search_framework 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3462f6d260c17cc73a60848b61901bd26672a8b7
-  data.tar.gz: 9b3ec91367cc9e54d4dea7d6cb2a226c6d3a4486
+  metadata.gz: ad27b2e732484f3dd87dab43f5970556944130d3
+  data.tar.gz: e544ff195387046123ace421f109e26afac7276b
 SHA512:
-  metadata.gz: a367754c71d545eaf6fb439ce9c4c11c5f0dd49dc4c935316c2fa708c3c8464af7125c1f10b6abcf7c5d25babf84a785f54ae142ea3ad907da28453361b79cbf
-  data.tar.gz: 845e279c30d93a5542bd23552993bec60ea81912e8ee22ed79f8848a4b5e61a1507f6fed8bcf29982f3232f4e793ac4140b92e1cc3d393b195ca413e8ba2461b
+  metadata.gz: bed96a3e35f0b61bfbabfae074fbb1aed3dd2ce0cc236230b97af0f89f26e521f84e349ad2622ac17bcb9ceb8b29567576c5ae1f8bf085938a2cd63cb98dc28c
+  data.tar.gz: 19c48dd859d007e6170602df0525389bfbe698fdd8a0b089a039cdd24e1483b721f92658e1348622228383a3ac2b6fb08f7e99dbefbff7eaf2900778ceec5e13

data/lib/elastic_search_framework.rb

@@ -1,6 +1,6 @@
 require 'hash_kit'
 require 'json'
-require 'curb'
+require 'connection_pool'
 require_relative 'elastic_search_framework/version'
 require_relative 'elastic_search_framework/logger'
 require_relative 'elastic_search_framework/exceptions'

data/lib/elastic_search_framework/index.rb

@@ -54,23 +54,33 @@ module ElasticSearchFramework
     end
 
     def put(payload:)
-      client = curl
-      client.url = "#{host}/#{full_name}"
-      json = JSON.dump(payload)
-      client.http_put(json)
-      unless is_valid_response?(client)
-        raise ElasticSearchFramework::Exceptions::IndexError.new("[#{self}] - Failed to put index. Payload: #{payload} | Response: #{client.body_str}")
+      uri = URI("#{host}/#{full_name}")
+
+      request = Net::HTTP::Put.new(uri.request_uri)
+      request.body = JSON.dump(payload)
+
+      response = repository.with_client do |client|
+        client.request(request)
+      end
+
+      unless is_valid_response?(response.code)
+        raise ElasticSearchFramework::Exceptions::IndexError.new("[#{self}] - Failed to put index. Payload: #{payload} | Response: #{response.body}")
       end
       true
     end
 
     def get
-      client = curl
-      client.url = "#{host}/#{full_name}"
-      client.http_get
+      uri = URI("#{host}/#{full_name}")
+
+      request = Net::HTTP::Get.new(uri.request_uri)
+
+      response = repository.with_client do |client|
+        client.request(request)
+      end
+
       result = nil
-      if is_valid_response?(client)
-        result = JSON.parse(client.body_str)
+      if is_valid_response?(response.code)
+        result = JSON.parse(response.body)
       end
       result
     end
@@ -80,10 +90,15 @@ module ElasticSearchFramework
     end
 
     def delete
-      client = curl
-      client.url = "#{host}/#{full_name}"
-      client.http_delete
-      is_valid_response?(client) || client.response_code == 404
+      uri = URI("#{host}/#{full_name}")
+
+      request = Net::HTTP::Delete.new(uri.request_uri)
+
+      response = repository.with_client do |client|
+        client.request(request)
+      end
+
+      is_valid_response?(response.code) || Integer(response.code) == 404
     end
 
     def create_payload(description:, mappings:)
@@ -134,12 +149,8 @@ module ElasticSearchFramework
       self.instance_variable_defined?(:@elastic_search_index_mappings) ? self.instance_variable_get(:@elastic_search_index_mappings) : {}
     end
 
-    def curl
-      Curl::Easy.new
-    end
-
-    def is_valid_response?(client)
-      [200,201,202].include?(client.response_code)
+    def is_valid_response?(code)
+      [200,201,202].include?(Integer(code))
     end
 
     def full_name
@@ -174,4 +185,4 @@ module ElasticSearchFramework
       ElasticSearchFramework::Query.new(index: self)
     end
   end
-end
+end

data/lib/elastic_search_framework/repository.rb

@@ -2,48 +2,75 @@ module ElasticSearchFramework
   class Repository
 
     def set(index:, entity:, type: 'default')
-      client = curl
-      client.url = "#{host}/#{index.full_name}/#{type.downcase}/#{get_id_value(index: index, entity: entity)}"
+      uri = URI("#{host}/#{index.full_name}/#{type.downcase}/#{get_id_value(index: index, entity: entity)}")
       hash = hash_helper.to_hash(entity)
-      client.http_put(JSON.dump(hash))
-      unless is_valid_response?(client)
-        raise ElasticSearchFramework::Exceptions::IndexError.new("An error occurred setting an index document. Response: #{client.body_str}")
+
+      request = Net::HTTP::Put.new(uri.request_uri)
+      request.body = JSON.dump(hash)
+
+      response = with_client do |client|
+        client.request(request)
+      end
+
+      unless is_valid_response?(response.code)
+        raise ElasticSearchFramework::Exceptions::IndexError.new(
+            "An error occurred setting an index document. Response: #{response.body}"
+        )
       end
       return true
     end
 
     def get(index:, id:, type: 'default')
-      client = curl
-      client.url = "#{host}/#{index.full_name}/#{type.downcase}/#{id}/_source"
-      client.get
-      if is_valid_response?(client)
-        result = JSON.load(client.body_str)
+      uri = URI("#{host}/#{index.full_name}/#{type.downcase}/#{id}/_source")
+
+      request = Net::HTTP::Get.new(uri.request_uri)
+
+      response = with_client do |client|
+        client.request(request)
+      end
+
+      if is_valid_response?(response.code)
+        result = JSON.load(response.body)
         hash_helper.indifferent!(result)
         return result
-      elsif client.response_code == 404
+      elsif Integer(response.code) == 404
         return nil
       else
-        raise ElasticSearchFramework::Exceptions::IndexError.new("An error occurred getting an index document. Response: #{client.body_str}")
+        raise ElasticSearchFramework::Exceptions::IndexError.new(
+            "An error occurred getting an index document. Response: #{response.body}"
+        )
       end
     end
 
     def drop(index:, id:, type: 'default')
-      client = curl
-      client.url = "#{host}/#{index.full_name}/#{type.downcase}/#{id}"
-      client.delete
-      if is_valid_response?(client) || client.response_code == 404
+      uri = URI("#{host}/#{index.full_name}/#{type.downcase}/#{id}")
+
+      request = Net::HTTP::Delete.new(uri.request_uri)
+
+      response = with_client do |client|
+        client.request(request)
+      end
+
+      if is_valid_response?(response.code) || Integer(response.code) == 404
         return true
       else
-        raise ElasticSearchFramework::Exceptions::IndexError.new("An error occurred dropping an index document. Response: #{client.body_str}")
+        raise ElasticSearchFramework::Exceptions::IndexError.new(
+            "An error occurred dropping an index document. Response: #{response.body}"
+        )
       end
     end
 
     def query(index:, expression:, type: 'default', limit: 10, count: false)
-      client = curl
-      client.url = "#{host}/#{index.full_name}/#{type}/_search?q=#{URI.encode(expression)}&size=#{limit}"
-      client.get
-      if is_valid_response?(client)
-        result = JSON.parse(client.body_str)
+      uri = URI("#{host}/#{index.full_name}/#{type}/_search?q=#{URI.encode(expression)}&size=#{limit}")
+
+      request = Net::HTTP::Get.new(uri.request_uri)
+
+      response = with_client do |client|
+        client.request(request)
+      end
+
+      if is_valid_response?(response.code)
+        result = JSON.parse(response.body)
         hash_helper.indifferent!(result)
         if count
           return result[:hits][:total]
@@ -51,22 +78,42 @@ module ElasticSearchFramework
           return result[:hits][:total] > 0 ? result[:hits][:hits] : []
         end
       else
-        raise ElasticSearchFramework::Exceptions::IndexError.new("An error occurred executing an index query. Response: #{client.body_str}")
+        raise ElasticSearchFramework::Exceptions::IndexError.new("An error occurred executing an index query. Response: #{response.body}")
+      end
+    end
+
+    def client
+      @client ||= Net::HTTP.new(host_uri.host, host_uri.port).tap do |c|
+        c.use_ssl = host_uri.scheme == 'https'
+        c.open_timeout = open_timeout
+        c.read_timeout = read_timeout
       end
     end
 
-    def curl
-      Curl::Easy.new
+    def idle_timeout
+      @idle_timeout ||= Integer(ENV['CONNECTION_IDLE_TIMEOUT'] ||  5)
     end
 
-    def is_valid_response?(client)
-      [200,201,202].include?(client.response_code)
+    def read_timeout
+      @read_timeout ||= Integer(ENV['CONNECTION_READ_TIMEOUT'] ||  5)
+    end
+
+    def open_timeout
+      @read_timeout ||= Integer(ENV['CONNECTION_OPEN_TIMEOUT'] ||  1)
+    end
+
+    def is_valid_response?(status)
+      [200,201,202].include?(Integer(status))
     end
 
     def host
       "#{ElasticSearchFramework.host}:#{ElasticSearchFramework.port}"
     end
 
+    def host_uri
+      URI("#{ElasticSearchFramework.host}:#{ElasticSearchFramework.port}")
+    end
+
     def hash_helper
       @hash_helper ||= HashKit::Helper.new
     end
@@ -75,5 +122,32 @@ module ElasticSearchFramework
       entity.instance_variable_get("@#{index.description[:id]}")
     end
 
+    def with_client
+      response = nil
+
+      self.class.pool.with do |base|
+        base.client.read_timeout = read_timeout
+        begin
+          response = yield base.client
+        ensure
+          base.client.read_timeout = idle_timeout
+        end
+      end
+
+      response
+    end
+
+    def self.pool
+      @pool ||= ConnectionPool.new(size: pool_size, timeout: pool_timeout) { ElasticSearchFramework::Repository.new }
+    end
+
+    def self.pool_size
+      @pool_size ||= Integer(ENV['CONNECTION_POOL_SIZE'] || 25)
+    end
+
+    def self.pool_timeout
+      @pool_timeout ||= Integer(ENV['CONNECTION_IDLE_TIMEOUT'] || 5)
+    end
+
   end
-end
+end

data/lib/elastic_search_framework/version.rb

@@ -1,3 +1,3 @@
 module ElasticSearchFramework
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

data/spec/index_spec.rb

@@ -92,63 +92,41 @@ RSpec.describe ElasticSearchFramework::Index do
     end
   end
 
-  describe '#curl' do
-    it 'should return a Curl::Easy instance' do
-      expect(ExampleIndex.curl).to be_a(Curl::Easy)
-    end
-    it 'should return a unique Curl::Easy instance' do
-      expect(ExampleIndex.curl).not_to eq ExampleIndex.curl
-    end
-  end
-
   describe '#is_valid_response?' do
-    let(:client) { double }
+    let(:code) { 200 }
     context 'when a 200 response code is returned' do
-      before do
-        allow(client).to receive(:response_code).and_return(200)
-      end
       it 'should return true' do
-        expect(ExampleIndex.is_valid_response?(client)).to be true
+        expect(ExampleIndex.is_valid_response?(code)).to be true
       end
     end
     context 'when a 201 response code is returned' do
-      before do
-        allow(client).to receive(:response_code).and_return(201)
-      end
+      let(:code) { 201 }
       it 'should return true' do
-        expect(ExampleIndex.is_valid_response?(client)).to be true
+        expect(ExampleIndex.is_valid_response?(code)).to be true
       end
     end
     context 'when a 202 response code is returned' do
-      before do
-        allow(client).to receive(:response_code).and_return(202)
-      end
+      let(:code) { 202 }
       it 'should return true' do
-        expect(ExampleIndex.is_valid_response?(client)).to be true
+        expect(ExampleIndex.is_valid_response?(code)).to be true
       end
     end
     context 'when a 400 response code is returned' do
-      before do
-        allow(client).to receive(:response_code).and_return(400)
-      end
+      let(:code) { 400 }
       it 'should return false' do
-        expect(ExampleIndex.is_valid_response?(client)).to be false
+        expect(ExampleIndex.is_valid_response?(code)).to be false
       end
     end
     context 'when a 401 response code is returned' do
-      before do
-        allow(client).to receive(:response_code).and_return(401)
-      end
+      let(:code) { 401 }
       it 'should return false' do
-        expect(ExampleIndex.is_valid_response?(client)).to be false
+        expect(ExampleIndex.is_valid_response?(code)).to be false
       end
     end
     context 'when a 500 response code is returned' do
-      before do
-        allow(client).to receive(:response_code).and_return(500)
-      end
+      let(:code) { 500 }
       it 'should return false' do
-        expect(ExampleIndex.is_valid_response?(client)).to be false
+        expect(ExampleIndex.is_valid_response?(code)).to be false
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elastic_search_framework
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - vaughanbrittonsage
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-11 00:00:00.000000000 Z
+date: 2017-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: curb
+  name: connection_pool
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="