algoliasearch-rails 1.11.0 → 1.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f39872864846771818558ceb0b4e0c39133a5f0
-  data.tar.gz: 6917f70e4192d8ad79b02e6bdcdca3e3cc1e8067
+  metadata.gz: ff7268843b4187ac3dcf7935b7cc6210ae2537bc
+  data.tar.gz: b2c861d79e0098fc865887ca837df5f95629e9ed
 SHA512:
-  metadata.gz: eb0791e62c9575254411b94315fa667229bf0fed7f601b64e4b356b1a735de2efa9b789c25259dd301fc715f623a36c52f7fb55d4d7f34db58c69a884a105319
-  data.tar.gz: 548db3f2db61373437b8902f907920a932db97747a098f4c13d2200d079aae8c7e6ed5daea3999a66a8c68db0510b4b5085ba19e2f2525a633406635f65750c7
+  metadata.gz: 4a07ec13513cbd052d1c44739ccb74d0c8270ad938cf232c960e8b7530dc5b4010baeb0c3b927eb913f52a3c75fa9e6df5b5025bb41d0c80859936c42da21927
+  data.tar.gz: 0e553e1bcdfd3aff649438957e72705cdb0da1da64a8f29b854a7524b537e363c7956d74a0f4b3058d5a6a8bccbfb71b1c884c02d535f0e676a0bb8a792b5508

data/ChangeLog

@@ -1,5 +1,10 @@
 CHANGELOG
 
+2014-08-25 1.11.1
+
+      * While using a temporary index to reindex, do not set the "slaves" index setting (will be set at move-time)
+      * Ability to strip HTML tags from attributes
+
 2014-08-20 1.11.0
 
       * Do not rely of _changed? method to detect reindexing needs, if those methods are missing we probably need to reindex

data/README.md

@@ -274,6 +274,21 @@ or
 MyModel.index_objects MyModel.limit(5)
 ```
 
+#### Sanitizer
+
+You can sanitize all your attributes using the ```sanitize``` option. It will strip all HTML tags from your attributes.
+
+```ruby
+class User < ActiveRecord::Base
+  include AlgoliaSearch
+
+  algoliasearch per_environment: true, sanitize: true do
+    attributes :name, :email, :company
+  end
+end
+
+```
+
 
 Configuration example
 ---------------------

data/VERSION

@@ -1 +1 @@
-1.11.0
+1.11.1

data/algoliasearch-rails.gemspec

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

data/lib/algoliasearch-rails.rb

@@ -87,7 +87,7 @@ module AlgoliaSearch
 
     def get_attributes(object)
       clazz = object.class
-      if defined?(::Mongoid::Document) && clazz.include?(::Mongoid::Document)
+      attributes = if defined?(::Mongoid::Document) && clazz.include?(::Mongoid::Document)
         # work-around mongoid 2.4's unscoped method, not accepting a block
         res = @attributes.nil? || @attributes.length == 0 ? object.attributes :
           Hash[@attributes.map { |name, value| [name.to_s, value.call(object) ] }]
@@ -101,6 +101,26 @@ module AlgoliaSearch
           res
         end
       end
+
+      if @options[:sanitize]
+        sanitizer = HTML::FullSanitizer.new
+        attributes = sanitize_attributes(attributes, sanitizer)
+      end
+
+      attributes
+    end
+
+    def sanitize_attributes(v, sanitizer)
+      case v
+      when String
+        sanitizer.sanitize(v)
+      when Hash
+        v.each { |key, value| v[key] = sanitize_attributes(value, sanitizer) }
+      when Array
+        v.map { |x| sanitize_attributes(x, sanitizer) }
+      else
+        v
+      end
     end
 
     def geoloc(lat_attr, lng_attr)
@@ -241,7 +261,7 @@ module AlgoliaSearch
 
         tmp_options = options.merge({ :index_name => "#{index_name}.tmp" })
         tmp_settings = settings.dup
-        tmp_index = algolia_ensure_init(tmp_options, tmp_settings)
+        tmp_index = algolia_ensure_init(tmp_options, tmp_settings, true)
 
         algolia_find_in_batches(batch_size) do |group|
           if algolia_conditional_index?(tmp_options)
@@ -418,14 +438,21 @@ module AlgoliaSearch
 
     protected
 
-    def algolia_ensure_init(options = nil, settings = nil)
+    def algolia_ensure_init(options = nil, settings = nil, remove_slaves = false)
       @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
-      @algolia_indexes[settings].set_settings(settings.to_settings) if !algolia_indexing_disabled?(options) && algoliasearch_settings_changed?(current_settings, settings.to_settings)
+      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
+        @algolia_indexes[settings].set_settings(index_settings)
+      end
       @algolia_indexes[settings]
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: algoliasearch-rails
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.11.1
 platform: ruby
 authors:
 - Algolia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-20 00:00:00.000000000 Z
+date: 2014-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json