couch-client 0.1.1 → 0.1.2

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.1.2. Attachment now typecasts fields for stub values.
+
 v0.1.1. Fixing Manifest contents and adding Rails information to README.
 
 v0.1.0. Adding rake tasks to sync and manage database functions and design documents.  Also added support for list and show functions; as well as fulltext administration.

data/Manifest

@@ -4,7 +4,6 @@ Manifest
 README.markdown
 Rakefile
 TODO
-couch-client.gemspec
 lib/couch-client.rb
 lib/couch-client/attachment.rb
 lib/couch-client/attachment_list.rb

data/couch-client.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{couch-client}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Robert Sosinski"]
-  s.date = %q{2010-11-11}
+  s.date = %q{2010-11-16}
   s.description = %q{A Ruby interface for CouchDB}
   s.email = %q{email@robertsosinski.com}
   s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README.markdown", "TODO", "lib/couch-client.rb", "lib/couch-client/attachment.rb", "lib/couch-client/attachment_list.rb", "lib/couch-client/collection.rb", "lib/couch-client/connection.rb", "lib/couch-client/connection_handler.rb", "lib/couch-client/consistent_hash.rb", "lib/couch-client/database.rb", "lib/couch-client/design.rb", "lib/couch-client/document.rb", "lib/couch-client/hookup.rb", "lib/couch-client/rake_task.rb", "lib/couch-client/row.rb"]
-  s.files = ["CHANGELOG", "LICENSE", "Manifest", "README.markdown", "Rakefile", "TODO", "couch-client.gemspec", "lib/couch-client.rb", "lib/couch-client/attachment.rb", "lib/couch-client/attachment_list.rb", "lib/couch-client/collection.rb", "lib/couch-client/connection.rb", "lib/couch-client/connection_handler.rb", "lib/couch-client/consistent_hash.rb", "lib/couch-client/database.rb", "lib/couch-client/design.rb", "lib/couch-client/document.rb", "lib/couch-client/hookup.rb", "lib/couch-client/rake_task.rb", "lib/couch-client/row.rb", "spec/attachment_list_spec.rb", "spec/attachment_spec.rb", "spec/collection_spec.rb", "spec/conection_handler_spec.rb", "spec/connection_spec.rb", "spec/consistent_hash_spec.rb", "spec/couch-client_spec.rb", "spec/database_spec.rb", "spec/design_spec.rb", "spec/designs/create/people/fulltext/by_name/index.js", "spec/designs/create/people/validate_on_update.js", "spec/designs/create/people/views/all/map.js", "spec/designs/create/people/views/sum/map.js", "spec/designs/create/people/views/sum/reduce.js", "spec/designs/update/people/fulltext/by_name/index.js", "spec/designs/update/people/validate_on_update.js", "spec/designs/update/people/views/sum/map.js", "spec/designs/update/people/views/sum/reduce.js", "spec/document_spec.rb", "spec/files/image.png", "spec/files/plain.txt", "spec/hookup_spec.rb", "spec/rake_task_spec.rb", "spec/row_spec.rb", "spec/spec_helper.rb"]
+  s.files = ["CHANGELOG", "LICENSE", "Manifest", "README.markdown", "Rakefile", "TODO", "lib/couch-client.rb", "lib/couch-client/attachment.rb", "lib/couch-client/attachment_list.rb", "lib/couch-client/collection.rb", "lib/couch-client/connection.rb", "lib/couch-client/connection_handler.rb", "lib/couch-client/consistent_hash.rb", "lib/couch-client/database.rb", "lib/couch-client/design.rb", "lib/couch-client/document.rb", "lib/couch-client/hookup.rb", "lib/couch-client/rake_task.rb", "lib/couch-client/row.rb", "spec/attachment_list_spec.rb", "spec/attachment_spec.rb", "spec/collection_spec.rb", "spec/conection_handler_spec.rb", "spec/connection_spec.rb", "spec/consistent_hash_spec.rb", "spec/couch-client_spec.rb", "spec/database_spec.rb", "spec/design_spec.rb", "spec/designs/create/people/fulltext/by_name/index.js", "spec/designs/create/people/validate_on_update.js", "spec/designs/create/people/views/all/map.js", "spec/designs/create/people/views/sum/map.js", "spec/designs/create/people/views/sum/reduce.js", "spec/designs/update/people/fulltext/by_name/index.js", "spec/designs/update/people/validate_on_update.js", "spec/designs/update/people/views/sum/map.js", "spec/designs/update/people/views/sum/reduce.js", "spec/document_spec.rb", "spec/files/image.png", "spec/files/plain.txt", "spec/hookup_spec.rb", "spec/rake_task_spec.rb", "spec/row_spec.rb", "spec/spec_helper.rb", "couch-client.gemspec"]
   s.homepage = %q{http://github.com/robertsosinski/couch-client}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Couch-client", "--main", "README.markdown"]
   s.require_paths = ["lib"]

data/lib/couch-client.rb

@@ -15,7 +15,7 @@ require 'couch-client/rake_task' if defined?(Rake)
 
 # The CouchClient module is the overall container of all CouchClient logic.
 module CouchClient
-  VERSION = "0.1.0"
+  VERSION = "0.1.2"
   
   class Error < Exception; end
   

data/lib/couch-client/attachment.rb

@@ -9,8 +9,16 @@ module CouchClient
     # Attachment is constructed with the id of the document it is attached to,
     # the filename, file stub and connection object.
     def initialize(id, name, stub, connection)
+      # Ensure that `revpos` and `length` fields are numbers, not strings, or couchdb will thow an error.
+      ["revpos", "length"].each do |field|
+        stub[field] &&= stub[field].to_i
+      end
+      
+      # Ensure that `stub` is a boolean, not a string, or couchdb will throw an error
+      stub["stub"] &&= true 
+      
       self.merge!(stub)
-
+      
       @id = id
       @name = name
       @connection = connection

data/lib/couch-client/hookup.rb

@@ -4,6 +4,7 @@ require 'json'
 module CouchClient
   class InvalidHTTPVerb < Exception; end
   class InvalidJSONData < Exception; end
+  class ConnectionFailed < Exception; end
 
   # Hookup is the basic HTTP interface that connects CouchClient to CouchDB.
   # Hookup can use any HTTP library if the conventions listed below are followed.
@@ -70,15 +71,28 @@ module CouchClient
         easy.userpwd  = handler.password
       end
       
+      # Setup error class with message
+      connection_error = lambda do
+        raise ConnectionFailed.new("could not connect to the database server at '#{handler.uri}'")
+      end
+      
       easy = case verb
       when :head, :get, :delete
         # head, get and delete http methods only take a uri string and options block
-        Curl::Easy.send("http_#{verb}", handler.uri(path, query), &options)
+        begin
+          Curl::Easy.send("http_#{verb}", handler.uri(path, query), &options)
+        rescue Curl::Err::ConnectionFailedError
+          connection_error.call
+        end
       when :post, :put
         # post and put http methods take a uri string, data string and options block
         # also convert the hash into json if the content_type of the request is json
         data = data.to_json if content_type == "application/json"
-        Curl::Easy.send("http_#{verb}", handler.uri(path, query), data, &options)
+        begin
+          Curl::Easy.send("http_#{verb}", handler.uri(path, query), data, &options)
+        rescue Curl::Err::ConnectionFailedError
+          connection_error.call
+        end
       else
         raise InvalidHTTPVerb.new("only `head`, `get`, `post`, `put` and `delete` are supported")
       end

data/spec/attachment_spec.rb

@@ -42,6 +42,16 @@ describe CouchClient::Attachment do
     @couch.database.delete!
   end
   
+  describe '#initialize' do
+    it 'should typecast fields to the currect type' do
+      attachment = CouchClient::Attachment.new("123abc", "text.txt", {"content_type" => "text/plain", "revpos" => "3", "length" => "123", "stub" => "true"}, true)
+      attachment["content_type"].should eql("text/plain")
+      attachment["revpos"].should eql(3)
+      attachment["length"].should eql(123)
+      attachment["stub"].should be_true
+    end
+  end
+  
   describe '#uri' do
     it 'should yield the uri for the attachment' do
       @attachment_plain.uri.should eql([@couch.hookup.handler.uri, @alice.id, "plain.txt"].join("/"))

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: 
 - Robert Sosinski
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-11 00:00:00 -05:00
+date: 2010-11-16 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -108,7 +108,6 @@ files:
 - README.markdown
 - Rakefile
 - TODO
-- couch-client.gemspec
 - lib/couch-client.rb
 - lib/couch-client/attachment.rb
 - lib/couch-client/attachment_list.rb
@@ -147,6 +146,7 @@ files:
 - spec/rake_task_spec.rb
 - spec/row_spec.rb
 - spec/spec_helper.rb
+- couch-client.gemspec
 has_rdoc: true
 homepage: http://github.com/robertsosinski/couch-client
 licenses: []