relaxo-model 0.17.0 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5a7bf567015446448d276991edbaf5ae5639c46fb718d3f3da95725fde8e983
-  data.tar.gz: bb061e063c19f537cf73704bdd3ddc2f2e4f84c3f9a9b84fc7b6a2cdd41ec41b
+  metadata.gz: 63fd2ee103b57f03ebfce40f23dcc3ac05daeb29120b227c18adf4b87d02b33c
+  data.tar.gz: 967f316145c175f04f58e0c0bb14c3ce7ec373fc11d02b2a73050d9b7ce8ddbe
 SHA512:
-  metadata.gz: f077e32a41107719d760835467b7ef8b8cfbd20b6dfa168e967d49a824f0be1822068f4b6742681f5f13fff974614a3deb74a3be1051d20359f5343668a8a74b
-  data.tar.gz: 1c2714ba31834609ce49f11dc6cd603959f79685986901709c73685b88165f3a18ee0eb74e6be9c2af0144ac0c534aee32197b688d630012a58611c19a387b7e
+  metadata.gz: e8723321b26441adb4bc97ca1003d483ac8bf41531c4cc4f760b198b404ab5d672634faabc36145d1cf90bb0d306e485ee01df4c004ef8309aa77f0cb073129f
+  data.tar.gz: bde1b5796ada74badcef1e6cfc870bb6ebafa3b426231a9abfee7e0fc04ac3d40b9a4f6ebbff5a73abdde67117d8a39ff09a3d4264ba35c851aeba708bda0e84

data/lib/relaxo/model/base.rb

@@ -120,9 +120,9 @@ module Relaxo
 				@properties[name] = klass
 
 				self.send(:define_method, name) do
-					if @changed.include? name
+					if @changed.include?(name)
 						return @changed[name]
-					elsif @attributes.include? name
+					elsif @attributes.include?(name)
 						if klass
 							value = @attributes[name]
 

data/lib/relaxo/model/component.rb

@@ -54,6 +54,10 @@ module Relaxo
 			# Attributes that have been changed or de-serialized from the dataset:
 			attr :changed
 			
+			def changed?(key)
+				@changed.include?(key)
+			end
+			
 			def reload(dataset = @dataset)
 				@dataset = dataset
 				@changed.clear
@@ -64,32 +68,32 @@ module Relaxo
 				@changed.delete(key)
 				@attributes.delete(key)
 			end
-
-			def assign(primative_attributes, only = :all)
-				enumerator = primative_attributes
-
-				if only == :all
-					enumerator = enumerator.select{|key, value| self.class.properties.include? key.to_sym}
-				elsif only.respond_to? :include?
-					enumerator = enumerator.select{|key, value| only.include? key.to_sym}
-				end
-
-				enumerator.each do |key, value|
+			
+			ALL = Hash.new(true)
+			
+			def assign(primative_attributes, only = ALL)
+				primative_attributes.each do |key, value|
 					key = key.to_sym
-
-					klass = self.class.properties[key]
-
-					if klass
-						# This might raise a validation error
-						value = klass.convert_from_primative(@dataset, value)
+					case mapping = only[key]
+					when true
+						# Assign from primitive value:
+						if klass = self.class.properties[key]
+							value = klass.convert_from_primative(@dataset, value)
+						end
+						
+						self[key] = value
+					when false, nil
+						# Ignore:
+						next
+					else
+						# Nested assignment:
+						self[key].assign(value, mapping)
 					end
-
-					self[key] = value
 				end
 				
 				return self
 			end
-
+			
 			def [] name
 				if self.class.properties.include? name
 					self.send(name)
@@ -97,7 +101,7 @@ module Relaxo
 					raise KeyError.new(name)
 				end
 			end
-
+			
 			def []= name, value
 				if self.class.properties.include? name
 					self.send("#{name}=", value)
@@ -105,7 +109,7 @@ module Relaxo
 					raise KeyError.new(name)
 				end
 			end
-
+			
 			def validate(changeset)
 				# Do nothing :)
 			end

data/lib/relaxo/model/document.rb

@@ -79,7 +79,7 @@ module Relaxo
 				# Fetch a record or create a model object from a hash of attributes.
 				def fetch(dataset, path = nil, **attributes)
 					if path and object = dataset.read(path)
-						instance = self.new(dataset, object, attributes)
+						instance = self.new(dataset, object, **attributes)
 						
 						instance.load_object
 						
@@ -100,10 +100,6 @@ module Relaxo
 				@object != nil
 			end
 			
-			def changed? key
-				@changed.include? key.to_s
-			end
-
 			def type
 				@attributes[:type]
 			end
@@ -113,7 +109,7 @@ module Relaxo
 			end
 
 			# Update any calculations:
-			def before_save
+			def before_save(changeset)
 			end
 
 			def after_save
@@ -147,39 +143,39 @@ module Relaxo
 				
 				self.class.keys.each do |name, key|
 					# @attributes is not modified until we call self.dump (which flattens @attributes into @changes). When we generate paths, we want to ensure these are done based on the non-mutable state of the object.
-					yield key.object_path(self, @attributes)
+					yield key.object_path(self, **@attributes)
 				end
 			end
 
 			# Save the model object.
-			def save(dataset)
-				return if persisted? and @changed.empty?
+			def save(changeset)
+				before_save(changeset)
 				
-				before_save
+				return if persisted? and @changed.empty?
 				
-				if errors = self.validate(dataset)
+				if errors = self.validate(changeset)
 					return errors
 				end
 				
 				existing_paths = persisted? ? paths.to_a : []
 				
 				# Write data, check if any actual changes made:
-				object = dataset.append(self.dump)
+				object = changeset.append(self.dump)
 				return if object == @object
 				
 				existing_paths.each do |path|
-					dataset.delete(path)
+					changeset.delete(path)
 				end
 				
 				paths do |path|
-					if dataset.exist?(path)
+					if changeset.exist?(path)
 						raise KeyError, "Dataset already contains path: #{path}, when inserting #{@attributes.inspect}"
 					end
 						
-					dataset.write(path, object)
+					changeset.write(path, object)
 				end
 				
-				@dataset = dataset
+				@dataset = changeset
 				@object = object
 				
 				after_save
@@ -187,8 +183,8 @@ module Relaxo
 				return true
 			end
 
-			def save!(dataset)
-				result = self.save(dataset)
+			def save!(changeset)
+				result = self.save(changeset)
 				
 				if result != true
 					raise ValidationFailure.new(self, result)
@@ -203,13 +199,13 @@ module Relaxo
 			def after_delete
 			end
 
-			def delete(dataset)
+			def delete(changeset)
 				before_delete
 				
 				@changed.clear
 				
 				paths.each do |path|
-					dataset.delete(path)
+					changeset.delete(path)
 				end
 
 				after_delete

data/lib/relaxo/model/properties/attribute.rb

@@ -26,18 +26,18 @@ module Relaxo
 			# Handle conversions for standard datatypes.
 			class Attribute
 				@@attributes = {}
-
+				
 				def self.for_class(klass, &block)
 					@@attributes[klass] = Proc.new(&block)
 				end
-
+				
 				def self.[](klass, proc = nil)
 					self.new(klass, &proc)
 				end
-
+				
 				def initialize(klass, &serialization)
 					@klass = klass
-
+					
 					if block_given?
 						self.instance_eval(&serialization)
 					else
@@ -45,7 +45,7 @@ module Relaxo
 					end
 				end
 			end
-		
+			
 			class Serialized
 				def self.[](klass, proc = nil)
 					self.new(klass, &proc)
@@ -63,93 +63,105 @@ module Relaxo
 					@klass.load(value)
 				end
 			end
-		
+			
 			Required = Attribute
-		
+			
 			class Optional
 				def self.[] klass
 					self.new(klass)
 				end
-
+				
 				def initialize(klass)
 					@klass = klass
 				end
 				
+				def blank?(value)
+					if value.nil?
+						return true
+					end
+					
+					if value.respond_to?(:empty?) && value.empty?
+						return true
+					end
+					
+					return false
+				end
+				
 				def convert_to_primative(value)
-					if value.nil? or (value.respond_to?(:empty?) and value.empty?)
+					if blank?(value)
 						nil
 					else
 						@klass.convert_to_primative(value)
 					end
 				end
-
+				
 				def convert_from_primative(dataset, value)
-					if value.nil? or value.empty?
+					if blank?(value)
 						nil
 					else
 						@klass.convert_from_primative(dataset, value)
 					end
 				end
 			end
-		
+			
 			class Boolean
 			end
-		
+			
 			Attribute.for_class(Boolean) do
 				def convert_to_primative(value)
 					value ? true : false
 				end
-
+				
 				def convert_from_primative(dataset, value)
 					[true, "on", "true"].include?(value)
 				end
 			end
-		
+			
 			Attribute.for_class(Integer) do
 				def convert_to_primative(value)
 					value.to_i
 				end
-
+				
 				def convert_from_primative(dataset, value)
 					value.to_i
 				end
 			end
-		
+			
 			Attribute.for_class(Float) do
 				def convert_to_primative(value)
 					value.to_f
 				end
-
+				
 				def convert_from_primative(dataset, value)
 					value.to_f
 				end
 			end
-
+			
 			Attribute.for_class(Date) do
 				def convert_to_primative(value)
 					value.iso8601
 				end
-
+				
 				def convert_from_primative(dataset, value)
 					Date.parse(value)
 				end
 			end
-
+			
 			Attribute.for_class(DateTime) do
 				def convert_to_primative(value)
 					value.iso8601
 				end
-
+				
 				def convert_from_primative(dataset, value)
 					DateTime.parse(value)
 				end
 			end
-
+			
 			Attribute.for_class(String) do
 				def convert_to_primative(value)
 					value.to_s
 				end
-
+				
 				def convert_from_primative(dataset, value)
 					value.to_s
 				end

data/lib/relaxo/model/properties/composite.rb

@@ -46,10 +46,10 @@ module Relaxo
 				
 				def convert_to_primative(document)
 					raise ArgumentError.new("Document must be saved before adding to relationship") unless document.persisted?
-
+					
 					document.paths.first
 				end
-
+				
 				def convert_from_primative(dataset, path)
 					type, _, _ = path.rpartition('/')
 					
@@ -58,7 +58,7 @@ module Relaxo
 					klass.fetch(dataset, path)
 				end
 			end
-
+			
 			class BelongsTo
 				def self.[] *klasses
 					if klasses.size == 1
@@ -67,17 +67,17 @@ module Relaxo
 						Polymorphic.new(klasses)
 					end
 				end
-			
+				
 				def initialize(klass)
 					@klass = klass
 				end
-
+				
 				def convert_to_primative(document)
 					raise ArgumentError.new("Document must be saved before adding to relationship") unless document.persisted?
 					
 					document.paths.first
 				end
-
+				
 				def convert_from_primative(dataset, path)
 					@klass.fetch(dataset, path)
 				end
@@ -85,7 +85,7 @@ module Relaxo
 			
 			class HasOne < BelongsTo
 			end
-		
+			
 			class HasMany < HasOne
 				def convert_to_primative(documents)
 					documents.each do |document|
@@ -94,7 +94,7 @@ module Relaxo
 					
 					documents.collect{|document| document.paths.first}
 				end
-
+				
 				def convert_from_primative(dataset, value)
 					value.collect{|id| @klass.fetch(dataset, id)}
 				end
@@ -115,13 +115,13 @@ module Relaxo
 				def initialize(klass)
 					@klass = Attribute.new(klass)
 				end
-
+				
 				def convert_to_primative(value)
 					value.collect do |item|
 						@klass.convert_to_primative(item)
 					end
 				end
-
+				
 				def convert_from_primative(dataset, value)
 					value.collect do |item|
 						@klass.convert_from_primative(dataset, item)

data/lib/relaxo/model/version.rb

@@ -20,6 +20,6 @@
 
 module Relaxo
 	module Model
-		VERSION = "0.17.0"
+		VERSION = "0.19.0"
 	end
 end

metadata

@@ -1,45 +1,45 @@
 --- !ruby/object:Gem::Specification
 name: relaxo-model
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.19.0
 platform: ruby
 authors:
 - Samuel Williams
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-27 00:00:00.000000000 Z
+date: 2020-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: relaxo
+  name: msgpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: msgpack
+  name: relaxo
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
-  name: covered
+  name: bake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,48 +67,39 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: covered
   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: 3.4.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-description: "\t\tRelaxo Model provides a framework for business logic on top of\n\t\tRelaxo.
-  While it supports some traditional ORM style patterns, it is\n\t\tprimary focus
-  is to model business processes and logic.\n"
+        version: '3.4'
+description:
 email:
-- samuel.williams@oriontransfer.co.nz
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
-- Gemfile
-- README.md
-- Rakefile
 - lib/relaxo/model.rb
 - lib/relaxo/model/base.rb
 - lib/relaxo/model/component.rb
@@ -123,18 +114,11 @@ files:
 - lib/relaxo/model/properties/uuid.rb
 - lib/relaxo/model/recordset.rb
 - lib/relaxo/model/version.rb
-- relaxo-model.gemspec
-- spec/relaxo/model/attribute_spec.rb
-- spec/relaxo/model/document_spec.rb
-- spec/relaxo/model/model_context.rb
-- spec/relaxo/model/properties/bcrypt_spec.rb
-- spec/relaxo/model/recordset_spec.rb
-- spec/spec_helper.rb
-homepage: http://www.codeotaku.com/projects/relaxo/model
+homepage: https://github.com/ioquatix/relaxo-model
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -142,7 +126,7 @@ 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:
   - - ">="
@@ -150,13 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
-summary: A model layer for CouchDB with minimal global state.
-test_files:
-- spec/relaxo/model/attribute_spec.rb
-- spec/relaxo/model/document_spec.rb
-- spec/relaxo/model/model_context.rb
-- spec/relaxo/model/properties/bcrypt_spec.rb
-- spec/relaxo/model/recordset_spec.rb
-- spec/spec_helper.rb
+summary: A model layer for the relaxo document database.
+test_files: []

data/.gitignore

@@ -1,12 +0,0 @@
-/.bundle/
-/.yardoc
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-
-Gemfile.lock
-.rspec_status
-.covered.db

data/.rspec

@@ -1,4 +0,0 @@
---format documentation
---backtrace
---warnings
---require spec_helper

data/.travis.yml

@@ -1,20 +0,0 @@
-language: ruby
-dist: xenial
-cache: bundler
-
-matrix:
-  include:
-    - rvm: 2.4
-    - rvm: 2.5
-    - rvm: 2.6
-    - rvm: 2.6
-      env: COVERAGE=PartialSummary,Coveralls
-    - rvm: truffleruby
-    - rvm: ruby-head
-    - rvm: 2.6
-      os: osx
-  allow_failures:
-    - rvm: truffleruby
-    - rvm: ruby-head
-    - rvm: jruby-head
-    - rvm: truffleruby

data/Gemfile

@@ -1,11 +0,0 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in relaxo-model.gemspec
-gemspec
-
-gem 'rugged', git: 'https://github.com/libgit2/rugged.git', submodules: true
-
-group :development do
-	gem "pry"
-	gem "bcrypt"
-end

data/README.md

@@ -1,119 +0,0 @@
-# Relaxo Model
-
-Relaxo Model provides a framework for business logic on top of Relaxo, a document data store built on top of git. While it supports some traditional relational style patterns, it is primary focus is to model business processes and logic at the document level.
-
-[![Build Status](https://secure.travis-ci.org/ioquatix/relaxo-model.svg)](http://travis-ci.org/ioquatix/relaxo-model)
-[![Code Climate](https://codeclimate.com/github/ioquatix/relaxo-model.svg)](https://codeclimate.com/github/ioquatix/relaxo-model)
-[![Coverage Status](https://coveralls.io/repos/ioquatix/relaxo-model/badge.svg)](https://coveralls.io/r/ioquatix/relaxo-model)
-
-## Basic Usage
-
-Here is a simple example of a traditional ORM style model:
-
-```ruby
-require 'relaxo/model'
-
-database = Relaxo.connect("test")
-
-trees = [
-	{:name => 'Hinoki', :planted => Date.parse("2013/11/17")},
-	{:name => 'Keyaki', :planted => Date.parse("2016/9/24")}
-]
-
-class Tree
-	include Relaxo::Model
-	
-	property :id, UUID
-	property :name
-	property :planted, Attribute[Date]
-	
-	view :all, [:type], index: [:id]
-end
-
-database.commit(message: "Create trees") do |changeset|
-	trees.each do |tree|
-		Tree.insert(changeset, tree)
-	end
-end
-
-database.current do |dataset|
-	Tree.all(dataset).each do |tree|
-		puts "A #{tree.name} was planted on #{tree.planted.to_s}."
-
-		# Expected output:
-		# A Hinoki was planted on 2013-11-17.
-		# A Keyaki was planted on 2016-09-24.
-	end
-end
-```
-
-### Non-UUID Primary Key
-
-```ruby
-#!/usr/bin/env ruby
-
-gem 'relaxo'
-
-require 'relaxo/model'
-
-database = Relaxo.connect("test")
-
-trees = [
-	{:name => 'Hinoki', :planted => Date.parse("2013/11/17")},
-	{:name => 'Keyaki', :planted => Date.parse("2016/9/24")}
-]
-
-class Tree
-	include Relaxo::Model
-
-	property :name
-	property :planted, Attribute[Date]
-
-	view :all, [:type], index: [:name]
-end
-
-database.commit(message: "Create trees") do |changeset|
-	trees.each do |tree|
-		Tree.insert(changeset, tree)
-	end
-end
-
-database.current do |dataset|
-	trees.each do |tree|
-		object = Tree.fetch_all(dataset, name: tree[:name])
-		puts object
-	end
-end
-```
-
-## Contributing
-
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
-
-## License
-
-Released under the MIT license.
-
-Copyright, 2017, by [Samuel G. D. Williams](http://www.codeotaku.com/samuel-williams).
-
-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.

data/Rakefile

@@ -1,17 +0,0 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-
-# For RSpec
-RSpec::Core::RakeTask.new(:spec)
-
-task :console do
-	require 'pry'
-	
-	require_relative 'lib/relaxo/model'
-	
-	DB = Relaxo.connect(File.join(__dir__, 'testdb'))
-	
-	Pry.start
-end
-
-task :default => :spec

data/relaxo-model.gemspec

@@ -1,30 +0,0 @@
-
-require_relative 'lib/relaxo/model/version'
-
-Gem::Specification.new do |spec|
-	spec.name          = "relaxo-model"
-	spec.version       = Relaxo::Model::VERSION
-	spec.authors       = ["Samuel Williams"]
-	spec.email         = ["samuel.williams@oriontransfer.co.nz"]
-	spec.description   = <<-EOF
-		Relaxo Model provides a framework for business logic on top of
-		Relaxo. While it supports some traditional ORM style patterns, it is
-		primary focus is to model business processes and logic.
-	EOF
-	spec.summary       = "A model layer for CouchDB with minimal global state."
-	spec.homepage      = "http://www.codeotaku.com/projects/relaxo/model"
-	spec.license       = "MIT"
-
-	spec.files         = `git ls-files`.split($/)
-	spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-	spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-	spec.require_paths = ["lib"]
-	
-	spec.add_dependency("relaxo", "~> 1.5")
-	spec.add_dependency("msgpack", "~> 1.0")
-	
-	spec.add_development_dependency "covered"
-	spec.add_development_dependency "bundler"
-	spec.add_development_dependency "rspec", "~> 3.4.0"
-	spec.add_development_dependency "rake"
-end

data/spec/relaxo/model/attribute_spec.rb

@@ -1,55 +0,0 @@
-# Copyright, 2019, 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 'relaxo/model'
-
-class Aggregate
-	include Relaxo::Model
-	
-	property :id, UUID
-	property :array_value
-	property :hash_value
-end
-
-RSpec.describe Relaxo::Model::Document do
-	let(:database_path) {File.join(__dir__, 'test')}
-	let(:database) {Relaxo.connect(database_path)}
-	
-	let(:document_path) {'test/document.json'}
-	
-	before(:each) {FileUtils.rm_rf(database_path)}
-	
-	it "should create and save document" do
-		model = Aggregate.create(database.current,
-			array_value: [1, 2, 3],
-			hash_value: {x: 10, y: 20}
-		)
-		
-		database.commit(message: "Adding test model") do |dataset|
-			model.save(dataset)
-		end
-		
-		# Force all attributes to be reloaded from the object store:
-		model.reload
-		
-		expect(model.array_value).to be_kind_of Array
-		expect(model.hash_value).to be_kind_of Hash
-	end
-end

data/spec/relaxo/model/document_spec.rb

@@ -1,152 +0,0 @@
-# Copyright, 2019, 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_relative 'model_context'
-
-RSpec.describe Relaxo::Model::Document do
-	include_context "model"
-	
-	it "should create and save document" do
-		model = Invoice.create(database.current, 
-			name: "Software Development"
-		)
-		
-		expect(model.persisted?).to be_falsey
-		
-		database.commit(message: "Adding test model") do |dataset|
-			model.save(dataset)
-		end
-		
-		expect(model.id).to_not be nil
-		expect(model.persisted?).to be_truthy
-	end
-	
-	it "should enumerate model objects" do
-		database.commit(message: "Adding test model") do |dataset|
-			Invoice.insert(dataset, name: "Software Development")
-			Invoice.insert(dataset, name: "Website Hosting")
-			Invoice.insert(dataset, name: "Backup Services")
-		end
-		
-		expect(Invoice.all(database.current).count).to be == 3
-	end
-	
-	it "should have valid type" do
-		expect(Invoice.type).to be == "invoice"
-		expect(Invoice::Transaction.type).to be == "invoice/transaction"
-	end
-	
-	it "should have resolved type" do
-		transaction = Invoice::Transaction.create(database.current, {id: 'test'})
-		
-		transaction.attributes[:type] = ["Invoice", "Transaction"]
-		
-		expect(transaction.paths.first).to be == "Invoice/Transaction/test"
-	end
-	
-	it "should create model indexes" do
-		database.commit(message: "Adding test model") do |dataset|
-			invoice = Invoice.create(dataset, name: "Software Development")
-			invoice.save(dataset)
-			
-			transaction = Invoice::Transaction.create(dataset, date: Date.today, invoice: invoice)
-			transaction.save(dataset)
-		end
-		
-		expect(Invoice.all(database.current).count).to be == 1
-		expect(Invoice::Transaction.all(database.current).count).to be == 1
-		
-		invoice = Invoice.all(database.current).first
-		expect(invoice).to_not be nil
-		
-		transactions = Invoice::Transaction.by_invoice(database.current, invoice: invoice)
-		expect(transactions.path).to be == "invoice/transaction/by_invoice/invoice/#{invoice.id}"
-		expect(transactions).to_not be_empty
-		
-		transaction = transactions.first
-		expect(transaction.to_s).to be == "invoice/transaction/#{transaction.id}"
-	end
-	
-	it "can edit model objects" do
-		invoice = nil
-		
-		database.commit(message: "Adding test model") do |dataset|
-			invoice = Invoice.create(dataset, name: "Software Development")
-			invoice.save(dataset)
-		end
-		
-		# Fetch the invoice from the database:
-		invoice = Invoice.fetch_all(database.current, id: invoice.id)
-		invoice.name = "Software Engineering"
-		
-		database.commit(message: "Editing test model") do |dataset|
-			invoice.save(dataset)
-		end
-		
-		invoice = Invoice.fetch_all(database.current, id: invoice.id)
-		expect(invoice.name).to be == "Software Engineering"
-	end
-	
-	it "updates indexes correctly" do
-		transaction = nil
-		
-		database.commit(message: "Adding test model") do |dataset|
-			invoice = Invoice.create(dataset, name: "Software Development")
-			invoice.save(dataset)
-			
-			transaction = Invoice::Transaction.create(dataset, date: Date.today, invoice: invoice)
-			transaction.save(dataset)
-		end
-		
-		transactions = Invoice::Transaction.all(database.current)
-		
-		database.commit(message: "Adding test model") do |dataset|
-			transaction.date = Date.today - 1
-			transaction.save(dataset)
-		end
-		
-		transactions = Invoice::Transaction.all(database.current)
-	end
-	
-	it "can query by index" do
-		database.commit(message: 'Adding new users.') do |changes|
-			User.insert(changes, email: 'john.doe@aol.com', name: 'John Doe')
-			User.insert(changes, email: 'jane.doe@aol.com', name: 'Jane Doe')
-		end
-		
-		expect(User.fetch_all(database.current, email: 'john.doe@aol.com').name).to be == 'John Doe'
-	end
-	
-	it "can handle indexes with reserved characters" do
-		database.commit(message: "Add new user") do |changeset|
-			User.insert(changeset, email: "its@complicated.com", name: "/John/James/")
-		end
-		
-		expect(User.fetch_all(database.current, email: 'its@complicated.com').name).to be == '/John/James/'
-	end
-	
-	it "can handle indexes with unicode" do
-		database.commit(message: "Add new user") do |changeset|
-			User.insert(changeset, email: "its@complicated.com", name: "こんにちは")
-		end
-		
-		expect(User.fetch_by_name(database.current, name: "こんにちは")).to_not be nil
-	end
-end

data/spec/relaxo/model/model_context.rb

@@ -1,81 +0,0 @@
-# Copyright, 2019, 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 'relaxo/model'
-require 'relaxo/model/properties/bcrypt'
-
-class Invoice
-	class Transaction; end
-	
-	include Relaxo::Model
-	
-	property :id, UUID
-	property :number
-	property :name
-	
-	property :date, Attribute[Date]
-	
-	view :all, :type, index: :id
-	
-	def transactions
-		Invoice::Transaction.by_invoice(@dataset, invoice: self)
-	end
-end
-
-class Invoice::Transaction
-	include Relaxo::Model
-	
-	parent_type Invoice
-	
-	property :id, UUID
-	property :invoice, BelongsTo[Invoice]
-	property :date, Attribute[Date]
-	
-	def year
-		date.year
-	end
-	
-	view :all, :type, index: :id
-	
-	view :by_invoice, index: unique(:date, :id)
-	view :by_year, :type, 'by_year', index: unique(:year)
-end
-
-class User
-	include Relaxo::Model
-	
-	property :email, Attribute[String]
-	property :name
-	property :password, Attribute[BCrypt::Password]
-	property :intro
-	
-	view :all, :type, index: unique(:email)
-	
-	view :by_name, :type, 'by_name', index: unique(:name)
-end
-
-RSpec.shared_context "model" do
-	let(:database_path) {File.join(__dir__, 'test')}
-	let(:database) {Relaxo.connect(database_path)}
-	
-	let(:document_path) {'test/document.json'}
-	
-	before(:each) {FileUtils.rm_rf(database_path)}
-end

data/spec/relaxo/model/properties/bcrypt_spec.rb

@@ -1,81 +0,0 @@
-# Copyright, 2019, 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_relative '../model_context'
-
-RSpec.describe Relaxo::Model::Properties do
-	context BCrypt::Password do
-		include_context "model"
-		
-		it "can set password string" do
-			database.commit(message: "Add new user") do |changeset|
-				User.insert(changeset, email: "its@complicated.com", name: "Bob", password: "foobar")
-			end
-			
-			bob = User.fetch_by_name(database.current, name: "Bob")
-			expect(bob).to_not be nil
-			
-			expect(bob.password == "foobar").to be_truthy
-		end
-		
-		it "can set password instance" do
-			database.commit(message: "Add new user") do |changeset|
-				User.insert(changeset, email: "its@complicated.com", name: "Bob", password: BCrypt::Password.create("foobar"))
-			end
-			
-			bob = User.fetch_by_name(database.current, name: "Bob")
-			expect(bob).to_not be nil
-			
-			expect(bob.password == "foobar").to be_truthy
-		end
-		
-		it "can assign password string" do
-			database.commit(message: "Add new user") do |changeset|
-				user = User.insert(changeset, email: "its@complicated.com", name: "Bob")
-				
-				user.assign(password: "foobar")
-				
-				user.save(changeset)
-			end
-			
-			bob = User.fetch_by_name(database.current, name: "Bob")
-			expect(bob).to_not be nil
-			
-			expect(bob.password == "foobar").to be_truthy
-		end
-		
-		it "can assign password hash" do
-			password = BCrypt::Password.create("foobar")
-			
-			database.commit(message: "Add new user") do |changeset|
-				user = User.insert(changeset, email: "its@complicated.com", name: "Bob")
-				
-				user.assign(password: password.to_s)
-				
-				user.save(changeset)
-			end
-			
-			bob = User.fetch_by_name(database.current, name: "Bob")
-			expect(bob).to_not be nil
-			
-			expect(bob.password == "foobar").to be_truthy
-		end
-	end
-end

data/spec/relaxo/model/recordset_spec.rb

@@ -1,45 +0,0 @@
-# Copyright, 2019, 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_relative 'model_context'
-
-RSpec.describe Relaxo::Model::Recordset do
-	include_context 'model'
-	
-	context "with several invoices" do
-		before(:each) do
-			database.commit(message: "Adding test model") do |dataset|
-				@first = Invoice.insert(dataset, id: "a", name: "Software Development")
-				@middle = Invoice.insert(dataset, id: "b", name: "Website Hosting")
-				@last = Invoice.insert(dataset, id: "c", name: "Backup Services")
-			end
-		end
-		
-		it "should have a first and last invoice" do
-			recordset = Invoice.all(database.current)
-			
-			expect(recordset.count).to be == 3
-			expect(recordset).to_not be_empty
-			
-			expect(recordset.first).to be == @first
-			expect(recordset.last).to be == @last
-		end
-	end
-end

data/spec/spec_helper.rb

@@ -1,31 +0,0 @@
-# Copyright, 2019, 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 "bundler/setup"
-require "covered/rspec"
-
-RSpec.configure do |config|
-	# Enable flags like --only-failures and --next-failure
-	config.example_status_persistence_file_path = ".rspec_status"
-
-	config.expect_with :rspec do |c|
-		c.syntax = :expect
-	end
-end