thinking-sphinx 1.3.9 → 1.3.10

data/README.textile

@@ -158,3 +158,4 @@ Since I first released this library, there's been quite a few people who have su
 * Jonas von Andrian
 * Dimitri Krassovski
 * Sergey Kojin
+* Brad Sumersford

data/VERSION

@@ -1 +1 @@
-1.3.9
+1.3.10

data/features/attribute_updates.feature

@@ -37,3 +37,14 @@ Feature: Update attributes directly to Sphinx
     
     When I search for the document id of beta eight in the beta_delta index
     Then it should not exist
+
+  Scenario: Updating boolean attribute in Sphinx
+    Given Sphinx is running
+    And I am searching on alphas
+    When I filter by active alphas
+    Then I should get 10 results
+    
+    When I flag alpha five as inactive
+    And I wait for Sphinx to catch up
+    And I filter by active alphas
+    Then I should get 9 results

data/features/step_definitions/alpha_steps.rb

@@ -5,3 +5,12 @@ end
 When /^I change the (\w+) of alpha (\w+) to (\w+)$/ do |column, name, replacement|
   Alpha.find_by_name(name).update_attributes(column.to_sym => replacement)
 end
+
+When /^I filter by active alphas$/ do
+  @results = nil
+  @with[:active] = true
+end
+
+When /^I flag alpha (\w+) as inactive$/ do |name|
+  Alpha.find_by_name(name).update_attributes(:active => false)
+end

data/features/support/db/migrations/create_alphas.rb

@@ -1,6 +1,7 @@
 ActiveRecord::Base.connection.create_table :alphas, :force => true do |t|
   t.column :name,       :string,  :null => false
   t.column :value,      :integer, :null => false
+  t.column :active,     :boolean, :null => false, :default => true
   t.column :cost,       :decimal, :precision => 10, :scale => 6
   t.column :created_on, :date
   t.column :created_at, :timestamp

data/features/support/models/alpha.rb

@@ -4,6 +4,7 @@ class Alpha < ActiveRecord::Base
     
     has value, created_at, created_on
     has cost, :facet => true
+    has active
     
     set_property :field_weights => {"name" => 10}
   end

data/lib/thinking_sphinx.rb

@@ -71,6 +71,10 @@ module ThinkingSphinx
     
     Thread.current[:thinking_sphinx_context]
   end
+  
+  def self.reset_context!
+    Thread.current[:thinking_sphinx_context] = nil
+  end
 
   def self.unique_id_expression(offset = nil)
     "* #{context.indexed_models.size} + #{offset || 0}"

data/lib/thinking_sphinx/active_record.rb

@@ -53,6 +53,20 @@ module ThinkingSphinx
             self.name.underscore.tr(':/\\', '_')
           end
           
+          #
+          # The above method to_crc32s is dependant on the subclasses being loaded consistently
+          # After a reset_subclasses is called (during a Dispatcher.cleanup_application in development)
+          # Our subclasses will be lost but our context will not reload them for us.
+          #
+          # We reset the context which causes the subclasses to be reloaded next time the context is called.
+          #
+          def reset_subclasses_with_thinking_sphinx
+            reset_subclasses_without_thinking_sphinx
+            ThinkingSphinx.reset_context!
+          end
+          
+          alias_method_chain :reset_subclasses, :thinking_sphinx
+          
           private
           
           def defined_indexes?

data/lib/thinking_sphinx/active_record/attribute_updates.rb

@@ -37,12 +37,7 @@ module ThinkingSphinx
       
       def attribute_values_for_index(index)
         updatable_attributes(index).inject({}) { |hash, attrib|
-          if attrib.type == :datetime && attrib.live_value(self)
-            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[attrib.unique_name.to_s] = attrib.live_value self
           hash
         }
       end

data/lib/thinking_sphinx/attribute.rb

@@ -180,7 +180,7 @@ module ThinkingSphinx
       object = instance
       column = @columns.first
       column.__stack.each { |method| object = object.send(method) }
-      object.send(column.__name)
+      sphinx_value object.send(column.__name)
     end
     
     def all_ints?
@@ -337,5 +337,20 @@ block:
         }
       }
     end
+    
+    def sphinx_value(value)
+      case value
+      when TrueClass
+        1
+      when FalseClass, NilClass
+        0
+      when Time
+        value.to_i
+      when Date
+        value.to_time.to_i
+      else
+        value
+      end
+    end
   end
 end

data/lib/thinking_sphinx/configuration.rb

@@ -13,7 +13,7 @@ module ThinkingSphinx
   # pid file::              log/searchd.#{environment}.pid
   # searchd files::         db/sphinx/#{environment}/
   # address::               127.0.0.1
-  # port::                  3312
+  # port::                  9312
   # allow star::            false
   # min prefix length::     1
   # min infix length::      1
@@ -94,7 +94,7 @@ module ThinkingSphinx
       
       @configuration = Riddle::Configuration.new
       @configuration.searchd.address    = "127.0.0.1"
-      @configuration.searchd.port       = 3312
+      @configuration.searchd.port       = 9312
       @configuration.searchd.pid_file   = "#{self.app_root}/log/searchd.#{environment}.pid"
       @configuration.searchd.log        = "#{self.app_root}/log/searchd.log"
       @configuration.searchd.query_log  = "#{self.app_root}/log/searchd.query.log"

data/lib/thinking_sphinx/tasks.rb

@@ -70,7 +70,7 @@ namespace :thinking_sphinx do
     end
     
     FileUtils.mkdir_p config.searchd_file_path
-    puts config.controller.index
+    config.controller.index :verbose => true
   end
   
   desc "Reindex Sphinx without regenerating the configuration file"

data/spec/thinking_sphinx/active_record_spec.rb

@@ -611,4 +611,12 @@ describe ThinkingSphinx::ActiveRecord do
       Alpha.should_not have_sphinx_indexes
     end
   end
+  
+  describe '.reset_subclasses' do
+    it "should reset the stored context" do
+      ThinkingSphinx.should_receive(:reset_context!)
+      
+      ActiveRecord::Base.reset_subclasses
+    end
+  end
 end

data/spec/thinking_sphinx/attribute_spec.rb

@@ -504,4 +504,43 @@ describe ThinkingSphinx::Attribute do
       @statement.should match(/SELECT cricket_team_id, id FROM tags/)
     end
   end
+  
+  describe '#live_value' do
+    before :each do
+      @attribute = ThinkingSphinx::Attribute.new @source, [
+        stub('column', :__stack => [], :__name => "col_name")
+      ]
+      @instance = stub('model')
+    end
+    
+    it "should translate boolean values to integers" do
+      @instance.stub!(:col_name => true)
+      @attribute.live_value(@instance).should == 1
+      
+      @instance.stub!(:col_name => false)
+      @attribute.live_value(@instance).should == 0
+    end
+    
+    it "should translate timestamps to integers" do
+      now = Time.now
+      @instance.stub!(:col_name => now)
+      @attribute.live_value(@instance).should == now.to_i
+    end
+    
+    it "should translate dates to timestamp integers" do
+      today = Date.today
+      @instance.stub!(:col_name => today)
+      @attribute.live_value(@instance).should == today.to_time.to_i
+    end
+    
+    it "should translate nils to 0" do
+      @instance.stub!(:col_name => nil)
+      @attribute.live_value(@instance).should == 0
+    end
+    
+    it "should return integers as integers" do
+      @instance.stub!(:col_name => 42)
+      @attribute.live_value(@instance).should == 42
+    end
+  end
 end

data/spec/thinking_sphinx_spec.rb

@@ -16,6 +16,17 @@ describe ThinkingSphinx do
     end
   end
   
+  describe '.reset_context!' do
+    it "should remove the existing Context instance" do
+      existing = ThinkingSphinx.context
+      
+      ThinkingSphinx.reset_context!
+      ThinkingSphinx.context.should_not == existing
+      
+      Thread.current[:thinking_sphinx_context] = existing
+    end
+  end
+  
   describe '.define_indexes?' do
     it "should define indexes by default" do
       ThinkingSphinx.define_indexes?.should be_true

data/tasks/distribution.rb

@@ -28,7 +28,7 @@ Jeweler::Tasks.new do |gem|
   ]
   
   gem.add_dependency 'activerecord', '>= 1.15.6'
-  gem.add_dependency 'riddle',       '>= 1.0.6'
+  gem.add_dependency 'riddle',       '>= 1.0.8'
   gem.add_dependency 'after_commit', '>= 1.0.5'
   
   gem.post_install_message = <<-MESSAGE

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: thinking-sphinx
 version: !ruby/object:Gem::Version 
-  version: 1.3.9
+  version: 1.3.10
 platform: ruby
 authors: 
 - Pat Allan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-09 00:00:00 +11:00
+date: 2009-12-10 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.6
+        version: 1.0.8
     version: 
 - !ruby/object:Gem::Dependency 
   name: after_commit