algoliasearch-rails 1.3.10 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b98457654ea69bba65dc9261a30eb05e56112d79
-  data.tar.gz: 9e4a4c26ee00fb820627468a4eacb3ef25f722ce
+  metadata.gz: c7c04861a87809fcc0e5b1f6a3195b38e62e5634
+  data.tar.gz: 1f354ed3067a4c438deef7d1355eaeb98c75edd1
 SHA512:
-  metadata.gz: cc9d4e8018b23c32f427e890f1288bfa66387f4f983dd01a2f45f4cad1eec7c6ae56d5e1bec542a8eec80f181c2d347176e16e45e50439ed9daaedb148c558e2
-  data.tar.gz: 7c4d013065b66d6a0415c72ca6440896256440f4faaa872b3ff25982a425868091ce7d979e9409ec0b26065b402d26832f011af9fd3058d0687eaf1c3550bf51
+  metadata.gz: 4329b3f1440d9dbb810da2225dbf04de248cbb771cdddfd508a44bf038b643ee6ca76fafd3a3282086dda476073dca63478522ed9141478579aaae6154f70618
+  data.tar.gz: 56b9c819f5e5d7b7cd79c664adecc2f8b770b19c45113682a0193d666090712c755e3ee60350f22841ec8c38da331e3b05af102fe5835ba923d3471d28ac8785

data/ChangeLog

@@ -1,5 +1,9 @@
 CHANGELOG
 
+2013-11-25  1.4.1
+
+      * ability to specify a block associated to an attribute as value
+
 2013-11-22  1.3.10
 
       * updated algoliasearch.js (2.3.2)

data/README.md

@@ -149,6 +149,21 @@ class Contact < ActiveRecord::Base
 end
 ```
 
+You can use a block to specify a complex attribute value
+
+```ruby
+class Contact < ActiveRecord::Base
+  include AlgoliaSearch
+
+  algoliasearch do
+    attribute :email
+    attribute :full_name do
+      "#{first_name} #{last_name}"
+    end
+  end
+end
+```
+
 Indexing
 ---------
 

data/VERSION

@@ -1 +1 @@
-1.3.10
+1.4.1

data/algoliasearch-rails.gemspec

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

data/lib/algoliasearch-rails.rb

@@ -42,7 +42,7 @@ module AlgoliaSearch
 
   end
 
-  class IndexOptions
+  class IndexSettings
 
     # AlgoliaSearch settings
     OPTIONS = [:attributesToIndex, :minWordSizefor1Typo,
@@ -56,26 +56,31 @@ module AlgoliaSearch
       end
     end
 
-    # attributes to consider
-    attr_accessor :attributes
-
     def initialize(block)
       instance_exec(&block) if block
     end
 
-    def attribute(*names)
-      self.attributes ||= []
-      self.attributes += names
+    def attribute(*names, &block)
+      raise ArgumentError.new('Cannot pass multiple attribute names if block given') if block_given? and names.length > 1
+      @attributes ||= {}
+      names.each do |name|
+        @attributes[name] = block_given? ? Proc.new { |o| o.instance_eval(&block) } : Proc.new { |o| o.send(name) }
+      end
+    end
+
+    def get_attributes(object)
+      return object.attributes if @attributes.nil? or @attributes.length == 0
+      Hash[@attributes.map { |name, value| [name.to_s, value.call(object) ] }]
     end
 
-    def get(setting)
-      instance_variable_get("@#{setting}")
+    def get_setting(name)
+      instance_variable_get("@#{name}")
     end
 
     def to_settings
       settings = {}
       OPTIONS.each do |k|
-        v = get(k)
+        v = get_setting(k)
         settings[k] = v if !v.nil?
       end
       settings
@@ -86,7 +91,10 @@ module AlgoliaSearch
   module ClassMethods
 
     def algoliasearch(options = {}, &block)
-      @index_options = IndexOptions.new(block_given? ? Proc.new : nil)
+      @index_settings = IndexSettings.new(block_given? ? Proc.new : nil)
+      @settings = @index_settings.to_settings
+      @options = { type: model_name, per_page: @index_settings.get_setting(:hitsPerPage) || 10, page: 1 }.merge(options)
+
       attr_accessor :highlight_result
 
       if options[:synchronous] == true
@@ -100,8 +108,6 @@ module AlgoliaSearch
       unless options[:auto_remove] == false
         after_destroy { |searchable| searchable.remove_from_index! } if respond_to?(:after_destroy)
       end
-
-      @options = { type: model_name, per_page: @index_options.get(:hitsPerPage) || 10, page: 1 }.merge(options)
     end
 
     def without_auto_index(&block)
@@ -118,7 +124,7 @@ module AlgoliaSearch
       ensure_init
       last_task = nil
       find_in_batches(batch_size: batch_size) do |group|
-        objects = group.map { |o| attributes(o).merge 'objectID' => o.id.to_s }
+        objects = group.map { |o| @index_settings.get_attributes(o).merge 'objectID' => o.id.to_s }
         last_task = @index.save_objects(objects)
       end
       @index.wait_task(last_task["taskID"]) if last_task and synchronous == true
@@ -128,9 +134,9 @@ module AlgoliaSearch
       return if @without_auto_index_scope
       ensure_init
       if synchronous
-        @index.add_object!(attributes(object), object.id.to_s)
+        @index.add_object!(@index_settings.get_attributes(object), object.id.to_s)
       else
-        @index.add_object(attributes(object), object.id.to_s)
+        @index.add_object(@index_settings.get_attributes(object), object.id.to_s)
       end
     end
 
@@ -162,17 +168,15 @@ module AlgoliaSearch
     end
 
     def ensure_init
-      new_settings = @index_options.to_settings
-      return if @index and !index_settings_changed?(@settings, new_settings)
+      return if @index
       @index = Algolia::Index.new(index_name)
       current_settings = @index.get_settings rescue nil # if the index doesn't exist
-      @index.set_settings(new_settings) if index_settings_changed?(current_settings, new_settings)
-      @settings = new_settings
+      @index.set_settings(@settings) if index_settings_changed?(current_settings, @settings)
     end
 
     def must_reindex?(object)
       return true if object.id_changed?
-      attributes(object).each do |k, v|
+      @index_settings.get_attributes(object).each do |k, v|
         changed_method = "#{k}_changed?"
         return true if object.respond_to?(changed_method) && object.send(changed_method)
       end
@@ -187,11 +191,6 @@ module AlgoliaSearch
 
     private
 
-    def attributes(object)
-      return object.attributes if @index_options.attributes.nil? or @index_options.attributes.length == 0
-      Hash[@index_options.attributes.map { |attr| [attr.to_s, object.send(attr)] }]
-    end
-
     def index_settings_changed?(prev, current)
       return true if prev.nil?
       current.each do |k, v|
@@ -233,7 +232,7 @@ module AlgoliaSearch
     end
 
     def mark_must_reindex
-      @must_reindex = self.class.must_reindex?(self)
+      @must_reindex = new_record? || self.class.must_reindex?(self)
       true
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: algoliasearch-rails
 version: !ruby/object:Gem::Version
-  version: 1.3.10
+  version: 1.4.1
 platform: ruby
 authors:
 - Algolia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-22 00:00:00.000000000 Z
+date: 2013-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json