sunspot 2.2.5 → 2.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ddf4e1e101c7789cbba01b5d4a46d69ac295f0e3
-  data.tar.gz: ef751e6cb93dbdd4bda40b18b661e044cee927fe
+  metadata.gz: db2b5999f51846958ab592d6e9b7d1481d707693
+  data.tar.gz: d036d9d479cb4ff7a9780cf32891084c0ede9a20
 SHA512:
-  metadata.gz: 2dd0adb2ce792ce3fa11ebbf9c05d7043e3402ba946e06a8b2ac78d84e885dc6cdda942528804f674e219d08ac1555e44fd392f8d993dd7feb4b24725e2368a6
-  data.tar.gz: feaeaa4d3d41676e5d063dad39cccbf1bca1ebe6968e9f952037e9b362886f76f1f8b2e7118078ee4335435da39c5b6f4e1e3323faab0d1eb636836863c5d123
+  metadata.gz: 49393ba5303b4742838fcca8cbfdd4b7dc023c8fd812d6cabcbbf8501868b29f0adfe8d163064a7ed30cf412716bd945556da296d0880af1aa53316fb211d582
+  data.tar.gz: 3e93cb4d25d43634ed84c48984ab235d66cd39e080b916f5ef6bad24a7049c146caf35f2cc154c3615084a26d11232cdc924c27744722dae3b515a6dd420077b

data/lib/sunspot/dsl/adjustable.rb

@@ -26,9 +26,9 @@ module Sunspot
       #       params["mlt.match.include"] = true
       #     end
       #   end
-      # 
+      #
       def adjust_solr_params( &block )
-        @query.solr_parameter_adjustment = block
+        @query.add_parameter_adjustment(block)
       end
 
       #

data/lib/sunspot/dsl/scope.rb

@@ -1,6 +1,6 @@
 module Sunspot
   module DSL #:nodoc:
-    # 
+    #
     # This DSL presents methods for constructing restrictions and other query
     # elements that are specific to fields. As well as being a superclass of
     # Sunspot::DSL::StandardQuery, which presents the main query block, this
@@ -12,7 +12,12 @@ module Sunspot
         @scope, @setup = scope, setup
       end
 
-      # 
+      # Build a restriction to return only fields of the type in the results.
+      def field_list(*args)
+        @query.add_field_list(Sunspot::Query::FieldList.new(args.flatten))
+      end
+
+      #
       # Build a positive restriction. This method can take three forms: equality
       # restriction, restriction by another restriction, or identity
       # restriction.
@@ -62,7 +67,7 @@ module Sunspot
       #   Sunspot.search do
       #     with(:category_ids, [1, 5, 9])
       #   end
-      # 
+      #
       # Other restriction types:
       #
       #   Sunspot.search(Post) do
@@ -87,7 +92,7 @@ module Sunspot
         add_restriction(true, *args)
       end
 
-      # 
+      #
       # Create a disjunction, scoping the results to documents that match any
       # of the enclosed restrictions.
       #
@@ -109,7 +114,7 @@ module Sunspot
         disjunction
       end
 
-      # 
+      #
       # Create a conjunction, scoping the results to documents that match all of
       # the enclosed restrictions. When called from the top level of a search
       # block, this has no effect, but can be useful for grouping a conjunction
@@ -138,9 +143,9 @@ module Sunspot
       # The block API is implemented by Sunspot::DSL::FieldQuery, which is a
       # superclass of the Query DSL (thus providing a subset of the API, in
       # particular only methods that refer to particular fields).
-      # 
+      #
       # ==== Parameters
-      # 
+      #
       # base_name<Symbol>:: The base name for the dynamic field definition
       #
       # ==== Example
@@ -160,14 +165,14 @@ module Sunspot
         )
       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
@@ -189,26 +194,25 @@ module Sunspot
 
       def add_restriction(negated, *args)
         case args.first
-        when String, Symbol
-          raise ArgumentError if args.length > 2
-          field = @setup.field(args[0].to_sym)
-          if args.length > 1
-            value = args[1]
-            @scope.add_shorthand_restriction(negated, field, value)
-          else # NONE
-            DSL::Restriction.new(field, @scope, negated)
+          when String, Symbol
+            raise ArgumentError if args.length > 2
+            field = @setup.field(args[0].to_sym)
+            if args.length > 1
+              value = args[1]
+              @scope.add_shorthand_restriction(negated, field, value)
+            else # NONE
+              DSL::Restriction.new(field, @scope, negated)
+            end
+          else # args are instances
+            @scope.add_restriction(
+              negated,
+              IdField.instance,
+              Sunspot::Query::Restriction::AnyOf,
+              args.flatten.map { |instance|
+                Sunspot::Adapters::InstanceAdapter.adapt(instance).index_id }
+            )
           end
-        else # args are instances
-          @scope.add_restriction(
-            negated,
-            IdField.instance,
-            Sunspot::Query::Restriction::AnyOf,
-            args.flatten.map { |instance|
-              Sunspot::Adapters::InstanceAdapter.adapt(instance).index_id }
-          )
         end
-      end
-
     end
   end
 end

data/lib/sunspot/indexer.rb

@@ -102,7 +102,7 @@ module Sunspot
     # Convert documents into hash of indexed properties
     #
     def prepare_full_update(model)
-      document = document_for(model.class, model.id)
+      document = document_for_full_update(model)
       setup = setup_for_object(model)
       if boost = setup.document_boost_for(model)
         document.attrs[:boost] = boost
@@ -114,7 +114,7 @@ module Sunspot
     end
 
     def prepare_atomic_update(clazz, id, updates = {})
-      document = document_for(clazz, id)
+      document = document_for_atomic_update(clazz, id)
       setup_for_class(clazz).all_field_factories.each do |field_factory|
         if updates.has_key?(field_factory.name)
           field_factory.populate_document(document, nil, value: updates[field_factory.name], update: :set)
@@ -137,10 +137,17 @@ module Sunspot
 
     # 
     # All indexed documents index and store the +id+ and +type+ fields.
-    # This method constructs the document hash containing those key-value
+    # These methods construct the document hash containing those key-value
     # pairs.
     #
-    def document_for(clazz, id)
+    def document_for_full_update(model)
+      RSolr::Xml::Document.new(
+        id: Adapters::InstanceAdapter.adapt(model).index_id,
+        type: Util.superclasses_for(model.class).map(&:name)
+      )
+    end
+
+    def document_for_atomic_update(clazz, id)
       if Adapters::InstanceAdapter.for(clazz)
         RSolr::Xml::Document.new(
             id: Adapters::InstanceAdapter.index_id_for(clazz.name, id),
@@ -148,7 +155,6 @@ module Sunspot
         )
       end
     end
-
     # 
     # Get the Setup object for the given object's class.
     #

data/lib/sunspot/query.rb

@@ -1,4 +1,5 @@
-%w(filter abstract_field_facet connective boost_query date_field_facet range_facet abstract_fulltext dismax join
+%w(filter abstract_field_facet connective boost_query date_field_facet
+   range_facet abstract_fulltext dismax join field_list
    field_facet highlighting pagination restriction common_query spellcheck
    standard_query more_like_this more_like_this_query geo geofilt bbox query_facet
    scope sort sort_composite text_field_boost function_query field_stats

data/lib/sunspot/query/common_query.rb

@@ -12,17 +12,22 @@ module Sunspot
         end
 
         @pagination = nil
-        @parameter_adjustment = nil
+        @parameter_adjustments = []
       end
 
-      def solr_parameter_adjustment=(block)
-        @parameter_adjustment = block
+      def add_parameter_adjustment(block)
+        @parameter_adjustments << block
       end
 
       def add_sort(sort)
         @sort << sort
       end
 
+      def add_field_list(field_list)
+        @components << field_list
+        field_list
+      end
+
       def add_group(group)
         @components << group
         group
@@ -76,7 +81,11 @@ module Sunspot
         @components.each do |component|
           Sunspot::Util.deep_merge!(params, component.to_params)
         end
-        @parameter_adjustment.call(params) if @parameter_adjustment
+
+        @parameter_adjustments.each do |_block|
+          _block.call(params)
+        end
+
         params[:q] ||= '*:*'
         params
       end

data/lib/sunspot/query/field_list.rb

@@ -0,0 +1,15 @@
+module Sunspot
+  module Query #:nodoc:
+
+    # This DSL represents only fields that would come out of the results of the search type.
+    class FieldList
+      def initialize(list)
+        @list = list
+      end
+
+      def to_params
+        { :fl => @list }
+      end
+    end
+  end
+end

data/lib/sunspot/util.rb

@@ -257,7 +257,15 @@ module Sunspot
       end
 
       def id
-        @__calling_context__.__send__(:id)
+        begin
+          @__calling_context__.__send__(:id)
+        rescue ::NoMethodError => e
+          begin
+            @__receiver__.__send__(:id)
+          rescue ::NoMethodError
+            raise(e)
+          end
+        end
       end
 
       # Special case due to `Kernel#sub`'s existence

data/lib/sunspot/version.rb

@@ -1,3 +1,3 @@
 module Sunspot
-  VERSION = '2.2.5'
+  VERSION = '2.2.6'
 end

data/spec/api/query/dsl_spec.rb

@@ -4,9 +4,20 @@ describe 'query DSL', :type => :query do
   it 'should allow building search using block argument rather than instance_eval' do
     @blog_id = 1
     session.search Post do |query|
+      query.field_list [:blog_id, :title]
       query.with(:blog_id, @blog_id)
     end
     connection.should have_last_search_including(:fq, 'blog_id_i:1')
+    connection.should have_last_search_with(fl: [:blog_id, :title])
+  end
+
+  it 'should allow field_list specified as arguments' do
+    @blog_id = 1
+    session.search Post do |query|
+      query.field_list :blog_id, :title
+      query.with(:blog_id, @blog_id)
+    end
+    connection.should have_last_search_with(fl: [:blog_id, :title])
   end
 
   it 'should accept a block in the #new_search method' do
@@ -15,4 +26,3 @@ describe 'query DSL', :type => :query do
     connection.should have_last_search_including(:fq, 'blog_id_i:1')
   end
 end
-

data/spec/api/query/more_like_this_spec.rb

@@ -132,6 +132,19 @@ describe 'more_like_this' do
     connection.should have_last_search_with(:some => 'param')
   end
 
+  it "should send query to solr with adjusted parameters in multiple blocks" do
+    session.more_like_this(Post.new) do
+      adjust_solr_params do |params|
+        params[:q]    = 'new search'
+      end
+      adjust_solr_params do |params|
+        params[:some] = 'param'
+      end
+    end
+    connection.should have_last_search_with(:q    => 'new search')
+    connection.should have_last_search_with(:some => 'param')
+  end
+
   private
 
   def search(*args, &block)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sunspot
 version: !ruby/object:Gem::Version
-  version: 2.2.5
+  version: 2.2.6
 platform: ruby
 authors:
 - Mat Brown
@@ -29,7 +29,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-05 00:00:00.000000000 Z
+date: 2016-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -129,6 +129,7 @@ files:
 - lib/sunspot/query/date_field_facet.rb
 - lib/sunspot/query/dismax.rb
 - lib/sunspot/query/field_facet.rb
+- lib/sunspot/query/field_list.rb
 - lib/sunspot/query/field_stats.rb
 - lib/sunspot/query/filter.rb
 - lib/sunspot/query/function_query.rb