sunspot_rails 2.2.3 → 2.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53553509fb1420ff217918c4af4874764cf06d97
-  data.tar.gz: 8135d49a163251579ca4233d6e6744b0b34bbbee
+  metadata.gz: 35f1acfbb723240a94351de829da76209d44e561
+  data.tar.gz: 47ee861fe055f37f2a09901f46538007789eb210
 SHA512:
-  metadata.gz: 7ad49232bf33f0e1d858bff51a965d022048b8240584b4a08776f508ba29b66d23cc08116c38994c32c0bf2592f473e5338c73ed90ee360a455750814ad4c1ed
-  data.tar.gz: 80e5d687362e3aafe2a5cb97e7ad6cb9629c8cdbf2f1b7ade41dbfcd83dca20eb83739f2f047b087a32780e715e8d4d84ae7cd1cf44064f8fbc497fbf4b1daf2
+  metadata.gz: 483a3523c068942840b0fee63727e30a7a506793ad7107ce9df747e0199e61f764a5915873e20ec66789c7ad895b9ceb22e640eb65caf9405523fc9245b41817
+  data.tar.gz: ae29cca30f1103b861cbffe4776f3172e4f6408711738a4e0dbce81dcb51b5e4c90ed0464f76db469de7cb63dc8a0d7adb29a7d58689b7283667bb46330767e7

data/lib/sunspot/rails/adapters.rb

@@ -21,11 +21,12 @@ module Sunspot #:nodoc:
       class ActiveRecordDataAccessor < Sunspot::Adapters::DataAccessor
         # options for the find
         attr_accessor :include
+        attr_accessor :scopes
         attr_reader :select
 
         def initialize(clazz)
           super(clazz)
-          @inherited_attributes = [:include, :select]
+          @inherited_attributes = [:include, :select, :scopes]
         end
 
         #
@@ -77,6 +78,9 @@ module Sunspot #:nodoc:
           scope = relation
           scope = scope.includes(@include) if @include.present?
           scope = scope.select(@select)    if @select.present?
+          Array.wrap(@scopes).each do |s|
+            scope = scope.send(s)
+          end
           scope 
         end
 

data/lib/sunspot/rails/searchable.rb

@@ -374,15 +374,15 @@ module Sunspot #:nodoc:
         end
         
         def solr_execute_search(options = {})
-          options.assert_valid_keys(:include, :select)
+          inherited_attributes = [:include, :select, :scopes]
+          options.assert_valid_keys(*inherited_attributes)
           search = yield
           unless options.empty?
             search.build do |query|
-              if options[:include]
-                query.data_accessor_for(self).include = options[:include]
-              end
-              if options[:select]
-                query.data_accessor_for(self).select = options[:select]
+              inherited_attributes.each do |attr|
+                if options[attr]
+                  query.data_accessor_for(self).send("#{attr}=", options[attr])
+                end
               end
             end
           end

data/spec/model_spec.rb

@@ -165,6 +165,22 @@ describe 'ActiveRecord mixin' do
       end.results.first.attribute_names.sort.should == ['body', 'id', 'title']
     end
 
+    it 'should use the scoped option from search call to data accessor' do
+      Post.search(:scopes => [:includes_location]) do
+        with :title, 'Test Post'
+      end.data_accessor_for(Post).scopes.should == [:includes_location]
+    end
+
+    it 'should use the scopes option on the data accessor when specified' do
+      @post.update_attribute(:location, Location.create)
+      post = Post.search do
+        with :title, 'Test Post'
+        data_accessor_for(Post).scopes = [:includes_location]
+      end.results.first
+
+      (Rails.version >= '3.1' ? post.association(:location).loaded? : post.loaded_location?).should be_true # Rails 3.1 removed "loaded_#{association}" method
+    end
+
     it 'should gracefully handle nonexistent records' do
       post2 = Post.create!(:title => 'Test Post')
       post2.index!

data/spec/rails_template/app/models/post.rb

@@ -10,4 +10,8 @@ class Post < ActiveRecord::Base
     text :body, :more_like_this => true
     location :location
   end
+
+  scope :includes_location, -> {
+    includes(:location)
+  }
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sunspot_rails
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.2.4
 platform: ruby
 authors:
 - Mat Brown
@@ -26,7 +26,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-15 00:00:00.000000000 Z
+date: 2016-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -48,14 +48,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.3
+        version: 2.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.3
+        version: 2.2.4
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement