es-elasticity 0.4.5 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b30428e6913d8edd82b5db7963dce7e372ea2f27
-  data.tar.gz: 213ba5a4a695cc18ac1c16f1c050988de0ec28b5
+  metadata.gz: 964aa0b0955363219b5b3258cfcf7341c9eccae7
+  data.tar.gz: e6379e81e8abba1a895a02e9d915f440e627f47f
 SHA512:
-  metadata.gz: 48f09521d34b7098daf93748d5ccd9423c34138389d98e0cd42767a9a7e2713dcf0c3923ea51c2dbfb7b455d2d776ae9167ed7c68ea4b84bfca551d9e44b0e24
-  data.tar.gz: 6c1596b4b9a3d7f3ceae0bc52a5ff281d2102530af49f12b67f5524596ac95bff6783154ab8db260b6898eb9543f5ac8a7427c1b16680854d13d1b2d9b43f5e4
+  metadata.gz: ec06b056b633344895a0d045df11f365854e398bc7f10c109c4c2cfe827ee16a17ca73a41570faf116ea0d4dbd55274522a76ec94c88cf95a261f61edf56535a
+  data.tar.gz: 221d4232fbc52a63fd16bc309c4474295817ecb9133b21b742004e16a6ee4200f966290d8ad5e338bfb5d2abb9f808d40a4902bc727231366d645c2895ef011f

data/lib/elasticity/multi_search.rb

@@ -1,5 +1,6 @@
 module Elasticity
   class MultiSearch
+
     def initialize
       @searches = {}
       @mappers  = {}
@@ -23,12 +24,15 @@ module Elasticity
     end
 
     def [](name)
-      @results ||= fetch
-      @results[name]
+      results_collection[name]
     end
 
     private
 
+    def results_collection
+      @results_collection ||= fetch
+    end
+
     def fetch
       bodies = @searches.values.map do |hsh|
         hsh[:search_definition].to_msearch_args
@@ -37,7 +41,6 @@ module Elasticity
       response = ActiveSupport::Notifications.instrument("multi_search.elasticity", args: { body: bodies }) do
         Elasticity.config.client.msearch(body: bodies.map(&:dup))
       end
-
       results = {}
 
       @searches.keys.each_with_index do |name, idx|
@@ -46,9 +49,9 @@ module Elasticity
 
         results[name] = case
         when search[:documents]
-          resp["hits"]["hits"].map { |hit| search[:documents].map_hit(hit) }
+          Search::Results.new(resp, search[:search_definition].body, search[:documents].method(:map_hit))
         when search[:active_records]
-          Search::ActiveRecordProxy.from_hits(search[:active_records], resp["hits"]["hits"])
+          Search::ActiveRecordProxy.map_response(search[:active_records], search[:search_definition].body, resp)
         end
       end
 

data/lib/elasticity/search.rb

@@ -84,12 +84,11 @@ module Elasticity
     class LazySearch
       include Enumerable
 
-      delegate :each, :size, :length, :[], :+, :-, :&, :|, to: :search_results
+      delegate :each, :size, :length, :[], :+, :-, :&, :|, :total, :per_page,
+        :total_pages, :current_page, to: :search_results
 
       attr_accessor :search_definition
 
-      DEFAULT_SIZE = 10
-
       def initialize(client, search_definition, &mapper)
         @client            = client
         @search_definition = search_definition
@@ -104,10 +103,6 @@ module Elasticity
         empty?
       end
 
-      def total
-        response["hits"]["total"]
-      end
-
       def aggregations
         response["aggregations"] ||= {}
       end
@@ -121,31 +116,7 @@ module Elasticity
       end
 
       def search_results
-        return @search_results if defined?(@search_results)
-
-        hits = response["hits"]["hits"]
-
-        @search_results = if @mapper.nil?
-          hits
-        else
-          hits.map { |hit| @mapper.(hit) }
-        end
-      end
-
-      # for pagination
-      def per_page
-        @search_definition.body[:size] || DEFAULT_SIZE
-      end
-
-      # for pagination
-      def total_pages
-        (total.to_f / per_page.to_f).ceil
-      end
-
-      # for pagination
-      def current_page
-        return 1 if @search_definition.body[:from].nil?
-        @search_definition.body[:from] / per_page + 1
+        @search_results ||= Search::Results.new(response, @search_definition.body, @mapper)
       end
 
       private
@@ -199,10 +170,9 @@ module Elasticity
 
           loop do
             response = @client.scroll(scroll_id: response["_scroll_id"], scroll: @scroll)
-            hits     = response["hits"]["hits"]
-            break if hits.empty?
+            break if response["hits"]["hits"].empty?
 
-            y << hits.map { |hit| @mapper.(hit) }
+            y << Search::Results.new(response, @search_definition.body, @mapper)
           end
         end
       end
@@ -216,21 +186,27 @@ module Elasticity
     end
 
     class ActiveRecordProxy
-      def self.from_hits(relation, hits)
-        ids = hits.map { |hit| hit["_id"] }
+      def self.map_response(relation, body, response)
+        ids = response["hits"]["hits"].map { |hit| hit["_id"] }
 
         if ids.any?
           id_col  = "#{relation.connection.quote_column_name(relation.table_name)}.#{relation.connection.quote_column_name(relation.klass.primary_key)}"
           id_vals = ids.map { |id| relation.connection.quote(id) }
-          relation.where("#{id_col} IN (?)", ids).order("FIELD(#{id_col}, #{id_vals.join(',')})")
+          Relation.new(relation.where("#{id_col} IN (?)", ids).order("FIELD(#{id_col}, #{id_vals.join(',')})"), body, response)
         else
-          relation.none
+          Relation.new(relation.none, body, response)
         end
       end
 
       class Relation < ActiveSupport::ProxyObject
-        def initialize(relation)
+
+        delegate :total, :per_page, :total_pages, :current_page, to: :@results
+
+        def initialize(relation, search_definition, response)
           @relation = relation
+          @search_definition = search_definition
+          @response = response
+          @results = Results.new(response, search_definition)
         end
 
         def method_missing(name, *args, &block)
@@ -251,7 +227,7 @@ module Elasticity
       def initialize(client, search_definition, relation)
         @client            = client
         @search_definition = search_definition.update(_source: false)
-        @relation          = Relation.new(relation)
+        @relation          = relation
       end
 
       def metadata
@@ -278,7 +254,7 @@ module Elasticity
 
       def filtered_relation
         return @filtered_relation if defined?(@filtered_relation)
-        @filtered_relation = ActiveRecordProxy.from_hits(@relation, response["hits"]["hits"])
+        @filtered_relation = ActiveRecordProxy.map_response(@relation, @search_definition.body, response)
       end
     end
 
@@ -302,5 +278,51 @@ module Elasticity
         documents.public_send(method_name, *args, &block)
       end
     end
+
+    class Results < ActiveSupport::ProxyObject
+      include ::Enumerable
+
+      delegate :each, :size, :length, :[], :+, :-, :&, :|, to: :@documents
+
+      DEFAULT_SIZE = 10
+
+      def initialize(response, body, mapper = nil)
+        @response = response
+        @body = body
+        @documents = if mapper.nil?
+          @response["hits"]["hits"]
+        else
+          @response["hits"]["hits"].map { |hit| mapper.(hit) }
+        end
+      end
+
+      def method_missing(name, *args, &block)
+        @documents.public_send(name, *args, &block)
+      end
+
+      def each(&block)
+        @documents.each(&block)
+      end
+
+      def total
+        @response["hits"]["total"]
+      end
+
+      # for pagination
+      def per_page
+        @body[:size] || DEFAULT_SIZE
+      end
+
+      # for pagination
+      def total_pages
+        (total.to_f / per_page.to_f).ceil
+      end
+
+      # for pagination
+      def current_page
+        return 1 if @body[:from].nil?
+        @body[:from] / per_page + 1
+      end
+    end
   end
 end

data/lib/elasticity/version.rb

@@ -1,3 +1,3 @@
 module Elasticity
-  VERSION = "0.4.5"
+  VERSION = "0.5.0"
 end

data/spec/functional/persistence_spec.rb

@@ -25,6 +25,7 @@ RSpec.describe "Persistence", elasticsearch: true do
 
     before do
       subject.recreate_index
+      @elastic_search_client.cluster.health wait_for_status: 'yellow'
     end
 
     after do

data/spec/units/multi_search_spec.rb

@@ -31,15 +31,18 @@ RSpec.describe Elasticity::MultiSearch do
   end
 
   it "performs multi search" do
-    subject.add(:first, Elasticity::Search::Facade.new(client, Elasticity::Search::Definition.new("index_first", "document_first", { search: :first })), documents: klass)
+    subject.add(:first, Elasticity::Search::Facade.new(client, Elasticity::Search::Definition.new("index_first", "document_first", { search: :first, size: 2 })), documents: klass)
     subject.add(:second, Elasticity::Search::Facade.new(client, Elasticity::Search::Definition.new("index_second", "document_second", { search: :second })), documents: klass)
 
     expect(Elasticity.config.client).to receive(:msearch).with(body: [
-      { index: "index_first", type: "document_first", search: { search: :first } },
+      { index: "index_first", type: "document_first", search: { search: :first, size: 2 } },
       { index: "index_second", type: "document_second", search: { search: :second } },
     ]).and_return(response)
 
-    expect(Array(subject[:first])). to eq [klass.new(_id: 1, name: "foo"), klass.new(_id: 2, name: "bar")]
-    expect(Array(subject[:second])). to eq [klass.new(_id: 3, name: "baz")]
+    expect(Array(subject[:first])).to eq [klass.new(_id: 1, name: "foo"), klass.new(_id: 2, name: "bar")]
+    expect(Array(subject[:second])).to eq [klass.new(_id: 3, name: "baz")]
+    expect(subject[:first].total).to eq 2
+    expect(subject[:first].total_pages).to eq 1
+    expect(subject[:first].current_page).to eq 1
   end
 end

data/spec/units/search_spec.rb

@@ -132,6 +132,7 @@ RSpec.describe "Search" do
         klass: double(:klass, primary_key: "id"),
         to_sql: "SELECT * FROM table_name WHERE id IN (1)"
       )
+
       allow(relation.connection).to receive(:quote_column_name) { |name| name }
       allow(relation.connection).to receive(:quote) { |name| name }
 
@@ -167,7 +168,7 @@ RSpec.describe "Search" do
           index: index_name,
           type: document_type,
           body: { size: 14, from: 25, filter: {} }
-        ).and_return({ "hits" => { "total" => 112 } })
+        ).and_return({ "hits" => { "total" => 112, "hits" => [] } })
       docs = subject.documents(mapper)
 
       expect(docs.per_page).to eq(14)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: es-elasticity
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.5.0
 platform: ruby
 authors:
 - Rodrigo Kochenburger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-29 00:00:00.000000000 Z
+date: 2016-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -230,7 +230,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: ActiveModel-based library for working with Elasticsearch
@@ -243,3 +243,4 @@ test_files:
 - spec/units/multi_search_spec.rb
 - spec/units/search_spec.rb
 - spec/units/strategies/single_index_spec.rb
+has_rdoc: