algoliasearch-rails 1.16.0 → 1.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 896c5f230813d18ff8e9690822d0a4306333db91
-  data.tar.gz: aebeff6835f6dd017dede213dcce29671cf3ef6b
+  metadata.gz: 30cea1db33b8935ea694324377f78f83fc4844d3
+  data.tar.gz: 284bf018c8b37a098364786b8315c7b4f586c678
 SHA512:
-  metadata.gz: 5e53db4e89af8d4ed8432f6cb918d62050348d7ebc6ee54f42839714a695f0199a7c6c65d17e1a9341c88b76751b305eca24919dbd7f91f0e765388215ecbe11
-  data.tar.gz: 7a11bf529e54d4b2024b0e0947baa7d1c985246945eafc910513301b7a79525609dd102f465119a9e68ca09ddc5e047966ba43e743467b905dfb9a4aba3efaa8
+  metadata.gz: c2a2d96c302380fed00f63918c15b1793d176f7d8be8ee061ac096ff0092d5c66204b4b5952f60baccbaefc954d6701bac2002ce9e1b27d755ec367a29016841
+  data.tar.gz: ae07742435830e1375ed1656689b6f7e2edc945104fa35498d66720bfba35ba0fe46eb05c1d0e5c67589b4ad990a037397ebcf91ce9ae816f3dcfddfcbe67c83

data/ChangeLog

@@ -1,5 +1,11 @@
 CHANGELOG
 
+2016-11-04 1.16.1
+
+      * Added IndexSettings#get_attribute_names
+      * Refactored IndexSettings#get_attributes
+      * algolia_must_reindex? doesn't compute attribute values anymore
+
 2016-10-02 1.16.0
 
       * Upgrade `algoliasearch` to 1.12.0

data/VERSION

@@ -1 +1 @@
-1.16.0
+1.16.1

data/lib/algoliasearch-rails.rb

@@ -97,27 +97,65 @@ module AlgoliaSearch
     end
     alias :add_attributes :add_attribute
 
-    def get_attributes(object)
-      clazz = object.class
-      attributes = if defined?(::Mongoid::Document) && clazz.include?(::Mongoid::Document)
+    def is_mongoid?(object)
+      defined?(::Mongoid::Document) && object.class.include?(::Mongoid::Document)
+    end
+
+    def is_sequel?(object)
+      defined?(::Sequel) && object.class < ::Sequel::Model
+    end
+
+    def is_active_record?(object)
+      !is_mongoid?(object) && !is_sequel?(object)
+    end
+
+    def get_default_attributes(object)
+      if is_mongoid?(object)
         # 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) ] }]
-        @additional_attributes.each { |name, value| res[name.to_s] = value.call(object) } if @additional_attributes
-        res
-      elsif defined?(::Sequel) && clazz < ::Sequel::Model
-        res = @attributes.nil? || @attributes.length == 0 ? object.to_hash :
-          Hash[@attributes.map { |name, value| [name.to_s, value.call(object) ] }]
-        @additional_attributes.each { |name, value| res[name.to_s] = value.call(object) } if @additional_attributes
-        res
+        object.attributes
+      elsif is_sequel?(object)
+        object.to_hash
       else
         object.class.unscoped do
-          res = @attributes.nil? || @attributes.length == 0 ? object.attributes :
-            Hash[@attributes.map { |name, value| [name.to_s, value.call(object) ] }]
-          @additional_attributes.each { |name, value| res[name.to_s] = value.call(object) } if @additional_attributes
-          res
+          object.attributes
         end
       end
+    end
+
+    def get_attribute_names(object)
+      res = if @attributes.nil? || @attributes.length == 0
+        get_default_attributes(object).keys
+      else
+        @attributes.keys
+      end
+
+      res += @additional_attributes.keys if @additional_attributes
+
+      res
+    end
+
+    def attributes_to_hash(attributes, object)
+      if attributes
+        Hash[attributes.map { |name, value| [name.to_s, value.call(object) ] }]
+      else
+        {}
+      end
+    end
+
+    def get_attributes(object)
+      attributes = if @attributes.nil? || @attributes.length == 0
+        get_default_attributes(object)
+      else
+        if is_active_record?(object)
+          object.class.unscoped do
+            attributes_to_hash(@attributes, object)
+          end
+        else
+          attributes_to_hash(@attributes, object)
+        end
+      end
+
+      attributes.merge!(attributes_to_hash(@additional_attributes, object))
 
       if @options[:sanitize]
         sanitizer = begin
@@ -629,7 +667,7 @@ module AlgoliaSearch
       algolia_configurations.each do |options, settings|
         next if options[:slave]
         return true if algolia_object_id_changed?(object, options)
-        settings.get_attributes(object).each do |k, v|
+        settings.get_attribute_names(object).each do |k|
           changed_method = "#{k}_changed?"
           return true if !object.respond_to?(changed_method) || object.send(changed_method)
         end

data/spec/spec_helper.rb

@@ -18,6 +18,7 @@ RSpec.configure do |c|
   c.mock_with :rspec
   c.filter_run :focus => true
   c.run_all_when_everything_filtered = true
+  c.formatter = 'documentation'
 end
 
 # avoid concurrent access to the same index

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: algoliasearch-rails
 version: !ruby/object:Gem::Version
-  version: 1.16.0
+  version: 1.16.1
 platform: ruby
 authors:
 - Algolia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-31 00:00:00.000000000 Z
+date: 2016-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json