rsolr 1.0.7 → 1.0.8

data/CHANGES.txt

@@ -1,3 +1,5 @@
+1.0.8
+   -  Fix connection refused errors in specs + add basic auth support (Denis Goeury)
 1.0.7
    - Response body encoding is set to response charset in Ruby >= 1.9
    - Ability to set :read_timeout and :open_timeout when creating new instance of RSolr

data/lib/rsolr/connection.rb

@@ -47,8 +47,6 @@ class RSolr::Connection
     when :get
       Net::HTTP::Get
     when :post
-      #require 'net/http/post/multipart'
-      #File === request_context[:data] ? Net::HTTP::Post::Multipart : Net::HTTP::Post
       Net::HTTP::Post
     when :head
       Net::HTTP::Head
@@ -56,17 +54,9 @@ class RSolr::Connection
       raise "Only :get, :post and :head http method types are allowed."
     end
     headers = request_context[:headers] || {}
-    # if http_method.to_s == "Net::HTTP::Post::Multipart"
-    #   io = request_context[:data]
-    #   UploadIO.convert! io, request_context[:headers]["Content-Type"], io.path, io.path
-    #   raw_request =
-    #     Net::HTTP::Post::Multipart.new(
-    #       request_context[:path],
-    #       :file => io)
-    # else
-      raw_request = http_method.new request_context[:uri].request_uri
-    # end
+    raw_request = http_method.new request_context[:uri].request_uri
     raw_request.initialize_http_header headers
+    raw_request.basic_auth(request_context[:uri].user, request_context[:uri].password) if request_context[:uri].user && request_context[:uri].password
     raw_request
   end
 
@@ -77,4 +67,4 @@ class RSolr::Connection
     body.force_encoding(charset)
   end
 
-end
+end

data/lib/rsolr.rb

@@ -6,7 +6,7 @@ module RSolr
   
   %W(Response Char Client Error Connection Uri Xml).each{|n|autoload n.to_sym, "rsolr/#{n.downcase}"}
   
-  def self.version; "1.0.7" end
+  def self.version; "1.0.8" end
   
   VERSION = self.version
   

data/spec/api/connection_spec.rb

@@ -1,4 +1,6 @@
 require 'spec_helper'
+require 'base64'
+
 describe "RSolr::Connection" do
   
   context "setup_raw_request" do
@@ -15,37 +17,60 @@ describe "RSolr::Connection" do
   context "read timeout configuration" do
     let(:client) { mock.as_null_object }
 
+    let(:http) { mock(Net::HTTP).as_null_object }
+
     subject { RSolr::Connection.new } 
 
+    before do
+      Net::HTTP.stub(:new) { http }
+    end
+
     it "should configure Net:HTTP read_timeout" do
+      http.should_receive(:read_timeout=).with(42)
       subject.execute client, {:uri => URI.parse("http://localhost/some_uri"), :method => :get, :read_timeout => 42}
-      http = subject.instance_variable_get(:@http)
-      http.read_timeout.should == 42
     end
 
     it "should use Net:HTTP default read_timeout if not specified" do
+      http.should_not_receive(:read_timeout=)
       subject.execute client, {:uri => URI.parse("http://localhost/some_uri"), :method => :get}
-      http = subject.instance_variable_get(:@http)
-      http.read_timeout.should == 60
     end
   end
 
   context "open timeout configuration" do
     let(:client) { mock.as_null_object }
 
+    let(:http) { mock(Net::HTTP).as_null_object }
+
     subject { RSolr::Connection.new } 
 
+    before do
+      Net::HTTP.stub(:new) { http }
+    end
+
     it "should configure Net:HTTP open_timeout" do
+      http.should_receive(:open_timeout=).with(42)
       subject.execute client, {:uri => URI.parse("http://localhost/some_uri"), :method => :get, :open_timeout => 42}
-      http = subject.instance_variable_get(:@http)
-      http.open_timeout.should == 42
     end
 
     it "should use Net:HTTP default open_timeout if not specified" do
+      http.should_not_receive(:open_timeout=)
       subject.execute client, {:uri => URI.parse("http://localhost/some_uri"), :method => :get}
-      http = subject.instance_variable_get(:@http)
-      http.open_timeout.should == nil
     end
   end
   
+  describe "basic auth support" do
+    let(:http) { mock(Net::HTTP).as_null_object }
+    
+    before do
+      Net::HTTP.stub(:new) { http }
+    end
+    
+    it "sets the authorization header" do
+      http.should_receive(:request) do |request|
+        request.fetch('authorization').should == "Basic #{Base64.encode64("joe:pass")}".strip
+        mock(Net::HTTPResponse).as_null_object
+      end
+      RSolr::Connection.new.execute nil, :uri => URI.parse("http://joe:pass@localhost:8983/solr"), :method => :get
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rsolr
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -29,11 +29,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-12 00:00:00.000000000Z
+date: 2012-04-22 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &70108731684080 !ruby/object:Gem::Requirement
+  requirement: &70327300845420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -41,10 +41,10 @@ dependencies:
         version: 2.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70108731684080
+  version_requirements: *70327300845420
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70108731667240 !ruby/object:Gem::Requirement
+  requirement: &70327300844920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -52,10 +52,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70108731667240
+  version_requirements: *70327300844920
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70108731666080 !ruby/object:Gem::Requirement
+  requirement: &70327300844460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -63,10 +63,10 @@ dependencies:
         version: 3.9.4
   type: :development
   prerelease: false
-  version_requirements: *70108731666080
+  version_requirements: *70327300844460
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70108731665120 !ruby/object:Gem::Requirement
+  requirement: &70327300844000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -74,7 +74,7 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70108731665120
+  version_requirements: *70327300844000
 description: RSolr aims to provide a simple and extensible library for working with
   Solr
 email:
@@ -123,18 +123,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -700646824116965374
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -700646824116965374
 requirements: []
 rubyforge_project: rsolr
 rubygems_version: 1.8.11