relaxo 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 426efa86735d93046dbd4d55532954c7a99ea27e
-  data.tar.gz: 26d8624fe4d3277e91fb2565d1c068b3a39ff121
+SHA256:
+  metadata.gz: 9be2c95aada8b0d15d79f7376b32e57a07724cbe1fd93afa578091c0c522906c
+  data.tar.gz: b17fa3492dd504ba16a018fee637e8c1d3d293bdacc4fb84f65e5deefca3e792
 SHA512:
-  metadata.gz: 0d504a18d7a283d7160ffb0a94d8e99bcbded19b3e408675c2d87a8dc582c28935b493cad5a1acd67d9ee984ef07243b55b8c636c6253d0dfbfdb981f26bab7b
-  data.tar.gz: 4824e4933d9b090385e42c3a825ff01978fe132ccddf2efee1eb342dfab7df8682aafbf11f6ab416be89f1a5a34db4fbae55bd3021b5a94cd8d7e347d2d40606
+  metadata.gz: d0b4a7b024ad81169340891f1c7541bc2b5a1ecff678c4f4685b1aa8c7567546f6d0f7a69c078b132f6e9a88b90ea1d63ea14308c7984836850ac0ae1fe979d2
+  data.tar.gz: ded7e4a80713178e513f7b8d585e974fef763fb025d1d083f2574ecf553015cb519c059054ac4e61cae4ba33a30d0924b1f971ca2632cab08efa8e41a68562d7

data/lib/relaxo.rb

@@ -23,15 +23,19 @@ require 'relaxo/database'
 require 'pry'
 
 module Relaxo
-	def self.connect(path, metadata = {})
+	MASTER = 'master'.freeze
+	
+	def self.connect(path, branch: nil, sync: nil, **metadata)
 		unless File.exist?(path)
 			repository = Rugged::Repository.init_at(path, true)
 			
-			if metadata[:sync] || ENV['RELAXO_SYNC']
+			if sync || ENV['RELAXO_SYNC']
 				repository.config['core.fsyncObjectFiles'] = true
 			end
 		end
 		
-		return Database.new(path, metadata)
+		branch ||= MASTER
+		
+		return Database.new(path, branch, metadata)
 	end
 end

data/lib/relaxo/database.rb

@@ -28,13 +28,15 @@ module Relaxo
 	HEAD = 'HEAD'.freeze
 	
 	class Database
-		def initialize(path, metadata = {})
+		def initialize(path, branch, metadata = {})
 			@path = path
 			@metadata = metadata
 			
 			@logger = metadata[:logger] || Logger.new($stderr).tap{|logger| logger.level = Logger::INFO}
 			
 			@repository = Rugged::Repository.new(path)
+			
+			@branch = branch
 		end
 		
 		attr :path
@@ -43,7 +45,9 @@ module Relaxo
 		
 		# Completely clear out the database.
 		def clear!
-			@repository.references.delete(@repository.head)
+			if head = @repository.branches[@branch]
+				@repository.references.delete(head)
+			end
 		end
 		
 		def empty?
@@ -131,7 +135,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)
@@ -141,13 +145,11 @@ module Relaxo
 		end
 		
 		def latest_commit
-			if head = @repository.head
+			if head = @repository.branches[@branch]
 				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/version.rb

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

data/spec/relaxo/database_spec.rb

@@ -15,6 +15,12 @@ RSpec.describe Relaxo::Database do
 		expect(database).to be_empty
 	end
 	
+	it "can clear database" do
+		expect do
+			database.clear!
+		end.to_not raise_error
+	end
+	
 	it "should not be empty with one document" do
 		database.commit(message: "Create test document") do |dataset|
 			oid = dataset.append(sample_json)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaxo
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-12 00:00:00.000000000 Z
+date: 2018-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rugged
@@ -90,7 +90,6 @@ files:
 - lib/relaxo/database.rb
 - lib/relaxo/dataset.rb
 - lib/relaxo/directory.rb
-- lib/relaxo/schema.rb
 - lib/relaxo/version.rb
 - relaxo.gemspec
 - spec/relaxo/changeset_spec.rb
@@ -120,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Relaxo is a helper for loading and working with CouchDB.

data/lib/relaxo/schema.rb

@@ -1,49 +0,0 @@
-# Copyright, 2016, 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
-# 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 'yaml'
-
-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
-end