sunspot_rails 2.2.8 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 846b1e615a854510c5027c97856eba487a2179d38ca0d3be15f89b911cc6fb60
-  data.tar.gz: 46a293fb375ac70062cce75885ad936724df1f5c1888cbda66d60a469841418c
+  metadata.gz: c03385c874a558e6fdbf6390e452bfc5c87a09f8a6c3d5efae34854e7fdab3d5
+  data.tar.gz: 472395a2311af2ef0323a5332c444275876958c4d2f8c6dacd50cee7fef0da56
 SHA512:
-  metadata.gz: 9f122dc6d0481e2740a504f3415bc4c00f892cb999c950535f55cf11ed5dc443a8335c09b42543b29bb885805c630896052560e7a83900d9ff0831cd18889dbe
-  data.tar.gz: ee63fcc4578de9c64350f759341aa7296ca521644cdb5cf6bbd82eaaedd2bf47fb2138ebfeac5588f739b453758dddf24fd454d63366eb628ff33854dc5a0795
+  metadata.gz: ccdf1424ba07fa9b7f9e2e6e0f4efc421f4da5aea49c3be1359616bb8727256fd72e7895ef0e294878d2e9f2c440661fbe97507b0219409eedb949c45cd2bf9d
+  data.tar.gz: 84c1b362c773e4c4a47a4e662ab0c9ac1bc8afdd018da8c8c88d9f88092846a44e86755c93692e9fbbed550947c54c23545466092cc9cb50f858f650d784fe14

data/lib/sunspot/rails.rb

@@ -53,6 +53,7 @@ module Sunspot #:nodoc:
         config.solr.read_timeout = sunspot_rails_configuration.read_timeout
         config.solr.open_timeout = sunspot_rails_configuration.open_timeout
         config.solr.proxy = sunspot_rails_configuration.proxy
+        config.solr.update_format = sunspot_rails_configuration.update_format
         config
       end
 
@@ -68,6 +69,7 @@ module Sunspot #:nodoc:
         config.solr.read_timeout = sunspot_rails_configuration.read_timeout
         config.solr.open_timeout = sunspot_rails_configuration.open_timeout
         config.solr.proxy = sunspot_rails_configuration.proxy
+        config.solr.update_format = sunspot_rails_configuration.update_format
         config
       end
     end

data/lib/sunspot/rails/configuration.rb

@@ -301,6 +301,10 @@ module Sunspot #:nodoc:
         @open_timeout ||= user_configuration_from_key('solr', 'open_timeout')
       end
 
+      def update_format
+        @update_format ||= user_configuration_from_key('solr', 'update_format')
+      end
+
       def proxy
         @proxy ||= user_configuration_from_key('solr', 'proxy')
       end

data/spec/configuration_spec.rb

@@ -50,11 +50,15 @@ describe Sunspot::Rails::Configuration, "default values without a sunspot.yml" d
   end
 
   it "should set the read timeout to nil when not set" do
-    @config.read_timeout == nil
+    expect(@config.read_timeout).to be_nil
   end
 
   it "should set the open timeout to nil when not set" do
-    @config.open_timeout == nil
+    expect(@config.open_timeout).to be_nil
+  end
+
+  it "should set the update_format to nil when not set" do
+    expect(@config.update_format).to be_nil
   end
 
   it "should set 'log_level' property using Rails log level when not set" do
@@ -163,6 +167,10 @@ describe Sunspot::Rails::Configuration, "user provided sunspot.yml" do
     expect(@config.open_timeout).to eq(0.5)
   end
 
+  it "should handle the 'update_format' property when set" do
+    expect(@config.update_format).to eq('json')
+  end
+
   it "should handle the 'proxy' property when set" do
     expect(@config.proxy).to eq('http://proxy.com:12345')
   end

data/spec/rails_app/config/sunspot.yml

@@ -22,6 +22,7 @@ config_test:
     bind_address: 127.0.0.1
     read_timeout: 2
     open_timeout: 0.5
+    update_format: json
     proxy: http://proxy.com:12345
   auto_commit_after_request: false
   auto_commit_after_delete_request: true

data/spec/request_lifecycle_spec.rb

@@ -20,7 +20,7 @@ describe PostsController, :type => :controller do
     expect(Sunspot).to receive(:commit_if_dirty)
     post :create, :params => { :post => { :title => 'Test 1' } }
   end
-  
+
   it 'should not commit, if configuration is set to false' do
     @configuration.user_configuration = { 'auto_commit_after_request' => false }
     expect(Sunspot).not_to receive(:commit_if_dirty)
@@ -32,16 +32,16 @@ describe PostsController, :type => :controller do
     expect(Sunspot).to receive(:commit_if_dirty)
     post :create, :params => { :post => { :title => 'Test 1' } }
   end
-  
+
   ### auto_commit_if_delete_dirty
-  
+
   it 'should automatically commit after each delete if specified' do
     @configuration.user_configuration = { 'auto_commit_after_request' => false,
                                           'auto_commit_after_delete_request' => true }
     expect(Sunspot).to receive(:commit_if_delete_dirty)
     post :create, :params => { :post => { :title => 'Test 1' } }
   end
-  
+
   it 'should not automatically commit on delete if configuration is set to false' do
     @configuration.user_configuration = { 'auto_commit_after_request' => false,
                                           'auto_commit_after_delete_request' => false }
@@ -54,4 +54,4 @@ describe PostsController, :type => :controller do
     expect(Sunspot).not_to receive(:commit_if_delete_dirty)
     post :create, :params => { :post => { :title => 'Test 1' } }
   end
-end
+end

data/sunspot_rails.gemspec

@@ -38,9 +38,9 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'appraisal', '2.2.0'
   s.add_development_dependency 'nokogiri', '< 1.7' if RUBY_VERSION <= '2.0.0'
   s.add_development_dependency 'rake', '< 12.3'
-  s.add_development_dependency 'rspec'
-  s.add_development_dependency 'rspec-rails'
-  s.add_development_dependency 'sqlite3'
+  s.add_development_dependency 'rspec', '~> 3.7'
+  s.add_development_dependency 'rspec-rails', '~> 3.7'
+  s.add_development_dependency 'sqlite3',  '~> 1.3'
 
   s.rdoc_options << '--webcvs=http://github.com/outoftime/sunspot/tree/master/%s' <<
                   '--title' << 'Sunspot-Rails - Rails integration for the Sunspot Solr search library - API Documentation' <<

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sunspot_rails
 version: !ruby/object:Gem::Version
-  version: 2.2.8
+  version: 2.3.0
 platform: ruby
 authors:
 - Mat Brown
@@ -26,7 +26,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-26 00:00:00.000000000 Z
+date: 2018-04-08 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.8
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.8
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -88,44 +88,44 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.7'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.7'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 description: |2
       Sunspot::Rails is an extension to the Sunspot library for Solr search.
       Sunspot::Rails adds integration between Sunspot and ActiveRecord, including