elastic_searchable 0.1.2 → 0.1.3

data/Gemfile

@@ -12,6 +12,7 @@ gem 'larsklevan-after_commit', '~> 1.0.5', :require => 'after_commit'
 group :development do
   gem "shoulda", ">= 0"
   gem "bundler", "~> 1.0.0"
+  gem 'mocha', '>= 0'
   gem "jeweler", "~> 1.5.2"
   gem "rcov", ">= 0"
   gem 'sqlite3-ruby', '~> 1.3.2'

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/elastic_searchable.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{elastic_searchable}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ryan Sonnek"]
-  s.date = %q{2011-01-25}
+  s.date = %q{2011-01-26}
   s.description = %q{integrate the elastic search engine with rails}
   s.email = %q{ryan@codecrate.com}
   s.extra_rdoc_files = [
@@ -54,6 +54,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<larsklevan-after_commit>, ["~> 1.0.5"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<mocha>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_development_dependency(%q<sqlite3-ruby>, ["~> 1.3.2"])
@@ -65,6 +66,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<larsklevan-after_commit>, ["~> 1.0.5"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<mocha>, [">= 0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<sqlite3-ruby>, ["~> 1.3.2"])
@@ -77,6 +79,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<larsklevan-after_commit>, ["~> 1.0.5"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<mocha>, [">= 0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
     s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<sqlite3-ruby>, ["~> 1.3.2"])

data/lib/elastic_searchable/active_record.rb

@@ -14,12 +14,16 @@ module ElasticSearchable
     module ClassMethods
       attr_accessor :index_name
       attr_accessor :elastic_search_type
+      attr_accessor :elastic_options
 
       # Valid options:
       # :index_name (will default class name using method "underscore")
+      # :if
+      # :unless
       def elastic_searchable(options = {})
         options.symbolize_keys!
-        
+
+        self.elastic_options = options
         @index_name = options[:index_name] || self.name.underscore.gsub(/\//,'-')
         @elastic_search_type = options[:elastic_search_type] || self.name.underscore.singularize.gsub(/\//,'-')
 
@@ -43,7 +47,7 @@ module ElasticSearchable
       def indexed_json_document
         self.to_json
       end
-      def local_index_in_elastic_search(options = {})
+      def index_in_elastic_search(options = {})
         options[:id]    ||= self.id.to_s
         document = self.indexed_json_document
         ElasticSearchable.searcher.index document, self.class.elastic_search_options(options)

data/lib/elastic_searchable/callbacks.rb

@@ -11,18 +11,19 @@ module ElasticSearchable
           backgrounded :delete_id_from_index => {:queue => 'searchindex'}
         end
 
+        callback_options = self.elastic_options.slice :if, :unless
         define_callbacks :after_index_on_create, :after_index_on_update, :after_index
-        after_commit_on_create :update_index_on_create_backgrounded
-        after_commit_on_update :update_index_on_update_backgrounded
+        after_commit_on_create :update_index_on_create_backgrounded, callback_options
+        after_commit_on_update :update_index_on_update_backgrounded, callback_options
         after_commit_on_destroy Proc.new {|o| o.class.delete_id_from_index_backgrounded(o.id) }
       end
     end
 
     def update_index_on_create
-      local_index_in_elastic_search :lifecycle => :create
+      index_in_elastic_search :lifecycle => :create
     end
     def update_index_on_update
-      local_index_in_elastic_search :lifecycle => :update
+      index_in_elastic_search :lifecycle => :update
     end
   end
 end

data/lib/elastic_searchable/index.rb

@@ -7,7 +7,7 @@ module ElasticSearchable
         ElasticSearchable.searcher.update_mapping(@mapping, self.elastic_search_options) if @mapping
 
         self.find_each do |record|
-          record.local_index_in_elastic_search
+          record.run_callbacks :after_commit_on_update
         end
         self.refresh_index
       end

data/test/helper.rb

@@ -9,6 +9,7 @@ rescue Bundler::BundlerError => e
 end
 require 'test/unit'
 require 'shoulda'
+require 'mocha'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))

data/test/test_elastic_searchable.rb

@@ -6,6 +6,11 @@ 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
+    end
   end
 
   class Post < ActiveRecord::Base
@@ -52,4 +57,30 @@ class TestElasticSearchable < Test::Unit::TestCase
       end
     end
   end
+
+  class Blog < ActiveRecord::Base
+    elastic_searchable :if => proc {|b| b.should_index? }
+    def should_index?
+      false
+    end
+  end
+  context 'activerecord class with :if=>proc' do
+    context 'when creating new instance' do
+      setup do
+        Blog.any_instance.expects(:index_in_elastic_search).never
+        Blog.delete_all
+        Blog.create_index
+        Blog.create! :title => 'foo'
+      end
+      should 'not index record' do end #see expectations
+
+      context 'recreating new index' do
+        setup do
+          Blog.any_instance.expects(:index_in_elastic_search).never
+          Blog.create_index
+        end
+        should 'not index record' do end #see expectations
+      end
+    end
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: elastic_searchable
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Ryan Sonnek
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-25 00:00:00 -06:00
+date: 2011-01-26 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -131,6 +131,20 @@ dependencies:
 - !ruby/object:Gem::Dependency 
   type: :development
   version_requirements: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id008
+  prerelease: false
+  name: mocha
+- !ruby/object:Gem::Dependency 
+  type: :development
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -141,12 +155,12 @@ dependencies:
         - 5
         - 2
         version: 1.5.2
-  requirement: *id008
+  requirement: *id009
   prerelease: false
   name: jeweler
 - !ruby/object:Gem::Dependency 
   type: :development
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -155,12 +169,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id009
+  requirement: *id010
   prerelease: false
   name: rcov
 - !ruby/object:Gem::Dependency 
   type: :development
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -171,7 +185,7 @@ dependencies:
         - 3
         - 2
         version: 1.3.2
-  requirement: *id010
+  requirement: *id011
   prerelease: false
   name: sqlite3-ruby
 description: integrate the elastic search engine with rails