elastify 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa548bd07b0b3431f9fe21c4e1bec9dbfd0105ca
-  data.tar.gz: 8480f5cd58f69422dae23ca1255b143743c36d4a
+  metadata.gz: 6574255a477a79f3ea8d236bf7a10cb8bd5702f9
+  data.tar.gz: 9410d4edb7474edd368775c908224f455dfcd4c7
 SHA512:
-  metadata.gz: 63a937116d4d8109b629638f82e76ea1e1bf560f120f83124b1023d433dc1fd9ceee98c57f2eeb6e5cb556c58e710856bab31a0c106a2cff2d827e8068f9eeee
-  data.tar.gz: f7cee3663f6c6e7652e2a17b9e453b697d67e0d223d622d187019c1e36a14dbc743871cac7a07131fdfbeb79c1fe211b437630327e20d8eafd96f4f23cca09e5
+  metadata.gz: f64b09a28b1d6dc0fa54ca92a5c58adfc5b30a57f6dd79d170934772e2cd36c601dc116922664ee6be0125db58972aa18677311a2ac999de089ebb40045b0b12
+  data.tar.gz: 58425beb87625933539354588cb8b771ad2b24a93f78d0e18e26fc6763a025c08eb5e2569ec1abad38477e31059c27c935e1bce4dbdf8c011f926b0eeb6b269b

data/elastify.gemspec

@@ -31,10 +31,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "activerecord", ">= 3.0.5"
-  spec.add_runtime_dependency "httparty", ">= 0.6.0"
   spec.add_runtime_dependency "backgrounded", ">= 2.0.0"
   spec.add_runtime_dependency "multi_json", ">= 1.0.0"
-  spec.add_runtime_dependency "rest-client", ["~> 2.0", ">= 2.0.1"]
+  spec.add_runtime_dependency "elasticsearch", ["~> 5.0", ">= 5.0.5"]
   
   spec.add_development_dependency "bundler", "~> 1.13"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/elastify/helpers/elastic_search/connector.rb

@@ -37,24 +37,20 @@ module Elastify
                 end
 
                 def self.search(options, dsl, scroll_timeout)
-                    if dsl.blank?
-                        raise :elastify__search__required_dsl
-                    end
-                    url = "#{options[:base_url]}/#{options[:index]}/#{options[:type]}/_search"
+                    raise :elastify__search__required_dsl unless dsl.present?
                     scroll_timeout ||= options[:scroll_timeout]
-                    url += "?scroll=#{scroll_timeout}" if scroll_timeout.present?
-                    Elastify::Helpers::ElasticSearch::SearchResultCollection.new(RestClient.post(url, dsl.to_json, {}), options)
+                    client = elasticsearch_client options
+                    response = client.search body: dsl, index: options[:index], type: options[:type], scroll: scroll_timeout
+                    Elastify::Helpers::ElasticSearch::SearchResultCollection.new(response, options)
                 end
 
                 def self.scroll(options, scroll_id, scroll_timeout)
-                    if scroll_id.blank?
-                        raise :elastify__search__required_scroll_id
-                    end
-                    url = "#{options[:base_url]}/_search/scroll"
-                    dsl = { scroll_id: scroll_id }
+                    raise :elastify__search__required_scroll_id unless scroll_id.present?
                     scroll_timeout ||= options[:scroll_timeout]
-                    dsl[:scroll] = scroll_timeout if scroll_timeout.present?
-                    Elastify::Helpers::ElasticSearch::SearchResultCollection.new(RestClient.post(url, dsl.to_json, {}), options)
+                    dsl = { scroll_id: scroll_id, scroll: scroll_timeout }
+                    client = elasticsearch_client options
+                    response = client.scroll body: dsl
+                    Elastify::Helpers::ElasticSearch::SearchResultCollection.new(response, options)
                 end
 
                 def self.create_index(options)
@@ -71,6 +67,11 @@ module Elastify
                     url = "#{options[:base_url]}/#{options[:index]}/_mappings/#{options[:type]}"
                     JSON.parse(RestClient.put(url, options[:map].squish, {})).to_hash
                 end
+
+                private
+                def self.elasticsearch_client options
+                    Elasticsearch::Client.new host: options[:base_url]
+                end
             end
         end
     end

data/lib/elastify/helpers/elastic_search/search_result_collection.rb

@@ -6,17 +6,22 @@ module Elastify
                               :elastify_options
 
                 def initialize(elasticsearch_search_result, elastify_options)
-                    esr = JSON.parse(elasticsearch_search_result)
-                    @scroll_id = esr["_scroll_id"]
-                    @took = esr["took"]
-                    @timed_out = esr["timed_out"]
-                    @shards_total = esr["_shards"]["total"]
-                    @shards_successful = esr["_shards"]["successful"]
-                    @shards_failed = esr["_shards"]["failed"]
-                    @hits_total = esr["hits"]["total"]
-                    @hits_maxscore = esr["hits"]["maxscore"]
-                    @hits = esr["hits"]["hits"].map{ |hit| Elastify::Helpers::ElasticSearch::SearchResult.new(hit, elastify_options) }
                     @elastify_options = elastify_options
+                    @scroll_id = elasticsearch_search_result["_scroll_id"]
+                    @took = elasticsearch_search_result["took"]
+                    @timed_out = elasticsearch_search_result["timed_out"]
+                    @shards_total = elasticsearch_search_result["_shards"]["total"]
+                    @shards_successful = elasticsearch_search_result["_shards"]["successful"]
+                    @shards_failed = elasticsearch_search_result["_shards"]["failed"]
+                    @hits_total = elasticsearch_search_result["hits"]["total"]
+                    @hits_maxscore = elasticsearch_search_result["hits"]["maxscore"]
+                    @hits = map_hits(elasticsearch_search_result["hits"]["hits"])
+                end
+
+                def map_hits(hits)
+                    hits.map do |hit|
+                        Elastify::Helpers::ElasticSearch::SearchResult.new(hit, @elastify_options)
+                    end
                 end
             end
         end

data/lib/elastify/version.rb

@@ -1,3 +1,3 @@
 module Elastify
-  VERSION = '0.2.4'
+  VERSION = '0.2.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elastify
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Bruno Bortolotti Ribeiro
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-10 00:00:00.000000000 Z
+date: 2019-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.5
-- !ruby/object:Gem::Dependency
-  name: httparty
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.6.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: backgrounded
   requirement: !ruby/object:Gem::Requirement
@@ -67,25 +53,25 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: rest-client
+  name: elasticsearch
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '5.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 5.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '5.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 5.0.5
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -208,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: A gem to help with ActiveRecord-ElasticSeach integration