grendel-ruby 0.1.4 → 0.1.5

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/grendel-ruby.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{grendel-ruby}
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brad Greenlee"]
-  s.date = %q{2010-04-29}
+  s.date = %q{2010-05-11}
   s.description = %q{Grendel is a RESTful web service which allows for the secure storage of users'
     documents. Grendel-Ruby provides a Ruby API for Grendel.}
   s.email = %q{brad@wesabe.com}

data/lib/grendel/client.rb

@@ -58,7 +58,10 @@ module Grendel
       end
 
     class HTTPException < Exception
+      attr_reader :response
+
       def initialize(response)
+        @response = response
         msg = "#{response.code} #{response.message}"
         msg << "\n#{response.body}" unless response.body.blank?
         super(msg)

data/spec/grendel/user_spec.rb

@@ -4,43 +4,57 @@ describe "Grendel::User" do
   before do
     @client = Grendel::Client.new("http://grendel")
   end
-  
+
   describe "new" do
     it "should strip the protocol and host from the uri" do
       user = Grendel::User.new(@client, :id => "alice", :uri => "http://grendel/users/alice")
       user.uri.should == "/users/alice"
     end
   end
-    
+
+  describe "find" do
+    context "a non-existent user" do
+      it "raises a HTTPException with response code 404" do
+        stub_json_request(:get, 'http://grendel/users/idontexist', "", :status => [404, "Not Found"])
+        begin
+          @client.users.find('idontexist', 'nordoi')
+          fail "HTTPException should have been raised but wasn't"
+        rescue Grendel::Client::HTTPException => e
+          e.response.code.should == 404
+        end
+      end
+    end
+  end
+
   describe "change_password" do
     before do
       @old_password = "s3kret"
       @new_password = "newpass"
       @user = Grendel::User.new(@client, :id => "alice", :password => @old_password)
       @url = "#{@user.id}:#{@user.password}@grendel/users/#{@user.id}"
-      stub_json_request(:put, @url, "", :status => "204 No Content")
+      stub_json_request(:put, @url, "", :status => [204, "No Content"])
     end
-    
+
     it "should send a properly-formatted request" do
       @user.change_password(@new_password)
       params = { "password" => @new_password }
       request(:put, @url).with(:body => params.to_json).should have_been_made.once
     end
-    
+
     it "should return a User with the new password" do
       lambda {
         @user.change_password(@new_password)
       }.should change(@user, :password).from(@old_password).to(@new_password)
     end
   end
-  
+
   describe "delete" do
     before do
       @user = Grendel::User.new(@client, :id => "alice", :password => "s3kret")
       @url = "#{@user.id}:#{@user.password}@grendel/users/#{@user.id}"
-      stub_json_request(:delete, @url, "", :status => "204 No Content")
+      stub_json_request(:delete, @url, "", :status => [204, "No Content"])
     end
-    
+
     it "should send a properly-formatted request" do
       @user.delete
       request(:delete, @url).should have_been_made.once

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Brad Greenlee
@@ -14,45 +14,45 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-29 00:00:00 -07:00
+date: 2010-05-11 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  prerelease: false
+  type: :runtime
+  name: json
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
         version: "0"
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :runtime
-  name: json
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  name: httparty
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
         version: "0"
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :runtime
-  name: httparty
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  name: mime-types
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
         version: "0"
-  prerelease: false
-  type: :runtime
-  name: mime-types
-  version_requirements: *id003
+  requirement: *id003
 description: |-
   Grendel is a RESTful web service which allows for the secure storage of users'
       documents. Grendel-Ruby provides a Ruby API for Grendel.