elastic_searchable 0.1.6 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.2.0

data/elastic_searchable.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{elastic_searchable}
-  s.version = "0.1.6"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ryan Sonnek"]
-  s.date = %q{2011-01-26}
+  s.date = %q{2011-01-28}
   s.description = %q{integrate the elastic search engine with rails}
   s.email = %q{ryan@codecrate.com}
   s.extra_rdoc_files = [

data/lib/elastic_searchable.rb

@@ -7,6 +7,9 @@ module ElasticSearchable
     def searcher
       @searcher ||= ElasticSearch.new("localhost:9200")
     end
+    def backgrounded_options
+      {:queue => 'elasticsearch'}
+    end
   end
 end
 

data/lib/elastic_searchable/active_record.rb

@@ -15,15 +15,20 @@ module ElasticSearchable
       attr_accessor :elastic_options
 
       # Valid options:
-      # :index_name (will default class name using method "underscore")
-      # :if
-      # :unless
+      # :index (optional) configure index to store data in.  default to model table name
+      # :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!
         options[:index] ||= self.table_name
         options[:type] ||= self.table_name
         options[:index_options] ||= {}
         options[:mapping] ||= false
+        options[:json] ||= {}
         self.elastic_options = options
 
         extend ElasticSearchable::ActiveRecord::Index
@@ -37,15 +42,11 @@ module ElasticSearchable
     end
 
     module InstanceMethods
-      # build json document to index in elasticsearch
-      # default implementation simply calls to_json
-      # implementations can override this method to index custom content
       def indexed_json_document
-        self.to_json
+        self.as_json self.class.elastic_options[:json]
       end
       def index_in_elastic_search(lifecycle = nil)
-        document = self.indexed_json_document
-        ElasticSearchable.searcher.index document, self.class.index_options.merge(:id => self.id.to_s)
+        ElasticSearchable.searcher.index self.indexed_json_document, self.class.index_options.merge(:id => self.id.to_s)
 
         self.run_callbacks("after_index_on_#{lifecycle}".to_sym) if lifecycle
         self.run_callbacks(:after_index)

data/lib/elastic_searchable/callbacks.rb

@@ -6,9 +6,9 @@ module ElasticSearchable
 
     module ClassMethods
       def add_indexing_callbacks
-        backgrounded :update_index_on_create => {:queue => 'searchindex'}, :update_index_on_update => {:queue => 'searchindex'}
+        backgrounded :update_index_on_create => ElasticSearchable.backgrounded_options, :update_index_on_update => ElasticSearchable.backgrounded_options
         class << self
-          backgrounded :delete_id_from_index => {:queue => 'searchindex'}
+          backgrounded :delete_id_from_index => ElasticSearchable.backgrounded_options
         end
 
         define_callbacks :after_index_on_create, :after_index_on_update, :after_index

data/test/test_elastic_searchable.rb

@@ -25,7 +25,6 @@ class TestElasticSearchable < Test::Unit::TestCase
       t.column :title, :string
       t.column :body, :string
     end
-
     create_table :blogs, :force => true do |t|
       t.column :title, :string
       t.column :body, :string
@@ -33,10 +32,28 @@ class TestElasticSearchable < Test::Unit::TestCase
     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
   end
 
   class Post < ActiveRecord::Base
     elastic_searchable
+    after_index :indexed
+    after_index_on_create :indexed_on_create
+    def indexed
+      @indexed = true
+    end
+    def indexed?
+      @indexed
+    end
+    def indexed_on_create
+      @indexed_on_create = true
+    end
+    def indexed_on_create?
+      @indexed_on_create
+    end
   end
 
   context 'Post class with default elastic_searchable config' do
@@ -70,6 +87,13 @@ class TestElasticSearchable < Test::Unit::TestCase
       @post = Post.create :title => 'foo', :body => "bar"
       Post.create_index
     end
+    should 'have fired after_index callback' do
+      assert @post.indexed?
+    end
+    should 'have fired after_index_on_create callback' do
+      assert @post.indexed_on_create?
+    end
+
     context 'searching for results' do
       setup do
         @results = Post.search 'foo'
@@ -132,4 +156,22 @@ class TestElasticSearchable < Test::Unit::TestCase
       end
     end
   end
+
+  class Friend < ActiveRecord::Base
+    elastic_searchable :json => {:only => [:name]}
+  end
+  context 'activerecord class with :json=>{}' do
+    context 'creating index' do
+      setup do
+        Friend.delete_all
+        @friend = Friend.create! :name => 'bob', :favorite_color => 'red'
+        Friend.create_index
+      end
+      should 'index json with configuration' do
+        @response = ElasticSearchable.searcher.get @friend.id, Friend.index_options
+        assert_equal 'bob', @response.name
+        assert_nil @response.favorite_color
+      end
+    end
+  end
 end

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: 
   segments: 
   - 0
-  - 1
-  - 6
-  version: 0.1.6
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Ryan Sonnek
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-26 00:00:00 -06:00
+date: 2011-01-28 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency