heliosphere 0.0.1 → 0.1.0

data/lib/heliosphere.rb

@@ -13,7 +13,7 @@ module Heliosphere
   end
 
   def self.reindex
-    server.start_and_reindex
+    server.reindex
   end
 
   def self.wait(&block)

data/lib/heliosphere/indexer.rb

@@ -12,6 +12,7 @@ module Heliosphere
 
     def define(&block)
       instance_eval(&block)
+      extend_active_record
       apply
     end
 
@@ -28,6 +29,27 @@ module Heliosphere
       end
     end
 
+    def extend_active_record
+      ActiveRecord::Base.class_eval %Q{
+        def index_on_save?
+          @index_on_save = true unless instance_variable_defined?(:@index_on_save)
+          @index_on_save
+        end
+
+        def save_without_index
+          @index_on_save = false
+          save
+          @index_on_save = true
+        end
+
+        def save_without_index!
+          @index_on_save = false
+          save!
+          @index_on_save = true
+        end
+      }
+    end
+
     def index(model, &block)
       model_definitions[model] = block
     end

data/lib/heliosphere/observer.rb

@@ -4,10 +4,10 @@ module Heliosphere
 
   class Observer < ActiveRecord::Observer
 
-    observe *Heliosphere.indexer.model_names
+    observe *Heliosphere.indexer.models
 
     def after_save(object)
-      running? { Sunspot.index(object) }
+      running? { Sunspot.index(object) if object.index_on_save? }
     end
 
     def after_destroy(object)

data/lib/heliosphere/railtie.rb

@@ -1,16 +1,20 @@
-require 'heliosphere/observer'
-
 module Heliosphere
 
   class Railtie < Rails::Railtie
 
-    initializer "heliosphere.add_observer" do |app|
+    config.after_initialize do |app|
+      require 'heliosphere/observer'
+
       ar = app.config.active_record
+
       if ar.observers
         ar.observers += [ Heliosphere::Observer ]
       else
         ar.observers = [ Heliosphere::Observer ]
       end
+
+      ActiveRecord::Base.observers = ar.observers
+      ActiveRecord::Base.instantiate_observers
     end
 
     rake_tasks do

data/lib/heliosphere/server.rb

@@ -29,9 +29,21 @@ module Heliosphere
     end
 
     def reindex
+      wait(&:up?)
+      clear_index
+
+      Heliosphere.indexer.models.each do |model|
+        model.all.each do |record|
+          Sunspot.index(record)
+        end
+      end
+
+      Sunspot.commit
+    end
+
+    def clear_index
       Heliosphere.indexer.models.each do |model|
         model.remove_all_from_index
-        model.index
       end
     end
 

data/lib/heliosphere/version.rb

@@ -1,3 +1,3 @@
 module Heliosphere
-  VERSION = "0.0.1"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heliosphere
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-26 00:00:00.000000000Z
+date: 2012-02-01 00:00:00.000000000 Z
 dependencies: []
 description: Saving a record is usually more important than indexing it in Solr. Heliosphere
   will only index when Solr is running. It also includes some convenient rake tasks
@@ -58,7 +58,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: heliosphere
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Heliosphere makes Sunspot less dangerous by allowing updates to occur when