relaxo 0.4.7 → 1.0.0

data/spec/relaxo/test_records.rb

@@ -0,0 +1,25 @@
+
+require 'relaxo'
+
+RSpec.shared_context "test records" do
+	let(:database_path) {File.join(__dir__, 'test')}
+	let(:database) {Relaxo.connect(database_path)}
+	
+	let(:prefix) {"records"}
+	
+	before(:each) do
+		FileUtils.rm_rf(database_path)
+		
+		database.commit(message: "Create Sample Data") do |dataset|
+			20.times do |i|
+				object = dataset.append("good-#{i}")
+				dataset.write("#{prefix}/#{i}", object)
+			end
+			
+			10.times do |i|
+				object = dataset.append("bad-#{i}")
+				dataset.write("#{prefix}/subdirectory/#{i}", object)
+			end
+		end
+	end
+end

metadata

@@ -1,31 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: relaxo
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 1.0.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-11 00:00:00.000000000 Z
+date: 2017-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.8'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.8'
-- !ruby/object:Gem::Dependency
-  name: rest-client
+  name: rugged
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -92,6 +78,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - ".simplecov"
 - ".travis.yml"
 - Gemfile
@@ -100,19 +87,19 @@ files:
 - bin/relaxo
 - bin/relaxo-admin
 - lib/relaxo.rb
-- lib/relaxo/attachments.rb
-- lib/relaxo/client.rb
-- lib/relaxo/connection.rb
+- lib/relaxo/changeset.rb
 - lib/relaxo/database.rb
-- lib/relaxo/json.rb
+- lib/relaxo/dataset.rb
+- lib/relaxo/directory.rb
 - lib/relaxo/schema.rb
-- lib/relaxo/transaction.rb
 - lib/relaxo/version.rb
 - relaxo.gemspec
-- spec/relaxo/connection_spec.rb
+- spec/relaxo/changeset_spec.rb
+- spec/relaxo/concurrency_spec.rb
 - spec/relaxo/database_spec.rb
-- spec/relaxo/spec_helper.rb
-- spec/relaxo/transaction_spec.rb
+- spec/relaxo/enumeration_spec.rb
+- spec/relaxo/performance_spec.rb
+- spec/relaxo/test_records.rb
 homepage: ''
 licenses:
 - MIT
@@ -133,12 +120,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Relaxo is a helper for loading and working with CouchDB.
 test_files:
-- spec/relaxo/connection_spec.rb
+- spec/relaxo/changeset_spec.rb
+- spec/relaxo/concurrency_spec.rb
 - spec/relaxo/database_spec.rb
-- spec/relaxo/spec_helper.rb
-- spec/relaxo/transaction_spec.rb
+- spec/relaxo/enumeration_spec.rb
+- spec/relaxo/performance_spec.rb
+- spec/relaxo/test_records.rb

data/lib/relaxo/attachments.rb

@@ -1,65 +0,0 @@
-# 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'
-
-require 'base64'
-
-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 => Parameter::Raw(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/client.rb

@@ -1,168 +0,0 @@
-# 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/json'
-require 'rest_client'
-require 'cgi'
-
-module Relaxo
-	# Typically returned from CouchDB when the request was successful:
-	SUCCESS = {'ok' => true}
-	
-	module Parameter
-		# Raw string parameter.
-		class Raw
-			def initialize(value)
-				@value = value
-			end
-			
-			def to_query_string
-				@value
-			end
-		end
-		
-		def self.Raw(value)
-			Raw.new(value)
-		end
-		
-		# Force JSON serialisation.
-		class JSON
-			def initialize(value)
-				@value = value
-			end
-			
-			def to_query_string
-				@value.to_json
-			end
-		end
-		
-		def self.JSON(value)
-			JSON.new(value)
-		end
-	end
-	
-	module Client
-		DEFAULT_GET_HEADERS = {:accept => :json}
-		DEFAULT_PUT_HEADERS = {:accept => :json, :content_type => :json}
-		
-		def self.execute(request)
-			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)
-			execute({
-				:method => :get,
-				:url => url,
-				:headers => DEFAULT_GET_HEADERS
-			})
-		end
-		
-		def self.head(url)
-			execute({
-				:method => :head,
-				:url => url,
-				:headers => DEFAULT_GET_HEADERS
-			})
-		end
-		
-		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 => document ? JSON.generate(document) : nil
-			})
-		end
-		
-		def self.post(url, document)
-			execute({
-				:method => :post,
-				:url => url,
-				:headers => DEFAULT_PUT_HEADERS,
-				:payload => JSON.generate(document)
-			})
-		end
-		
-		def self.delete(url)
-			execute({
-				:method => :delete,
-				:url => url,
-				:headers => DEFAULT_PUT_HEADERS
-			})
-		end
-		
-		def self.escape(component)
-			return CGI.escape(component)
-		end
-		
-		def self.encode_parameters(parameters)
-			query = []
-			
-			parameters.each do |key, value|
-				key_string = key.to_s
-				
-				if value.respond_to? :to_query_string
-					query << escape(key_string) + '=' + escape(value.to_query_string)
-				elsif Symbol === value || key_string.end_with?("docid")
-					query << escape(key_string) + '=' + escape(value.to_s)
-				else
-					query << escape(key_string) + '=' + escape(value.to_json)
-				end
-			end
-			
-			return '?' + query.join('&')
-		end
-		
-		def self.encode_url(url, parameters = {})
-			if parameters.empty?
-				url
-			else
-				url + encode_parameters(parameters)
-			end
-		end
-		
-		def self.escape_id(id)
-			/^_design\/(.*)/ =~ id ? "_design/#{escape($1)}" : escape(id)
-		end
-	end
-end

data/lib/relaxo/transaction.rb

@@ -1,116 +0,0 @@
-# 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/client'
-require 'relaxo/connection'
-
-module Relaxo
-	
-	# We monkey-patch this in as Transaction is basically an optional feature for doing bulk_saves.
-	class Database
-		def transaction(klass = nil, metadata = {})
-			transaction = Transaction.new(self, metadata)
-			
-			catch(:abort) do
-				yield transaction
-				
-				changed = transaction.commit!
-				
-				if klass
-					klass.new(self, changed.last)
-				else
-					changed
-				end
-			end
-		end
-	end
-	
-	class Transaction
-		def initialize(database, metadata = {})
-			@database = database
-			@metadata = {}
-			
-			@documents = []
-			@uuids = []
-		end
-		
-		def [] key
-			@metadata[key] || @database[key]
-		end
-		
-		def get(*args)
-			@database.get(*args)
-		end
-		
-		def delete(document)
-			@documents << {
-				ID => document[ID],
-				REV => document[REV],
-				DELETED => true
-			}
-		end
-		
-		def save(document)
-			@documents << document
-			
-			# We assume the save operation will be successful:
-			unless document.key? ID
-				@uuids << (document[ID] = @database.connection.next_uuid)
-			end
-		end
-		
-		def transaction(klass)
-			yield self
-			
-			klass.new(self, @documents.last)
-		end
-		
-		def view(*args)
-			@database.view(*args)
-		end
-		
-		def commit!
-			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
-		end
-		
-		def abort!
-			throw :abort
-		end
-	end
-end