rsolr 1.0.0.beta2 → 1.0.0.beta3

data/VERSION

@@ -1 +1 @@
-1.0.0.beta2
+1.0.0.beta3

data/lib/rsolr/connectable.rb

@@ -51,9 +51,11 @@ module RSolr::Connectable
   #   :path
   #   :query
   def build_request path, opts
+    raise "path must be a string or symbol, not #{path.inspect}" unless [String,Symbol].include?(path.class)
+    path = path.to_s
     opts[:method] ||= :get
     raise "The :data option can only be used if :method => :post" if opts[:method] != :post and opts[:data]
-    opts[:params] = opts[:params].nil? ? {:wt => :ruby} : opts[:params].merge(:wt => :ruby)
+    opts[:params] = opts[:params].nil? ? {:wt => :ruby} : {:wt => :ruby}.merge(opts[:params])
     query = RSolr::Uri.params_to_solr(opts[:params]) unless opts[:params].empty?
     opts[:query] = query
     if opts[:data].is_a? Hash

data/spec/api/error_spec.rb

@@ -0,0 +1,4 @@
+require 'spec_helper'
+describe "RSolr::Error" do
+  
+end

data/spec/api/http_spec.rb

@@ -1,5 +1,20 @@
 require 'spec_helper'
 describe "RSolr::Http" do
+  it "Should be an RSolr::Connectable and implement an execute method" do
+    http = RSolr::Http.new
+    http.should be_a(RSolr::Connectable)
+    http.should respond_to(:execute)
+  end
+  
+  context "execute" do
+    it "should require a request_context hash" do
+      http = RSolr::Http.new
+      lambda {
+        http.execute
+      }.should raise_error(ArgumentError)
+    end
+  end
+  
   # it "should raise an Http error if the response status code aint right" do
   #   client.connection.should_receive(:get).
   #     and_return({:status => 400, :body => "", :headers => {}})

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 1
   - 0
   - 0
-  - beta2
-  version: 1.0.0.beta2
+  - beta3
+  version: 1.0.0.beta3
 platform: ruby
 authors: 
 - Matt Mitchell
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-12 00:00:00 -04:00
+date: 2010-08-18 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -89,6 +89,7 @@ test_files:
 - spec/api/char_spec.rb
 - spec/api/client_spec.rb
 - spec/api/connectable_spec.rb
+- spec/api/error_spec.rb
 - spec/api/http_spec.rb
 - spec/api/uri_spec.rb
 - spec/api/xml_spec.rb