relaxo 0.3.0 → 0.3.1

data/bin/relaxo

@@ -15,7 +15,10 @@ elsif ARGV.delete('--update')
 	OPTIONS[:existing] = :update
 end
 
-$database = Relaxo.connect(ARGV.shift)
+$url = ARGV.shift
+$database = Relaxo.connect($url)
+$stderr.puts "Connecting to #{$url}..."
+
 $documents = YAML::load(ARGF)
 
 unless Array === $documents
@@ -30,7 +33,7 @@ $stats = {
 
 $documents.each do |document|
 	begin
-		$stderr.puts "Loading #{document.inspect}"
+		$stderr.puts "Loading #{document[Relaxo::ID]}"
 		existing_document = nil
 		
 		if document && document[Relaxo::ID]

data/lib/relaxo/client.rb

@@ -35,7 +35,7 @@ module Relaxo
 		
 		def self.execute(request)
 			# Poor mans debugging:
-			$stderr.puts "Client: #{request[:method]} #{request[:url]}" if @@debug
+			$stderr.puts "Relaxo Client: #{request[:method]} #{request[:url]}" if @@debug
 			
 			response = RestClient::Request.execute(request)
 			return JSON.parse(response)

data/lib/relaxo/{server.rb → connection.rb}

@@ -21,7 +21,7 @@
 require 'relaxo/client'
 
 module Relaxo
-	class Server
+	class Connection
 		DEFAULT_UUID_FETCH_COUNT = 10
 		
 		def initialize(url)

data/lib/relaxo/database.rb

@@ -19,7 +19,7 @@
 # THE SOFTWARE.
 
 require 'relaxo/client'
-require 'relaxo/server'
+require 'relaxo/connection'
 
 module Relaxo
 	
@@ -60,7 +60,7 @@ module Relaxo
 			
 			# We assume the save operation will be successful:
 			unless document.key? ID
-				@uuids << (document[ID] = @database.server.next_uuid)
+				@uuids << (document[ID] = @database.connection.next_uuid)
 			end
 		end
 		
@@ -106,14 +106,14 @@ module Relaxo
 	end
 	
 	class Database
-		def initialize(server, name)
-			@server = server
+		def initialize(connection, name)
+			@connection = connection
 			@name = name
 			
-			@root = server.url + "/" + CGI.escape(name)
+			@root = connection.url + "/" + CGI.escape(name)
 		end
 		
-		attr :server
+		attr :connection
 		attr :name
 		attr :root
 		
@@ -122,7 +122,7 @@ module Relaxo
 		end
 		
 		def put(document)
-			Client.put document_url(document[ID] || @server.next_uuid), document
+			Client.put document_url(document[ID] || @connection.next_uuid), document
 		end
 		
 		def delete(document)

data/lib/relaxo/session.rb

@@ -19,7 +19,7 @@
 # THE SOFTWARE.
 
 require 'relaxo/client'
-require 'relaxo/server'
+require 'relaxo/connection'
 
 module Relaxo
 	
@@ -65,7 +65,7 @@ module Relaxo
 			
 			# We assume the save operation will be successful:
 			unless document.key? ID
-				@uuids << (document[ID] = @database.server.next_uuid)
+				@uuids << (document[ID] = @database.connection.next_uuid)
 			end
 		end
 		

data/lib/relaxo/version.rb

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

data/lib/relaxo.rb

@@ -31,7 +31,7 @@ module Relaxo
 			name = url
 		end
 		
-		server = Server.new(host)
-		database = Database.new(server, name)
+		connection = Connection.new(host)
+		database = Database.new(connection, name)
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: relaxo
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-11 00:00:00.000000000 Z
+date: 2012-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -52,8 +52,8 @@ extra_rdoc_files: []
 files:
 - bin/relaxo
 - lib/relaxo/client.rb
+- lib/relaxo/connection.rb
 - lib/relaxo/database.rb
-- lib/relaxo/server.rb
 - lib/relaxo/session.rb
 - lib/relaxo/version.rb
 - lib/relaxo.rb
@@ -83,3 +83,4 @@ signing_key:
 specification_version: 3
 summary: Relaxo is a helper for loading and working with CouchDB.
 test_files: []
+has_rdoc: