algoliasearch-rails 1.11.2 → 1.11.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e8dd1f75b435b4e192ce211b00c399417b42689
-  data.tar.gz: e211db3fc43bc4fa55ab38c6ec2e860a037cea10
+  metadata.gz: 5d30fc03ca7d3eff1c03acba69d072d537b05490
+  data.tar.gz: be2943752a81bec8523b6259d0808703bb280cda
 SHA512:
-  metadata.gz: e12c15de1151b7fc6e3fb5d69486844bbe2216769be212d60ebcd8f127d0b9b1b76416c8d1e85bf5fbd3671ba88f1e259b3801a2ec5d6f47aa2235aaa4f2ce9f
-  data.tar.gz: f6103d4b36d27ee3d2133280edc9e16d50e4bdbb09b6287d66f866afe47f39bf2255f7a8a08a15186b175b95ad9338d4517827d478a8721a3d4ce8251ea41fac
+  metadata.gz: a1789ee695aca9675cf336449c068e7cc7af92da6c5b1a4cca93c05eb443bceb71a77fba39915933e58498dac1e69efc8a845c59b014e253dc1ecd94b40539d3
+  data.tar.gz: b6989c9492c3594823e6b39ed69600cd0172d88b00e6de30fea0a1ee8737424cd5d5c69a5e7532aeb06b1214f964d1057adf7e17cfe32c67a9242652ed2d9d75

data/ChangeLog

@@ -1,5 +1,9 @@
 CHANGELOG
 
+2014-09-16 1.11.3
+
+      * While reindexing, fetch the master's settings to setup the temporary index
+
 2014-09-02 1.11.2
 
       * Ability to search in a slave or extra index using the ```:index```/```:slave``` parameter

data/VERSION

@@ -1 +1 @@
-1.11.2
+1.11.3

data/algoliasearch-rails.gemspec

@@ -6,11 +6,11 @@
 
 Gem::Specification.new do |s|
   s.name = "algoliasearch-rails"
-  s.version = "1.11.2"
+  s.version = "1.11.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Algolia"]
-  s.date = "2014-09-02"
+  s.date = "2014-09-16"
   s.description = "AlgoliaSearch integration to your favorite ORM"
   s.email = "contact@algolia.com"
   s.extra_rdoc_files = [

data/lib/algoliasearch-rails.rb

@@ -257,11 +257,21 @@ module AlgoliaSearch
       algolia_configurations.each do |options, settings|
         next if algolia_indexing_disabled?(options)
         next if options[:slave]
-        index_name = algolia_index_name(options)
 
+        # fetch the master settings
+        master_index = algolia_ensure_init(options, settings)
+        master_settings = master_index.get_settings rescue {} # if master doesn't exist yet
+        master_settings.merge!(JSON.parse(settings.to_settings.to_json)) # convert symbols to strings
+
+        # remove the slaves of the temporary index
+        master_settings.delete :slaves
+        master_settings.delete 'slaves'
+
+        # init temporary index
+        index_name = algolia_index_name(options)
         tmp_options = options.merge({ :index_name => "#{index_name}.tmp" })
         tmp_settings = settings.dup
-        tmp_index = algolia_ensure_init(tmp_options, tmp_settings, true)
+        tmp_index = algolia_ensure_init(tmp_options, tmp_settings, master_settings)
 
         algolia_find_in_batches(batch_size) do |group|
           if algolia_conditional_index?(tmp_options)
@@ -439,19 +449,15 @@ module AlgoliaSearch
 
     protected
 
-    def algolia_ensure_init(options = nil, settings = nil, remove_slaves = false)
+    def algolia_ensure_init(options = nil, settings = nil, index_settings = nil)
       @algolia_indexes ||= {}
       options ||= algoliasearch_options
       settings ||= algoliasearch_settings
       return @algolia_indexes[settings] if @algolia_indexes[settings]
       @algolia_indexes[settings] = Algolia::Index.new(algolia_index_name(options))
       current_settings = @algolia_indexes[settings].get_settings rescue nil # if the index doesn't exist
-      if !algolia_indexing_disabled?(options) && algoliasearch_settings_changed?(current_settings, settings.to_settings)
-        index_settings = settings.to_settings
-        if remove_slaves
-          index_settings.delete :slaves
-          index_settings.delete 'slaves'
-        end
+      if !algolia_indexing_disabled?(options) && (index_settings || algoliasearch_settings_changed?(current_settings, settings.to_settings))
+        index_settings ||= settings.to_settings
         @algolia_indexes[settings].set_settings(index_settings)
       end
       @algolia_indexes[settings]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: algoliasearch-rails
 version: !ruby/object:Gem::Version
-  version: 1.11.2
+  version: 1.11.3
 platform: ruby
 authors:
 - Algolia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-02 00:00:00.000000000 Z
+date: 2014-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json