search_flip 2.1.0.beta1 → 2.1.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 906fc0c71acae9c0ad7dd8b3089c78cbe73388348e43cd25470eb7289502652a
-  data.tar.gz: 5c45894fd491152c08cd3c5e39ca5bafa94e321ae81166dc7d3ce0012fa834ba
+  metadata.gz: 6b3740c9ca1f4b34538a0302d4efc92afb12ee845d1b534241070ade3255b4dd
+  data.tar.gz: afb51d3e77ef804e3487da46a8f5db33a9d5baa9dd17337afb09fa4874b710e3
 SHA512:
-  metadata.gz: 2abdc760a6a104b242bd1147d4bf5629996c6e58b89b4a364b2b21c75daae0a3b57165577e75450b80fa965611b54a4680dd10deba7a22d3021381c7d893fa37
-  data.tar.gz: 81e2c3887da0f55653a60cbea327a068964b42acd30427b274f05e2091a5f30c67a7af0bbdac1ab38a29a31c97c4048a23c0ea265c5bb44c2b8a4ef7db8577d5
+  metadata.gz: 96e43715270ac96cd15933a6e2243c9f61dec661abe6b70e1aba93d411a7ebaa19c528a6c9f5d11950babd48f144afef06a4b5be29d91bc2d820bc014b81e951
+  data.tar.gz: be195c055a264206dd2a85657fd8c874d8e09661e6bb9d39f0fbc80f1c30cda3ce006082540c739d00eadecbf0f4e2fd68805e4c0099393bbe153986864a67a3

data/README.md

@@ -549,11 +549,13 @@ To use multiple Elasticsearch clusters, specify a connection within your
 indices:
 
 ```ruby
+MyConnection = SearchFlip::Connection.new(base_url: "http://elasticsearch.host:9200")
+
 class MyIndex
   include SearchFlip::Index
 
   def self.connection
-    @connection ||= SearchFlip::Connection.new(base_url: "http://elasticsearch.host:9200")
+    MyConnection
   end
 end
 ```

data/lib/search_flip/connection.rb

@@ -17,6 +17,7 @@ module SearchFlip
       @base_url = options[:base_url] || SearchFlip::Config[:base_url]
       @http_client = options[:http_client] || SearchFlip::HTTPClient.new
       @bulk_limit = options[:bulk_limit] || SearchFlip::Config[:bulk_limit]
+      @version_mutex = Mutex.new
     end
 
     # Queries and returns the ElasticSearch version used.
@@ -27,7 +28,9 @@ module SearchFlip
     # @return [String] The ElasticSearch version
 
     def version
-      @version ||= http_client.headers(accept: "application/json").get("#{base_url}/").parse["version"]["number"]
+      @version_mutex.synchronize do
+        @version ||= http_client.headers(accept: "application/json").get("#{base_url}/").parse["version"]["number"]
+      end
     end
 
     # Queries and returns the ElasticSearch cluster health.

data/lib/search_flip/index.rb

@@ -42,6 +42,8 @@ module SearchFlip
   #   CommentIndex.range(:created_at, gt: Time.now - 7.days)
 
   module Index
+    ConnectionMutex = Mutex.new
+
     def self.included(base)
       base.extend ClassMethods
     end
@@ -159,7 +161,7 @@ module SearchFlip
             yield record
           end
         else
-          (scope.respond_to?(:each) ? scope : Array(scope)).each do |record|
+          (scope.respond_to?(:each) && !scope.is_a?(SearchFlip::Result) ? scope : Array(scope)).each do |record|
             yield record
           end
         end
@@ -636,7 +638,9 @@ module SearchFlip
       # @return [SearchFlip::Connection] The connection
 
       def connection
-        @connection ||= SearchFlip::Connection.new(base_url: SearchFlip::Config[:base_url])
+        ConnectionMutex.synchronize do
+          @connection ||= SearchFlip::Connection.new(base_url: SearchFlip::Config[:base_url])
+        end
       end
     end
   end

data/lib/search_flip/version.rb

@@ -1,5 +1,5 @@
 
 module SearchFlip
-  VERSION = "2.1.0.beta1"
+  VERSION = "2.1.0.beta2"
 end
 

data/lib/search_flip.rb

@@ -2,6 +2,7 @@
 require "forwardable"
 require "http"
 require "hashie"
+require "thread"
 require "oj"
 require "set"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: search_flip
 version: !ruby/object:Gem::Version
-  version: 2.1.0.beta1
+  version: 2.1.0.beta2
 platform: ruby
 authors:
 - Benjamin Vetter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-07 00:00:00.000000000 Z
+date: 2019-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord