thinking-sphinx 2.0.11 → 2.0.12

data/spec/thinking_sphinx/index_spec.rb

@@ -178,6 +178,12 @@ describe ThinkingSphinx::Index do
 
         index.to_riddle(0).last.local_indices.should include('beta_delta')
       end
+
+      it "should add additional local indexes if there are any" do
+        index = ThinkingSphinx::Index.new(Alpha)
+        index.additional_indices << "other_index_core"
+        index.to_riddle(0).last.local_indices.should include('other_index_core')
+      end
     end
   end
 end

data/spec/thinking_sphinx/search_spec.rb

@@ -32,6 +32,15 @@ describe ThinkingSphinx::Search do
     end
   end
 
+  describe '#==' do
+    it "populates the search results when checking equality" do
+      search = ThinkingSphinx::Search.new
+      search == []
+
+      search.should be_populated
+    end
+  end
+
   describe '#populated?' do
     before :each do
       @search = ThinkingSphinx::Search.new
@@ -215,8 +224,8 @@ describe ThinkingSphinx::Search do
         :matches => minimal_result_hashes(@alpha_a, @beta_b, @alpha_b, @beta_a),
         :fields  => ["one", "two", "three", "four", "five"]
       }
-      Alpha.stub! :find => [@alpha_a, @alpha_b]
-      Beta.stub!  :find => [@beta_a, @beta_b]
+      Alpha.stub! :find => [@alpha_a, @alpha_b], :unscoped => Alpha
+      Beta.stub!  :find => [@beta_a, @beta_b], :unscoped => Beta
     end
 
     it "should issue only one select per model" do
@@ -505,7 +514,7 @@ describe ThinkingSphinx::Search do
         filter = @client.filters.last
         filter.values.should == [
           Parent.to_crc32, Admin::Person.to_crc32,
-          Child.to_crc32, Person.to_crc32
+          Child.to_crc32, Teenager.to_crc32, Person.to_crc32
         ]
         filter.attribute.should == 'class_crc'
         filter.exclude?.should be_false
@@ -904,6 +913,18 @@ describe ThinkingSphinx::Search do
       end
     end
 
+    describe ':attributes_only option' do
+      it "returns the attributes as hashes with values" do
+        ThinkingSphinx::Search.new(
+          :attributes_only => true
+        ).first.should == {
+          :sphinx_internal_class => "Alpha",
+          :class_crc => Alpha.to_crc32,
+          :sphinx_internal_id => 1
+        }
+      end
+    end
+
     context 'result objects' do
       describe '#excerpts' do
         before :each do
@@ -1150,7 +1171,7 @@ describe ThinkingSphinx::Search do
           }
         }]
       }
-      Alpha.stub!(:find => [@alpha])
+      Alpha.stub :find => [@alpha], :unscoped => Alpha
     end
 
     it "should yield the match, group and count" do
@@ -1186,7 +1207,7 @@ describe ThinkingSphinx::Search do
           }, :weight => 12
         }]
       }
-      Alpha.stub!(:find => [@alpha])
+      Alpha.stub :find => [@alpha], :unscoped => Alpha
     end
 
     it "should yield the match and weight" do
@@ -1215,7 +1236,7 @@ describe ThinkingSphinx::Search do
           }, :weight => 12
         }]
       }
-      Alpha.stub!(:find => [@alpha])
+      Alpha.stub :find => [@alpha], :unscoped => Alpha
 
       @search = ThinkingSphinx::Search.new
     end

data/spec/thinking_sphinx/source_spec.rb

@@ -85,13 +85,17 @@ describe ThinkingSphinx::Source do
       @riddle.sql_host.should == config[:host]
       @riddle.sql_port.should == config[:port]
       @riddle.sql_sock.should == config[:socket]
+
+      @riddle.mysql_ssl_ca.should   == config[:sslca]
+      @riddle.mysql_ssl_cert.should == config[:sslcert]
+      @riddle.mysql_ssl_key.should  == config[:sslkey]
     end
 
     it "should use a environment user if nothing else is provided" do
       Person.connection.stub!(:instance_variable_get => {
-        :user     => nil,
-        :username => nil
-      })
+          :user     => nil,
+          :username => nil
+        })
       @source = ThinkingSphinx::Source.new(@index)
 
       riddle = @source.to_riddle_for_core(1, 0)
@@ -161,6 +165,16 @@ describe ThinkingSphinx::Source do
       it "should include any defined groupings" do
         @query.should match(/GROUP BY.+`first_name`/)
       end
+
+      it "should include descendants" do
+        index  = ThinkingSphinx::Index.new(Child)
+        source = ThinkingSphinx::Source.new(index, :sql_range_step => 1000)
+        riddle = source.to_riddle_for_core(1, 0)
+        query  = riddle.sql_query
+
+        query.should match(/WHERE.+`people`\.`type`.+'Child'.+ 'Teenager'\)/)
+        query.should_not match(/WHERE.+"users"."type" = 'Employee'/)
+      end
     end
 
     describe "#sql_query_range" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: thinking-sphinx
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 2
   - 0
-  - 11
-  version: 2.0.11
+  - 12
+  version: 2.0.12
 platform: ruby
 authors: 
 - Pat Allan
@@ -15,12 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-02 00:00:00 +11:00
-default_executable: 
+date: 2012-05-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: activerecord
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -31,28 +30,28 @@ dependencies:
         - 0
         - 3
         version: 3.0.3
-  type: :runtime
+  version_requirements: *id001
   prerelease: false
-  requirement: *id001
+  name: activerecord
 - !ruby/object:Gem::Dependency 
-  name: riddle
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  type: :runtime
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 7
         segments: 
         - 1
         - 5
-        - 0
-        version: 1.5.0
-  type: :runtime
+        - 2
+        version: 1.5.2
+  version_requirements: *id002
   prerelease: false
-  requirement: *id002
+  name: riddle
 - !ruby/object:Gem::Dependency 
-  name: builder
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  type: :runtime
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -63,12 +62,12 @@ dependencies:
         - 1
         - 2
         version: 2.1.2
-  type: :runtime
+  version_requirements: *id003
   prerelease: false
-  requirement: *id003
+  name: builder
 - !ruby/object:Gem::Dependency 
-  name: actionpack
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -79,12 +78,28 @@ dependencies:
         - 0
         - 3
         version: 3.0.3
+  version_requirements: *id004
+  prerelease: false
+  name: actionpack
+- !ruby/object:Gem::Dependency 
   type: :development
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 0
+        - 4
+        - 0
+        version: 0.4.0
+  version_requirements: *id005
   prerelease: false
-  requirement: *id004
+  name: appraisal
 - !ruby/object:Gem::Dependency 
-  name: cucumber
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -95,12 +110,12 @@ dependencies:
         - 0
         - 2
         version: 1.0.2
-  type: :development
+  version_requirements: *id006
   prerelease: false
-  requirement: *id005
+  name: cucumber
 - !ruby/object:Gem::Dependency 
-  name: faker
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -111,28 +126,12 @@ dependencies:
         - 3
         - 1
         version: 0.3.1
-  type: :development
+  version_requirements: *id007
   prerelease: false
-  requirement: *id006
+  name: faker
 - !ruby/object:Gem::Dependency 
-  name: ginger
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 1
-        - 2
-        - 0
-        version: 1.2.0
   type: :development
-  prerelease: false
-  requirement: *id007
-- !ruby/object:Gem::Dependency 
-  name: rake
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -143,12 +142,12 @@ dependencies:
         - 9
         - 2
         version: 0.9.2
-  type: :development
+  version_requirements: *id008
   prerelease: false
-  requirement: *id008
+  name: rake
 - !ruby/object:Gem::Dependency 
-  name: rspec
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -159,12 +158,12 @@ dependencies:
         - 6
         - 0
         version: 2.6.0
-  type: :development
+  version_requirements: *id009
   prerelease: false
-  requirement: *id009
+  name: rspec
 - !ruby/object:Gem::Dependency 
-  name: will_paginate
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -174,12 +173,12 @@ dependencies:
         - 3
         - 0
         version: "3.0"
-  type: :development
+  version_requirements: *id010
   prerelease: false
-  requirement: *id010
+  name: will_paginate
 - !ruby/object:Gem::Dependency 
-  name: yard
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -190,9 +189,9 @@ dependencies:
         - 7
         - 2
         version: 0.7.2
-  type: :development
+  version_requirements: *id011
   prerelease: false
-  requirement: *id011
+  name: yard
 description: A concise and easy-to-use Ruby library that connects ActiveRecord to the Sphinx search daemon, managing configuration, indexing and searching.
 email: 
 - pat@freelancing-gods.com
@@ -377,7 +376,6 @@ files:
 - spec/thinking_sphinx/source_spec.rb
 - spec/thinking_sphinx/test_spec.rb
 - spec/thinking_sphinx_spec.rb
-has_rdoc: true
 homepage: http://freelancing-god.github.com/ts/en/
 licenses: []
 
@@ -410,7 +408,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: thinking-sphinx
-rubygems_version: 1.4.2
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: ActiveRecord/Rails Sphinx library
@@ -538,3 +536,4 @@ test_files:
 - spec/thinking_sphinx/source_spec.rb
 - spec/thinking_sphinx/test_spec.rb
 - spec/thinking_sphinx_spec.rb
+has_rdoc: