sunspot_rails 2.2.4 → 2.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35f1acfbb723240a94351de829da76209d44e561
-  data.tar.gz: 47ee861fe055f37f2a09901f46538007789eb210
+  metadata.gz: b486e494f2f1a9cb4e2ae5a48020ff25ad4df89e
+  data.tar.gz: d8895bf88c97f05fbad3c6e17b49b0c8f7fe37ec
 SHA512:
-  metadata.gz: 483a3523c068942840b0fee63727e30a7a506793ad7107ce9df747e0199e61f764a5915873e20ec66789c7ad895b9ceb22e640eb65caf9405523fc9245b41817
-  data.tar.gz: ae29cca30f1103b861cbffe4776f3172e4f6408711738a4e0dbce81dcb51b5e4c90ed0464f76db469de7cb63dc8a0d7adb29a7d58689b7283667bb46330767e7
+  metadata.gz: 91fc7586cb8fd9dbe7dcfdf0d9fe61b2effdf196085f442b475ff791c7bc7e3fc0f5147f8c9877f8cc1fd6f71d997e891a28316ffa7d2bb7e9e6fb753a90affb
+  data.tar.gz: 5c71e44309d9b8d2949950a521b22d232e05e260a8010db22194c2ea394c5f6fa85715467c2f38652373b27a55c75ab0e91c70edbe8ba66601e1e4ab08bbde85

data/lib/sunspot/rails.rb

@@ -52,6 +52,7 @@ module Sunspot #:nodoc:
         ).to_s
         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
       end
 
@@ -66,6 +67,7 @@ module Sunspot #:nodoc:
         ).to_s
         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
       end
     end

data/lib/sunspot/rails/configuration.rb

@@ -15,6 +15,7 @@ module Sunspot #:nodoc:
     #       memory: 1G
     #       solr_jar: /some/path/solr15/start.jar
     #       bind_address: 0.0.0.0
+    #       proxy: false
     #     disabled: false
     #   test:
     #     solr:
@@ -23,6 +24,7 @@ module Sunspot #:nodoc:
     #       log_level: OFF
     #       open_timeout: 0.5
     #       read_timeout: 2
+    #       proxy: false
     #   production:
     #     solr:
     #       scheme: http
@@ -35,6 +37,7 @@ module Sunspot #:nodoc:
     #       solr_home: /some/path
     #       open_timeout: 0.5
     #       read_timeout: 2
+    #       proxy: http://proxy.com:12345
     #     master_solr:
     #       hostname: localhost
     #       port: 8982
@@ -298,6 +301,10 @@ module Sunspot #:nodoc:
         @open_timeout ||= user_configuration_from_key('solr', 'open_timeout')
       end
 
+      def proxy
+        @proxy ||= user_configuration_from_key('solr', 'proxy')
+      end
+
       #
       # Whether or not to disable Solr.
       # Defaults to false.

data/spec/configuration_spec.rb

@@ -22,6 +22,10 @@ describe Sunspot::Rails::Configuration, "default values without a sunspot.yml" d
     @config.userinfo.should be_nil
   end
 
+  it "should not set a proxy" do
+    @config.proxy.should be_nil
+  end
+
   describe "port" do
     it "should default to port 8981 in test" do
       ::Rails.stub(:env => 'test')
@@ -158,6 +162,10 @@ describe Sunspot::Rails::Configuration, "user provided sunspot.yml" do
   it "should handle the 'open_timeout' property when set" do
     @config.open_timeout.should == 0.5
   end
+
+  it "should handle the 'proxy' property when set" do
+    @config.proxy.should == 'http://proxy.com:12345'
+  end
 end
 
 describe Sunspot::Rails::Configuration, "with auto_index_callback and auto_remove_callback set" do

data/spec/rails_template/config/sunspot.yml

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sunspot_rails
 version: !ruby/object:Gem::Version
-  version: 2.2.4
+  version: 2.2.5
 platform: ruby
 authors:
 - Mat Brown
@@ -26,7 +26,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-21 00:00:00.000000000 Z
+date: 2016-03-05 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.4
+        version: 2.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.4
+        version: 2.2.5
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement