outoftime-sunspot 0.8.5 → 0.8.8

data/README.rdoc

@@ -29,7 +29,7 @@ objects such as the filesystem.
 
 In order to start the packaged Solr installation, run:
 
-  sunspot-solr start -- [-d /path/to/data/directory] [-p port] [-s path/to/solr/home]
+  sunspot-solr start -- [-d /path/to/data/directory] [-p port] [-s path/to/solr/home] [--pid-dir=path/to/pid/dir]
 
 If you don't specify a data directory, your Solr index will be stored in your operating system's temporary directory.
 
@@ -146,6 +146,7 @@ http://outoftime.lighthouseapp.com/projects/20339-sunspot
 == Further Reading
 
 * Sunspot Discussion: http://groups.google.com/group/ruby-sunspot
+* IRC: #sunspot-ruby @ Freenode
 * Posts about Sunspot from my tumblog: http://outofti.me/tagged/sunspot
 * Read about it on Linux Magazine: http://www.linux-mag.com/id/7341
 

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 8
-:patch: 5
+:patch: 8

data/bin/sunspot-solr

@@ -24,14 +24,22 @@ module SolrFlags extend OptiFlagSet
     description 'Solr home (should contain conf/ directory)'
   end
 
+  optional_flag 'pd' do
+    long_form 'pid-dir'
+    description 'Directory for pid files'
+  end
+
   and_process!
 end
 
-port = ARGV.flags.p || '8983'
+port     = ARGV.flags.p || '8983'
 data_dir = File.expand_path(ARGV.flags.d || File.join(Dir.tmpdir, 'solr_data'))
-home = File.expand_path(ARGV.flags.s) if ARGV.flags.s
+home     = File.expand_path(ARGV.flags.s) if ARGV.flags.s
+pid_dir  = File.expand_path(ARGV.flags.pd || working_directory)
+
+options = { :dir_mode => :normal, :dir => pid_dir }
 
-Daemons.run_proc('sunspot-solr') do
+Daemons.run_proc('sunspot-solr', options) do
   FileUtils.cd(working_directory) do
     FileUtils.cd(solr_home) do
       args = ['java']

data/lib/sunspot/adapters.rb

@@ -118,7 +118,7 @@ module Sunspot
         def for(clazz) #:nodoc:
           original_class_name = clazz.name
           clazz.ancestors.each do |ancestor_class|
-            next if ancestor_class.name.empty?
+            next if ancestor_class.name.nil? || ancestor_class.name.empty?
             class_name = ancestor_class.name.to_sym
             return instance_adapters[class_name] if instance_adapters[class_name]
           end
@@ -227,14 +227,21 @@ module Sunspot
         #
         # ==== Returns
         #
-        # Class:: Implementation of DataAccessor, or nil if none found
+        # Class:: Implementation of DataAccessor
+        #
+        # ==== Raises
+        #
+        # Sunspot::NoAdapterError:: If no data accessor exists for the given class
         #
         def for(clazz) #:nodoc:
+          original_class_name = clazz.name
           clazz.ancestors.each do |ancestor_class|
-            next if ancestor_class.name.empty?
+            next if ancestor_class.name.nil? || ancestor_class.name.empty?
             class_name = ancestor_class.name.to_sym
             return data_accessors[class_name] if data_accessors[class_name]
           end
+          raise(Sunspot::NoAdapterError,
+                "No data accessor is configured for #{original_class_name} or its superclasses. See the documentation for Sunspot::Adapters")
         end
 
         protected

data/lib/sunspot/indexer.rb

@@ -33,7 +33,7 @@ module Sunspot
     # Delete all documents of the class indexed by this indexer from Solr.
     #
     def remove_all
-      @connection.delete_by_query("type:#{@setup.clazz.name}")
+      @connection.delete_by_query("type:#{Solr::Util.query_parser_escape(@setup.clazz.name)}")
     end
 
     protected

data/lib/sunspot/query.rb

@@ -314,11 +314,18 @@ module Sunspot
     #
     def types_phrase
       if @types.nil? || @types.empty? then "type:[* TO *]"
-      elsif @types.length == 1 then "type:#{@types.first}"
-      else "type:(#{@types * ' OR '})"
+      elsif @types.length == 1 then "type:#{escaped_types.first}"
+      else "type:(#{escaped_types * ' OR '})"
       end
     end
 
+    #
+    # Wraps each type in quotes to escape names of the form Namespace::Class
+    #
+    def escaped_types
+      @types.map { |t| Solr::Util.query_parser_escape(t.name)}
+    end
+
     # 
     # Return a hash of field names to field objects, containing all fields
     # that are common to all of the classes under search. In order for fields

data/lib/sunspot.rb

@@ -347,7 +347,7 @@ module Sunspot
     # classes...<Class>::
     #   classes for which to remove all instances from the index
     def remove_all!(*classes)
-      session.remove_all(*classes)
+      session.remove_all!(*classes)
     end
 
     #
@@ -385,7 +385,7 @@ module Sunspot
     # static data between tests, but probably nowhere else.
     #
     def reset!
-      @session = nil
+      @session = Session.new(session.config)
     end
 
     private

data/spec/api/adapters_spec.rb

@@ -8,6 +8,12 @@ describe Sunspot::Adapters::InstanceAdapter do
   it "finds adapter by mixin" do
     Sunspot::Adapters::InstanceAdapter::for(MixModel).should be(MixInModelInstanceAdapter)
   end
+
+  it 'throws NoAdapterError if anonymous module passed in' do
+    lambda do
+      Sunspot::Adapters::InstanceAdapter::for(Module.new)
+    end.should raise_error(Sunspot::NoAdapterError)
+  end
 end
 
 describe Sunspot::Adapters::DataAccessor do
@@ -18,4 +24,10 @@ describe Sunspot::Adapters::DataAccessor do
   it "finds adapter by mixin" do
     Sunspot::Adapters::DataAccessor::for(MixModel).should be(MixInModelDataAccessor)
   end
+
+  it 'throws NoAdapterError if anonymous module passed in' do
+    lambda do
+      Sunspot::Adapters::DataAccessor::for(Module.new)
+    end.should raise_error(Sunspot::NoAdapterError)
+  end
 end

data/spec/api/build_search_spec.rb

@@ -320,23 +320,28 @@ describe 'Search' do
     end
   end
 
+  it 'should properly escape namespaced type names' do
+    connection.should_receive(:query).with('(type:Namespaced\:\:Comment)', hash_including)
+    session.search(Namespaced::Comment)
+  end
+
   it 'should build search for multiple types' do
-    connection.should_receive(:query).with('(type:(Post OR Comment))', hash_including)
-    session.search(Post, Comment)
+    connection.should_receive(:query).with('(type:(Post OR Namespaced\:\:Comment))', hash_including)
+    session.search(Post, Namespaced::Comment)
   end
 
   it 'should allow search on fields common to all types' do
-    connection.should_receive(:query).with('(type:(Post OR Comment))', hash_including(:filter_queries => ['published_at_d:1983\-07\-08T09\:00\:00Z'])).twice
+    connection.should_receive(:query).with('(type:(Post OR Namespaced\:\:Comment))', hash_including(:filter_queries => ['published_at_d:1983\-07\-08T09\:00\:00Z'])).twice
     time = Time.parse('1983-07-08 05:00:00 -0400')
-    session.search Post, Comment, :conditions => { :published_at => time }
-    session.search Post, Comment do
+    session.search Post, Namespaced::Comment, :conditions => { :published_at => time }
+    session.search Post, Namespaced::Comment do
       with :published_at, time
     end
   end
 
   it 'should raise Sunspot::UnrecognizedFieldError if search scoped to field not common to all types' do
     lambda do
-      session.search Post, Comment do
+      session.search Post, Namespaced::Comment do
         with :blog_id, 1
       end
     end.should raise_error(Sunspot::UnrecognizedFieldError)
@@ -344,15 +349,15 @@ describe 'Search' do
 
   it 'should raise Sunspot::UnrecognizedFieldError if search scoped to field configured differently between types' do
     lambda do
-      session.search Post, Comment do
+      session.search Post, Namespaced::Comment do
         with :average_rating, 2.2 # this is a float in Post but an integer in Comment
       end
     end.should raise_error(Sunspot::UnrecognizedFieldError)
   end
 
   it 'should ignore condition if field is not common to all types' do
-    connection.should_receive(:query).with('(type:(Post OR Comment))', hash_not_including(:filter_queries))
-    session.search Post, Comment, :conditions => { :blog_id => 1 }
+    connection.should_receive(:query).with('(type:(Post OR Namespaced\:\:Comment))', hash_not_including(:filter_queries))
+    session.search Post, Namespaced::Comment, :conditions => { :blog_id => 1 }
   end
 
   it 'should allow building search using block argument rather than instance_eval' do

data/spec/api/indexer_spec.rb

@@ -15,10 +15,10 @@ describe 'indexer' do
     end
 
     it 'should index an array containing more than one type of object' do
-      post1, comment, post2 = objects = [Post.new, Comment.new, Post.new]
+      post1, comment, post2 = objects = [Post.new, Namespaced::Comment.new, Post.new]
       connection.should_receive(:add).with([hash_including(:id => "Post #{post1.id}", :type => ['Post', 'BaseClass']),
                                             hash_including(:id => "Post #{post2.id}", :type => ['Post', 'BaseClass'])])
-      connection.should_receive(:add).with([hash_including(:id => "Comment #{comment.id}", :type => ['Comment', 'BaseClass'])])
+      connection.should_receive(:add).with([hash_including(:id => "Namespaced::Comment #{comment.id}", :type => ['Namespaced::Comment', 'BaseClass'])])
       session.index objects
     end
 
@@ -134,6 +134,11 @@ describe 'indexer' do
       connection.should_receive(:delete_by_query).with("type:Post")
       session.remove_all(Post)
     end
+
+    it 'should correctly escape namespaced classes when removing everything from the index' do
+      connection.should_receive(:delete_by_query).with('type:Namespaced\:\:Comment')
+      session.remove_all(Namespaced::Comment)
+    end
   end
 
   describe 'dynamic fields' do

data/spec/api/sunspot_spec.rb

@@ -0,0 +1,20 @@
+require File.join(File.dirname(__FILE__), 'spec_helper')
+
+describe Sunspot do
+  describe "reset!" do
+    it "should reset current session" do
+      old_session = Sunspot.send(:session)
+      Sunspot.reset!
+
+      Sunspot.send(:session).should_not == old_session
+    end
+    it "should keep keep configuration" do
+      Sunspot.config.solr.url = "http://localhost:9999/path/solr"
+
+      config_before_reset = Sunspot.config
+      Sunspot.reset!
+
+      Sunspot.config.should == config_before_reset
+    end
+  end
+end

data/spec/integration/keyword_search_spec.rb

@@ -11,6 +11,8 @@ describe 'keyword search' do
     @posts << Post.new(:title => 'The toast abbreviates the recovering spirit',
                        :body => 'Does the wind interpret the buffer?')
     Sunspot.index!(*@posts)
+    @comment = Namespaced::Comment.new(:body => 'Hey there where ya goin, not exactly knowin, who says you have to call just one place toast.')
+    Sunspot.index!(@comment)
   end
 
   it 'matches a single keyword out of a single field' do
@@ -29,4 +31,12 @@ describe 'keyword search' do
     [0, 2].each { |i| results.should include(@posts[i]) }
     [1].each { |i| results.should_not include(@posts[i]) }
   end
+
+  it 'matches multiple types' do
+    results = Sunspot.search(Post, Namespaced::Comment) do
+      keywords 'toast'
+    end.results
+    [@posts[0], @posts[2], @comment].each  { |obj| results.should include(obj) }
+    results.should_not include(@posts[1])
+  end
 end

data/spec/mocks/comment.rb

@@ -1,28 +1,30 @@
-class Comment < BaseClass
-  @@id = 0
-  @@comments = [nil]
+module Namespaced
+  class Comment < BaseClass
+    @@id = 0
+    @@comments = [nil]
 
-  attr_reader :id
-  attr_accessor :author_name, :published_at, :body, :average_rating
+    attr_reader :id
+    attr_accessor :author_name, :published_at, :body, :average_rating
 
-  def initialize(attrs = {})
-    @id = @@id += 1
-    @@comments << self
-    attrs.each_pair { |attribute, value| self.send("#{attribute}=", value) }
-  end
+    def initialize(attrs = {})
+      @id = @@id += 1
+      @@comments << self
+      attrs.each_pair { |attribute, value| self.send("#{attribute}=", value) }
+    end
 
-  def self.get(id)
-    @@posts[id]
-  end
+    def self.get(id)
+      @@comments[id]
+    end
 
-  def self.get_all(ids)
-    ids.map { |id| get(id) }.sort_by { |post| post.id } # this is so that results are not ordered by coincidence
+    def self.get_all(ids)
+      ids.map { |id| get(id) }.sort_by { |post| post.id } # this is so that results are not ordered by coincidence
+    end
   end
-end
 
-Sunspot.setup(Comment) do
-  text :author_name, :body
-  string :author_name
-  time :published_at
-  integer :average_rating
+  Sunspot.setup(Comment) do
+    text :author_name, :body
+    string :author_name
+    time :published_at
+    integer :average_rating
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: outoftime-sunspot
 version: !ruby/object:Gem::Version 
-  version: 0.8.5
+  version: 0.8.8
 platform: ruby
 authors: 
 - Mat Brown
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-09 00:00:00 -07:00
+date: 2009-06-15 00:00:00 -07:00
 default_executable: sunspot-solr
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -127,6 +127,7 @@ files:
 - 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/keyword_search_spec.rb
@@ -195,5 +196,6 @@ test_files:
 - 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