wrest 0.0.7 → 0.0.8

data/spec/wrest/uri_spec.rb

@@ -1,7 +1,16 @@
+# Copyright 2009 Sidu Ponnappa
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+# Unless required by applicable law or agreed to in writing, software distributed under the License
+# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and limitations under the License.
+
 require File.dirname(__FILE__) + '/../spec_helper'
 
 module Wrest
-  describe Uri do
+  describe Wrest::Uri do
     def build_ok_response(body = '')
       returning mock(Net::HTTPOK) do |response|
         response.stub!(:code).and_return('200')
@@ -26,20 +35,76 @@ module Wrest
       Uri.new('http://localhost:3000').should_not be_https
     end
 
-    it "should understand equality" do
-      Uri.new('https://localhost:3000/ooga').should_not == 'https://localhost:3000/ooga'
-      Uri.new('https://localhost:3000/ooga').should_not == Uri.new('https://localhost:3000/booga')
-      Uri.new('https://localhost:3000').should_not == Uri.new('https://localhost:3500')
-      Uri.new('https://localhost:3000').should_not == Uri.new('http://localhost:3000')
-      Uri.new('http://localhost:3000').should == Uri.new('http://localhost:3000')
+    it "should know how to build a new uri from an existing one by appending a path" do
+      Uri.new('http://localhost:3000')['/ooga/booga'].should == Uri.new('http://localhost:3000/ooga/booga')
+    end
+    
+    it "should know its full path" do
+      Uri.new('http://localhost:3000/ooga').full_path.should == '/ooga'
+      Uri.new('http://localhost:3000/ooga?foo=meh&bar=1').full_path.should == '/ooga?foo=meh&bar=1'
+    end
+        
+    it "should know its host" do
+      Uri.new('http://localhost:3000/ooga').host.should == 'localhost'
+    end
+  
+    it "should know its port" do
+      Uri.new('http://localhost:3000/ooga').port.should == 3000
+      Uri.new('http://localhost/ooga').port.should == 80
+    end
+  
+    it "should include the username and password while building a new uri if no options are provided" do
+      Uri.new(
+        'http://localhost:3000', 
+        :username => 'foo', 
+        :password => 'bar')['/ooga/booga'].should == Uri.new(
+                                                      'http://localhost:3000/ooga/booga', 
+                                                      :username => 'foo', 
+                                                      :password => 'bar')
     end
+    
+    it "should use the username and password provided while building a new uri if present" do
+      uri = Uri.new('http://localhost:3000', :username => 'foo', :password => 'bar')
+      uri.username.should == 'foo'
+      uri.password.should == 'bar'
+      
+      extended_uri = uri['/ooga/booga', {:username => 'meh', :password => 'baz'}]
+      extended_uri.username.should == 'meh'
+      extended_uri.password.should == 'baz'
+    end
+    
+    describe 'Equals' do
+      it "should understand equality" do
+        Uri.new('https://localhost:3000/ooga').should_not == nil
+        Uri.new('https://localhost:3000/ooga').should_not == 'https://localhost:3000/ooga'
+        Uri.new('https://localhost:3000/ooga').should_not == Uri.new('https://localhost:3000/booga')
+        
+        Uri.new('https://ooga:booga@localhost:3000/ooga').should_not == Uri.new('https://foo:bar@localhost:3000/booga')
+        Uri.new('http://ooga:booga@localhost:3000/ooga').should_not == Uri.new('http://foo:bar@localhost:3000/booga')
+        Uri.new('http://localhost:3000/ooga').should_not == Uri.new('http://foo:bar@localhost:3000/booga')
+        
+        Uri.new('https://localhost:3000').should_not == Uri.new('https://localhost:3500')
+        Uri.new('https://localhost:3000').should_not == Uri.new('http://localhost:3000')
+        Uri.new('http://localhost:3000', :username => 'ooga', :password => 'booga').should_not == Uri.new('http://ooga:booga@localhost:3000')
+                
+        Uri.new('http://localhost:3000').should == Uri.new('http://localhost:3000')
+        Uri.new('http://localhost:3000', :username => 'ooga', :password => 'booga').should == Uri.new('http://localhost:3000', :username => 'ooga', :password => 'booga')
+        Uri.new('http://ooga:booga@localhost:3000').should == Uri.new('http://ooga:booga@localhost:3000')
+      end
 
 
-    it "should have the same hash code if it is the same uri" do
-      Uri.new('https://localhost:3000').hash.should == Uri.new('https://localhost:3000').hash
-      Uri.new('https://localhost:3001').hash.should_not == Uri.new('https://localhost:3000').hash
+      it "should have the same hash code if it is the same uri" do
+        Uri.new('https://localhost:3000').hash.should == Uri.new('https://localhost:3000').hash
+        Uri.new('http://ooga:booga@localhost:3000').hash.should == Uri.new('http://ooga:booga@localhost:3000').hash
+        Uri.new('http://localhost:3000', :username => 'ooga', :password => 'booga').hash.should == Uri.new('http://localhost:3000', :username => 'ooga', :password => 'booga').hash
+        
+        Uri.new('https://localhost:3001').hash.should_not == Uri.new('https://localhost:3000').hash
+        Uri.new('https://ooga:booga@localhost:3000').hash.should_not == Uri.new('https://localhost:3000').hash
+        Uri.new('https://localhost:3000', :username => 'ooga', :password => 'booga').hash.should_not == Uri.new('https://localhost:3000').hash
+        Uri.new('https://localhost:3000', :username => 'ooga', :password => 'booga').hash.should_not == Uri.new('http://localhost:3000', :username => 'foo', :password => 'bar').hash
+      end
     end
-
+    
     describe 'Get' do
       it "should know how to get" do
         uri = "http://localhost:3000/glassware".to_uri
@@ -48,7 +113,10 @@ module Wrest
         http = mock(Net::HTTP)
         Net::HTTP.should_receive(:new).with('localhost', 3000).and_return(http)
 
-        http.should_receive(:get).with('/glassware', {}).and_return(build_ok_response)
+        request = Net::HTTP::Get.new('/glassware', {})
+        Net::HTTP::Get.should_receive(:new).with('/glassware', {}).and_return(request)
+        
+        http.should_receive(:request).with(request, nil).and_return(build_ok_response)
 
         uri.get
       end
@@ -59,8 +127,11 @@ module Wrest
 
         http = mock(Net::HTTP)
         Net::HTTP.should_receive(:new).with('localhost', 3000).and_return(http)
-
-        http.should_receive(:get).with('/glassware?owner=Kai&type=bottle', 'page' => '2', 'per_page' => '5').and_return(build_ok_response)
+        
+        request = Net::HTTP::Get.new('/glassware?owner=Kai&type=bottle', {'page' => '2', 'per_page' => '5'})
+        Net::HTTP::Get.should_receive(:new).with('/glassware?owner=Kai&type=bottle', {'page' => '2', 'per_page' => '5'}).and_return(request)
+        
+        http.should_receive(:request).with(request, nil).and_return(build_ok_response)
 
         uri.get({:owner => 'Kai', :type => 'bottle'}, :page => '2', :per_page => '5')
       end
@@ -72,7 +143,10 @@ module Wrest
         http = mock(Net::HTTP)
         Net::HTTP.should_receive(:new).with('localhost', 3000).and_return(http)
 
-        http.should_receive(:get).with('/glassware?owner=Kai&type=bottle', {}).and_return(build_ok_response)
+        request = Net::HTTP::Get.new('/glassware?owner=Kai&type=bottle', {})
+        Net::HTTP::Get.should_receive(:new).with('/glassware?owner=Kai&type=bottle', {}).and_return(request)
+        
+        http.should_receive(:request).with(request, nil).and_return(build_ok_response)
 
         uri.get(:owner => 'Kai', :type => 'bottle')
       end
@@ -85,7 +159,10 @@ module Wrest
       http = mock(Net::HTTP)
       Net::HTTP.should_receive(:new).with('localhost', 3000).and_return(http)
 
-      http.should_receive(:post).with('/glassware', '<ooga>Booga</ooga>', {'page' => '2', 'per_page' => '5'}).and_return(build_ok_response)
+      request = Net::HTTP::Post.new('/glassware', {'page' => '2', 'per_page' => '5'})
+      Net::HTTP::Post.should_receive(:new).with('/glassware', {'page' => '2', 'per_page' => '5'}).and_return(request)
+      
+      http.should_receive(:request).with(request, '<ooga>Booga</ooga>').and_return(build_ok_response)
 
       uri.post '<ooga>Booga</ooga>', :page => '2', :per_page => '5'
     end
@@ -96,8 +173,11 @@ module Wrest
 
       http = mock(Net::HTTP)
       Net::HTTP.should_receive(:new).with('localhost', 3000).and_return(http)
+      
+      request = Net::HTTP::Put.new('/glassware', {'page' => '2', 'per_page' => '5'})
+      Net::HTTP::Put.should_receive(:new).with('/glassware', {'page' => '2', 'per_page' => '5'}).and_return(request)
 
-      http.should_receive(:put).with('/glassware', '<ooga>Booga</ooga>', {'page' => '2', 'per_page' => '5'}).and_return(build_ok_response)
+      http.should_receive(:request).with(request, '<ooga>Booga</ooga>').and_return(build_ok_response)
 
       uri.put '<ooga>Booga</ooga>', :page => '2', :per_page => '5'
     end
@@ -109,7 +189,10 @@ module Wrest
       http = mock(Net::HTTP)
       Net::HTTP.should_receive(:new).with('localhost', 3000).and_return(http)
 
-      http.should_receive(:delete).with('/glassware?owner=Kai&type=bottle', {'page' => '2', 'per_page' => '5'}).and_return(build_ok_response(nil))
+      request = Net::HTTP::Delete.new('/glassware?owner=Kai&type=bottle', {'page' => '2', 'per_page' => '5'})
+      Net::HTTP::Delete.should_receive(:new).with('/glassware?owner=Kai&type=bottle', {'page' => '2', 'per_page' => '5'}).and_return(request)
+
+      http.should_receive(:request).with(request, nil).and_return(build_ok_response(nil))
 
       uri.delete({:owner => 'Kai', :type => 'bottle'}, :page => '2', :per_page => '5')
     end
@@ -121,7 +204,10 @@ module Wrest
       http = mock(Net::HTTP)
       Net::HTTP.should_receive(:new).with('localhost', 3000).and_return(http)
 
-      http.should_receive(:options).with('/glassware').and_return(build_ok_response(nil))
+      request = Net::HTTP::Options.new('/glassware')
+      Net::HTTP::Options.should_receive(:new).with('/glassware', {}).and_return(request)
+      
+      http.should_receive(:request).with(request, nil).and_return(build_ok_response(nil))
 
       uri.options
     end
@@ -133,8 +219,14 @@ module Wrest
       http = mock(Net::HTTP)
       Net::HTTP.should_receive(:new).with('localhost', 3000).any_number_of_times.and_return(http)
 
-      http.should_receive(:get).with('/glassware?owner=Kai&type=bottle', 'page' => '2', 'per_page' => '5').and_return(build_ok_response)
-      http.should_receive(:post).with('/glassware', '<ooga>Booga</ooga>', {'page' => '2', 'per_page' => '5'}).and_return(build_ok_response)
+      request_get = Net::HTTP::Get.new('/glassware?owner=Kai&type=bottle', {'page' => '2', 'per_page' => '5'})
+      Net::HTTP::Get.should_receive(:new).with('/glassware?owner=Kai&type=bottle', {'page' => '2', 'per_page' => '5'}).and_return(request_get)
+      
+      request_post = Net::HTTP::Post.new('/glassware', {'page' => '2', 'per_page' => '5'})
+      Net::HTTP::Post.should_receive(:new).with('/glassware', {'page' => '2', 'per_page' => '5'}).and_return(request_post)
+      
+      http.should_receive(:request).with(request_get, nil).and_return(build_ok_response)
+      http.should_receive(:request).with(request_post, '<ooga>Booga</ooga>').and_return(build_ok_response)
 
       uri.get({:owner => 'Kai', :type => 'bottle'}, :page => '2', :per_page => '5')
       uri.post '<ooga>Booga</ooga>', :page => '2', :per_page => '5'

data/spec/wrest/uri_template_spec.rb

@@ -10,7 +10,7 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
 module Wrest
-  describe UriTemplate do
+  describe Wrest::UriTemplate do
     it "should not maintain a reference to the string it is initialized with" do
       url_pattern = "http://localhost:3000/:resource/:id.:format"
       template = UriTemplate.new(url_pattern)
@@ -24,5 +24,15 @@ module Wrest
           :resource => 'shen_coins', :id => 5, :format => :json
         ).should == "http://localhost:3000/shen_coins/5.json".to_uri
     end
+    
+    it "should also handle username and password" do
+      template = UriTemplate.new("http://:user::password@coathangers.com/:resource/:id")
+      template.to_uri(
+        :user => 'kaiwren',
+        :password => 'fupuppies',
+        :resource => 'portal',
+        :id => '1'
+      ).should == "http://kaiwren:fupuppies@coathangers.com/portal/1".to_uri
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: wrest
 version: !ruby/object:Gem::Version 
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors: 
 - Sidu Ponnappa
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-07 00:00:00 +05:30
+date: 2009-08-13 00:00:00 +05:30
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -48,6 +48,8 @@ files:
 - bin/jwrest
 - bin/wrest
 - bin/wrest_shell.rb
+- examples/delicious.rb
+- examples/wow_realm_status.rb
 - lib/wrest.rb
 - lib/wrest/components.rb
 - lib/wrest/components/attributes_container.rb
@@ -68,11 +70,18 @@ files:
 - lib/wrest/exceptions.rb
 - lib/wrest/exceptions/method_not_overridden_exception.rb
 - lib/wrest/exceptions/unsupported_content_type_exception.rb
+- lib/wrest/http.rb
+- lib/wrest/http/delete.rb
+- lib/wrest/http/get.rb
+- lib/wrest/http/options.rb
+- lib/wrest/http/post.rb
+- lib/wrest/http/put.rb
+- lib/wrest/http/request.rb
+- lib/wrest/http/response.rb
 - lib/wrest/resource.rb
 - lib/wrest/resource/base.rb
 - lib/wrest/resource/collection.rb
 - lib/wrest/resource/state.rb
-- lib/wrest/response.rb
 - lib/wrest/uri.rb
 - lib/wrest/uri_template.rb
 - lib/wrest/version.rb
@@ -91,8 +100,9 @@ files:
 - spec/wrest/components/translators_spec.rb
 - spec/wrest/core_ext/hash/conversions_spec.rb
 - spec/wrest/core_ext/string/conversions_spec.rb
+- spec/wrest/http/request_spec.rb
+- spec/wrest/http/response_spec.rb
 - spec/wrest/resource/base_spec.rb
-- spec/wrest/response_spec.rb
 - spec/wrest/uri_spec.rb
 - spec/wrest/uri_template_spec.rb
 has_rdoc: true
@@ -119,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: wrest
-rubygems_version: 1.3.2
+rubygems_version: 1.3.3
 signing_key: 
 specification_version: 3
 summary: REST client library for Ruby.
@@ -137,7 +147,10 @@ test_files:
 - spec/wrest/components/translators_spec.rb
 - spec/wrest/core_ext/hash/conversions_spec.rb
 - spec/wrest/core_ext/string/conversions_spec.rb
+- spec/wrest/http/request_spec.rb
+- spec/wrest/http/response_spec.rb
 - spec/wrest/resource/base_spec.rb
-- spec/wrest/response_spec.rb
 - spec/wrest/uri_spec.rb
 - spec/wrest/uri_template_spec.rb
+- examples/delicious.rb
+- examples/wow_realm_status.rb

data/lib/wrest/response.rb

@@ -1,42 +0,0 @@
-# Copyright 2009 Sidu Ponnappa
-
-# Licensed under the Apache License, Version 2.0 (the "License"); 
-# you may not use this file except in compliance with the License. 
-# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 
-# Unless required by applicable law or agreed to in writing, software distributed under the License 
-# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-# See the License for the specific language governing permissions and limitations under the License. 
-
-module Wrest #:nodoc:
-  # Decorates a response providing support for deserialisation. 
-  #
-  # The following methods are also available (unlisted by rdoc because they're forwarded):
-  #
-  # <tt>:@http_response,  :code, :message, :body, :http_version, 
-  # :[], :content_length, :content_type, :each_header, :each_name, :each_value, :fetch,
-  # :get_fields, :key?, :type_params</tt>
-  #
-  # They behave exactly like their Net::HTTPResponse equivalents.
-  class Response
-    extend Forwardable
-    def_delegators  :@http_response,  :code, :message, :body, :http_version, 
-                    :[], :content_length, :content_type, :each_header, :each_name, :each_value, :fetch,
-                    :get_fields, :key?, :type_params
-    
-    def initialize(http_response)
-      @http_response = http_response
-    end
-    
-    def deserialise
-      deserialise_using(Wrest::Components::Translators.lookup(@http_response.content_type))
-    end
-    
-    def deserialise_using(translator)
-      translator.deserialise(@http_response)
-    end
-    
-    def headers
-      @http_response.to_hash
-    end
-  end
-end