freelancing-god-thinking-sphinx 1.1.7 → 1.1.8

data/README

@@ -125,3 +125,4 @@ Since I first released this library, there's been quite a few people who have su
 - Andrei Bocan
 - László Bácsi
 - Peter Wagenet
+- Max Lapshin

data/lib/thinking_sphinx.rb

@@ -36,7 +36,7 @@ module ThinkingSphinx
   module Version #:nodoc:
     Major = 1
     Minor = 1
-    Tiny  = 7
+    Tiny  = 8
     
     String = [Major, Minor, Tiny].join('.')
   end

data/lib/thinking_sphinx/active_record.rb

@@ -1,3 +1,4 @@
+require 'thinking_sphinx/active_record/attribute_updates'
 require 'thinking_sphinx/active_record/delta'
 require 'thinking_sphinx/active_record/search'
 require 'thinking_sphinx/active_record/has_many_association'
@@ -79,6 +80,8 @@ module ThinkingSphinx
             
             after_destroy :toggle_deleted
             
+            include ThinkingSphinx::ActiveRecord::AttributeUpdates
+            
             index
           end
           alias_method :sphinx_index, :define_index

data/lib/thinking_sphinx/active_record/attribute_updates.rb

@@ -0,0 +1,48 @@
+module ThinkingSphinx
+  module ActiveRecord
+    module AttributeUpdates
+      def self.included(base)
+        base.class_eval do
+          after_commit :update_attribute_values
+        end
+      end
+      
+      private
+            
+      def update_attribute_values
+        return unless ThinkingSphinx.updates_enabled? && ThinkingSphinx.sphinx_running?
+        
+        config = ThinkingSphinx::Configuration.instance
+        client = Riddle::Client.new config.address, config.port
+        
+        self.sphinx_indexes.each do |index|
+          attribute_pairs  = attribute_values_for_index(index)
+          attribute_names  = attribute_pairs.keys
+          attribute_values = attribute_names.collect { |key|
+            attribute_pairs[key]
+          }
+          
+          client.update "#{index.name}_core", attribute_names, {
+            sphinx_document_id => attribute_values
+          } if in_core_index?
+        end
+      end
+      
+      def updatable_attributes(index)
+        index.attributes.select { |attrib| attrib.updatable? }
+      end
+      
+      def attribute_values_for_index(index)
+        updatable_attributes(index).inject({}) { |hash, attrib|
+          if attrib.type == :datetime
+            hash[attrib.unique_name.to_s] = attrib.live_value(self).to_time.to_i
+          else
+            hash[attrib.unique_name.to_s] = attrib.live_value self
+          end
+          
+          hash
+        }
+      end
+    end
+  end
+end

data/lib/thinking_sphinx/active_record/delta.rb

@@ -69,7 +69,16 @@ module ThinkingSphinx
           end
           
           def should_toggle_delta?
-            !self.respond_to?(:changed?) || self.changed? || self.new_record?
+            self.new_record? || indexed_data_changed?
+          end
+          
+          def indexed_data_changed?
+            sphinx_indexes.any? { |index|
+              index.fields.any? { |field| field.changed?(self) } ||
+              index.attributes.any? { |attrib|
+                attrib.public? && attrib.changed?(self) && !attrib.updatable?
+              }
+            }
           end
         end
       end

data/lib/thinking_sphinx/attribute.rb

@@ -157,6 +157,17 @@ module ThinkingSphinx
       end
     end
     
+    def updatable?
+      [:integer, :datetime, :boolean].include?(type) && !is_string?
+    end
+    
+    def live_value(instance)
+      object = instance
+      column = @columns.first
+      column.__stack.each { |method| object = object.send(method) }
+      object.send(column.__name)
+    end
+    
     private
     
     def source_value(offset)

data/lib/thinking_sphinx/property.rb

@@ -49,6 +49,23 @@ module ThinkingSphinx
       end
     end
     
+    def changed?(instance)
+      return true if is_string? || @columns.any? { |col| !col.__stack.empty? }
+      
+      !@columns.all? { |col|
+        instance.respond_to?("#{col.__name.to_s}_changed?") &&
+        !instance.send("#{col.__name.to_s}_changed?")
+      }
+    end
+    
+    def admin?
+      admin
+    end
+    
+    def public?
+      !admin
+    end
+    
     private
     
     # Could there be more than one value related to the parent record? If so,

data/spec/unit/thinking_sphinx/active_record_spec.rb

@@ -64,15 +64,15 @@ describe "ThinkingSphinx::ActiveRecord" do
       
       TestModule::TestModel.define_index do; end
       
-      TestModule::TestModel.should have_received(:before_save)
-      TestModule::TestModel.should have_received(:after_commit)
+      TestModule::TestModel.should have_received(:before_save).with(:toggle_delta)
+      TestModule::TestModel.should have_received(:after_commit).with(:index_delta)
     end
     
     it "should not add before_save and after_commit hooks to the model if delta indexing is disabled" do
       TestModule::TestModel.define_index do; end
       
-      TestModule::TestModel.should_not have_received(:before_save)
-      TestModule::TestModel.should_not have_received(:after_commit)
+      TestModule::TestModel.should_not have_received(:before_save).with(:toggle_delta)
+      TestModule::TestModel.should_not have_received(:after_commit).with(:index_delta)
     end
     
     it "should add an after_destroy hook with delta indexing enabled" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: freelancing-god-thinking-sphinx
 version: !ruby/object:Gem::Version 
-  version: 1.1.7
+  version: 1.1.8
 platform: ruby
 authors: 
 - Pat Allan
@@ -22,6 +22,7 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- lib/thinking_sphinx/active_record/attribute_updates.rb
 - lib/thinking_sphinx/active_record/delta.rb
 - lib/thinking_sphinx/active_record/has_many_association.rb
 - lib/thinking_sphinx/active_record/search.rb