benjaminkrause-sunspot 0.9.7 → 0.9.8

data/README.rdoc

@@ -152,7 +152,10 @@ http://outoftime.lighthouseapp.com/projects/20339-sunspot
 * Peer Allan (peer.allan@gmail.com)
 * Dmitriy Dzema (dima@dzema.name)
 * Benjamin Krause (bk@benjaminkrause.com)
+* Marcel de Graaf (marcel@slashdev.nl)
 * Brandon Keepers (brandon@opensoul.org)
+* Peter Berkenbosch (peterberkenbosch@me.com)
+* Brian Atkinson
 
 == License
 

data/TODO

@@ -1,5 +1,5 @@
 === 0.10 ===
-* Pass highlight fields into #highlight varargs
+* Wrap everything into :q parameter when local search performed
 * Allow boosting without field constraints
 * Allow coordinates to be specified with block in setup
 === 0.11 ===

data/VERSION.yml

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

data/bin/sunspot-solr

@@ -77,7 +77,7 @@ Daemons.run_proc('sunspot-solr', options) do
       args << "-Djetty.port=#{port}" if port
       args << "-Dsolr.data.dir=#{data_dir}" if data_dir
       args << "-Dsolr.solr.home=#{home}" if home
-      args << "-Djava.util.logging.config.file=#{logging_properties(log_file, log_level)}" if log_file and log_file != 'OFF'
+      args << "-Djava.util.logging.config.file=#{logging_properties(log_file, log_level)}" if log_file and log_level != 'OFF'
       args << '-jar' << 'start.jar'
       STDERR.puts(args * ' ')
       Kernel.exec(*args)

data/lib/sunspot/configuration.rb

@@ -28,6 +28,9 @@ module Sunspot
           solr do
             url 'http://127.0.0.1:8983/solr'
           end
+          master_solr do
+            url nil
+          end
           pagination do
             default_per_page 30
           end

data/lib/sunspot/dsl/fulltext.rb

@@ -17,7 +17,7 @@ module Sunspot
       # === Example
       #
       #   Sunspot.search(Post) do
-      #     fulltext 'search is cool' do
+      #     keywords 'search is cool' do
       #       fields(:body, :title => 2.0)
       #     end
       #   end
@@ -36,7 +36,15 @@ module Sunspot
       end
 
       # 
-      # Enable keyword highlighting for this search. Options are the following:
+      # Enable keyword highlighting for this search. By default, the fields 
+      # under search will be highlighted; you may also may pass one or more
+      # symbol arguments indicating fields to be highlighted (they don't even
+      # have to be the same fields you're searching).
+      #
+      #   highlight :title, :body
+      #
+      # You may also pass a hash of options as the last argument. Options are
+      # the following:
       #
       # Full disclosure: I barely understand what these options actually do;
       # this documentation is pretty much just copied from the
@@ -56,8 +64,11 @@ module Sunspot
       #   this particular field (only has an effect if :phrase_highlighter is
       #   true as well)
       #
-      def highlight(options = {})
-        @query.set_highlight(options)
+      def highlight(*args)
+        options = args.last.kind_of?(Hash) ? args.pop : {}
+        fields  = args
+
+        @query.set_highlight(fields, options)
       end
 
       # 

data/lib/sunspot/query/fulltext_base_query.rb

@@ -4,13 +4,11 @@ module Sunspot
       def initialize(keywords, options, types, setup)
         super(types, setup)
         @keywords = keywords
+
         if highlight_options = options.delete(:highlight)
-          if highlight_options == true
-            set_highlight
-          else
-            set_highlight(highlight_options)
-          end
+          set_highlight(highlight_options == true ? [] : highlight_options)
         end
+
         if fulltext_fields = options.delete(:fields)
           Array(fulltext_fields).each do |field|
             add_fulltext_field(field)
@@ -58,12 +56,18 @@ module Sunspot
         @boost_query ||= BoostQuery.new(factor, @setup)
       end
 
-      def set_highlight(options = {})
-        @highlight = Highlighting.new(options)
+      def set_highlight(field_names=[], options={})
+        @highlight = Highlighting.new(text_fields(field_names), options)
       end
 
       private
 
+      def text_fields(field_names)
+        field_names.inject([]) do |fields, name|
+          fields.concat(@setup.text_fields(name))
+        end
+      end
+
       # 
       # Returns the names of text fields that should be queried in a keyword
       # search. If specific fields are requested, use those; otherwise use the

data/lib/sunspot/query/highlighting.rb

@@ -4,7 +4,8 @@ module Sunspot
     # A query component that builds parameters for requesting highlights
     #
     class Highlighting #:nodoc:
-      def initialize(options)
+      def initialize(fields=[], options={})
+        @fields  = fields
         @options = options
       end
 
@@ -14,6 +15,9 @@ module Sunspot
           :"hl.simple.pre" => '@@@hl@@@',
           :"hl.simple.post" => '@@@endhl@@@'
         }
+        unless @fields.empty?
+          params[:"hl.fl"] = @fields.map { |field| field.indexed_name }
+        end
         if max_snippets = @options[:max_snippets]
           params[:"hl.snippets"] = max_snippets
         end

data/lib/sunspot/session.rb

@@ -15,7 +15,7 @@ module Sunspot
       # For testing purposes
       #
       def connection_class #:nodoc:
-        @connection_class ||= RSolr::Connection
+        @connection_class ||= RSolr
       end
     end
 
@@ -29,10 +29,11 @@ module Sunspot
     # connection. Usually you will want to stick with the default arguments
     # when instantiating your own sessions.
     #
-    def initialize(config = Configuration.build, connection = nil)
+    def initialize(config = Configuration.build, connection = nil, master_connection = nil)
       @config = config
       yield(@config) if block_given?
       @connection = connection
+      @master_connection = master_connection
       @updates = 0
     end
 
@@ -84,7 +85,7 @@ module Sunspot
     #
     def commit
       @updates = 0
-      connection.commit
+      master_connection.commit
     end
 
     # 
@@ -134,7 +135,7 @@ module Sunspot
       classes.flatten!
       if classes.empty?
         @updates += 1
-        Indexer.remove_all(connection)
+        Indexer.remove_all(master_connection)
       else
         @updates += classes.length
         for clazz in classes
@@ -187,20 +188,40 @@ module Sunspot
     def connection
       @connection ||=
         begin
-          connection = self.class.connection_class.new(
-            RSolr::Adapter::HTTP.new(:url => config.solr.url)
-          )
-          connection.adapter.connector.adapter_name = config.http_client
-          connection
+          self.class.connection_class.connect(:url => config.solr.url, :adapter => config.http_client)
+          # connection = self.class.connection_class.new(
+          #   RSolr::Adapter::HTTP.new(:url => config.solr.url)
+          # )
+          # connection.adapter.connector.adapter_name = config.http_client
+          # connection
         end
     end
 
     # 
-    # Return an indexer pointing at this session's connection. One is created
-    # and saved for each sesion.
+    # Retrieve the Solr connection to the master for this session, creating one
+    # if it does not already exist.
     #
+    # ==== Returns
+    #
+    # Solr::Connection:: The connection for this session
+    #
+    def master_connection
+      @master_connection ||=
+        begin
+          if config.master_solr.url && config.master_solr.url != config.solr.url
+            master_connection = self.class.connection_class.new(
+              RSolr::Adapter::HTTP.new(:url => config.master_solr.url)
+            )
+            master_connection.adapter.connector.adapter_name = config.http_client
+            master_connection
+          else
+            connection
+          end
+        end
+    end
+
     def indexer
-      @indexer ||= Indexer.new(connection)
+      @indexer ||= Indexer.new(master_connection)
     end
   end
 end

data/lib/sunspot/util.rb

@@ -66,7 +66,7 @@ module Sunspot
       #
       def full_const_get(string)
         string.split('::').inject(Object) do |context, const_name|
-          context.const_get(const_name)
+          context.const_defined?(const_name) ? context.const_get(const_name) : context.const_missing(const_name)
         end
       end
 

data/spec/api/query/highlighting_spec.rb

@@ -15,6 +15,42 @@ describe 'highlighted fulltext queries', :type => :query do
     connection.should have_last_search_with(:hl => 'on')
   end
 
+  it 'should enable highlighting on multiple fields when highlighting requested as array of fields via keywords argument' do
+    session.search(Post) do
+      keywords 'test', :highlight => [:title, :body]
+    end
+
+    connection.should have_last_search_with(:hl => 'on', :'hl.fl' => %w(title_text body_texts))
+  end
+
+  it 'should raise UnrecognizedFieldError if try to highlight unexisting field via keywords argument' do
+    lambda {
+      session.search(Post) do
+        keywords 'test', :highlight => [:unknown_field]
+      end
+    }.should raise_error(Sunspot::UnrecognizedFieldError)
+  end
+
+  it 'should enable highlighting on multiple fields when highlighting requested as list of fields via block call' do
+    session.search(Post) do
+      keywords 'test' do
+        highlight :title, :body
+      end
+    end
+
+    connection.should have_last_search_with(:hl => 'on', :'hl.fl' => %w(title_text body_texts))
+  end
+
+  it 'should raise UnrecognizedFieldError if try to highlight unexisting field via block call' do
+    lambda {
+      session.search(Post) do
+        keywords 'test' do
+          highlight :unknown_field
+        end
+      end
+    }.should raise_error(Sunspot::UnrecognizedFieldError)
+  end
+
   it 'should set internal formatting' do
     session.search(Post) do
       keywords 'test', :highlight => true
@@ -25,6 +61,18 @@ describe 'highlighted fulltext queries', :type => :query do
     )
   end
 
+  it 'should set options and hihglight fields' do
+    session.search(Post) do
+      keywords 'test' do
+        highlight :title, :max_snippets => 3
+      end
+    end
+    connection.should have_last_search_with(
+      :"hl.fl"       => %w(title_text),
+      :"hl.snippets" => 3
+    )
+  end
+
   it 'should set maximum highlights per field' do
     session.search(Post) do
       keywords 'test' do
@@ -79,4 +127,5 @@ describe 'highlighted fulltext queries', :type => :query do
       :"hl.requireFieldMatch" => 'true'
     )
   end
+
 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/helpers/search_helper.rb

@@ -69,7 +69,7 @@ module SearchHelper
   end
 
   def connection
-    @connection ||= mock('connection')
+    @connection ||= Mock::Connection.new
   end
 
   def session

data/spec/integration/local_search_spec.rb

@@ -29,6 +29,15 @@ describe 'local search' do
     search.results.should == [@posts[1]]
   end
 
+  it 'should perform a radial search with attribute scoping' do
+    pending 'local/scope workaround'
+    search = Sunspot.search(Post) do |query|
+      query.near(ORIGIN,20)
+      query.with(:title, 'teacup')
+    end
+    search.results.should == [@posts[1]]
+  end
+  
   it 'should order by arbitrary field' do
     search = Sunspot.search(Post) do |query|
       query.near(ORIGIN, 20)

data/spec/integration/spec_helper.rb

@@ -1 +1,7 @@
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
+
+Spec::Runner.configure do |config|
+  config.before(:each) do
+    Sunspot.config.solr.url = ENV['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/tasks/gemspec.rake

@@ -10,10 +10,10 @@ begin
     s.description = <<TEXT
 Sunspot is a library providing a powerful, all-ruby API for the Solr search engine. Sunspot manages the configuration of persistent Ruby classes for search and indexing and exposes Solr's most powerful features through a collection of DSLs. Complex search operations can be performed without hand-writing any boolean queries or building Solr parameters by hand.
 TEXT
-    s.authors = ['Mat Brown', 'Peer Allan', 'Dmitriy Dzema', 'Benjamin Krause', 'Brandon Keepers']
+    s.authors = ['Mat Brown', 'Peer Allan', 'Dmitriy Dzema', 'Benjamin Krause', 'Marcel de Graaf', 'Brandon Keepers', 'Peter Berkenbosch', 'Brian Atkinson']
     s.rubyforge_project = 'sunspot'
     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.9.1'
+    s.add_dependency 'mwmitchell-rsolr', '= 0.9.6'
     s.add_dependency 'daemons', '~> 1.0'
     s.add_dependency 'optiflag', '~> 0.6.5'
     s.add_development_dependency 'rspec', '~> 1.1'

metadata

@@ -1,19 +1,22 @@
 --- !ruby/object:Gem::Specification 
 name: benjaminkrause-sunspot
 version: !ruby/object:Gem::Version 
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors: 
 - Mat Brown
 - Peer Allan
 - Dmitriy Dzema
 - Benjamin Krause
+- Marcel de Graaf
 - Brandon Keepers
+- Peter Berkenbosch
+- Brian Atkinson
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-09-16 00:00:00 -07:00
+date: 2009-09-21 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,7 +27,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.1
+        version: 0.9.6
     version: 
 - !ruby/object:Gem::Dependency 
   name: daemons
@@ -253,60 +256,60 @@ requirements: []
 rubyforge_project: sunspot
 rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Library for expressive, powerful interaction with the Solr search engine
 test_files: 
-- spec/api/adapters_spec.rb
-- spec/api/indexer/attributes_spec.rb
-- spec/api/indexer/batch_spec.rb
-- spec/api/indexer/dynamic_fields_spec.rb
-- spec/api/indexer/fixed_fields_spec.rb
-- spec/api/indexer/fulltext_spec.rb
-- spec/api/indexer/removal_spec.rb
-- spec/api/indexer/spec_helper.rb
-- spec/api/indexer_spec.rb
-- spec/api/query/connectives_spec.rb
-- spec/api/query/dsl_spec.rb
-- spec/api/query/dynamic_fields_spec.rb
-- spec/api/query/faceting_spec.rb
-- spec/api/query/fulltext_spec.rb
-- spec/api/query/highlighting_spec.rb
-- spec/api/query/local_spec.rb
-- spec/api/query/ordering_pagination_spec.rb
-- spec/api/query/scope_spec.rb
-- spec/api/query/spec_helper.rb
-- spec/api/query/text_field_scoping_spec.rb
-- spec/api/query/types_spec.rb
-- spec/api/search/dynamic_fields_spec.rb
-- spec/api/search/faceting_spec.rb
-- spec/api/search/highlighting_spec.rb
-- spec/api/search/hits_spec.rb
-- spec/api/search/results_spec.rb
-- spec/api/search/search_spec.rb
-- spec/api/search/spec_helper.rb
-- spec/api/session_spec.rb
-- spec/api/spec_helper.rb
-- spec/api/sunspot_spec.rb
+- spec/spec_helper.rb
 - spec/helpers/indexer_helper.rb
-- spec/helpers/query_helper.rb
 - spec/helpers/search_helper.rb
-- spec/integration/dynamic_fields_spec.rb
+- spec/helpers/query_helper.rb
+- spec/integration/spec_helper.rb
+- spec/integration/local_search_spec.rb
 - spec/integration/faceting_spec.rb
+- spec/integration/scoped_search_spec.rb
 - spec/integration/highlighting_spec.rb
 - spec/integration/keyword_search_spec.rb
-- spec/integration/local_search_spec.rb
-- spec/integration/scoped_search_spec.rb
-- spec/integration/spec_helper.rb
+- spec/integration/dynamic_fields_spec.rb
 - spec/integration/stored_fields_spec.rb
 - spec/integration/test_pagination.rb
-- spec/mocks/adapters.rb
+- spec/mocks/mock_record.rb
 - spec/mocks/blog.rb
-- spec/mocks/comment.rb
-- spec/mocks/connection.rb
+- spec/mocks/adapters.rb
 - spec/mocks/mock_adapter.rb
-- spec/mocks/mock_record.rb
+- spec/mocks/user.rb
 - spec/mocks/photo.rb
 - spec/mocks/post.rb
+- spec/mocks/comment.rb
 - spec/mocks/super_class.rb
-- spec/mocks/user.rb
-- spec/spec_helper.rb
+- spec/mocks/connection.rb
+- spec/api/spec_helper.rb
+- spec/api/session_spec.rb
+- spec/api/indexer/spec_helper.rb
+- spec/api/indexer/fixed_fields_spec.rb
+- spec/api/indexer/attributes_spec.rb
+- spec/api/indexer/dynamic_fields_spec.rb
+- spec/api/indexer/fulltext_spec.rb
+- spec/api/indexer/removal_spec.rb
+- spec/api/indexer/batch_spec.rb
+- spec/api/search/spec_helper.rb
+- spec/api/search/hits_spec.rb
+- spec/api/search/faceting_spec.rb
+- spec/api/search/highlighting_spec.rb
+- spec/api/search/dynamic_fields_spec.rb
+- spec/api/search/search_spec.rb
+- spec/api/search/results_spec.rb
+- spec/api/adapters_spec.rb
+- spec/api/query/dsl_spec.rb
+- spec/api/query/spec_helper.rb
+- spec/api/query/faceting_spec.rb
+- spec/api/query/connectives_spec.rb
+- spec/api/query/local_spec.rb
+- spec/api/query/highlighting_spec.rb
+- spec/api/query/ordering_pagination_spec.rb
+- spec/api/query/dynamic_fields_spec.rb
+- spec/api/query/types_spec.rb
+- spec/api/query/scope_spec.rb
+- spec/api/query/text_field_scoping_spec.rb
+- spec/api/query/fulltext_spec.rb
+- spec/api/sunspot_spec.rb
+- spec/api/indexer_spec.rb