elastic_searchable 0.6.4 → 0.6.5

data/lib/elastic_searchable/active_record_extensions.rb

@@ -0,0 +1,43 @@
+require 'active_record'
+require 'after_commit'
+require 'backgrounded'
+require 'elastic_searchable/queries'
+require 'elastic_searchable/callbacks'
+require 'elastic_searchable/index'
+
+module ElasticSearchable
+  module ActiveRecordExtensions
+    attr_accessor :elastic_options
+
+    # Valid options:
+    # :index (optional) configure index to store data in.  default to ElasticSearchable.default_index
+    # :type (optional) configue type to store data in.  default to model table name
+    # :index_options (optional) configure index properties (ex: tokenizer)
+    # :mapping (optional) configure field properties for this model (ex: skip analyzer for field)
+    # :if (optional) reference symbol/proc condition to only index when condition is true 
+    # :unless (optional) reference symbol/proc condition to skip indexing when condition is true
+    # :json (optional) configure the json document to be indexed (see http://api.rubyonrails.org/classes/ActiveModel/Serializers/JSON.html#method-i-as_json for available options)
+    def elastic_searchable(options = {})
+      options.symbolize_keys!
+      self.elastic_options = options
+
+      extend ElasticSearchable::Indexing::ClassMethods
+      extend ElasticSearchable::Queries
+
+      include ElasticSearchable::Indexing::InstanceMethods
+      include ElasticSearchable::Callbacks::InstanceMethods
+
+      backgrounded :update_index_on_create => ElasticSearchable::Callbacks.backgrounded_options, :update_index_on_update => ElasticSearchable::Callbacks.backgrounded_options
+      class << self
+        backgrounded :delete_id_from_index => ElasticSearchable::Callbacks.backgrounded_options
+      end
+
+      define_callbacks :after_index_on_create, :after_index_on_update, :after_index
+      after_commit_on_create :update_index_on_create_backgrounded, :if => :should_index?
+      after_commit_on_update :update_index_on_update_backgrounded, :if => :should_index?
+      after_commit_on_destroy :delete_from_index
+    end
+  end
+end
+
+ActiveRecord::Base.send(:extend, ElasticSearchable::ActiveRecordExtensions)

data/lib/elastic_searchable/index.rb

@@ -1,3 +1,5 @@
+require 'will_paginate'
+
 module ElasticSearchable
   module Indexing
     module ClassMethods
@@ -54,20 +56,20 @@ module ElasticSearchable
       end
 
       # reindex all records using bulk api
-      # options:
-      #   :scope - scope the find_in_batches to only a subset of records
-      #   :batch - counter to start indexing at
-      #   :include - passed to find_in_batches to hydrate objects
       # see http://www.elasticsearch.org/guide/reference/api/bulk.html
+      # options:
+      #   :scope - scope to use for looking up records to reindex. defaults to self (all)
+      #   :page - page/batch to begin indexing at. defaults to 1
+      #   :per_page - number of records to index per batch. defaults to 1000
       def reindex(options = {})
         self.update_index_mapping
-        batch = options.delete(:batch) || 1
-        options[:batch_size] ||= 1000
-        options[:start] ||= (batch - 1) * options[:batch_size]
+        options.reverse_merge! :page => 1, :per_page => 1000, :total_entries => 1
         scope = options.delete(:scope) || self
-        scope.find_in_batches(options) do |records|
-          ElasticSearchable.logger.info "reindexing batch ##{batch}..."
-          batch += 1
+
+        records = scope.paginate(options)
+        while records.any? do
+          ElasticSearchable.logger.info "reindexing batch ##{records.current_page}..."
+
           actions = []
           records.each do |record|
             next unless record.should_index?
@@ -82,9 +84,12 @@ module ElasticSearchable
           begin
             ElasticSearchable.request(:put, '/_bulk', :body => "\n#{actions.join("\n")}\n") if actions.any?
           rescue ElasticError => e
-            ElasticSearchable.logger.warn "Error indexing batch ##{batch}: #{e.message}"
+            ElasticSearchable.logger.warn "Error indexing batch ##{options[:page]}: #{e.message}"
             ElasticSearchable.logger.warn e
           end
+
+          options.merge! :page => (options[:page] + 1)
+          records = scope.paginate(options)
         end
       end
 

data/lib/elastic_searchable/version.rb

@@ -1,4 +1,4 @@
 module ElasticSearchable
-  VERSION = '0.6.4'
+  VERSION = '0.6.5'
 end
 

data/lib/elastic_searchable.rb

@@ -1,6 +1,6 @@
 require 'httparty'
 require 'logger'
-require 'elastic_searchable/active_record'
+require 'elastic_searchable/active_record_extensions'
 
 module ElasticSearchable
   include HTTParty
@@ -46,4 +46,3 @@ module ElasticSearchable
   end
 end
 
-ActiveRecord::Base.send(:include, ElasticSearchable::ActiveRecord)

data/test/helper.rb

@@ -14,10 +14,7 @@ require 'mocha'
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'elastic_searchable'
-
-config = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml'))
-ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/debug.log")
-ActiveRecord::Base.establish_connection(config[ENV['DB'] || 'sqlite'])
+require 'setup_database'
 
 class Test::Unit::TestCase
   def delete_index

data/test/setup_database.rb

@@ -0,0 +1,30 @@
+config = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml'))
+ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/debug.log")
+ActiveRecord::Base.establish_connection(config[ENV['DB'] || 'sqlite'])
+
+ActiveRecord::Schema.define(:version => 1) do
+  create_table :posts, :force => true do |t|
+    t.column :title, :string
+    t.column :body, :string
+  end
+  create_table :blogs, :force => true do |t|
+    t.column :title, :string
+    t.column :body, :string
+  end
+  create_table :users, :force => true do |t|
+    t.column :name, :string
+  end
+  create_table :friends, :force => true do |t|
+    t.column :name, :string
+    t.column :favorite_color, :string
+  end
+  create_table :books, :force => true do |t|
+    t.column :title, :string
+  end
+  create_table :max_page_size_classes, :force => true do |t|
+    t.column :name, :string
+  end
+end
+
+WillPaginate.enable_activerecord
+

data/test/test_elastic_searchable.rb

@@ -1,30 +1,6 @@
 require File.join(File.dirname(__FILE__), 'helper')
 
 class TestElasticSearchable < Test::Unit::TestCase
-  ActiveRecord::Schema.define(:version => 1) do
-    create_table :posts, :force => true do |t|
-      t.column :title, :string
-      t.column :body, :string
-    end
-    create_table :blogs, :force => true do |t|
-      t.column :title, :string
-      t.column :body, :string
-    end
-    create_table :users, :force => true do |t|
-      t.column :name, :string
-    end
-    create_table :friends, :force => true do |t|
-      t.column :name, :string
-      t.column :favorite_color, :string
-    end
-    create_table :books, :force => true do |t|
-      t.column :title, :string
-    end
-    create_table :max_page_size_classes, :force => true do |t|
-      t.column :name, :string
-    end
-  end
-
   def setup
     delete_index
   end
@@ -122,12 +98,14 @@ class TestElasticSearchable < Test::Unit::TestCase
     end
     context 'Post.reindex' do
       setup do
-        Post.reindex
+        Post.reindex :per_page => 1, :scope => Post.scoped(:order => 'body desc')
         Post.refresh_index
       end
       should 'have reindexed both records' do
-        ElasticSearchable.request :get, "/elastic_searchable/posts/#{@first_post.id}"
-        ElasticSearchable.request :get, "/elastic_searchable/posts/#{@second_post.id}"
+        assert_nothing_raised do
+          ElasticSearchable.request :get, "/elastic_searchable/posts/#{@first_post.id}"
+          ElasticSearchable.request :get, "/elastic_searchable/posts/#{@second_post.id}"
+        end
       end
     end
   end
@@ -149,7 +127,7 @@ class TestElasticSearchable < Test::Unit::TestCase
       end
       should 'be paginated' do
         assert_equal 1, @results.current_page
-        assert_equal 20, @results.per_page
+        assert_equal Post.per_page, @results.per_page
         assert_nil @results.previous_page
         assert_nil @results.next_page
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: elastic_searchable
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 6
-  - 4
-  version: 0.6.4
+  - 5
+  version: 0.6.5
 platform: ruby
 authors: 
 - Ryan Sonnek
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-30 00:00:00 -05:00
+date: 2011-04-01 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -191,13 +191,14 @@ files:
 - VERSION
 - elastic_searchable.gemspec
 - lib/elastic_searchable.rb
-- lib/elastic_searchable/active_record.rb
+- lib/elastic_searchable/active_record_extensions.rb
 - lib/elastic_searchable/callbacks.rb
 - lib/elastic_searchable/index.rb
 - lib/elastic_searchable/queries.rb
 - lib/elastic_searchable/version.rb
 - test/database.yml
 - test/helper.rb
+- test/setup_database.rb
 - test/test_elastic_searchable.rb
 has_rdoc: true
 homepage: http://github.com/wireframe/elastic_searchable
@@ -236,4 +237,5 @@ summary: elastic search for activerecord
 test_files: 
 - test/database.yml
 - test/helper.rb
+- test/setup_database.rb
 - test/test_elastic_searchable.rb

data/lib/elastic_searchable/active_record.rb

@@ -1,47 +0,0 @@
-require 'active_record'
-require 'after_commit'
-require 'backgrounded'
-require 'elastic_searchable/queries'
-require 'elastic_searchable/callbacks'
-require 'elastic_searchable/index'
-
-module ElasticSearchable
-  module ActiveRecord
-    def self.included(base)
-      base.send :extend, ClassMethods
-    end
-
-    module ClassMethods
-      attr_accessor :elastic_options
-
-      # Valid options:
-      # :index (optional) configure index to store data in.  default to ElasticSearchable.default_index
-      # :type (optional) configue type to store data in.  default to model table name
-      # :index_options (optional) configure index properties (ex: tokenizer)
-      # :mapping (optional) configure field properties for this model (ex: skip analyzer for field)
-      # :if (optional) reference symbol/proc condition to only index when condition is true 
-      # :unless (optional) reference symbol/proc condition to skip indexing when condition is true
-      # :json (optional) configure the json document to be indexed (see http://api.rubyonrails.org/classes/ActiveModel/Serializers/JSON.html#method-i-as_json for available options)
-      def elastic_searchable(options = {})
-        options.symbolize_keys!
-        self.elastic_options = options
-
-        extend ElasticSearchable::Indexing::ClassMethods
-        extend ElasticSearchable::Queries
-
-        include ElasticSearchable::Indexing::InstanceMethods
-        include ElasticSearchable::Callbacks::InstanceMethods
-
-        backgrounded :update_index_on_create => ElasticSearchable::Callbacks.backgrounded_options, :update_index_on_update => ElasticSearchable::Callbacks.backgrounded_options
-        class << self
-          backgrounded :delete_id_from_index => ElasticSearchable::Callbacks.backgrounded_options
-        end
-
-        define_callbacks :after_index_on_create, :after_index_on_update, :after_index
-        after_commit_on_create :update_index_on_create_backgrounded, :if => :should_index?
-        after_commit_on_update :update_index_on_update_backgrounded, :if => :should_index?
-        after_commit_on_destroy :delete_from_index
-      end
-    end
-  end
-end