UnderpantsGnome-sunspot 0.9.1.1 → 0.9.8.1

data/spec/api/search_retrieval_spec.rb

@@ -15,6 +15,16 @@ describe 'retrieving search' do
     session.search(Post).results.should == [post_2, post_1]
   end
 
+  # This is a reduction of a crazy bug I found in production where some hits
+  # were inexplicably not being populated.
+  it 'properly loads results of multiple classes that have the same primary key' do
+    Post.reset!
+    Namespaced::Comment.reset!
+    results = [Post.new, Namespaced::Comment.new]
+    stub_results(*results)
+    session.search(Post, Namespaced::Comment).results.should == results
+  end
+
   if ENV['USE_WILL_PAGINATE']
 
     it 'should return search total as attribute of results if pagination is provided' do
@@ -144,7 +154,7 @@ describe 'retrieving search' do
     end
     facet_values(result, :published_at).should ==
       [Time.gm(2009, 04, 07, 20, 25, 23),
-       Time.gm(2009, 04, 07, 20, 26, 19)]
+        Time.gm(2009, 04, 07, 20, 26, 19)]
   end
 
   it 'should return date facet' do
@@ -158,7 +168,7 @@ describe 'retrieving search' do
     end
     facet_values(result, :expire_date).should ==
       [Date.new(2009, 07, 13),
-       Date.new(2009, 04, 01)]
+        Date.new(2009, 04, 01)]
   end
 
   it 'should return boolean facet' do
@@ -223,6 +233,21 @@ describe 'retrieving search' do
     facet.rows.first.count.should == 3
   end
 
+  it 'returns limited field facet' do
+    stub_query_facet(
+      'category_ids_im:1' => 3,
+      'category_ids_im:3' => 1
+    )
+    search = session.search(Post) do
+      facet :category_ids, :only => [1, 3, 5]
+    end
+    facet = search.facet(:category_ids)
+    facet.rows.first.value.should == 1
+    facet.rows.first.count.should == 3
+    facet.rows.last.value.should == 3
+    facet.rows.last.count.should == 1
+  end
+
   it 'should return dynamic string facet' do
     stub_facet(:"custom_string:test_s", 'two' => 2, 'one' => 1)
     result = session.search(Post) { dynamic(:custom_string) { facet(:test) }}
@@ -236,6 +261,18 @@ describe 'retrieving search' do
     result.facet(:blog_id).rows.map { |row| row.instance }.should == blogs
   end
 
+  it 'returns instantiated facet values for limited field facet' do
+    blogs = Array.new(2) { Blog.new }
+    stub_query_facet(
+      "blog_id_i:#{blogs[0].id}" => 3,
+      "blog_id_i:#{blogs[1].id}" => 1
+    )
+    search = session.search(Post) do
+      facet(:blog_id, :only => blogs.map { |blog| blog.id })
+    end
+    search.facet(:blog_id).rows.map { |row| row.instance }.should == blogs
+  end
+
   it 'should only query the persistent store once for an instantiated facet' do
     query_count = Blog.query_count
     blogs = Array.new(2) { Blog.new }
@@ -258,9 +295,9 @@ describe 'retrieving search' do
     end
     response = {
       'response' => {
-        'docs' => docs,
-        'numFound' => count
-      }
+      'docs' => docs,
+      'numFound' => count
+    }
     }
     connection.stub!(:select).and_return(response)
   end
@@ -268,11 +305,11 @@ describe 'retrieving search' do
   def stub_results(*results)
     stub_full_results(
       *results.map do |result|
-        if result.is_a?(Integer)
-          result
-        else
-          { 'instance' => result }
-        end
+      if result.is_a?(Integer)
+        result
+      else
+        { 'instance' => result }
+      end
       end
     )
   end
@@ -280,20 +317,20 @@ describe 'retrieving search' do
   def stub_facet(name, values)
     connection.stub!(:select).and_return(
       'facet_counts' => {
-        'facet_fields' => {
-          name.to_s => values.to_a.sort_by { |value, count| -count }.flatten
-        }
-      }
+      'facet_fields' => {
+      name.to_s => values.to_a.sort_by { |value, count| -count }.flatten
+    }
+    }
     )
   end
 
   def stub_date_facet(name, gap, values)
     connection.stub!(:select).and_return(
       'facet_counts' => {
-        'facet_dates' => {
-          name.to_s => { 'gap' => "+#{gap}SECONDS" }.merge(values)
-        }
-      }
+      'facet_dates' => {
+      name.to_s => { 'gap' => "+#{gap}SECONDS" }.merge(values)
+    }
+    }
     )
   end
 

data/spec/api/session_spec.rb

@@ -67,24 +67,24 @@ describe 'Session' do
 
     it 'should open connection with defaults if nothing specified' do
       Sunspot.commit
-      connection.adapter.opts[:url].should == 'http://127.0.0.1:8983/solr'
+      connection.opts[:url].should == 'http://127.0.0.1:8983/solr'
     end
 
     it 'should open a connection with custom host' do
       Sunspot.config.solr.url = 'http://127.0.0.1:8981/solr'
       Sunspot.commit
-      connection.adapter.opts[:url].should == 'http://127.0.0.1:8981/solr'
+      connection.opts[:url].should == 'http://127.0.0.1:8981/solr'
     end
 
     it 'should use Net::HTTP adapter by default' do
       Sunspot.commit
-      connection.adapter.connector.adapter_name.should == :net_http
+      connection.adapter.should == :net_http
     end
 
     it 'should use Net::HTTP adapter when specified' do
       Sunspot.config.http_client = :curb
       Sunspot.commit
-      connection.adapter.connector.adapter_name.should == :curb
+      connection.adapter.should == :curb
     end
   end
 
@@ -100,7 +100,7 @@ describe 'Session' do
         config.solr.url = 'http://127.0.0.1:8982/solr'
       end
       session.commit
-      connection.adapter.opts[:url].should == 'http://127.0.0.1:8982/solr'
+      connection.opts[:url].should == 'http://127.0.0.1:8982/solr'
     end
   end
 

data/spec/integration/scoped_search_spec.rb

@@ -153,6 +153,107 @@ describe 'scoped_search' do
     end
   end
 
+  describe 'connectives' do
+    before :each do
+      Sunspot.remove_all
+    end
+
+    it 'should return results that match any restriction in a disjunction' do
+      posts = (1..3).map { |i| Post.new(:blog_id => i)}
+      Sunspot.index!(posts)
+      Sunspot.search(Post) do
+        any_of do
+          with(:blog_id, 1)
+          with(:blog_id, 2)
+        end
+      end.results.should == posts[0..1]
+    end
+
+    it 'should return results that match a nested conjunction in a disjunction' do
+      posts = [
+        Post.new(:title => 'No', :blog_id => 1),
+        Post.new(:title => 'Yes', :blog_id => 2),
+        Post.new(:title => 'Yes', :blog_id => 3),
+        Post.new(:title => 'No', :blog_id => 2)
+      ]
+      Sunspot.index!(posts)
+      Sunspot.search(Post) do
+        any_of do
+          with(:blog_id, 1)
+          all_of do
+            with(:blog_id, 2)
+            with(:title, 'Yes')
+          end
+        end
+      end.results.should == posts[0..1]
+    end
+
+    it 'should return results that match a conjunction with a negated restriction' do
+      posts = [
+        Post.new(:title => 'No', :blog_id => 1),
+        Post.new(:title => 'Yes', :blog_id => 2),
+        Post.new(:title => 'No', :blog_id => 2)
+      ]
+      Sunspot.index!(posts)
+      search = Sunspot.search(Post) do
+        any_of do
+          with(:blog_id, 1)
+          without(:title, 'No')
+        end
+      end
+      search.results.should == posts[0..1]
+    end
+
+    it 'should return results that match a conjunction with a disjunction with a conjunction with a negated restriction' do
+      posts = [
+        Post.new(:title => 'Yes', :ratings_average => 2.0),
+        Post.new(:blog_id => 1, :category_ids => [4], :ratings_average => 2.0),
+        Post.new(:blog_id => 1),
+        Post.new(:blog_id => 2),
+        Post.new(:blog_id => 1, :ratings_average => 2.0)
+      ]
+      Sunspot.index!(posts)
+      search = Sunspot.search(Post) do
+        any_of do
+          with(:title, 'Yes')
+          all_of do
+            with(:blog_id, 1)
+            any_of do
+              with(:category_ids, 4)
+              without(:average_rating, 2.0)
+            end
+          end
+        end
+      end
+      search.results.should == posts[0..2]
+    end
+
+    it 'should return results that match a disjunction with a negated restriction and a nested disjunction in a conjunction with a negated restriction' do
+      posts = [
+        Post.new,
+        Post.new(:title => 'Yes', :blog_id => 1, :category_ids => [4], :ratings_average => 2.0),
+        Post.new(:title => 'Yes', :blog_id => 1),
+        Post.new(:title => 'Yes'),
+        Post.new(:title => 'Yes', :category_ids => [4], :ratings_average => 2.0),
+        Post.new(:title => 'Yes', :blog_id => 1, :ratings_average => 2.0)
+      ]
+      Sunspot.index!(posts)
+      search = Sunspot.search(Post) do
+        any_of do
+          without(:title, 'Yes')
+          all_of do
+            with(:blog_id, 1)
+            any_of do
+              with(:category_ids, 4)
+              without(:average_rating, 2.0)
+            end
+          end
+        end
+      end
+      search.results.should == posts[0..2]
+    end
+  end
+
   describe 'multiple column ordering' do
     before do
       Sunspot.remove_all

data/spec/integration/spec_helper.rb

@@ -1 +1,7 @@
 require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+
+Spec::Runner.configure do |config|
+  config.before(:all) do
+    Sunspot.config.solr.url = 'http://localhost:8983/solr'
+  end
+end

data/spec/mocks/connection.rb

@@ -1,5 +1,13 @@
 module Mock
   class ConnectionFactory
+    def connect(opts)
+      if @instance
+        raise('Factory can only create an instance once!')
+      else
+        @instance = Connection.new(opts.delete(:adapter), opts)
+      end
+    end
+
     def new(adapter = nil, opts = nil)
       if @instance
         raise('Factory can only create an instance once!')

data/spec/mocks/mock_record.rb

@@ -5,6 +5,13 @@ class MockRecord
 
   attr_reader :id
 
+  class <<self
+    def reset!
+      IDS[name.to_sym] = 0
+      INSTANCES[name.to_sym] = {}
+    end
+  end
+
   def initialize(attrs = {})
     attrs.each_pair do |name, value|
       send(:"#{name}=", value)

data/spec/mocks/post.rb

@@ -68,3 +68,6 @@ Sunspot.setup(Post) do
     end
   end
 end
+
+class PhotoPost < Post
+end

data/tasks/gemspec.rake

@@ -1,16 +1,15 @@
 begin
-  gem 'technicalpickles-jeweler', '~> 1.0.1'
   require 'jeweler'
   Jeweler::Tasks.new do |s|
     s.name = 'sunspot'
-    s.executables = 'sunspot-solr'
+    s.executables = ['sunspot-solr', 'sunspot-configure-solr']
     s.summary = 'Library for expressive, powerful interaction with the Solr search engine'
     s.email = 'mat@patch.com'
     s.homepage = 'http://github.com/outoftime/sunspot'
     s.description = 'Library for expressive, powerful interaction with the Solr search engine'
     s.authors = ['Mat Brown', 'Peer Allan', 'Dmitriy Dzema', 'Benjamin Krause']
     s.files = FileList['[A-Z]*', '{bin,lib,spec,tasks,templates}/**/*', 'solr/{etc,lib,webapps}/**/*', 'solr/solr/conf/*', 'solr/start.jar']
-    s.add_dependency 'mwmitchell-rsolr', '>= 0.8.9'
+    s.add_dependency 'mwmitchell-rsolr', '= 0.9.6'
     s.add_dependency 'daemons', '~> 1.0'
     s.add_dependency 'optiflag', '~> 0.6.5'
     s.add_dependency 'haml', '~> 2.2'

data/tasks/rdoc.rake

@@ -1,5 +1,6 @@
 gem 'mislav-hanna'
 require 'hanna/rdoctask'
+require 'jeweler'
 
 Rake::RDocTask.new(:doc) do |rdoc|
   version = Jeweler::VersionHelper.new(File.join(File.dirname(__FILE__), '..')).to_s

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: UnderpantsGnome-sunspot
 version: !ruby/object:Gem::Version 
-  version: 0.9.1.1
+  version: 0.9.8.1
 platform: ruby
 authors: 
 - Mat Brown
@@ -12,8 +12,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-21 00:00:00 -07:00
-default_executable: sunspot-solr
+date: 2009-09-13 00:00:00 -07:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mwmitchell-rsolr
@@ -21,9 +21,9 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: 0.8.9
+        version: 0.9.6
     version: 
 - !ruby/object:Gem::Dependency 
   name: daemons
@@ -79,6 +79,7 @@ description: Library for expressive, powerful interaction with the Solr search e
 email: mat@patch.com
 executables: 
 - sunspot-solr
+- sunspot-configure-solr
 extensions: []
 
 extra_rdoc_files: 
@@ -98,8 +99,6 @@ files:
 - lib/sunspot/composite_setup.rb
 - lib/sunspot/configuration.rb
 - lib/sunspot/data_extractor.rb
-- lib/sunspot/date_facet.rb
-- lib/sunspot/date_facet_row.rb
 - lib/sunspot/dsl.rb
 - lib/sunspot/dsl/field_query.rb
 - lib/sunspot/dsl/fields.rb
@@ -109,6 +108,7 @@ files:
 - lib/sunspot/dsl/scope.rb
 - lib/sunspot/dsl/search.rb
 - lib/sunspot/facet.rb
+- lib/sunspot/facet_data.rb
 - lib/sunspot/facet_row.rb
 - lib/sunspot/field.rb
 - lib/sunspot/field_factory.rb
@@ -124,12 +124,11 @@ files:
 - lib/sunspot/query/pagination.rb
 - lib/sunspot/query/query_facet.rb
 - lib/sunspot/query/query_facet_row.rb
+- lib/sunspot/query/query_field_facet.rb
 - lib/sunspot/query/restriction.rb
 - lib/sunspot/query/scope.rb
 - lib/sunspot/query/sort.rb
 - lib/sunspot/query/sort_composite.rb
-- lib/sunspot/query_facet.rb
-- lib/sunspot/query_facet_row.rb
 - lib/sunspot/schema.rb
 - lib/sunspot/search.rb
 - lib/sunspot/search/hit.rb
@@ -188,6 +187,7 @@ files:
 - templates/schema.xml.haml
 has_rdoc: true
 homepage: http://github.com/outoftime/sunspot
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -213,33 +213,33 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 3
+specification_version: 2
 summary: Library for expressive, powerful interaction with the Solr search engine
 test_files: 
-- spec/spec_helper.rb
-- spec/integration/spec_helper.rb
+- spec/api/adapters_spec.rb
+- spec/api/build_search_spec.rb
+- spec/api/indexer_spec.rb
+- spec/api/query_spec.rb
+- spec/api/search_retrieval_spec.rb
+- spec/api/session_spec.rb
+- spec/api/spec_helper.rb
+- spec/api/sunspot_spec.rb
+- spec/integration/dynamic_fields_spec.rb
 - spec/integration/faceting_spec.rb
-- spec/integration/scoped_search_spec.rb
 - spec/integration/keyword_search_spec.rb
-- spec/integration/dynamic_fields_spec.rb
+- spec/integration/scoped_search_spec.rb
+- spec/integration/spec_helper.rb
 - spec/integration/stored_fields_spec.rb
 - spec/integration/test_pagination.rb
-- spec/mocks/mock_record.rb
-- spec/mocks/blog.rb
 - spec/mocks/adapters.rb
+- spec/mocks/blog.rb
+- spec/mocks/comment.rb
+- spec/mocks/connection.rb
 - spec/mocks/mock_adapter.rb
-- spec/mocks/user.rb
+- spec/mocks/mock_record.rb
 - spec/mocks/photo.rb
 - spec/mocks/post.rb
-- spec/mocks/comment.rb
-- spec/mocks/connection.rb
-- spec/api/search_retrieval_spec.rb
-- spec/api/spec_helper.rb
-- spec/api/session_spec.rb
-- spec/api/adapters_spec.rb
-- spec/api/build_search_spec.rb
-- spec/api/sunspot_spec.rb
-- spec/api/indexer_spec.rb
-- spec/api/query_spec.rb
+- spec/mocks/user.rb
+- spec/spec_helper.rb