grendel-ruby 0.1.1 → 0.1.2

data/.gitignore

@@ -19,3 +19,4 @@ rdoc
 pkg
 
 ## PROJECT::SPECIFIC
+.bundle

data/Gemfile

@@ -0,0 +1,15 @@
+source :gemcutter
+
+gem 'json'
+gem 'httparty'
+gem 'mime-types'
+
+group :development do
+  gem 'bundler', '>= 0.9.20'
+end
+
+group :test do
+  gem 'webmock'
+  gem 'rspec', '>= 1.2.9'
+  gem 'ruby-debug'
+end

data/Gemfile.lock

@@ -0,0 +1,59 @@
+--- 
+dependencies: 
+  ruby-debug: 
+    group: 
+    - :test
+    version: ">= 0"
+  httparty: 
+    group: 
+    - :default
+    version: ">= 0"
+  mime-types: 
+    group: 
+    - :default
+    version: ">= 0"
+  rspec: 
+    group: 
+    - :test
+    version: ">= 1.2.9"
+  json: 
+    group: 
+    - :default
+    version: ">= 0"
+  bundler: 
+    group: 
+    - :development
+    version: ">= 0.9.20"
+  webmock: 
+    group: 
+    - :test
+    version: ">= 0"
+specs: 
+- addressable: 
+    version: 2.1.2
+- bundler: 
+    version: 0.9.24
+- columnize: 
+    version: 0.3.1
+- crack: 
+    version: 0.1.6
+- httparty: 
+    version: 0.5.2
+- json: 
+    version: 1.4.1
+- linecache: 
+    version: "0.43"
+- mime-types: 
+    version: "1.16"
+- rspec: 
+    version: 1.3.0
+- ruby-debug-base: 
+    version: 0.10.3
+- ruby-debug: 
+    version: 0.10.3
+- webmock: 
+    version: 1.0.0
+hash: ba591b03680c95446b835ca0f00273517b491c6d
+sources: 
+- Rubygems: 
+    uri: http://gemcutter.org

data/README.md

@@ -1,7 +1,7 @@
 grendel-ruby
 ============
 
-Ruby interface to the Grendel secure document storage service (http://github.com/wesabe/grendel). See the Grendel API documentation (http://github.com/wesabe/grendel/blob/master/API.md) for more information.
+Ruby interface to the [Grendel secure document storage service](http://github.com/wesabe/grendel). See the [Grendel API documentation](http://github.com/wesabe/grendel/blob/master/API.md) for more information.
 
 Installation
 ------------
@@ -11,7 +11,7 @@ Installation
 Examples
 --------
 
-The following examples assumes that you have the Grendel server running locally on port 8080.
+The following examples assume that you have the Grendel server running locally on port 8080.
 
 
 ### Establishing a Connection
@@ -28,7 +28,7 @@ The following examples assumes that you have the Grendel server running locally
 
     user = client.users.create("alice", "s3kret")  # returns a Grendel::User with id "alice" and password "s3kret"
     
-If the user `id` is taken, a `Grendel::HTTPException` will be thrown with a message containing `422 Unprocessable Entity` and an explanation.
+If the user `id` is taken, a `Grendel::Client::HTTPException` will be thrown with a message containing `422 Unprocessable Entity` and an explanation.
 
 
 ### Viewing A User
@@ -41,12 +41,12 @@ If the user `id` is taken, a `Grendel::HTTPException` will be thrown with a mess
 
 The returned `Grendel::User` will contain the following attributes:
 
-    id - user id
-    modified_at - DateTime
-    created_at - DateTime
-    keys - array of key fingerprints
+    - id  # user id
+    - modified_at  # DateTime
+    - created_at  # DateTime
+    - keys  # array of key fingerprints
     
-If the user is not found, a `Grendel::HTTPException` will be thrown with a message containing `404 Not Found`
+If the user is not found, a `Grendel::Client::HTTPException` will be thrown with a message containing `404 Not Found`
 
 
 ### Changing A User's Password
@@ -154,7 +154,7 @@ user's linked documents.
 
 
     user = client.users.find("alice", "s3kret")
-    linked_docs = user.linked_documents  # returns an array of Grende::LinkedDocuments
+    linked_docs = user.linked_documents  # returns an array of Grendel::LinkedDocuments
     
 A `Grendel::LinkedDocument` is a subclass of `Grendel::Document` with the following additional attribute:
 

data/Rakefile

@@ -1,6 +1,12 @@
 require 'rubygems'
 require 'rake'
 
+begin
+  require 'bundler'
+rescue LoadError
+  puts "Bundler is not available. Install it with: gem install bundler"
+end
+
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
@@ -11,9 +17,11 @@ begin
     gem.email = "brad@wesabe.com"
     gem.homepage = "http://github.com/wesabe/grendel-ruby"
     gem.authors = ["Brad Greenlee"]
-    gem.add_dependency "json"
-    gem.add_dependency "httparty"
-    gem.add_development_dependency "rspec", ">= 1.2.9"
+
+    Bundler::Definition.from_gemfile('Gemfile').dependencies.each do |dependency|
+      next unless dependency.groups.include?(:default)
+      gem.add_dependency dependency.name, dependency.requirement
+    end
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/grendel-ruby.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{grendel-ruby}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brad Greenlee"]
-  s.date = %q{2010-02-24}
+  s.date = %q{2010-04-27}
   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}
@@ -20,6 +20,8 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
      ".gitignore",
+     "Gemfile",
+     "Gemfile.lock",
      "LICENSE.md",
      "README.md",
      "Rakefile",
@@ -74,16 +76,16 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<json>, [">= 0"])
       s.add_runtime_dependency(%q<httparty>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_runtime_dependency(%q<mime-types>, [">= 0"])
     else
       s.add_dependency(%q<json>, [">= 0"])
       s.add_dependency(%q<httparty>, [">= 0"])
-      s.add_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_dependency(%q<mime-types>, [">= 0"])
     end
   else
     s.add_dependency(%q<json>, [">= 0"])
     s.add_dependency(%q<httparty>, [">= 0"])
-    s.add_dependency(%q<rspec>, [">= 1.2.9"])
+    s.add_dependency(%q<mime-types>, [">= 0"])
   end
 end
 

data/lib/grendel/client.rb

@@ -3,23 +3,30 @@ module Grendel
   class Client
     attr_accessor :debug, :debug_output
     attr_reader :base_uri
-    
+
     # Create a new Grendel client instance
     def initialize(base_uri, options = {})
       @base_uri = base_uri
       @debug = options[:debug]
       @debug_output = options[:debug_output] || $stderr
     end
-    
+
     def get(uri, options = {})
       options.merge!(:debug_output => @debug_output) if @debug
       response = HTTParty.get(@base_uri + uri, options)
       raise HTTPException.new(response) if response.code >= 400
       return response
     end
-    
+
+    def head(uri, options = {})
+      options.merge!(:debug_output => @debug_output) if @debug
+      response = HTTParty.head(@base_uri + uri, options)
+      raise HTTPException.new(response) if response.code >= 400
+      return response
+    end
+
     def post(uri, data = {}, options = {})
-      data = data.to_json unless options.delete(:raw_data)        
+      data = data.to_json unless options.delete(:raw_data)
       options.merge!(
           :body => data,
           :headers => {'Content-Type' => 'application/json'}
@@ -29,10 +36,10 @@ module Grendel
       raise HTTPException.new(response) if response.code >= 400
       return response
     end
-    
+
     def put(uri, data = {}, options = {})
-      data = data.to_json unless options.delete(:raw_data)        
-      options = { 
+      data = data.to_json unless options.delete(:raw_data)
+      options = {
         :body => data,
         :headers => {'Content-Type' => 'application/json'}
       }.update(options)
@@ -41,17 +48,17 @@ module Grendel
       raise HTTPException.new(response) if response.code >= 400
       return response
     end
-    
+
     def delete(uri, options = {})
       options.merge!(:debug_output => @debug_output) if @debug
       response = HTTParty.delete(@base_uri + uri, options)
       raise HTTPException.new(response) if response.code >= 400
     end
-  
+
     def users
       UserManager.new(self)
     end
-    
+
     class HTTPException < Exception
       def initialize(response)
         msg = "#{response.code} #{response.message}"

data/lib/grendel/document.rb

@@ -1,7 +1,7 @@
 module Grendel
   class Document
     attr_accessor :user, :name, :uri, :data, :content_type
-    
+
     def initialize(user, params)
       params.symbolize_keys!
       @user = user
@@ -9,19 +9,33 @@ module Grendel
       @name = params[:name]
       @data = params[:data]
       @content_type = params[:content_type]
-      @uri = params[:uri] ? 
+      @uri = params[:uri] ?
         URI.parse(params[:uri]).path :
         "/documents/" + @name # escape this?
     end
-    
+
     # delete this document from Grendel
     def delete
       @user.delete(@uri)
     end
-        
+
     # send link operations to the Link class
     def links
       LinkManager.new(self)
-    end    
+    end
+
+    def content_type
+      @content_type ||= begin
+        @user.head(@uri).headers['content-type'].first
+      end
+    end
+
+    def data
+      @data ||= begin
+        response = @user.get(@uri)
+        @content_type = response.headers['content-type'].first
+        response.body
+      end
+    end
   end
 end

data/lib/grendel/link.rb

@@ -1,15 +1,15 @@
 module Grendel
   class Link
     attr_accessor :document, :user, :uri
-    
+
     def initialize(document, user, params = {})
       params.symbolize_keys!
       @document = document
       @user = user
-      @uri = params[:uri] ? 
+      @uri = params[:uri] ?
         URI.parse(params[:uri]).path :
         "/links/" + @user.id # escape this?
     end
-        
+
   end
 end

data/lib/grendel/linked_document.rb

@@ -1,7 +1,7 @@
 module Grendel
   class LinkedDocument < Document
     attr_accessor :linked_user, :owner
-    
+
     # create a new linked document
     # user - linked user
     # params:
@@ -17,11 +17,11 @@ module Grendel
       super(@owner, params)
       @linked_user = linked_user
       @name = params[:name]
-      @uri = params[:uri] ? 
+      @uri = params[:uri] ?
         URI.parse(params[:uri]).path :
         ["/linked-documents", @owner.id, name].join("/")
     end
-    
+
     # delete this linked document
     def delete
       @linked_user.delete(@uri)

data/lib/grendel/user.rb

@@ -2,7 +2,7 @@ module Grendel
   class User
     attr_accessor :id, :password, :uri
     attr_reader :client, :modified_at, :created_at, :keys
-    
+
     # create a new Grendel::User object
     # params:
     #  id
@@ -12,7 +12,7 @@ module Grendel
       params.symbolize_keys!
       @client = client
       @id = params[:id]
-      @uri = params[:uri] ? 
+      @uri = params[:uri] ?
         URI.parse(params[:uri]).path :
         "/users/" + @id # escape this?
       @password = params[:password]
@@ -31,38 +31,57 @@ module Grendel
     #
     def get(uri = "", options = {})
       options.merge!(auth)
-      @client.get(@uri + uri, options)
+      @client.get(child_uri(uri), options)
     end
-    
+
+    def head(uri = "", options = {})
+      options.merge!(auth)
+      @client.head(child_uri(uri), options)
+    end
+
     def post(uri = "", data = {}, options = {})
       options.merge!(auth)
-      @client.post(@uri + uri, data, options)
+      @client.post(child_uri(uri), data, options)
     end
-    
+
     def put(uri = "", data = {}, options = {})
       options.merge!(auth)
-      @client.put(@uri + uri, data, options)
+      @client.put(child_uri(uri), data, options)
     end
 
     def delete(uri = "", options = {})
       options.merge!(auth)
-      @client.delete(@uri + uri, options)
+      @client.delete(child_uri(uri), options)
     end
-    
+
     # change the user's password
     def change_password(new_password)
       put("", {:password => new_password})
       @password = new_password
     end
-    
+
     # send documents calls to the DocumentManager
     def documents
       DocumentManager.new(self)
     end
-    
+
     # send linked documents calls to the LinkedDocumentManager
     def linked_documents
       LinkedDocumentManager.new(self)
     end
+
+    private
+      def child_uri(uri)
+        if uri.nil? || uri.empty?
+          # blank uri, just use the user's uri
+          @uri
+        elsif uri.index(@uri) == 0
+          # uri already starts with user's uri, just leave it alone
+          uri
+        else
+          # otherwise just tack the uri onto the end of the user's uri
+          @uri + uri
+        end
+      end
   end
 end

data/spec/grendel/document_manager_spec.rb

@@ -8,7 +8,7 @@ describe "Grendel::DocumentManager" do
     @user = Grendel::User.new(@client, :id => @user_id, :password => @password)
     @base_uri = "#{@user_id}:#{@password}@grendel/users/#{@user_id}/documents"
   end
-  
+
   describe "list" do
     before do
       stub_json_request(:get, @base_uri, %{{
@@ -19,7 +19,7 @@ describe "Grendel::DocumentManager" do
              "uri":"http://grendel/users/#{@user_id}/documents/document2.txt"}
           ]}})
     end
-    
+
     it "should return an array of all documents" do
       docs = @user.documents.list
       docs.length.should == 2
@@ -33,29 +33,29 @@ describe "Grendel::DocumentManager" do
   describe "find" do
     before do
       stub_json_request(:get, @base_uri + "/document1.txt", "yay for me", :content_type => "text/plain")
-      stub_json_request(:get, @base_uri + "/notfound.txt", "", :status => "404 Not Found")
+      stub_json_request(:get, @base_uri + "/notfound.txt", "", :status => [404, "Not Found"])
     end
-    
+
     it "should return the document" do
       doc = @user.documents.find("document1.txt")
       doc.name.should == "document1.txt"
       doc.content_type.should == "text/plain"
       doc.data.should == "yay for me"
     end
-    
+
     it "should raise an exception if the document is not found" do
       lambda {
         @user.documents.find("notfound.txt")
-      }.should raise_error(Grendel::Client::HTTPException) {|error| error.message.should match("404")} # change to should == "404 Not Found" once WebMock supports status messages
+      }.should raise_error(Grendel::Client::HTTPException) {|error| error.message.should == "404 Not Found"}
     end
   end
 
   describe "store" do
     describe "a successful request" do
       before do
-        stub_json_request(:put, @base_uri + "/new_document.txt", "", :status => "204 No Content")
+        stub_json_request(:put, @base_uri + "/new_document.txt", "", :status => [204, "No Content"])
       end
-    
+
       it "should send a properly-formatted request" do
         @user.documents.store("new_document.txt", "top secret stuff", "text/plain")
         params = { "id" => @user_id, "password" => @password }
@@ -63,7 +63,7 @@ describe "Grendel::DocumentManager" do
           with(:body => "top secret stuff", :headers => {"Content-Type" => "text/plain"}).
           should have_been_made.once
       end
-    
+
       it "should guess the content type if not provided" do
         @user.documents.store("new_document.txt", "top secret stuff")
         params = { "id" => @user_id, "password" => @password }
@@ -73,14 +73,14 @@ describe "Grendel::DocumentManager" do
       end
 
       it "should default the content type to 'application/octet-stream' if unknown" do
-        stub_json_request(:put, @base_uri + "/new_document.-wtf-", "", :status => "204 No Content")
+        stub_json_request(:put, @base_uri + "/new_document.-wtf-", "", :status => [204, "No Content"])
         @user.documents.store("new_document.-wtf-", "top secret stuff")
         params = { "id" => @user_id, "password" => @password }
         request(:put, @base_uri + "/new_document.-wtf-").
           with(:body => "top secret stuff", :headers => {"Content-Type" => "application/octet-stream"}).
           should have_been_made.once
       end
-      
+
       it "should return a document" do
         doc = @user.documents.store("new_document.txt", "top secret stuff")
         doc.name.should == "new_document.txt"
@@ -89,10 +89,10 @@ describe "Grendel::DocumentManager" do
       end
     end
   end
-  
+
   describe "delete" do
     before do
-      stub_json_request(:delete, @base_uri + "/document.txt", "", :status => "204 No Content")
+      stub_json_request(:delete, @base_uri + "/document.txt", "", :status => [204, "No Content"])
       @document = Grendel::Document.new(@user, :name => "document.txt")
     end
 

data/spec/grendel/document_spec.rb

@@ -7,12 +7,12 @@ describe "Grendel::Document" do
     @password = "s3kret"
     @user = Grendel::User.new(@client, :id => @user_id, :password => @password)
     @base_uri = "#{@user_id}:#{@password}@grendel/users/#{@user_id}/documents"
+    @document = Grendel::Document.new(@user, :name => "document.txt")
   end
 
   describe "delete" do
     before do
-      stub_json_request(:delete, @base_uri + "/document.txt", "", :status => "204 No Content")
-      @document = Grendel::Document.new(@user, :name => "document.txt")
+      stub_json_request(:delete, @base_uri + "/document.txt", "", :status => [204, "No Content"])
     end
 
     it "should send a properly-formatted request" do
@@ -20,4 +20,44 @@ describe "Grendel::Document" do
       request(:delete, @base_uri + "/document.txt").should have_been_made.once
     end
   end
+
+  describe "accessing content type without it being set" do
+    before do
+      @document.content_type = nil
+      stub_request(:head, @base_uri + "/document.txt").
+        to_return(:body => "", :status => 200, :headers => {"Content-Type" => "application/x-lolcat"})
+    end
+
+    it "loads content type" do
+      @document.content_type.should == "application/x-lolcat"
+    end
+
+    it "causes a HEAD request for the document" do
+      @document.content_type
+      request(:head, @base_uri + "/document.txt").should have_been_made.once
+    end
+  end
+
+  describe "accessing data without it being set" do
+    before do
+      @document.data = nil
+      stub_request(:get, @base_uri + "/document.txt").
+        to_return(:body => "OMGLOL", :status => 200, :headers => {"Content-Type" => "application/x-lolcat"})
+    end
+
+    it "loads the data" do
+      @document.data.should == "OMGLOL"
+    end
+
+    it "causes a GET request for the document" do
+      @document.data
+      request(:get, @base_uri + "/document.txt").should have_been_made.once
+    end
+
+    it "populates the content type too" do
+      @document.content_type = nil
+      @document.data
+      @document.content_type.should == "application/x-lolcat"
+    end
+  end
 end

data/spec/grendel/linked_document_manager_spec.rb

@@ -37,11 +37,11 @@ describe "Grendel::LinkedDocumentManager" do
               "uri": "http://grendel/users/carol"
             }
           }
-          
+
         ]
       }})
     end
-    
+
     it "should return an array of all linked documents" do
       docs = @user.linked_documents.list
       docs.length.should == 2
@@ -55,13 +55,13 @@ describe "Grendel::LinkedDocumentManager" do
       docs[1].owner.uri.should == "/users/carol"
     end
   end
-  
+
   describe "find" do
     before do
       stub_json_request(:get, @base_uri + "/bob/document1.txt", "yay for me", :content_type => "text/plain")
-      stub_json_request(:get, @base_uri + "/carol/notfound.txt", "", :status => "404 Not Found")
+      stub_json_request(:get, @base_uri + "/carol/notfound.txt", "", :status => [404, "Not Found"])
     end
-    
+
     it "should return the document" do
       doc = @user.linked_documents.find("bob", "document1.txt")
       doc.name.should == "document1.txt"
@@ -69,17 +69,17 @@ describe "Grendel::LinkedDocumentManager" do
       doc.data.should == "yay for me"
       doc.owner.id.should == "bob"
     end
-    
+
     it "should raise an exception if the document is not found" do
       lambda {
         @user.linked_documents.find("carol", "notfound.txt")
-      }.should raise_error(Grendel::Client::HTTPException) {|error| error.message.should match("404")} # change to should == "404 Not Found" once WebMock supports status messages
+      }.should raise_error(Grendel::Client::HTTPException) {|error| error.message.should == "404 Not Found"}
     end
   end
-  
+
   describe "delete" do
     before do
-      stub_json_request(:delete, @base_uri + "/bob/document.txt", "", :status => "204 No Content")
+      stub_json_request(:delete, @base_uri + "/bob/document.txt", "", :status => [204, "No Content"])
       @linked_document = Grendel::LinkedDocument.new(@user, :name => "document.txt", :owner => {:id => "bob"})
     end
 

data/spec/grendel/linked_document_spec.rb

@@ -11,7 +11,7 @@ describe "Grendel::LinkedDocument" do
 
   describe "delete" do
     before do
-      stub_json_request(:delete, @base_uri + "/bob/document.txt", "", :status => "204 No Content")
+      stub_json_request(:delete, @base_uri + "/bob/document.txt", "", :status => [204, "No Content"])
       @linked_document = Grendel::LinkedDocument.new(@user, :name => "document.txt", :owner => {:id => "bob"})
     end
 

data/spec/grendel/user_manager_spec.rb

@@ -4,17 +4,17 @@ describe "Grendel::User" do
   before do
     @client = Grendel::Client.new("http://grendel")
   end
-  
+
   describe "list" do
     before do
       stub_json_request(:get, "grendel/users", %{{
         "users":[
           {"id":"alice", "uri":"http://grendel/users/alice"},
-          {"id":"bob",   "uri":"http://grendel/users/bob"}          
+          {"id":"bob",   "uri":"http://grendel/users/bob"}
         ]
       }})
     end
-    
+
     it "should return an array of all users" do
       users = @client.users.list
       users.length.should == 2
@@ -33,9 +33,9 @@ describe "Grendel::User" do
         "created-at":"20091227T211120Z",
         "keys":['2048-RSA/0A895A19', '2048-RSA/39D1621B']
       }})
-      stub_json_request(:get, "grendel/users/nobody", "", :status => "404 Not Found")
+      stub_json_request(:get, "grendel/users/nobody", "", :status => [404, "Not Found"])
     end
-    
+
     it "should return the user" do
       user = @client.users.find("alice")
       user.id.should == "alice"
@@ -43,29 +43,29 @@ describe "Grendel::User" do
       user.created_at.should == DateTime.parse("20091227T211120Z")
       user.keys.length.should == 2
     end
-    
+
     it "should raise an exception if the user is not found" do
       lambda {
         @client.users.find("nobody")
-      }.should raise_error(Grendel::Client::HTTPException) {|error| error.message.should match("404")} # change to should == "404 Not Found" once WebMock supports status messages
+      }.should raise_error(Grendel::Client::HTTPException) {|error| error.message.should == "404 Not Found"}
     end
   end
-  
+
   describe "create" do
     describe "a successful request" do
       before do
         @user_id = "bob"
         @password = "s3kret"
         @uri = "http://grendel/users/#{@user_id}"
-        stub_json_request(:post, "grendel/users", "", :status => "201 Created", "Location" => @uri)
+        stub_json_request(:post, "grendel/users", "", :status => [201, "Created"], "Location" => @uri)
       end
-    
+
       it "should send a properly-formatted request" do
         @client.users.create(@user_id, @password)
         params = { :id => @user_id, :password => @password }
         request(:post, "grendel/users").with(:body => params.to_json).should have_been_made.once
       end
-    
+
       it "should return a user" do
         user = @client.users.create(@user_id, @password)
         user.id.should == @user_id
@@ -73,16 +73,16 @@ describe "Grendel::User" do
         user.uri.should == "/users/bob"
       end
     end
-    
+
     describe "an unsuccessful request" do
       before do
-        stub_json_request(:post, "grendel/users", "", :status => "422 Unprocessable Entity")
+        stub_json_request(:post, "grendel/users", "", :status => [422, "Unprocessable Entity"])
       end
-      
+
       it "should raise an exception if the user already exists" do
         lambda {
           @client.users.create("joe","exists")
-        }.should raise_error(Grendel::Client::HTTPException) {|error| error.message.should match("422")}
+        }.should raise_error(Grendel::Client::HTTPException) {|error| error.message.should == "422 Unprocessable Entity"}
       end
     end
   end

data/spec/spec_helper.rb

@@ -1,6 +1,14 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
+begin
+  require 'bundler'
+rescue LoadError
+  require 'rubygems'
+  require 'bundler'
+end
+Bundler.setup
+
 require 'grendel'
 require 'spec'
 require 'spec/autorun'
@@ -10,11 +18,11 @@ include WebMock
 
 Spec::Runner.configure do |config|
   WebMock.disable_net_connect!
-  
+
   # helper to add Content-Type: application/json to each request
   def stub_json_request(method, uri, body, headers = {})
-    headers = headers.update("Content-Type" => "application/json")
-    status = headers.delete(:status) || "200 OK"
+    headers = headers.merge("Content-Type" => "application/json")
+    status = headers.delete(:status) || 200
     stub_request(method, uri).
       to_return(:body => body, :status => status, :headers => headers)
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Brad Greenlee
@@ -14,12 +14,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-24 00:00:00 -08:00
+date: 2010-04-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: json
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
@@ -27,11 +25,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
   type: :runtime
+  name: json
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: httparty
-  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
@@ -39,21 +37,21 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
   type: :runtime
+  name: httparty
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
-        - 1
-        - 2
-        - 9
-        version: 1.2.9
-  type: :development
+        - 0
+        version: "0"
+  prerelease: false
+  type: :runtime
+  name: mime-types
   version_requirements: *id003
 description: |-
   Grendel is a RESTful web service which allows for the secure storage of users'
@@ -69,6 +67,8 @@ extra_rdoc_files:
 files: 
 - .document
 - .gitignore
+- Gemfile
+- Gemfile.lock
 - LICENSE.md
 - README.md
 - Rakefile