sunspot 0.10.6 → 0.10.7

data/History.txt

@@ -1,3 +1,10 @@
+== 0.10.7 2009-11-16
+* Ignore boost_fields that don't apply
+* Ability to specify text_fields inside connectives
+* Fix bug with newlines in strings incorrectly being considered multi-value
+* Compatibility with RSolr 0.10.1
+* Remove commented-out code entirely
+
 == 0.10.6 2009-11-05
 * Support more dismax parameters
 * Support multiple boost queries

data/README.rdoc

@@ -125,7 +125,7 @@ me so I can rectify the situation!
 
 == Dependencies
 
-1. RSolr 0.9.6
+1. RSolr 0.10.1
 2. Daemons 1.x
 4. Java 1.5+
 
@@ -184,6 +184,7 @@ Sunspot repository at `upstream`:
 * Peter Berkenbosch (peterberkenbosch@me.com)
 * Brian Atkinson
 * Tom Coleman (tom@thesnail.org)
+* Matt Mitchell (goodieboy@gmail.com)
 
 == License
 

data/TODO

@@ -1,4 +1,8 @@
 === 0.10.x ===
+* Can retrieve facets from search via string
+* Allow #latitude and #longitude as coordinate attributes
+* Allow use of #text_fields from inside disjunction
+
 * Assumed inconsistency
 * Support all operations in batches. Make it smart.
   * Don't use more than one commits when one is equivalent

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 10
-:patch: 6
+:patch: 7
 :major: 0

data/lib/sunspot.rb

@@ -161,7 +161,7 @@ module Sunspot
     #
     # ==== Example
     #
-    #   post1, post2 = Array(2) { Post.create }
+    #   post1, post2 = new Array(2) { Post.create }
     #   Sunspot.index(post1, post2)
     #
     # Note that indexed objects won't be reflected in search until a commit is

data/lib/sunspot/adapters.rb

@@ -94,7 +94,7 @@ module Sunspot
         #   One or more classes that this instance adapter adapts
         #
         def register(instance_adapter, *classes)
-          for clazz in classes
+          classes.each do |clazz|
             instance_adapters[clazz.name.to_sym] = instance_adapter
           end
         end
@@ -216,7 +216,7 @@ module Sunspot
         #   One or more classes that this data accessor providess access to
         #
         def register(data_accessor, *classes)
-          for clazz in classes
+          classes.each do |clazz|
             data_accessors[clazz.name.to_sym] = data_accessor
           end
         end

data/lib/sunspot/configuration.rb

@@ -29,9 +29,6 @@ module Sunspot
       #
       def build #:nodoc:
         LightConfig.build do
-          http_client :net_http
-          xml_builder :builder
-
           solr do
             url 'http://127.0.0.1:8983/solr'
           end

data/lib/sunspot/dsl/field_query.rb

@@ -84,7 +84,7 @@ module Sunspot
           field_names.each do |field_name|
             field = @setup.field(field_name)
             search_facet = @search.add_field_facet(field, options)
-            Array(options[:only]).each do |value|
+            Util.Array(options[:only]).each do |value|
               facet = Sunspot::Query::QueryFacet.new
               facet.add_restriction(field, Sunspot::Query::Restriction::EqualTo, value)
               @query.add_query_facet(facet)
@@ -110,7 +110,7 @@ module Sunspot
                 Sunspot::Query::FieldFacet.new(field, options)
               end
             @query.add_field_facet(facet)
-            Array(options[:extra]).each do |extra|
+            Util.Array(options[:extra]).each do |extra|
               extra_facet = Sunspot::Query::QueryFacet.new
               case extra
               when :any

data/lib/sunspot/dsl/fields.rb

@@ -34,7 +34,7 @@ module Sunspot
       #
       def text(*names, &block)
         options = names.pop if names.last.is_a?(Hash)
-        for name in names
+        names.each do |name|
           @setup.add_text_field_factory(
             name,
             options || {},

data/lib/sunspot/dsl/fulltext.rb

@@ -179,8 +179,12 @@ module Sunspot
       #
       def boost_fields(boosts)
         boosts.each_pair do |field_name, boost|
-          @setup.text_fields(field_name).each do |field|
-            @query.add_fulltext_field(field, boost)
+          begin
+            @setup.text_fields(field_name).each do |field|
+              @query.add_fulltext_field(field, boost)
+            end
+          rescue Sunspot::UnrecognizedFieldError
+            # We'll let this one slide.
           end
         end
       end

data/lib/sunspot/dsl/query.rb

@@ -55,7 +55,7 @@ module Sunspot
         if keywords && !(keywords.to_s =~ /^\s*$/)
           fulltext_query = @query.set_fulltext(keywords)
           if field_names = options.delete(:fields)
-            Array(field_names).each do |field_name|
+            Util.Array(field_names).each do |field_name|
               @setup.text_fields(field_name).each do |field|
                 fulltext_query.add_fulltext_field(field, field.default_boost)
               end
@@ -75,7 +75,7 @@ module Sunspot
               fulltext_query.add_highlight
             else
               highlight_fields = []
-              Array(highlight_field_names).each do |field_name|
+              Util.Array(highlight_field_names).each do |field_name|
                 highlight_fields.concat(@setup.text_fields(field_name))
               end
               fulltext_query.add_highlight(highlight_fields)
@@ -157,31 +157,6 @@ module Sunspot
       def near(coordinates, miles)
         @query.add_location_restriction(coordinates, miles)
       end
-
-      # 
-      # Apply scope-type restrictions on fulltext fields. In certain situations,
-      # it may be desirable to place logical restrictions on text fields.
-      # Remember that text fields are tokenized; your mileage may very.
-      #
-      # The block works exactly like a normal scope, except that the field names
-      # refer to text fields instead of attribute fields.
-      # 
-      # === Example
-      #
-      #   Sunspot.search(Post) do
-      #     text_fields do
-      #       with :body, nil
-      #     end
-      #   end
-      #
-      # This will return all documents that do not have a body.
-      #
-      def text_fields(&block)
-        Sunspot::Util.instance_eval_or_call(
-          Scope.new(@scope, TextFieldSetup.new(@setup)),
-          &block
-        )
-      end
     end
   end
 end

data/lib/sunspot/dsl/scope.rb

@@ -117,7 +117,7 @@ module Sunspot
           end
         else
           instances = args
-          for instance in instances.flatten
+          instances.flatten.each do |instance|
             @scope.add_negated_restriction(
               IdField.instance,
               Sunspot::Query::Restriction::EqualTo,
@@ -195,6 +195,31 @@ module Sunspot
           &block
         )
       end
+
+      # 
+      # Apply scope-type restrictions on fulltext fields. In certain situations,
+      # it may be desirable to place logical restrictions on text fields.
+      # Remember that text fields are tokenized; your mileage may very.
+      #
+      # The block works exactly like a normal scope, except that the field names
+      # refer to text fields instead of attribute fields.
+      # 
+      # === Example
+      #
+      #   Sunspot.search(Post) do
+      #     text_fields do
+      #       with :body, nil
+      #     end
+      #   end
+      #
+      # This will return all documents that do not have a body.
+      #
+      def text_fields(&block)
+        Sunspot::Util.instance_eval_or_call(
+          Scope.new(@scope, TextFieldSetup.new(@setup)),
+          &block
+        )
+      end
     end
   end
 end

data/lib/sunspot/field_factory.rb

@@ -56,7 +56,7 @@ module Sunspot
       #
       def populate_document(document, model) #:nodoc:
         unless (value = @data_extractor.value_for(model)).nil?
-          for scalar_value in Array(@field.to_indexed(value))
+          Util.Array(@field.to_indexed(value)).each do |scalar_value|
             document.add_field(
               @field.indexed_name.to_sym,
               scalar_value, @field.attributes
@@ -105,7 +105,7 @@ module Sunspot
         if values = @data_extractor.value_for(model)
           values.each_pair do |dynamic_name, value|
             field_instance = build(dynamic_name)
-            for scalar_value in Array(field_instance.to_indexed(value))
+            Util.Array(field_instance.to_indexed(value)).each do |scalar_value|
               document.add_field(
                 field_instance.indexed_name.to_sym,
                 scalar_value

data/lib/sunspot/indexer.rb

@@ -21,7 +21,7 @@ module Sunspot
     # model<Object>:: the model to index
     #
     def add(model)
-      documents = Array(model).map { |m| prepare(m) }
+      documents = Util.Array(model).map { |m| prepare(m) }
       if @batch.nil?
         add_documents(documents)
       else
@@ -75,7 +75,7 @@ module Sunspot
       if boost = setup.document_boost_for(model)
         document.attrs[:boost] = boost
       end
-      for field_factory in setup.all_field_factories
+      setup.all_field_factories.each do |field_factory|
         field_factory.populate_document(document, model)
       end
       document

data/lib/sunspot/query/connective.rb

@@ -105,7 +105,7 @@ module Sunspot
         #
         def negate
           negated = self.class.new(!negated?)
-          for component in @components
+          @components.each do |component|
             negated.add_component(component)
           end
           negated
@@ -157,7 +157,7 @@ module Sunspot
         #
         def denormalize
           denormalized = self.class.inverse.new(!negated?)
-          for component in @components
+          @components.each do |component|
             denormalized.add_component(component.negate)
           end
           denormalized

data/lib/sunspot/schema.rb

@@ -47,8 +47,8 @@ module Sunspot
     #
     def dynamic_fields
       fields = []
-      for field_variants in variant_combinations
-        for type in FIELD_TYPES
+      variant_combinations.each do |field_variants|
+        FIELD_TYPES.each do |type|
           fields << DynamicField.new(type, field_variants)
         end
       end

data/lib/sunspot/session.rb

@@ -94,7 +94,7 @@ module Sunspot
     def remove(*objects)
       objects.flatten!
       @deletes += objects.length
-      for object in objects
+      objects.each do |object|
         indexer.remove(object)
       end
     end
@@ -138,9 +138,7 @@ module Sunspot
         Indexer.remove_all(master_connection)
       else
         @deletes += classes.length
-        for clazz in classes
-          indexer.remove_all(clazz)
-        end
+        classes.each { |clazz| indexer.remove_all(clazz) }
       end
     end
 
@@ -203,13 +201,8 @@ module Sunspot
       @connection ||=
         begin
           connection = self.class.connection_class.connect(
-            :url => config.solr.url,
-            :adapter => config.http_client
+            :url => config.solr.url
           )
-          connection.message.adapter =
-            RSolr::Message::Adapter.const_get(
-              Util.camel_case(config.xml_builder.to_s)
-            ).new
           connection
         end
     end
@@ -227,9 +220,8 @@ module Sunspot
         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)
+              RSolr::Connection::NetHttp.new(:url => config.master_solr.url)
             )
-            master_connection.adapter.connector.adapter_name = config.http_client
             master_connection
           else
             connection

data/lib/sunspot/util.rb

@@ -95,6 +95,18 @@ module Sunspot
         end
       end
 
+      #
+      # Ruby's treatment of Strings as Enumerables is heavily annoying. As far
+      # as I know the behavior of Kernel.Array() is otherwise fine.
+      #
+      def Array(object)
+        if object.is_a?(String)
+          [object]
+        else
+          super
+        end
+      end
+
       # 
       # Perform a deep merge of hashes, returning the result as a new hash.
       # See #deep_merge_into for rules used to merge the hashes

data/spec/api/indexer/attributes_spec.rb

@@ -21,6 +21,11 @@ describe 'indexing attribute fields', :type => :indexer do
     connection.should have_add_with(:category_ids_im => ['3', '14'])
   end
 
+  it 'should not index a single-value field with newlines as multiple' do
+    session.index(post(:title => "Multi\nLine"))
+    connection.adds.last.first.field_by_name(:title_ss).value.should == "Multi\nLine"
+  end
+
   it 'should correctly index a time field' do
     session.index(
       post(:published_at => Time.parse('1983-07-08 05:00:00 -0400'))

data/spec/api/query/connectives_spec.rb

@@ -153,6 +153,20 @@ describe 'connective in scope', :type => :query do
     )
   end
 
+  it 'creates a disjunction with some text field components' do
+    session.search Post do
+      any_of do
+        text_fields do
+          with(:title).starting_with('test')
+        end
+        with(:blog_id, 1)
+      end
+    end
+    connection.should have_last_search_including(
+      :fq, '(title_text:test* OR blog_id_i:1)'
+    )
+  end
+
   it 'should ignore empty connectives' do
     session.search Post do
       any_of {}

data/spec/api/query/fulltext_spec.rb

@@ -151,6 +151,15 @@ describe 'fulltext query', :type => :query do
     connection.searches.last[:qf].split(' ').sort.should == %w(backwards_title_text body_texts title_text^1.5)
   end
 
+  it 'ignores boost fields that do not apply' do
+    session.search Post do
+      keywords 'great pizza' do
+        boost_fields :bogus => 1.2, :title => 1.5
+      end
+    end
+    connection.searches.last[:qf].split(' ').sort.should == %w(backwards_title_text body_texts title_text^1.5)
+  end
+
   it 'sets default boost with default fields' do
     session.search Photo do
       keywords 'great pizza'

data/spec/api/session_spec.rb

@@ -75,23 +75,6 @@ describe 'Session' do
       Sunspot.commit
       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.should == :net_http
-    end
-
-    it 'should use Net::HTTP adapter when specified' do
-      Sunspot.config.http_client = :curb
-      Sunspot.commit
-      connection.adapter.should == :curb
-    end
-
-    it 'should use LibXML builder when specified' do
-      Sunspot.config.xml_builder = :libxml
-      Sunspot.commit
-      connection.message.adapter.should be_a(RSolr::Message::Adapter::Libxml)
-    end
   end
 
   context 'custom session' do

data/spec/integration/indexing_spec.rb

@@ -0,0 +1,7 @@
+describe 'indexing' do
+  it 'should index non-multivalued field with newlines' do
+    lambda do
+      Sunspot.index!(Post.new(:title => "A\nTitle"))
+    end.should_not raise_error(RSolr::RequestError)
+  end
+end

data/spec/spec_helper.rb

@@ -1,4 +1,12 @@
 using_gems = false
+
+if rsolr_gem_version = ENV['RSOLR_GEM_VERSION']
+  STDERR.puts("Forcing RSolr gem version #{rsolr_gem_version}")
+  using_gems = true
+  require 'rubygems'
+  gem 'rsolr', rsolr_gem_version
+end
+
 begin
   require 'spec'
   begin

data/tasks/gemspec.rake

@@ -11,10 +11,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', 'Marcel de Graaf', 'Brandon Keepers', 'Peter Berkenbosch', 'Brian Atkinson', 'Tom Coleman']
+    s.authors = ['Mat Brown', 'Peer Allan', 'Dmitriy Dzema', 'Benjamin Krause', 'Marcel de Graaf', 'Brandon Keepers', 'Peter Berkenbosch', 'Brian Atkinson', 'Tom Coleman', 'Matt Mitchell']
     s.rubyforge_project = 'sunspot'
     s.files = FileList['[A-Z]*', '{bin,lib,spec,tasks,templates}/**/*', 'solr/{etc,lib,webapps}/**/*', 'solr/solr/{conf,lib}/*', 'solr/start.jar']
-    s.add_dependency 'rsolr', '= 0.9.6'
+    s.add_dependency 'rsolr', '>= 0.9.6', '<= 0.10.1'
     s.add_dependency 'daemons', '~> 1.0'
     s.add_development_dependency 'rspec', '~> 1.1'
     s.add_development_dependency 'ruby-debug', '~> 0.10'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sunspot
 version: !ruby/object:Gem::Version 
-  version: 0.10.6
+  version: 0.10.7
 platform: ruby
 authors: 
 - Mat Brown
@@ -13,11 +13,12 @@ authors:
 - Peter Berkenbosch
 - Brian Atkinson
 - Tom Coleman
+- Matt Mitchell
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-11-05 00:00:00 -05:00
+date: 2009-11-16 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,9 +27,12 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
         version: 0.9.6
+    - - <=
+      - !ruby/object:Gem::Version 
+        version: 0.10.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: daemons
@@ -198,6 +202,7 @@ files:
 - spec/integration/dynamic_fields_spec.rb
 - spec/integration/faceting_spec.rb
 - spec/integration/highlighting_spec.rb
+- spec/integration/indexing_spec.rb
 - spec/integration/keyword_search_spec.rb
 - spec/integration/local_search_spec.rb
 - spec/integration/scoped_search_spec.rb
@@ -266,6 +271,7 @@ test_files:
 - spec/integration/scoped_search_spec.rb
 - spec/integration/highlighting_spec.rb
 - spec/integration/keyword_search_spec.rb
+- spec/integration/indexing_spec.rb
 - spec/integration/dynamic_fields_spec.rb
 - spec/integration/stored_fields_spec.rb
 - spec/integration/test_pagination.rb