relaxo 1.0.1 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 801d2413ec4ce9a0befc4ad46726900c09453cb8
-  data.tar.gz: e9b179cd2f9a6da4083848c3197f69b328dc455e
+SHA256:
+  metadata.gz: ae1194ada958c694f278dd6340b8c910bf79e79f66735fb5e1f8c6acc7e8417a
+  data.tar.gz: fee89902ec4e5dc0a77c0642b47cc997d13a90f30f7ad51bf008f765aeccdeef
 SHA512:
-  metadata.gz: 6f5c211fdb870371d30dd6555b556771a78a12408004db4bc1be125bcced2daa64bf05c989a8a8045b0456a64cc277d9fc1d132af9f26ed6a76c7ede4c3714af
-  data.tar.gz: 9f6a3c721c120a000666fb192fc2d779ff62a3d0ab714cc24f75284bfa6ca1bfe72cd5e32be469c241af28a43b6a3309f683dda823a76ecd74dd638eba176c68
+  metadata.gz: 8280b8de30982f10ac8753cf49a3e4e2149b82b387037a8038173f9f1c29e6aa1e61d417fb22789615db5b8907c16da25194c8073cf3e5e811ecb2b8764bb441
+  data.tar.gz: ed739652d8c5b8cd5e04b10f122faa426af7a8f9e7bf7d0e90643664c7677f52e96444e257b1611830e291de95fd2eb8395d5c4931546f8a8824c9fbd0af064f

data/lib/relaxo.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2012 Samuel G. D. Williams. <http://www.oriontransfer.co.nz>
+# Copyright, 2012, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -20,14 +20,35 @@
 
 require 'relaxo/database'
 
-require 'pry'
+require 'etc'
+require 'socket'
 
 module Relaxo
-	def self.connect(path, metadata = {})
+	MASTER = 'master'.freeze
+	
+	def self.connect(path, branch: nil, sync: nil, **metadata)
 		unless File.exist?(path)
-			Rugged::Repository.init_at(path, true)
+			repository = Rugged::Repository.init_at(path, true)
+			
+			if sync || ENV['RELAXO_SYNC']
+				repository.config['core.fsyncObjectFiles'] = true
+			end
 		end
 		
-		return Database.new(path, metadata)
+		branch ||= MASTER
+		
+		database = Database.new(path, branch, metadata)
+		
+		if config = database.config
+			unless config['user.name']
+				login = Etc.getlogin
+				hostname = Socket.gethostname
+				
+				config['user.name'] = login
+				config['user.email'] = "#{login}@#{hostname}"
+			end
+		end
+		
+		return database
 	end
 end

data/lib/relaxo/changeset.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2012 Samuel G. D. Williams. <http://www.oriontransfer.co.nz>
+# Copyright, 2012, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -65,7 +65,7 @@ module Relaxo
 				name: name,
 			}
 			
-			directory(root).insert(entry)
+			fetch_directory(root).insert(entry)
 			
 			return entry
 		end
@@ -82,7 +82,7 @@ module Relaxo
 				name: name,
 			}
 			
-			directory(root).delete(entry)
+			fetch_directory(root).delete(entry)
 			
 			return entry
 		end

data/lib/relaxo/database.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2012 Samuel G. D. Williams. <http://www.oriontransfer.co.nz>
+# Copyright, 2012, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -19,8 +19,8 @@
 # THE SOFTWARE.
 
 require 'rugged'
-require 'logger'
 
+require_relative 'logger'
 require_relative 'dataset'
 require_relative 'changeset'
 
@@ -28,29 +28,48 @@ module Relaxo
 	HEAD = 'HEAD'.freeze
 	
 	class Database
-		def initialize(path, metadata = {})
+		def initialize(path, branch, metadata = {}, fsync: true)
 			@path = path
 			@metadata = metadata
 			
-			@logger = metadata[:logger] || Logger.new($stderr).tap{|logger| logger.level = Logger::INFO}
+			@repository = Rugged::Repository.new(path)
+			@repository.config['core.fsyncObjectFiles'] = fsync
 			
-			@repository = repository || Rugged::Repository.new(path)
+			@branch = branch
+		end
+		
+		def config
+			@repository.config
 		end
 		
 		attr :path
 		attr :metadata
 		attr :repository
 		
+		# Completely clear out the database.
+		def clear!
+			if head = @repository.branches[@branch]
+				@repository.references.delete(head)
+			end
+		end
+		
 		def empty?
 			@repository.empty?
 		end
 		
+		def head
+			@repository.branches[@branch]
+		end
+		
 		def [] key
 			@metadata[key]
 		end
 		
 		# During the execution of the block, changes don't get stored immediately, so reading from the dataset (from outside the block) will continue to return the values that were stored in the configuration when the transaction was started.
+		# @return the result of the block.
 		def commit(**options)
+			result = nil
+			
 			track_time(options[:message]) do
 				catch(:abort) do
 					begin
@@ -58,10 +77,12 @@ module Relaxo
 						
 						changeset = Changeset.new(@repository, tree)
 						
-						yield changeset
+						result = yield changeset
 					end until apply(parent, changeset, **options)
 				end
 			end
+			
+			return result
 		end
 		
 		# Efficient point-in-time read-only access.
@@ -113,7 +134,7 @@ module Relaxo
 			end_time = Time.now
 			elapsed_time = end_time - start_time
 			
-			@logger.debug("time") {"#{message.inspect}: %0.3fs" % elapsed_time}
+			Relaxo.logger.debug(self) {"#{message.inspect}: %0.3fs" % elapsed_time}
 		end
 		
 		def apply(parent, changeset, **options)
@@ -121,7 +142,7 @@ module Relaxo
 			
 			options[:tree] = changeset.write_tree
 			options[:parents] ||= [parent]
-			options[:update_ref] ||= HEAD
+			options[:update_ref] ||= "refs/heads/#{@branch}"
 			
 			begin
 				Rugged::Commit.create(@repository, options)
@@ -131,13 +152,11 @@ module Relaxo
 		end
 		
 		def latest_commit
-			if head = @repository.head
+			if head = self.head
 				return head.target, head.target.tree
 			else
 				return nil, empty_tree
 			end
-		rescue Rugged::ReferenceError
-			return nil, empty_tree
 		end
 		
 		def empty_tree

data/lib/relaxo/dataset.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2012 Samuel G. D. Williams. <http://www.oriontransfer.co.nz>
+# Copyright, 2012, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -41,19 +41,31 @@ module Relaxo
 		
 		alias [] read
 		
+		def file?
+			read(path)
+		end
+		
 		def exist?(path)
-			read(path) != nil
+			read(path) or directory?(path)
+		end
+		
+		def directory?(path)
+			@directories.key?(path) or @tree.path(path)[:type] == :tree
+		rescue Rugged::TreeError
+			return false
 		end
 		
-		def each(path = nil, &block)
+		def each(path = '', &block)
 			return to_enum(:each, path) unless block_given?
 			
-			directory(path).each(&block)
+			directory = fetch_directory(path)
+			
+			directory.each(&block)
 		end
 		
 		protected
 		
-		def directory(path = nil)
+		def fetch_directory(path)
 			@directories[path] ||= Directory.new(@repository, @tree, path)
 		end
 	end

data/lib/relaxo/directory.rb

@@ -22,9 +22,16 @@ require 'rugged'
 
 module Relaxo
 	class Directory
-		def initialize(repository, tree, path)
+		def initialize(repository, root_tree, path)
 			@repository = repository
-			@tree = tree
+			
+			# The root tree, which path is relative to:
+			@root_tree = root_tree
+			
+			# The entry and tree for the directory itself:
+			@entry = nil
+			@tree = nil
+			
 			@path = path
 			
 			@entries = nil
@@ -51,6 +58,12 @@ module Relaxo
 			end
 		end
 		
+		def each_entry(&block)
+			return to_enum(:each_entry) unless block_given?
+			
+			entries.each(&block)
+		end
+		
 		def insert(entry)
 			_, _, name = entry[:name].rpartition('/')
 			
@@ -71,10 +84,14 @@ module Relaxo
 		
 		private
 		
-		def fetch_tree(path = @path)
-			entry = @tree.path(path)
-			
-			Rugged::Tree.new(@repository, entry[:oid])
+		# Look up the entry for the given directory `@path`:
+		def fetch_entry
+			@entry ||= @root_tree.path(@path)
+		end
+		
+		# Load the directory tree for the given `@path`:
+		def fetch_tree
+			@tree ||= Rugged::Tree.new(@repository, fetch_entry[:oid])
 		rescue Rugged::TreeError
 			return nil
 		end

data/lib/relaxo/{schema.rb → logger.rb}

@@ -1,4 +1,4 @@
-# Copyright, 2016, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# Copyright, 2012, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -18,32 +18,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'yaml'
+require 'console'
 
 module Relaxo
-	class Schema
-		def initialize(document)
-			@document = document
-		end
-		
-		def self.load_file(schema_path)
-			self.new(YAML.load_file(schema_path))
-		end
-		
-		def id
-			@document[ID]
-		end
-		
-		def migrate(db)
-			if db.id?(self.id)
-				if existing_document = GeoZone::DB.get(self.id)
-					@document[Relaxo::REV] = existing_document[Relaxo::REV]
-				end
-			end
-
-			if existing_document != @document
-				db.save(@document)
-			end
-		end
-	end
+	extend Console
 end

data/lib/relaxo/version.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2012 Samuel G. D. Williams. <http://www.oriontransfer.co.nz>
+# Copyright, 2012, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -19,5 +19,5 @@
 # THE SOFTWARE.
 
 module Relaxo
-	VERSION = "1.0.1"
+	VERSION = "1.6.0"
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: relaxo
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.6.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-13 00:00:00.000000000 Z
+date: 2020-05-29 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: console
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rugged
   requirement: !ruby/object:Gem::Requirement
@@ -25,35 +39,63 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: bake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bake-bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bake-modernize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: covered
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -66,44 +108,52 @@ dependencies:
     - - ">="
       - !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
+- !ruby/object:Gem::Dependency
+  name: msgpack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.6'
+description: 
+email: 
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".simplecov"
-- ".travis.yml"
-- Gemfile
-- README.md
-- Rakefile
-- bin/relaxo
-- bin/relaxo-admin
 - lib/relaxo.rb
 - lib/relaxo/changeset.rb
 - lib/relaxo/database.rb
 - lib/relaxo/dataset.rb
 - lib/relaxo/directory.rb
-- lib/relaxo/schema.rb
+- lib/relaxo/logger.rb
 - lib/relaxo/version.rb
-- relaxo.gemspec
-- spec/relaxo/changeset_spec.rb
-- spec/relaxo/concurrency_spec.rb
-- spec/relaxo/database_spec.rb
-- spec/relaxo/enumeration_spec.rb
-- spec/relaxo/performance_spec.rb
-- spec/relaxo/test_records.rb
-homepage: ''
+homepage: https://github.com/ioquatix/relaxo
 licenses:
 - MIT
-metadata: {}
+metadata:
+  funding_uri: https://github.com/sponsors/ioquatix/
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -112,22 +162,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
-summary: Relaxo is a helper for loading and working with CouchDB.
-test_files:
-- spec/relaxo/changeset_spec.rb
-- spec/relaxo/concurrency_spec.rb
-- spec/relaxo/database_spec.rb
-- spec/relaxo/enumeration_spec.rb
-- spec/relaxo/performance_spec.rb
-- spec/relaxo/test_records.rb
+summary: Relaxo is versioned document database built on top of git.
+test_files: []