relaxo 0.3.1 → 0.4.0

data/README.md

@@ -26,30 +26,28 @@ Connect to a local database and manipulate some documents.
 
 	require 'relaxo'
 	
-	$database = Relaxo.connect("http://localhost:5984/test")
+	database = Relaxo.connect("http://localhost:5984/test")
 	
 	doc1 = {:bob => 'dole'}
-	$database.save(doc1)
+	database.save(doc1)
 	
-	doc2 = $database.get(doc1['_id'])
+	doc2 = database.get(doc1['_id'])
 	doc2[:foo] = 'bar'
-	$database.save(doc2)
+	database.save(doc2)
 
-Bulk Changes/Sessions
----------------------
+### Bulk Changes/Sessions ###
 
 Sessions support a very similar interface to the main database class and can for many cases be used interchangeably, but with added efficiency.
 
 	require 'relaxo'
 	require 'relaxo/session'
 	
-	$database = Relaxo.connect("http://localhost:5984/test")
+	database = Relaxo.connect("http://localhost:5984/test")
+	animals = ['Neko-san', 'Wan-chan', 'Nezu-chan', 'Chicken-san']
 	
-	$animals = ['Neko-san', 'Wan-chan', 'Nezu-chan', 'Chicken-san']
-	
-	$database.session do |session|
-		$animals.each do |animal|
-			session.save({:name => animal})
+	database.transaction do |transaction|
+		animals.each do |animal|
+			transaction.save({:name => animal})
 		end
 	end
 	# => [
@@ -64,8 +62,7 @@ using CouchDB `_bulk_save`.
 
 To abort the session, either raise an exception or call `session.abort!` which is equivalent to `throw :abort`.
 
-Loading Data
-------------
+### Loading Data ###
 
 Relaxo includes a command line script to import documents into a CouchDB database:
 

data/bin/relaxo

@@ -1,29 +1,76 @@
 #!/usr/bin/env ruby
 
 require 'relaxo'
+require 'relaxo/version'
+require 'optparse'
 require 'yaml'
+require 'csv'
 
 OPTIONS = {
-	:existing => :merge
+	:existing => :update, # :merge, :replace
+	:format => :yaml,
+	:transaction => true,
 }
 
-if ARGV.delete('--merge')
-	OPTIONS[:existing] = :merge
-elsif ARGV.delete('--replace')
-	OPTIONS[:existing] = :replace
-elsif ARGV.delete('--update')
-	OPTIONS[:existing] = :update
+module Formats
+	def self.yaml(io, &block)
+		documents = YAML::load(io)
+
+		unless Array === documents
+			documents = [documents]
+		end
+		
+		documents.each &block
+	end
+	
+	def self.csv(io, &block)
+		csv = CSV.new(io, :headers => :first_row)
+		
+		csv.each do |row|
+			yield row.to_hash
+		end
+	end
 end
 
+ARGV.options do |o|
+	script_name = File.basename($0)
+	
+	o.banner = "Usage: #{script_name} [options] [server-url] [files]"
+	o.define_head "This script can be used to import data to CouchDB."
+
+	o.separator ""
+	o.separator "Document creation:"
+
+	o.on("--existing [mode]", "Control whether to 'update (new document attributes takes priority), 'merge' (existing document attributes takes priority) or replace (old document attributes discarded) existing documents.") do |mode|
+		OPTIONS[:existing] = mode.to_sym
+	end
+
+	o.on("--format [type]", "Control the input format. 'yaml' files are imported as a single document or array of documents. 'csv' files are imported as records using the first row as attribute keys.") do |format|
+		OPTIONS[:format] = format.to_sym
+	end
+
+	o.on("--[no-]transaction", "Controls whether data is saved using the batch save operation. Not suitable for huge amounts of data.")
+
+	o.separator ""
+	o.separator "Help and Copyright information:"
+
+	o.on_tail("--copy", "Display copyright and warranty information") do
+		$stderr.puts "#{script_name} v#{Relaxo::VERSION::STRING}. Copyright (c) 2012 Samuel Williams."
+		$stderr.puts "This software is released under the MIT license and comes with ABSOLUTELY NO WARRANTY."
+		exit
+	end
+
+	o.on_tail("-h", "--help", "Show this help message.") do
+		$stderr.puts o
+		exit
+	end
+end.parse!
+
 $url = ARGV.shift
-$database = Relaxo.connect($url)
 $stderr.puts "Connecting to #{$url}..."
+$database = Relaxo.connect($url)
 
-$documents = YAML::load(ARGF)
-
-unless Array === $documents
-	$documents = [$documents]
-end
+$format = Formats.method(OPTIONS[:format])
 
 $stats = {
 	:saved => 0,
@@ -31,13 +78,13 @@ $stats = {
 	:total => 0
 }
 
-$documents.each do |document|
+def process_document(database)
 	begin
-		$stderr.puts "Loading #{document[Relaxo::ID]}"
 		existing_document = nil
 		
 		if document && document[Relaxo::ID]
-			existing_document = $database.get(document[Relaxo::ID]) rescue nil
+			$stderr.puts "Loading #{document[Relaxo::ID]}"
+			existing_document = database.get(document[Relaxo::ID]) rescue nil
 		end
 		
 		if existing_document
@@ -59,7 +106,7 @@ $documents.each do |document|
 		end
 		
 		$stderr.puts "Saving #{document.inspect}"
-		$result = $database.save(document)
+		$result = database.save(document)
 		
 		$stats[:saved] += 1
 	rescue RestClient::BadRequest => ex
@@ -71,7 +118,13 @@ $documents.each do |document|
 	$stats[:total] += 1
 end
 
-$stderr.puts "#{$stats[:saved]} document(s) saved out of #{$stats[:total]}."
-if $stats[:errors] > 0
-	$stderr.puts "#{$stats[:errors]} errors occurred!"
+begin
+	$format.call(ARGF) do |document|
+		process_document(document)
+	end
+ensure
+	$stderr.puts "#{$stats[:saved]} document(s) saved out of #{$stats[:total]}."
+	if $stats[:errors] > 0
+		$stderr.puts "#{$stats[:errors]} errors occurred!"
+	end
 end

data/lib/relaxo/attachments.rb

@@ -0,0 +1,69 @@
+# Copyright (c) 2012 Samuel G. D. Williams. <http://www.oriontransfer.co.nz>
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+require 'relaxo/database'
+
+if RUBY_VERSION < "1.9"
+	require 'relaxo/base64-1.8'
+else
+	require 'base64'
+end
+
+module Relaxo
+	ATTACHMENTS = '_attachments'
+	
+	def self.encode_attachments!(document)
+		return unless document[ATTACHMENTS]
+		
+		document[ATTACHMENTS].each do |name,contents|
+			next if contents.include? 'stub'
+			
+			contents['data'] = Base64.strict_encode64(contents['data'])
+		end
+	end
+	
+	class Database
+		def attach(document, name, data, options = {})
+			parameters = {
+				:rev => document[REV]
+			}.merge(options[:parameters] || {})
+			
+			headers = {}
+			
+			if options[:headers]
+				headers = options[:headers].dup
+			else
+				headers = {}
+			end
+			
+			if options[:content_type]
+				headers[:content_type] = options[:content_type]
+			end
+			
+			Client.attach attachment_url(document[ID], name, parameters), data, headers
+		end
+		
+		private
+		
+		def attachment_url(id, name, parameters = {})
+			Client.encode_url("#{@root}/#{Client.escape_id(id)}/#{Client.escape(name)}", parameters)
+		end
+	end
+end

data/lib/relaxo/base64-1.8.rb

@@ -0,0 +1,8 @@
+
+require 'base64'
+
+module Base64
+	def self.strict_encode64(data)
+		encode64(data).gsub(/\s/, '')
+	end
+end

data/lib/relaxo/client.rb

@@ -18,27 +18,30 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'json'
+require 'relaxo/json'
 require 'rest_client'
 require 'cgi'
 
 module Relaxo
+	# Typically returned from CouchDB when the request was successful:
+	SUCCESS = {'ok' => true}
+	
 	module Client
-		@@debug = false
-		
-		def self.debug= flag
-			@@debug = flag
-		end
-		
 		DEFAULT_GET_HEADERS = {:accept => :json}
 		DEFAULT_PUT_HEADERS = {:accept => :json, :content_type => :json}
 		
 		def self.execute(request)
-			# Poor mans debugging:
-			$stderr.puts "Relaxo Client: #{request[:method]} #{request[:url]}" if @@debug
-			
-			response = RestClient::Request.execute(request)
-			return JSON.parse(response)
+			if request[:method] == :head
+				begin
+					response = RestClient::Request.execute(request)
+					return response.code == 200
+				rescue RestClient::ResourceNotFound
+					return false
+				end
+			else
+				response = RestClient::Request.execute(request)
+				return JSON.parse(response)
+			end
 		end
 		
 		def self.get(url)
@@ -57,12 +60,25 @@ module Relaxo
 			})
 		end
 		
-		def self.put(url, document)
+		def self.attach(url, data, headers = {})
+			headers = {
+				:accept => :json
+			}.merge(headers)
+			
+			execute({
+				:method => :put,
+				:url => url,
+				:headers => headers,
+				:payload => data
+			})
+		end
+		
+		def self.put(url, document = nil)
 			execute({
 				:method => :put,
 				:url => url,
 				:headers => DEFAULT_PUT_HEADERS,
-				:payload => JSON.generate(document)
+				:payload => document ? JSON.generate(document) : nil
 			})
 		end
 		
@@ -115,4 +131,4 @@ module Relaxo
 			/^_design\/(.*)/ =~ id ? "_design/#{escape($1)}" : escape(id)
 		end
 	end
-end
+end

data/lib/relaxo/connection.rb

@@ -44,5 +44,10 @@ module Relaxo
 		def info
 			Client.get @url
 		end
+		
+		# Returns a list of names, one for each available database.
+		def databases
+			Client.get("#{@url}/_all_dbs")
+		end
 	end
 end

data/lib/relaxo/database.rb

@@ -21,102 +21,53 @@
 require 'relaxo/client'
 require 'relaxo/connection'
 
+if RUBY_VERSION < "1.9"
+	require 'relaxo/base64-1.8'
+else
+	require 'base64'
+end
+
 module Relaxo
-	
 	ID = '_id'
 	REV = '_rev'
-	ATTACHMENTS = '_attachments'
+	DELETED = '_deleted'
 	
-	def self.encode_attachments!(document)
-		return unless document[ATTACHMENTS]
-		
-		document[ATTACHMENTS].each do |name,contents|
-			next if contents['stub']
-			
-			contents['data'] = Base64.encode64(contents['data'])
-		end
-	end
-	
-	class Session
-		def initialize(database)
-			@database = database
+	class Database
+		def initialize(connection, name)
+			@connection = connection
+			@name = name
 			
-			@documents = []
-			@uuids = []
+			@root = connection.url + "/" + CGI.escape(name)
 		end
 		
-		def get(*args)
-			@database.get(*args)
-		end
+		attr :connection
+		attr :name
+		attr :root
 		
-		def delete(document)
-			@documents << {:_deleted => true}.merge(document)
+		# Create the database, will potentially throw an exception if it already exists.
+		def create!
+			Client.put @root
 		end
 		
-		def save(document)
-			Relaxo::encode_attachments!(document)
-			
-			@documents << document
-			
-			# We assume the save operation will be successful:
-			unless document.key? ID
-				@uuids << (document[ID] = @database.connection.next_uuid)
-			end
+		# Return true if the database already exists.
+		def exist?
+			Client.head @root
 		end
 		
-		def session(klass)
-			yield self
-			
-			klass.new(self, @documents.last)
+		# Delete the database and all data.
+		def delete!
+			Client.delete @root
 		end
 		
-		def view(*args)
-			@database.view(*args)
+		# Compact the database, removing old document revisions and optimizing space use.
+		def compact!
+			Client.post "#{@root}/_compact"
 		end
 		
-		def commit!
-			#puts "Commiting session:"
-			#puts YAML::dump(@documents)
-			
-			changed = []
-			
-			unless @documents.empty?
-				results = @database.bulk_save @documents
-				
-				# Update the documents with revision information:
-				@documents.each_with_index do |document, index|
-					status = results[index]
-					
-					if status['ok']
-						document[ID] = status['id']
-						document[REV] = status['rev']
-					end
-				end
-				
-				changed = @documents
-				@documents = []
-			end
-			
-			return changed
+		def id?(id, parameters = {})
+			Client.head document_url(id, parameters)
 		end
 		
-		#def rollback!
-			# Restore all documents based on @uuids
-		#end
-	end
-	
-	class Database
-		def initialize(connection, name)
-			@connection = connection
-			@name = name
-			
-			@root = connection.url + "/" + CGI.escape(name)
-		end
-		
-		attr :connection
-		attr :name
-		attr :root
-		
 		def get(id, parameters = {})
 			Client.get document_url(id, parameters)
 		end
@@ -130,8 +81,6 @@ module Relaxo
 		end
 		
 		def save(document)
-			Relaxo::encode_attachments!(document)
-			
 			status = put(document)
 			
 			if status['ok']
@@ -142,11 +91,13 @@ module Relaxo
 			return status
 		end
 		
-		def bulk_save(documents)
-			Client.post command_url("_bulk_docs"), {
+		def bulk_save(documents, options = {})
+			options = {
 				:docs => documents,
 				:all_or_nothing => true
-			}
+			}.merge(options)
+			
+			Client.post command_url("_bulk_docs"), options
 		end
 		
 		# Accepts paramaters as described in http://wiki.apache.org/couchdb/HttpViewApi

data/lib/relaxo/json.rb

@@ -0,0 +1,33 @@
+# Copyright (c) 2012 Samuel G. D. Williams. <http://www.oriontransfer.co.nz>
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+# You can define `Relaxo::JSON` before loading Relaxo, and it will use this implementation without trying to load the default JSON implementation.
+
+module Relaxo
+end
+
+unless defined? Relaxo::JSON
+	unless defined? JSON
+		# Try to load a JSON implementation if it doesn't already exist:
+		require 'json'
+	end
+	
+	Relaxo::JSON = JSON
+end

data/lib/relaxo/{session.rb → transaction.rb}

@@ -23,15 +23,15 @@ require 'relaxo/connection'
 
 module Relaxo
 	
-	# We monkey-patch this in as Session is basically an optional feature for doing bulk_saves.
+	# We monkey-patch this in as Transaction is basically an optional feature for doing bulk_saves.
 	class Database
-		def session(klass = nil)
-			session = Session.new(self)
+		def transaction(klass = nil)
+			transaction = Transaction.new(self)
 			
 			catch(:abort) do
-				yield session
+				yield transaction
 				
-				changed = session.commit!
+				changed = transaction.commit!
 				
 				if klass
 					klass.new(self, changed.last)
@@ -42,7 +42,7 @@ module Relaxo
 		end
 	end
 	
-	class Session
+	class Transaction
 		def initialize(database)
 			@database = database
 			
@@ -55,12 +55,14 @@ module Relaxo
 		end
 		
 		def delete(document)
-			@documents << {:_deleted => true}.merge(document)
+			@documents << {
+				ID => document[ID],
+				REV => document[REV],
+				DELETED => true
+			}
 		end
 		
 		def save(document)
-			Relaxo::encode_attachments!(document)
-			
 			@documents << document
 			
 			# We assume the save operation will be successful:
@@ -69,7 +71,7 @@ module Relaxo
 			end
 		end
 		
-		def session(klass)
+		def transaction(klass)
 			yield self
 			
 			klass.new(self, @documents.last)
@@ -80,9 +82,6 @@ module Relaxo
 		end
 		
 		def commit!
-			#puts "Commiting session:"
-			#puts YAML::dump(@documents)
-			
 			changed = []
 			
 			unless @documents.empty?
@@ -108,9 +107,5 @@ module Relaxo
 		def abort!
 			throw :abort
 		end
-		
-		#def rollback!
-			# Restore all documents based on @uuids
-		#end
 	end
 end

data/lib/relaxo/version.rb

@@ -21,8 +21,8 @@
 module Relaxo
   module VERSION
     MAJOR = 0
-    MINOR = 3
-    TINY  = 1
+    MINOR = 4
+    TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/test/README.md

@@ -0,0 +1,5 @@
+# Relaxo Unit Tests #
+
+Warning: DO NOT RUN THESE UNIT TESTS ON A LIVE SERVER.
+
+The unit tests will create and drop databases with the details within `helper.rb`.

data/test/attachments_test.rb

@@ -0,0 +1,32 @@
+#!/usr/bin/env ruby
+
+require 'helper'
+
+require 'relaxo'
+require 'relaxo/attachments'
+
+class DatabaseTest < Test::Unit::TestCase
+	def setup
+		@connection = Relaxo::Connection.new(TEST_DATABASE_HOST)
+		@database = Relaxo::Database.new(@connection, TEST_DATABASE_NAME)
+		
+		if @database.exist?
+			@database.delete!
+		end
+		
+		@database.create!
+	end
+	
+	def test_attachments
+		document = {
+			Relaxo::ATTACHMENTS => {
+				"foo.txt" => {
+					"content_type" => "text\/plain",
+					"data" => "VGhpcyBpcyBhIGJhc2U2NCBlbmNvZGVkIHRleHQ="
+				}
+			}
+		}
+		
+		puts @database.save(document).inspect
+	end
+end

data/test/connection_test.rb

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+
+require 'helper'
+
+require 'relaxo'
+
+class ConnectionTest < Test::Unit::TestCase
+	def setup
+		@connection = Relaxo::Connection.new(TEST_DATABASE_HOST)
+	end
+	
+	def test_info
+		assert_equal Hash, @connection.info.class
+	end
+	
+	def test_create_database
+		database = Relaxo::Database.new(@connection, TEST_DATABASE_NAME)
+		
+		if database.exist?
+			assert_equal Relaxo::SUCCESS, database.delete!
+		end
+		
+		assert_equal Relaxo::SUCCESS, database.create!
+		
+		assert_includes TEST_DATABASE_NAME, @connection.databases
+		
+		assert_equal Relaxo::SUCCESS, database.delete!
+	end
+end

data/test/database_test.rb

@@ -0,0 +1,34 @@
+#!/usr/bin/env ruby
+
+require 'helper'
+
+require 'relaxo'
+
+class DatabaseTest < Test::Unit::TestCase
+	def setup
+		@connection = Relaxo::Connection.new(TEST_DATABASE_HOST)
+		@database = Relaxo::Database.new(@connection, TEST_DATABASE_NAME)
+		
+		if @database.exist?
+			@database.delete!
+		end
+		
+		@database.create!
+	end
+	
+	def test_adding_document
+		assert_equal false, @database.id?('foobar')
+		
+		document = {'animal' => 'Cat', 'name' => 'Seifa'}
+		
+		@database.save(document)
+		
+		id = document[Relaxo::ID]
+		assert_equal true, @database.id?(id)
+		
+		copy = @database.get(id)
+		document.each do |key, value|
+			assert_equal value, copy[key]
+		end
+	end
+end

data/test/helper.rb

@@ -0,0 +1,19 @@
+
+$LOAD_PATH.unshift File.expand_path("../../lib/", __FILE__)
+
+require 'rubygems'
+require 'test/unit'
+
+TEST_DATABASE_NAME = 'relaxo-test-database'
+TEST_DATABASE_HOST = 'localhost:5984'
+
+class Test::Unit::TestCase
+	# Why isn't this in rails?
+	def assert_includes(elem, array, message = nil)
+		message = build_message message, '<?> is not found in <?>.', elem, array
+		
+		assert_block message do
+			array.include? elem
+		end
+	end
+end

data/test/transaction_test.rb

@@ -0,0 +1,63 @@
+#!/usr/bin/env ruby
+
+require 'helper'
+
+require 'relaxo'
+require 'relaxo/transaction'
+
+class TransactionTest < Test::Unit::TestCase
+	def setup
+		@connection = Relaxo::Connection.new(TEST_DATABASE_HOST)
+		@database = Relaxo::Database.new(@connection, TEST_DATABASE_NAME)
+		
+		if @database.exist?
+			@database.delete!
+		end
+		
+		@database.create!
+	end
+	
+	def test_adding_documents
+		documents = @database.transaction do |txn|
+			10.times do |i|
+				txn.save({:i => i})
+			end
+		end
+		
+		# We got 10 document IDs back
+		assert_equal 10, documents.size
+	end
+	
+	def test_abortion
+		all_documents = @database.documents
+		
+		documents = @database.transaction do |txn|
+			10.times do |i|
+				txn.save({:i => i})
+				
+				txn.abort! if i == 5
+			end
+		end
+		
+		assert_equal nil, documents
+		assert_equal all_documents, @database.documents
+	end
+	
+	def test_deletion
+		documents = @database.transaction do |txn|
+			3.times do |i|
+				txn.save({:i => i})
+			end
+		end
+		
+		@database.transaction do |txn|
+			documents.each do |document|
+				txn.delete(document)
+			end
+		end
+		
+		documents.each do |document|
+			assert_equal false, @database.id?(document[Relaxo::ID])
+		end
+	end
+end

metadata

@@ -1,86 +1,105 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: relaxo
-version: !ruby/object:Gem::Version
-  version: 0.3.1
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  prerelease: false
+  segments: 
+  - 0
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
-authors:
+authors: 
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-22 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-10-14 00:00:00 +13:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: json
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.7.3
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 7
+        - 3
         version: 1.7.3
-- !ruby/object:Gem::Dependency
-  name: rest-client
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.6.7
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rest-client
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 6
+        - 7
         version: 1.6.7
+  type: :runtime
+  version_requirements: *id002
 description: 
 email: samuel.williams@oriontransfer.co.nz
-executables:
+executables: 
 - relaxo
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - bin/relaxo
+- lib/relaxo/attachments.rb
+- lib/relaxo/base64-1.8.rb
 - lib/relaxo/client.rb
 - lib/relaxo/connection.rb
 - lib/relaxo/database.rb
-- lib/relaxo/session.rb
+- lib/relaxo/json.rb
+- lib/relaxo/transaction.rb
 - lib/relaxo/version.rb
 - lib/relaxo.rb
+- test/README.md
+- test/attachments_test.rb
+- test/connection_test.rb
+- test/database_test.rb
+- test/helper.rb
+- test/transaction_test.rb
 - README.md
+has_rdoc: true
 homepage: http://www.oriontransfer.co.nz/gems/relaxo
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Relaxo is a helper for loading and working with CouchDB.
 test_files: []
-has_rdoc: 
+