thinking-sphinx 1.3.13 → 1.3.14

data/VERSION

@@ -1 +1 @@
-1.3.13
+1.3.14

data/features/attribute_updates.feature

@@ -32,6 +32,7 @@ Feature: Update attributes directly to Sphinx
     Then I should get 1 result
     
     When I change the value of beta eight to 18
+    And I wait for Sphinx to catch up
     And I filter by 18 on value
     Then I should get 1 result
     

data/features/facets_across_model.feature

@@ -5,7 +5,7 @@ Feature: Search and browse across models by their defined facets
     When I am requesting facet results
     And I want all possible attributes
     Then I should have valid facet results
-    And I should have 11 facets
+    And I should have 12 facets
     And I should have the facet Class
     And the Class facet should have a "Person" key
     And I should have the facet Gender
@@ -19,7 +19,7 @@ Feature: Search and browse across models by their defined facets
     When I am requesting facet results
     And I want all possible attributes
     And I don't want classes included
-    Then I should have 10 facets
+    Then I should have 11 facets
     And I should not have the facet Class
   
   Scenario: Requesting facets common to all indexed models

data/features/handling_edits.feature

@@ -14,7 +14,7 @@ Feature: Keeping Sphinx in line with model changes when requested
     And I search for two
     Then I should get 1 result
   
-  Scenario: Not returing an instance from old data if there is a delta
+  Scenario: Not returning an instance from old data if there is a delta
     Given Sphinx is running
     And I am searching on betas
     When I search for two

data/features/support/models/beta.rb

@@ -1,6 +1,6 @@
 class Beta < ActiveRecord::Base
   define_index do
-    indexes :name, :sortable => true
+    indexes :name, :sortable => true, :facet => true
     has value
     
     set_property :delta => true

data/lib/thinking_sphinx/attribute.rb

@@ -352,6 +352,8 @@ block:
         value.to_i
       when Date
         value.to_time.to_i
+      when String
+        value.to_crc32
       else
         value
       end

data/lib/thinking_sphinx/configuration.rb

@@ -93,8 +93,6 @@ module ThinkingSphinx
       end
       
       @configuration = Riddle::Configuration.new
-      @configuration.searchd.address    = "127.0.0.1"
-      @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"
@@ -102,6 +100,8 @@ module ThinkingSphinx
       @controller = Riddle::Controller.new @configuration,
         "#{self.app_root}/config/#{environment}.sphinx.conf"
       
+      self.address              = "127.0.0.1"
+      self.port                 = 9312
       self.database_yml_file    = "#{self.app_root}/config/database.yml"
       self.searchd_file_path    = "#{self.app_root}/db/sphinx/#{environment}"
       self.allow_star           = false
@@ -150,18 +150,20 @@ module ThinkingSphinx
     end
     
     def address
-      @configuration.searchd.address
+      @address
     end
     
     def address=(address)
+      @address = address
       @configuration.searchd.address = address
     end
     
     def port
-      @configuration.searchd.port
+      @port
     end
     
     def port=(port)
+      @port = port
       @configuration.searchd.port = port
     end
     

data/lib/thinking_sphinx/context.rb

@@ -7,7 +7,7 @@ class ThinkingSphinx::Context
   
   def prepare
     load_models
-    add_indexed_models if cached?
+    add_indexed_models
   end
   
   def define_indexes
@@ -33,12 +33,6 @@ class ThinkingSphinx::Context
   
   private
   
-  def cached?
-    defined?(Rails)                   &&
-    Rails::VERSION::STRING.to_f > 2.1 &&
-    Rails.configuration.cache_classes
-  end
-  
   def add_indexed_models
     Object.subclasses_of(ActiveRecord::Base).each do |klass|
       add_indexed_model klass if klass.has_sphinx_indexes?

data/spec/thinking_sphinx/attribute_spec.rb

@@ -558,5 +558,13 @@ describe ThinkingSphinx::Attribute do
       @instance.stub!(:assoc_name => stub('object', :id => 42))
       @attribute.live_value(@instance).should == 42
     end
+    
+    it "should translate crc strings to their integer values" do
+      @attribute = ThinkingSphinx::Attribute.new @source, [
+        stub('column', :__stack => [], :__name => "col_name")
+      ], :crc => true, :type => :string
+      @instance.stub!(:col_name => 'foo')
+      @attribute.live_value(@instance).should == 'foo'.to_crc32
+    end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: thinking-sphinx
 version: !ruby/object:Gem::Version 
-  version: 1.3.13
+  version: 1.3.14
 platform: ruby
 authors: 
 - Pat Allan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-15 00:00:00 +11:00
+date: 2009-12-22 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency