relaxo 0.4.0 → 0.4.2

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZmJjYzZmZTEwYTAwNzczMjhlNmI5YzdmZWIxNTViOTMwZmZkZmY4Ng==
+  data.tar.gz: !binary |-
+    MzA2ZDlmY2U0MzI0NGFkMGExYmRmNjkyY2ZkZjAzMjQzNzliMGJiYQ==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    ODBmMzE1YzAwNjM3MmUzZjJiNDRlZjNkMTM0NjNjZjM1YTYxZjUxMmQwMGY0
+    Njk2NTllYWZlM2RjZmU0YmU2ZWYxNWNjNGZmNjE0YjU1ZWQwZjM2NWMzMjdl
+    NDJhZWE5MzVkZmJkMjMxZjI5YzNhYTk3ZjI5YmZlOGNkYzVkMmY=
+  data.tar.gz: !binary |-
+    ZDU3MmI3MTc3NTY3Nzk2NmQ4Njk2Y2IyNTBmNWExY2ZjYTljN2U2NGE1NjNm
+    ZTM2YTI0MWM5N2MwNTFmMTYzYzQ3Y2IyYWYxZTM4YWVhZTA4ZDA5MDFhMzNk
+    MmNkYzA2Yzk1ZGJlZWRhNTkwY2ZhNWM3ZDI4ZTc2ZDY3ODNiZWU=

data/.gitignore

@@ -0,0 +1,17 @@
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp

data/.travis.yml

@@ -0,0 +1,11 @@
+language: ruby
+rvm:
+  - "1.8.7"
+  - "1.9.2"
+  - "1.9.3"
+  - jruby-18mode # JRuby in 1.8 mode
+  - jruby-19mode # JRuby in 1.9 mode
+  - rbx-18mode
+  - rbx-19mode
+services:
+  - couchdb

data/Gemfile

@@ -0,0 +1,8 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in relaxo.gemspec
+gemspec
+
+platforms :jruby do
+  gem 'jruby-openssl'
+end

data/README.md

@@ -1,26 +1,24 @@
-Relaxo
-======
-
-* Author: Samuel G. D. Williams (<http://www.oriontransfer.co.nz>)
-* Copyright (C) 2012 Samuel G. D. Williams.
-* Released under the MIT license.
+# Relaxo
 
 Relaxo provides a set of tools and interfaces for interacting with CouchDB. It aims to be as simple and efficient as possible while still improving the usability of various CouchDB features.
 
-Installation
-------------
+[![Build Status](https://secure.travis-ci.org/ioquatix/relaxo.png)](http://travis-ci.org/ioquatix/relaxo)
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+    gem 'relaxo'
 
-Install the ruby gem as follows:
+And then execute:
 
-	sudo gem install relaxo
+    $ bundle
 
-To build and install the gem from source:
+Or install it yourself as:
 
-	cd build/
-	sudo GEM=gem1.9 rake1.9 install_gem
+    $ gem install relaxo
 
-Basic Usage
------------
+## Usage
 
 Connect to a local database and manipulate some documents.
 
@@ -35,7 +33,7 @@ Connect to a local database and manipulate some documents.
 	doc2[:foo] = 'bar'
 	database.save(doc2)
 
-### Bulk Changes/Sessions ###
+### Transactions/Bulk Save
 
 Sessions support a very similar interface to the main database class and can for many cases be used interchangeably, but with added efficiency.
 
@@ -57,18 +55,32 @@ Sessions support a very similar interface to the main database class and can for
 	#	{:name=>"Chicken-san", "_id"=>"...", "_rev"=>"..."}
 	#]
 
-All documents will allocated uuids appropriately and at the end of the session block they will be updated (saved or deleted)
-using CouchDB `_bulk_save`.
+All documents will allocated UUIDs appropriately and at the end of the session block they will be updated (saved or deleted) using CouchDB `_bulk_save`. The Transactions interface doesn't support any kind of interaction with the server and thus views won't be updated until after the transaction is complete.
 
 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:
 
-	relaxo http://localhost:5984/test design.yaml sample.yaml
+	% relaxo --help
+	Usage: relaxo [options] [server-url] [files]
+	This script can be used to import data to CouchDB.
+
+	Document creation:
+	        --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.
+	        --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.
+	        --[no-]transaction           Controls whether data is saved using the batch save operation. Not suitable for huge amounts of data.
+
+	Help and Copyright information:
+	        --copy                       Display copyright and warranty information
+	    -h, --help                       Show this help message.
+
+This command loads the documents stored in `design.yaml` and `sample.yaml` into the database at `http://localhost:5984/test`.
 
-Where `design.yaml` and `sample.yaml` contain lists of valid documents, e.g.:
+	% relaxo http://localhost:5984/test design.yaml sample.yaml
+
+...where `design.yaml` and `sample.yaml` contain lists of valid documents, e.g.:
 
 	# design.yaml
 	-   _id: "_design/services"
@@ -82,10 +94,23 @@ Where `design.yaml` and `sample.yaml` contain lists of valid documents, e.g.:
 	                    }
 	                }
 
-License
--------
+If you specify `--format=csv`, the input files will be parsed as standard CSV. The document schema is inferred from the zeroth (header) row and all subsequent rows will be converted to individual documents. All fields will be saved as text.
+
+If your requirements are more complex, consider writing a custom script either to import directly using the `relaxo` gem or convert your data to YAML and import that as above.
+
+## Contributing
+
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request
+
+## License
+
+Released under the MIT license.
 
-Copyright (c) 2010, 2011 Samuel G. D. Williams. <http://www.oriontransfer.co.nz>
+Copyright, 2012, by [Samuel G. D. Williams](http://www.codeotaku.com/samuel-williams).
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/bin/relaxo

@@ -55,7 +55,7 @@ ARGV.options do |o|
 	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 "#{script_name} v#{Relaxo::VERSION}. Copyright (c) 2012 Samuel Williams."
 		$stderr.puts "This software is released under the MIT license and comes with ABSOLUTELY NO WARRANTY."
 		exit
 	end
@@ -66,19 +66,31 @@ ARGV.options do |o|
 	end
 end.parse!
 
-$url = ARGV.shift
-$stderr.puts "Connecting to #{$url}..."
-$database = Relaxo.connect($url)
+url = ARGV.shift
 
-$format = Formats.method(OPTIONS[:format])
+$stderr.puts "Connecting to #{url}..."
+database = Relaxo.connect(url)
 
-$stats = {
+begin
+	info = database.info
+	
+	$stderr.puts "Connected to #{info['db_name']} which contains #{info['doc_count']} document(s)."
+rescue StandardError => error
+	$stderr.puts "Could not fetch info from database server!"
+	
+	throw
+end
+
+
+format = Formats.method(OPTIONS[:format])
+
+@stats = {
 	:saved => 0,
 	:errors => 0,
 	:total => 0
 }
 
-def process_document(database)
+def process_document(database, document)
 	begin
 		existing_document = nil
 		
@@ -106,25 +118,25 @@ def process_document(database)
 		end
 		
 		$stderr.puts "Saving #{document.inspect}"
-		$result = database.save(document)
+		result = database.save(document)
 		
-		$stats[:saved] += 1
+		@stats[:saved] += 1
 	rescue RestClient::BadRequest => ex
 		$stderr.puts ex.inspect
 		
-		$stats[:errors] += 1
+		@stats[:errors] += 1
 	end
 	
-	$stats[:total] += 1
+	@stats[:total] += 1
 end
 
 begin
-	$format.call(ARGF) do |document|
-		process_document(document)
+	format.call(ARGF) do |document|
+		process_document(database, document)
 	end
 ensure
-	$stderr.puts "#{$stats[:saved]} document(s) saved out of #{$stats[:total]}."
-	if $stats[:errors] > 0
-		$stderr.puts "#{$stats[:errors]} errors occurred!"
+	$stderr.puts "#{@stats[:saved]} document(s) saved out of #{@stats[:total]}."
+	if @stats[:errors] > 0
+		$stderr.puts "#{@stats[:errors]} errors occurred!"
 	end
 end

data/bin/relaxo-admin

@@ -0,0 +1,61 @@
+#!/usr/bin/env ruby
+
+require 'relaxo'
+require 'relaxo/version'
+require 'optparse'
+require 'digest/sha1'
+
+$url = ARGV.shift unless ARGV[0] =~ /^-/
+$connection = Relaxo::Connection.new($url)
+
+OPTIONS = {
+	:roles => [],
+	:password => nil
+}
+
+ARGV.options do |o|
+	script_name = File.basename($0)
+	
+	o.banner = "Usage: #{script_name} [server-url] [options]"
+	o.define_head "This script can be used to import data to CouchDB."
+
+	o.on("--password password", "Specify the password for a new user") do |password|
+		OPTIONS[:password] = password
+	end
+
+	o.on("--roles reader,writer", Array, "Specify the roles for a new user") do |roles|
+		OPTIONS[:roles] = roles
+	end
+
+	o.on("--create-user name", "Create a new (non-admin) user") do |name|
+		password = OPTIONS[:password]
+		
+		salt = Digest::SHA1.hexdigest(rand.to_s + name + Time.now.to_s + password)
+		
+		user = {
+			Relaxo::ID => "org.couchdb.user:#{name}",
+			:type => "user",
+			:name => name,
+			:roles => OPTIONS[:roles],
+			:salt => salt,
+			:password_sha => Digest::SHA1.hexdigest(password + salt)
+		}
+		
+		database = Relaxo::Database.new($connection, "_users")
+		puts database.save(user).inspect
+	end
+
+	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}. 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!

data/build/master.rb

@@ -0,0 +1,22 @@
+
+Dir.chdir("../") do
+	require './lib/relaxo/version'
+
+	Gem::Specification.new do |s|
+		s.name = "relaxo"
+		s.version = Relaxo::VERSION::STRING
+		s.author = "Samuel Williams"
+		s.email = "samuel@oriontransfer.org"
+		s.homepage = "http://www.codeotaku.com/projects/relaxo"
+		s.platform = Gem::Platform::RUBY
+		s.summary = "Relaxo is a helper for loading and working with CouchDB."
+		s.files = FileList["{bin,lib,test}/**/*"] + ["rakefile.rb", "Gemfile", "README.md"]
+
+		s.executables << 'relaxo'
+
+		s.add_dependency("json", "~> 1.7.3")
+		s.add_dependency("rest-client", "~> 1.6.7")
+
+		s.has_rdoc = "yard"
+	end
+end

data/build/rakefile.rb

@@ -0,0 +1,39 @@
+
+# Automatic Gem Build Script v3.0
+
+require 'fileutils'
+require 'rubygems'
+
+MasterGemspec = "master.rb"
+
+GEM = ENV['GEM'] || "gem"
+
+desc 'Build a gemspec file'
+task :build_gemspec do
+  $spec = Gem::Specification.load(MasterGemspec)
+  
+  $versioned_gem = "#{$spec.name}-#{$spec.version}.gem"
+  $versioned_gemspec = "#{$spec.name}-#{$spec.version}.gemspec"
+  $base_gemspec = "#{$spec.name}.gemspec"
+  
+  puts "Building #{$versioned_gemspec}..."
+  
+  File.open($versioned_gemspec, "w") do |f|
+    f.write($spec.to_ruby)
+  end
+  
+  puts "Copying file to ../#{$base_gemspec}"
+  FileUtils.cp($versioned_gemspec, "../#{$base_gemspec}")
+end
+
+task :build_gem => [:build_gemspec] do
+  Dir.chdir("../") do
+    system("#{GEM} build #{$base_gemspec}")
+  end
+end
+
+task :install_gem => [:build_gem] do
+  Dir.chdir("../") do
+    system("#{GEM} install --local #{$versioned_gem}")
+  end
+end

data/build/relaxo-0.1.0.gemspec

@@ -0,0 +1,29 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = "relaxo"
+  s.version = "0.1.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Samuel Williams"]
+  s.date = "2012-07-09"
+  s.email = "samuel.williams@oriontransfer.co.nz"
+  s.executables = ["relaxo"]
+  s.files = ["bin/relaxo", "lib/relaxo", "lib/relaxo/version.rb", "lib/relaxo.rb", "README.md"]
+  s.homepage = "http://www.oriontransfer.co.nz/gems/relaxo"
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.23"
+  s.summary = "Relaxo is a helper for loading and working with CouchDB."
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<couchrest>, [">= 0"])
+    else
+      s.add_dependency(%q<couchrest>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<couchrest>, [">= 0"])
+  end
+end

data/build/relaxo-0.1.1.gemspec

@@ -0,0 +1,32 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = "relaxo"
+  s.version = "0.1.1"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Samuel Williams"]
+  s.date = "2012-07-10"
+  s.email = "samuel.williams@oriontransfer.co.nz"
+  s.executables = ["relaxo"]
+  s.files = ["bin/relaxo", "lib/relaxo", "lib/relaxo/client.rb", "lib/relaxo/database.rb", "lib/relaxo/model.rb", "lib/relaxo/properties.rb", "lib/relaxo/recordset.rb", "lib/relaxo/server.rb", "lib/relaxo/version.rb", "lib/relaxo.rb", "README.md"]
+  s.homepage = "http://www.oriontransfer.co.nz/gems/relaxo"
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.23"
+  s.summary = "Relaxo is a helper for loading and working with CouchDB."
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<couchrest>, [">= 0"])
+      s.add_runtime_dependency(%q<rest-client>, [">= 0"])
+    else
+      s.add_dependency(%q<couchrest>, [">= 0"])
+      s.add_dependency(%q<rest-client>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<couchrest>, [">= 0"])
+    s.add_dependency(%q<rest-client>, [">= 0"])
+  end
+end

data/build/relaxo-0.2.0.gemspec

@@ -0,0 +1,32 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = "relaxo"
+  s.version = "0.2.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Samuel Williams"]
+  s.date = "2012-07-11"
+  s.email = "samuel.williams@oriontransfer.co.nz"
+  s.executables = ["relaxo"]
+  s.files = ["bin/relaxo", "lib/relaxo", "lib/relaxo/client.rb", "lib/relaxo/database.rb", "lib/relaxo/model.rb", "lib/relaxo/properties", "lib/relaxo/properties/money.rb", "lib/relaxo/properties.rb", "lib/relaxo/recordset.rb", "lib/relaxo/server.rb", "lib/relaxo/version.rb", "lib/relaxo.rb", "README.md"]
+  s.homepage = "http://www.oriontransfer.co.nz/gems/relaxo"
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.23"
+  s.summary = "Relaxo is a helper for loading and working with CouchDB."
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<couchrest>, [">= 0"])
+      s.add_runtime_dependency(%q<rest-client>, [">= 0"])
+    else
+      s.add_dependency(%q<couchrest>, [">= 0"])
+      s.add_dependency(%q<rest-client>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<couchrest>, [">= 0"])
+    s.add_dependency(%q<rest-client>, [">= 0"])
+  end
+end

data/build/relaxo-0.3.0.gemspec

@@ -0,0 +1,32 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = "relaxo"
+  s.version = "0.3.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Samuel Williams"]
+  s.date = "2012-07-11"
+  s.email = "samuel.williams@oriontransfer.co.nz"
+  s.executables = ["relaxo"]
+  s.files = ["bin/relaxo", "lib/relaxo", "lib/relaxo/client.rb", "lib/relaxo/database.rb", "lib/relaxo/server.rb", "lib/relaxo/session.rb", "lib/relaxo/version.rb", "lib/relaxo.rb", "README.md"]
+  s.homepage = "http://www.oriontransfer.co.nz/gems/relaxo"
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.23"
+  s.summary = "Relaxo is a helper for loading and working with CouchDB."
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<json>, ["~> 1.7.3"])
+      s.add_runtime_dependency(%q<rest-client>, ["~> 1.6.7"])
+    else
+      s.add_dependency(%q<json>, ["~> 1.7.3"])
+      s.add_dependency(%q<rest-client>, ["~> 1.6.7"])
+    end
+  else
+    s.add_dependency(%q<json>, ["~> 1.7.3"])
+    s.add_dependency(%q<rest-client>, ["~> 1.6.7"])
+  end
+end

data/build/relaxo-0.3.1.gemspec

@@ -0,0 +1,32 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = "relaxo"
+  s.version = "0.3.1"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Samuel Williams"]
+  s.date = "2012-07-23"
+  s.email = "samuel.williams@oriontransfer.co.nz"
+  s.executables = ["relaxo"]
+  s.files = ["bin/relaxo", "lib/relaxo", "lib/relaxo/client.rb", "lib/relaxo/connection.rb", "lib/relaxo/database.rb", "lib/relaxo/session.rb", "lib/relaxo/version.rb", "lib/relaxo.rb", "test/database_test.rb", "README.md"]
+  s.homepage = "http://www.oriontransfer.co.nz/gems/relaxo"
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.23"
+  s.summary = "Relaxo is a helper for loading and working with CouchDB."
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<json>, ["~> 1.7.3"])
+      s.add_runtime_dependency(%q<rest-client>, ["~> 1.6.7"])
+    else
+      s.add_dependency(%q<json>, ["~> 1.7.3"])
+      s.add_dependency(%q<rest-client>, ["~> 1.6.7"])
+    end
+  else
+    s.add_dependency(%q<json>, ["~> 1.7.3"])
+    s.add_dependency(%q<rest-client>, ["~> 1.6.7"])
+  end
+end

data/build/relaxo-0.4.0.gemspec

@@ -0,0 +1,32 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = "relaxo"
+  s.version = "0.4.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Samuel Williams"]
+  s.date = "2012-10-14"
+  s.email = "samuel.williams@oriontransfer.co.nz"
+  s.executables = ["relaxo"]
+  s.files = ["bin/relaxo", "lib/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/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"]
+  s.homepage = "http://www.oriontransfer.co.nz/gems/relaxo"
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.23"
+  s.summary = "Relaxo is a helper for loading and working with CouchDB."
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<json>, ["~> 1.7.3"])
+      s.add_runtime_dependency(%q<rest-client>, ["~> 1.6.7"])
+    else
+      s.add_dependency(%q<json>, ["~> 1.7.3"])
+      s.add_dependency(%q<rest-client>, ["~> 1.6.7"])
+    end
+  else
+    s.add_dependency(%q<json>, ["~> 1.7.3"])
+    s.add_dependency(%q<rest-client>, ["~> 1.6.7"])
+  end
+end

data/lib/relaxo/database.rb

@@ -21,12 +21,6 @@
 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'

data/lib/relaxo/version.rb

@@ -19,11 +19,5 @@
 # THE SOFTWARE.
 
 module Relaxo
-  module VERSION
-    MAJOR = 0
-    MINOR = 4
-    TINY  = 0
-
-    STRING = [MAJOR, MINOR, TINY].join('.')
-  end
+	VERSION = "0.4.2"
 end

data/lib/relaxo.rb

@@ -27,6 +27,11 @@ module Relaxo
 		if url =~ /^(https?:\/\/.+?)\/(.+)$/
 			host = $1
 			name = $2
+			
+			# Ensure that we use the default port if none has been specified:
+			unless host =~ /:\d+$/
+				host = host + ":5984"
+			end
 		else
 			name = url
 		end

data/rakefile.rb

@@ -0,0 +1,9 @@
+require "bundler/gem_tasks"
+require "rake/testtask"
+
+Rake::TestTask.new do |t|
+	t.libs << 'test'
+end
+
+desc "Run tests"
+task :default => :test

data/relaxo.gemspec

@@ -0,0 +1,30 @@
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'relaxo/version'
+
+Gem::Specification.new do |spec|
+	spec.name          = "relaxo"
+	spec.version       = Relaxo::VERSION
+	spec.authors       = ["Samuel Williams"]
+	spec.email         = ["samuel.williams@oriontransfer.co.nz"]
+	spec.description   = <<-EOF
+		Relaxo provides a set of tools and interfaces for interacting with CouchDB.
+		It aims to be as simple and efficient as possible while still improving the
+		usability of various CouchDB features.
+	EOF
+	spec.summary       = %q{Relaxo is a helper for loading and working with CouchDB.}
+	spec.homepage      = ""
+	spec.license       = "MIT"
+
+	spec.files         = `git ls-files`.split($/)
+	spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+	spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+	spec.require_paths = ["lib"]
+
+	spec.add_development_dependency "bundler", "~> 1.3"
+	spec.add_development_dependency "rake"
+	
+	spec.add_dependency "json", "~> 1.7.3"
+	spec.add_dependency "rest-client"
+end

data/test/{attachments_test.rb → test_attachments.rb}

@@ -27,6 +27,10 @@ class DatabaseTest < Test::Unit::TestCase
 			}
 		}
 		
-		puts @database.save(document).inspect
+		result = @database.save(document)
+		assert result['ok']
+		
+		document = @database.get(document[Relaxo::ID])
+		assert_equal 1, document[Relaxo::ATTACHMENTS].size
 	end
 end

metadata

@@ -1,60 +1,97 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: relaxo
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 4
-  - 0
-  version: 0.4.0
+version: !ruby/object:Gem::Version
+  version: 0.4.2
 platform: ruby
-authors: 
+authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-10-14 00:00:00 +13:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: json
+date: 2013-04-04 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 7
-        - 3
+      - !ruby/object:Gem::Version
         version: 1.7.3
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rest-client
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 6
-        - 7
-        version: 1.6.7
+      - !ruby/object:Gem::Version
+        version: 1.7.3
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-description: 
-email: samuel.williams@oriontransfer.co.nz
-executables: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: ! "\t\tRelaxo provides a set of tools and interfaces for interacting
+  with CouchDB.\n\t\tIt aims to be as simple and efficient as possible while still
+  improving the\n\t\tusability of various CouchDB features.\n"
+email:
+- samuel.williams@oriontransfer.co.nz
+executables:
 - relaxo
+- relaxo-admin
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
+- .gitignore
+- .travis.yml
+- Gemfile
+- README.md
 - bin/relaxo
+- bin/relaxo-admin
+- build/master.rb
+- build/rakefile.rb
+- build/relaxo-0.1.0.gemspec
+- build/relaxo-0.1.1.gemspec
+- build/relaxo-0.2.0.gemspec
+- build/relaxo-0.3.0.gemspec
+- build/relaxo-0.3.1.gemspec
+- build/relaxo-0.4.0.gemspec
+- lib/relaxo.rb
 - lib/relaxo/attachments.rb
 - lib/relaxo/base64-1.8.rb
 - lib/relaxo/client.rb
@@ -63,43 +100,42 @@ files:
 - lib/relaxo/json.rb
 - lib/relaxo/transaction.rb
 - lib/relaxo/version.rb
-- lib/relaxo.rb
+- rakefile.rb
+- relaxo.gemspec
 - 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: []
-
+- test/test_attachments.rb
+- test/test_connection.rb
+- test/test_database.rb
+- test/test_transactions.rb
+homepage: ''
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-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"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Relaxo is a helper for loading and working with CouchDB.
-test_files: []
-
+test_files:
+- test/README.md
+- test/helper.rb
+- test/test_attachments.rb
+- test/test_connection.rb
+- test/test_database.rb
+- test/test_transactions.rb