relaxo 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64d93992b8989b3da2ea1d3538d65bec9803a556
-  data.tar.gz: e559ca748c9c1b13acf35980fa31d8152a2a456d
+  metadata.gz: 0f271109f32a46b527537f02d2d74d11c0b6bec8
+  data.tar.gz: f420d81ae8aefaa83d76aeff87e14ce1a3bf4041
 SHA512:
-  metadata.gz: efd8db9bc3dc670ff3db9f44a517bb2c64a786b9a07363bcb2f232c49060fef0b1b393d8e37437a3cbc7f554238486e1dd9ef0a2945a0942965c60308b1e2ddd
-  data.tar.gz: 7d37db1c92596301d4ef68121b05cd162c20fb2d9ab6fe46a93117f3b7a79fa6e0ca1bcc70c0649a80d4f2cbb3a6c4f5159126f6b95455a2c23d535ad96f947e
+  metadata.gz: 0303b6aa8c28daca4eab2de9485fd0fead7a9ae2272d2c10c936d3ce15481344555cc2744b1bae5221dea1955e8b253a77832a5f1e838d597837e3b10ffdf727
+  data.tar.gz: 96314b1bbc9dd5fb2b9a036c1b7e37da3dac2ad9516c1d9fa91ad88179f1095b8740270a0513f5dee371dcfa40cef9dc7dd587fe73b5b0621fc2f1404d31b1db

data/.travis.yml

@@ -1,11 +1,8 @@
 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
+  - 2.0
+  - 2.1
+  - 2.2
 services:
   - couchdb
+env: COVERAGE=true

data/Gemfile

@@ -4,5 +4,10 @@ source 'https://rubygems.org'
 gemspec
 
 platforms :jruby do
-  gem 'jruby-openssl'
+	gem 'jruby-openssl'
+end
+
+group :test do
+	gem 'simplecov'
+	gem 'coveralls', require: false
 end

data/lib/relaxo.rb

@@ -21,7 +21,7 @@
 require 'relaxo/database'
 
 module Relaxo
-	def self.connect(url)
+	def self.connect(url, metadata = nil)
 		host = "http://localhost:5984"
 		
 		if url =~ /^(https?:\/\/.+?)\/(.+)$/
@@ -37,6 +37,6 @@ module Relaxo
 		end
 		
 		connection = Connection.new(host)
-		database = Database.new(connection, name)
+		database = Database.new(connection, name, metadata)
 	end
 end

data/lib/relaxo/connection.rb

@@ -20,6 +20,8 @@
 
 require 'relaxo/client'
 
+require 'thread'
+
 module Relaxo
 	class Connection
 		DEFAULT_UUID_FETCH_COUNT = 10
@@ -27,18 +29,23 @@ module Relaxo
 		def initialize(url)
 			@url = url
 			@uuids = []
+			
+			@uuid_lock = Mutex.new
 		end
 		
 		attr :url
 		
-		def fetch_uuids(count)
+		private def fetch_uuids(count)
 			@uuids += Client.get("#{@url}/_uuids?count=#{count}")["uuids"]
 		end
 		
+		# This implementation could be improved. It's not exactly fast to request 1 UUID at a time. One idea is to add a UUID queue to Transaction which allows UUIDs to be fetched in bulk on a per-transaction basis, and reused if the transaction fails.
 		def next_uuid
-			fetch_uuids(DEFAULT_UUID_FETCH_COUNT) if @uuids.size == 0
+			@uuid_lock.synchronize do
+				fetch_uuids(DEFAULT_UUID_FETCH_COUNT) if @uuids.size == 0
 			
-			@uuids.pop
+				return @uuids.pop
+			end
 		end
 		
 		def info
@@ -49,5 +56,9 @@ module Relaxo
 		def databases
 			Client.get("#{@url}/_all_dbs")
 		end
+		
+		def configuration
+			Client.get("#{@url}/_config")
+		end
 	end
 end

data/lib/relaxo/database.rb

@@ -27,10 +27,12 @@ module Relaxo
 	DELETED = '_deleted'
 	
 	class Database
-		def initialize(connection, name)
+		def initialize(connection, name, metadata = {})
 			@connection = connection
 			@name = name
 			
+			@metadata = metadata
+			
 			@root = connection.url + "/" + CGI.escape(name)
 		end
 		
@@ -38,6 +40,12 @@ module Relaxo
 		attr :name
 		attr :root
 		
+		attr :metadata
+		
+		def [] key
+			@metadata[key]
+		end
+		
 		# Create the database, will potentially throw an exception if it already exists.
 		def create!
 			Client.put @root

data/lib/relaxo/transaction.rb

@@ -25,8 +25,8 @@ module Relaxo
 	
 	# We monkey-patch this in as Transaction is basically an optional feature for doing bulk_saves.
 	class Database
-		def transaction(klass = nil)
-			transaction = Transaction.new(self)
+		def transaction(klass = nil, metadata = {})
+			transaction = Transaction.new(self, metadata)
 			
 			catch(:abort) do
 				yield transaction
@@ -43,13 +43,18 @@ module Relaxo
 	end
 	
 	class Transaction
-		def initialize(database)
+		def initialize(database, metadata = {})
 			@database = database
+			@metadata = {}
 			
 			@documents = []
 			@uuids = []
 		end
 		
+		def [] key
+			@metadata[key] || @database[key]
+		end
+		
 		def get(*args)
 			@database.get(*args)
 		end

data/lib/relaxo/version.rb

@@ -19,5 +19,5 @@
 # THE SOFTWARE.
 
 module Relaxo
-	VERSION = "0.4.4"
+	VERSION = "0.4.5"
 end

data/relaxo.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
 	spec.add_dependency "json", "~> 1.8"
 	spec.add_dependency "rest-client"
 	
-	spec.add_development_dependency "rspec", "~> 3.1.0"
+	spec.add_development_dependency "rspec", "~> 3.4.0"
 	spec.add_development_dependency "bundler", "~> 1.3"
 	spec.add_development_dependency "rake"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaxo
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-08 00:00:00.000000000 Z
+date: 2016-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.4.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -132,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Relaxo is a helper for loading and working with CouchDB.