thinking-sphinx 2.0.4 → 2.0.5

data/spec/thinking_sphinx/auto_version_spec.rb

@@ -46,6 +46,14 @@ describe ThinkingSphinx::AutoVersion do
       ThinkingSphinx::AutoVersion.detect
     end
     
+    it "should require 2.0.1 if using Sphinx 2.0.2 dev" do
+      ThinkingSphinx::AutoVersion.should_receive(:require).
+        with('riddle/2.0.1')
+      
+      @config.stub!(:version => '2.0.2-dev')
+      ThinkingSphinx::AutoVersion.detect
+    end
+    
     it "should output a warning if the detected version is unsupported" do
       STDERR.should_receive(:puts).with(/unsupported/i)
       

data/spec/thinking_sphinx/facet_search_spec.rb

@@ -16,16 +16,22 @@ describe ThinkingSphinx::FacetSearch do
         
     it "should request all shared facets in a multi-model request by default" do
       ThinkingSphinx.stub!(:search => search)
-      ThinkingSphinx::FacetSearch.new.facet_names.should == ['class_crc']
+      if Riddle.loaded_version.to_i < 2
+        ThinkingSphinx::FacetSearch.new.facet_names.should == ['class_crc']
+      else
+        ThinkingSphinx::FacetSearch.new.facet_names.should == ['sphinx_internal_class']
+      end
     end
     
     it "should request all facets in a multi-model request if specified" do
       ThinkingSphinx.stub!(:search => search)
-      ThinkingSphinx::FacetSearch.new(
-        :all_facets => true
-      ).facet_names.should == [
-        'class_crc', 'city_facet', 'state_facet', 'birthday'
-      ]
+      names = ThinkingSphinx::FacetSearch.new(:all_facets => true).facet_names
+      
+      if Riddle.loaded_version.to_i < 2
+        names.should == ['class_crc', 'city_facet', 'state_facet', 'birthday']
+      else
+        names.should == ['sphinx_internal_class', 'city_facet', 'state_facet', 'birthday']
+      end
     end
     
     it "should use the system-set max_matches for limit on facet calls" do

data/spec/thinking_sphinx/index/builder_spec.rb

@@ -1,6 +1,9 @@
 require 'spec_helper'
 
 describe ThinkingSphinx::Index::Builder do
+  let(:internal_attribute_count) {
+    Riddle.loaded_version.to_i < 2 ? 3 : 4
+  }
   describe ".generate without source scope" do
     before :each do
       @index = ThinkingSphinx::Index::Builder.generate(Person) do
@@ -31,10 +34,10 @@ describe ThinkingSphinx::Index::Builder do
       @source.fields[1].unique_name.should == :last_name
     end
     
-    it "should have two attributes alongside the three internal ones" do
-      @source.attributes.length.should == 5
-      @source.attributes[3].unique_name.should == :birthday
-      @source.attributes[4].unique_name.should == :internal_id
+    it "should have two attributes alongside the internal ones" do
+      @source.attributes.length.should == 2 + internal_attribute_count
+      @source.attributes[internal_attribute_count].unique_name.should == :birthday
+      @source.attributes[1 + internal_attribute_count].unique_name.should == :internal_id
     end
     
     it "should have one condition" do
@@ -95,8 +98,8 @@ describe ThinkingSphinx::Index::Builder do
       @source.fields.length.should == 1
     end
     
-    it "should have one attribute alongside the three internal ones" do
-      @source.attributes.length.should == 4
+    it "should have one attribute alongside the internal ones" do
+      @source.attributes.length.should == 1 + internal_attribute_count
     end
     
     it "should set the attribute name to have the _sort suffix" do
@@ -142,8 +145,8 @@ describe ThinkingSphinx::Index::Builder do
       @source.fields.length.should == 1
     end
     
-    it "should have one attribute alongside the three internal ones" do
-      @source.attributes.length.should == 4
+    it "should have one attribute alongside the internal ones" do
+      @source.attributes.length.should == 1 + internal_attribute_count
     end
     
     it "should set the attribute name to have the _facet suffix" do
@@ -174,8 +177,8 @@ describe ThinkingSphinx::Index::Builder do
       Alpha.sphinx_facets.delete_at(-1)
     end
     
-    it "should have just one attribute alongside the three internal ones" do
-      @source.attributes.length.should == 4
+    it "should have just one attribute alongside the internal ones" do
+      @source.attributes.length.should == 1 + internal_attribute_count
     end
   end
   
@@ -193,8 +196,8 @@ describe ThinkingSphinx::Index::Builder do
       Person.sphinx_facets.delete_at(-1)
     end
     
-    it "should have just one attribute alongside the three internal ones" do
-      @source.attributes.length.should == 4
+    it "should have just one attribute alongside the internal ones" do
+      @source.attributes.length.should == 1 + internal_attribute_count
     end
   end
   
@@ -212,8 +215,8 @@ describe ThinkingSphinx::Index::Builder do
       Beta.sphinx_facets.delete_at(-1)
     end
     
-    it "should have just one attribute alongside the three internal ones" do
-      @source.attributes.length.should == 4
+    it "should have just one attribute alongside the internal ones" do
+      @source.attributes.length.should == 1 + internal_attribute_count
     end
   end
   
@@ -231,8 +234,8 @@ describe ThinkingSphinx::Index::Builder do
       Alpha.sphinx_facets.delete_at(-1)
     end
     
-    it "should have just one attribute alongside the three internal ones" do
-      @source.attributes.length.should == 4
+    it "should have just one attribute alongside the internal ones" do
+      @source.attributes.length.should == 1 + internal_attribute_count
     end
   end
   
@@ -250,8 +253,8 @@ describe ThinkingSphinx::Index::Builder do
       Person.sphinx_facets.delete_at(-1)
     end
     
-    it "should have two attributes alongside the three internal ones" do
-      @source.attributes.length.should == 5
+    it "should have two attributes alongside the internal ones" do
+      @source.attributes.length.should == 2 + internal_attribute_count
     end
     
     it "should set the facet attribute name to have the _facet suffix" do
@@ -282,8 +285,8 @@ describe ThinkingSphinx::Index::Builder do
       Person.sphinx_facets.delete_at(-1)
     end
     
-    it "should have two attributes alongside the three internal ones" do
-      @source.attributes.length.should == 5
+    it "should have two attributes alongside the internal ones" do
+      @source.attributes.length.should == 2 + internal_attribute_count
     end
     
     it "should set the facet attribute name to have the _facet suffix" do
@@ -321,8 +324,8 @@ describe ThinkingSphinx::Index::Builder do
       @source.fields.length.should == 1
     end
     
-    it "should have one attribute alongside the three internal ones" do
-      @source.attributes.length.should == 4
+    it "should have one attribute alongside the internal ones" do
+      @source.attributes.length.should == 1 + internal_attribute_count
     end
     
     it "should set the attribute name to have the _facet suffix" do
@@ -381,10 +384,10 @@ describe ThinkingSphinx::Index::Builder do
       @source.fields[1].unique_name.should == :last_name
     end
     
-    it "should have two attributes alongside the three internal ones" do
-      @source.attributes.length.should == 5
-      @source.attributes[3].unique_name.should == :birthday
-      @source.attributes[4].unique_name.should == :internal_id
+    it "should have two attributes alongside the internal ones" do
+      @source.attributes.length.should == 2 + internal_attribute_count
+      @source.attributes[internal_attribute_count].unique_name.should == :birthday
+      @source.attributes[1 + internal_attribute_count].unique_name.should == :internal_id
     end
   end
   
@@ -418,12 +421,12 @@ describe ThinkingSphinx::Index::Builder do
     end
     
     it "should have two attributes alongside the six internal ones" do
-      @index.attributes.length.should == 8
+      @index.attributes.length.should == 2 + (internal_attribute_count * 2)
     end
     
-    it "should have one attribute in each source alongside the three internal ones" do
+    it "should have one attribute in each source alongside the internal ones" do
       @index.sources.each do |source|
-        source.attributes.length.should == 4
+        source.attributes.length.should == 1 + internal_attribute_count
       end
     end
   end

data/spec/thinking_sphinx/search_spec.rb

@@ -1145,10 +1145,11 @@ describe ThinkingSphinx::Search do
       @client.stub! :query => {
         :matches => [{
           :attributes => {
-            'sphinx_internal_id' => @alpha.id,
-            'class_crc'          => Alpha.to_crc32,
-            '@groupby'           => 101,
-            '@count'             => 5
+            'sphinx_internal_id'    => @alpha.id,
+            'sphinx_internal_class' => 'Alpha',
+            'class_crc'             => Alpha.to_crc32,
+            '@groupby'              => 101,
+            '@count'                => 5
           }
         }]
       }
@@ -1182,8 +1183,9 @@ describe ThinkingSphinx::Search do
       @client.stub! :query => {
         :matches => [{
           :attributes => {
-            'sphinx_internal_id' => @alpha.id,
-            'class_crc'          => Alpha.to_crc32
+            'sphinx_internal_id'    => @alpha.id,
+            'sphinx_internal_class' => 'Alpha',
+            'class_crc'             => Alpha.to_crc32
           }, :weight => 12
         }]
       }
@@ -1207,11 +1209,12 @@ describe ThinkingSphinx::Search do
       @client.stub! :query => {
         :matches => [{
           :attributes => {
-            'sphinx_internal_id' => @alpha.id,
-            'class_crc'          => Alpha.to_crc32,
-            '@geodist'           => 101,
-            '@groupby'           => 102,
-            '@count'             => 103
+            'sphinx_internal_id'    => @alpha.id,
+            'sphinx_internal_class' => 'Alpha',
+            'class_crc'             => Alpha.to_crc32,
+            '@geodist'              => 101,
+            '@groupby'              => 102,
+            '@count'                => 103
           }, :weight => 12
         }]
       }

metadata

@@ -2,7 +2,7 @@
 name: thinking-sphinx
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors: 
 - Pat Allan
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-12 00:00:00 +10:00
+date: 2011-05-25 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -31,7 +31,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.3.2
+        version: 1.3.3
   type: :runtime
   prerelease: false
   version_requirements: *id002
@@ -240,6 +240,7 @@ files:
 - lib/thinking_sphinx/railtie.rb
 - lib/thinking_sphinx/search.rb
 - lib/thinking_sphinx/search_methods.rb
+- lib/thinking_sphinx/sinatra.rb
 - lib/thinking_sphinx/source.rb
 - lib/thinking_sphinx/source/internal_properties.rb
 - lib/thinking_sphinx/source/sql.rb
@@ -378,7 +379,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2581213737903947446
+      hash: 1998854075128866188
       segments: 
       - 0
       version: "0"