es-elasticity 0.2.8 → 0.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b092a148409adc4a7e11885a4be8a235d7933dcb
-  data.tar.gz: 8049626e93cbeb9f26d5f88859fa422b6425925c
+  metadata.gz: 58ea71d50e68bd34f58ea88ebf80197f1fc04083
+  data.tar.gz: 740f4b8b9bc70011fa146245bf2b5f30600f77cd
 SHA512:
-  metadata.gz: fa7dd7e2e17f990df9a65fc62ca31b7c498374e35ff95051f77747a3d41ec859eb65ecef3bf33ebd9149eadf7781f4b6d1d94cd0e7b632314f0150e8007295d6
-  data.tar.gz: ec226e57b6332ee5734a91272e3939218d7d80dc71c4eebe60d86a275eebbea0563e52ced4f5452f4bad57ef4b079ffe6fcb5b9302e354ffa7e445807386c5e9
+  metadata.gz: 0d9f5f2c133c66e27725e8e95051c780a407900f19ad278feae655de91305054e807bfa9fe87b591e57f991540d745790cf4f075f3cfd35f7c3d11c6150f09c2
+  data.tar.gz: ac2228701bf716f8febb33027a75640477b46cd276f47cdaeb1ffee4eed25ad7649588d9e4dd07f37756d576eb775efaab4bf796f5743c4469c6ef888b50d16b

data/lib/elasticity/index.rb

@@ -90,7 +90,7 @@ module Elasticity
     private
 
     def instrument(name, extra = {})
-      ActiveSupport::Notifications.instrument("#{name}.elasticity", args: extra) do
+      ActiveSupport::Notifications.instrument("#{name}.elasticity", args: extra, backtrace: caller(1)) do
         yield
       end
     end

data/lib/elasticity/multi_search.rb

@@ -1,7 +1,8 @@
 module Elasticity
   class MultiSearch
     def initialize
-      @searches = []
+      @searches = {}
+      @mappers  = {}
       yield self if block_given?
     end
 
@@ -17,7 +18,9 @@ module Elasticity
         raise ArgumentError, "you need to provide either :documents or :active_records as an option"
       end
 
-      @searches << [name, search, mapper]
+      @searches[name] = { index: search.index.name, type: search.document_type, search: search.body }
+      @mappers[name]  = mapper
+      name
     end
 
     def [](name)
@@ -28,17 +31,17 @@ module Elasticity
     private
 
     def fetch
-      multi_body = @searches.map do |name, search, _|
-        { index: search.index.name, type: search.document_type, search: search.body }
-      end
+      bodies = @searches.values.map(&:dup)
 
-      response = ActiveSupport::Notifications.instrument("multi_search.elasticity", args: { body: multi_body }) do
-        Elasticity.config.client.msearch(body: multi_body)
+      response = ActiveSupport::Notifications.instrument("multi_search.elasticity", args: { body: @searches.values }) do
+        Elasticity.config.client.msearch(body: bodies)
       end
 
       results = {}
-      Array(response["responses"]).each_with_index do |resp, idx|
-        name, search, mapper = @searches[idx]
+
+      @searches.keys.each_with_index do |name, idx|
+        resp          = response["responses"][idx]
+        mapper        = @mappers[name]
         results[name] = Search::Result.new(resp, mapper)
       end
 

data/lib/elasticity/railtie.rb

@@ -2,12 +2,16 @@ module Elasticity
   class Railtie < Rails::Railtie
     initializer 'elasticity.initialize_logging' do
       ActiveSupport::Notifications.subscribe(/\.elasticity$/) do |name, start, finish, id, payload|
-        puts name
         time = (finish - start)*1000
 
         if logger = Elasticity.config.logger
           logger.debug "#{name} #{"%.2f" % time}ms #{MultiJson.dump(payload[:args], pretty: Elasticity.config.pretty_json)}"
 
+          if payload[:backtrace].present?
+            bt = Rails.backtrace_cleaner.clean(payload[:backtrace])
+            logger.debug bt[0,4].join("\n")
+          end
+
           exception, message = payload[:exception]
           if exception
             logger.error "#{name} #{exception}: #{message}"

data/lib/elasticity/search.rb

@@ -121,8 +121,28 @@ module Elasticity
     end
 
     class ActiveRecordMapper
+      class Relation < ActiveSupport::ProxyObject
+        def initialize(relation)
+          @relation = relation
+        end
+
+        def method_missing(name, *args, &block)
+          @relation.public_send(name, *args, &block)
+        end
+
+        def pretty_print(pp)
+          pp.object_group(self) do
+            pp.text " #{@relation.to_sql}"
+          end
+        end
+
+        def inspect
+          "#<#{self.class}: #{@relation.to_sql}>"
+        end
+      end
+
       def initialize(relation)
-        @relation = relation
+        @relation = Relation.new(relation)
       end
 
       def map(hits)

data/lib/elasticity/version.rb

@@ -1,3 +1,3 @@
 module Elasticity
-  VERSION = "0.2.8"
+  VERSION = "0.2.11"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: es-elasticity
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.11
 platform: ruby
 authors:
 - Rodrigo Kochenburger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-21 00:00:00.000000000 Z
+date: 2014-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler