relaxo-model 0.5.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f93d72c130b887bf10c8e60ed09ab2bc506e6aa
-  data.tar.gz: 166daf641e55a51bb1d35a202565da55a2b34b5f
+  metadata.gz: 85f3d648fadd1ad073b9ba8b19c4bc343022143f
+  data.tar.gz: 6da3f03fcdcfcae4a6ada3e1a856649e135c407d
 SHA512:
-  metadata.gz: e2df342a27fe0036e569a546c75c2abf090342d0cf1039c3de9194f92bdaa07c6472ab25d298233218626f5c2ce0aef0f1cc1a2bb1a93194eb7cc8341b0706be
-  data.tar.gz: 9fb5e00b0509388b99345233a76efbdb9f67263ceff30de36ee6eeb954877be0db959def3574e21e95a8553582ca60b4590ee7d3a4ba08b8a4e3522fa167050c
+  metadata.gz: 73c64d7d6b81ba525e7348205e400213876f5b7c675f8c299c55497fae3f8eb6125f21fc7297dfb70d721dc598287df73678538a663ae6e5a07a855dba53d778
+  data.tar.gz: ab3091e7dd54e8fceec551486522e8822368109b57a684c6c769374ebb9d713135ac51c2014b19c71cd099f0c1fa95145022ac6dfbc9db80f8020efd6605aa30

data/.gitignore

@@ -0,0 +1,17 @@
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp

data/.simplecov

@@ -0,0 +1,9 @@
+
+SimpleCov.start do
+	add_filter "/spec/"
+end
+
+if ENV['TRAVIS']
+	require 'coveralls'
+	Coveralls.wear!
+end

data/.travis.yml

@@ -0,0 +1,17 @@
+language: ruby
+sudo: false
+before_install:
+  # For testing purposes:
+  - git config --global user.name "Samuel Williams"
+  - git config --global user.email "samuel@oriontransfer.net"
+rvm:
+  - 2.1.8
+  - 2.2.4
+  - 2.3.1
+  - 2.4.0
+  - rbx-2
+env: COVERAGE=true
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+    - rvm: "rbx-2"

data/Gemfile

@@ -2,3 +2,14 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in relaxo-model.gemspec
 gemspec
+
+gem 'rugged', git: 'git://github.com/libgit2/rugged.git', submodules: true
+
+group :development do
+	gem "pry"
+end
+
+group :test do
+	gem 'simplecov'
+	gem 'coveralls', require: false
+end

data/README.md

@@ -1,64 +1,50 @@
 # Relaxo Model
 
-Relaxo Model provides a framework for business logic on top of Relaxo/CouchDB. While it supports some traditional ORM style patterns, it is primary focus is to model business processes and logic.
+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:
 
-	require 'relaxo'
 	require 'relaxo/model'
 
-	database = Relaxo.connect("http://localhost:5984/test")
+	database = Relaxo.connect("test")
 
 	trees = [
-		{:name => 'Hinoki', :planted => Date.parse("1948/4/2")},
-		{:name => 'Rimu', :planted => Date.parse("1962/8/7")}
+		{: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]
-	
-		# Ensure you've loaded an appropriate design document:
-		view :all, 'catalog/tree', Tree
+		
+		view :all, [:type], index: [:id]
 	end
 
-	trees.each do |doc|
-		tree = Tree.create(database, doc)
-	
-		tree.save
+	database.commit(message: "Create trees") do |changeset|
+		trees.each do |tree|
+			Tree.insert(changeset, tree)
+		end
 	end
 
-	Tree.all(database).each do |tree|
-		puts "A #{tree.name} was planted on #{tree.planted.to_s}."
+	database.current do |dataset|
+		Tree.all(dataset).each do |tree|
+			puts "A #{tree.name} was planted on #{tree.planted.to_s}."
 
-		# Expected output:
-		# => A Rimu was planted on 1962-08-07.
-		# => A Hinoki was planted on 1948-04-02.
-	
-		tree.delete
+			# Expected output:
+			# A Hinoki was planted on 2013-11-17.
+			# A Keyaki was planted on 2016-09-24.
+		end
 	end
-
-Here is the design document:
-
-	-   _id: "_design/catalog"
-	    language: javascript
-	    views:
-	        tree:
-	            map: |
-	                function(doc) {
-	                    if (doc.type == 'tree') {
-	                        emit(doc._id, doc._rev);
-	                    }
-	                }
-
-If the design document was saved as `catalog.yaml`, you could load it using relaxo into the `test` database as follows:
-
-	relaxo test catalog.yaml 
-
+	
 ## Contributing
 
 1. Fork it
@@ -71,7 +57,7 @@ If the design document was saved as `catalog.yaml`, you could load it using rela
 
 Released under the MIT license.
 
-Copyright, 2010-2013, by [Samuel G. D. Williams](http://www.codeotaku.com/samuel-williams).
+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

data/Rakefile

@@ -0,0 +1,18 @@
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new(:spec) do |task|
+	task.rspec_opts = ["--require", "simplecov"] if ENV['COVERAGE']
+end
+
+task :default => :spec
+
+task :console do
+	require 'pry'
+	
+	require_relative 'lib/relaxo/model'
+	
+	DB = Relaxo.connect(File.join(__dir__, 'testdb'))
+	
+	Pry.start
+end

data/lib/relaxo/model/base.rb

@@ -18,22 +18,48 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'relaxo/model/recordset'
+require_relative 'recordset'
 
 module Relaxo
 	module Model
+		Key = Struct.new(:prefix, :index) do
+			def resolve(key_path, model, **arguments)
+				key_path.collect do |component|
+					case component
+					when Symbol
+						arguments[component] || model.send(component) || "null"
+					when Array
+						resolve(component, model, arguments).join('-')
+					when Proc
+						model.instance_exec(**arguments, &component)
+					else
+						component
+					end
+				end
+			end
+			
+			def object_path(model, **arguments)
+				resolve(self.prefix + self.index, model, **arguments).join('/')
+			end
+			
+			def prefix_path(model, **arguments)
+				resolve(self.prefix, model, **arguments).join('/')
+			end
+		end
+		
 		module Base
 			def self.extended(child)
 				# $stderr.puts "#{self} extended -> #{child} (setup Base)"
 				child.instance_variable_set(:@properties, {})
 				child.instance_variable_set(:@relationships, {})
-
+				
+				child.instance_variable_set(:@keys, {})
+				child.instance_variable_set(:@primary_key, nil)
+				
 				default_type = child.name.split('::').last.gsub(/(.)([A-Z])/,'\1_\2').downcase!
 				child.instance_variable_set(:@type, default_type)
 			end
 
-			attr :type
-
 			def metaclass
 				class << self; self; end
 			end
@@ -41,61 +67,36 @@ module Relaxo
 			attr :type
 			attr :properties
 			attr :relationships
-
-			DEFAULT_VIEW_OPTIONS = {:include_docs => true}
-
-			def view(name, path, *args)
-				options = Hash === args.last ? args.pop : DEFAULT_VIEW_OPTIONS
-				klass = args.pop || options[:class]
-
-				self.metaclass.send(:define_method, name) do |database, query = {}|
-					records = database.view(path, query.merge(options))
-					Recordset.new(database, records, klass)
-				end
+			
+			attr :keys
+			attr :primary_key
+			
+			def parent_type klass
+				@type = [klass.type, self.type].join('/')
 			end
-
-			DEFAULT_RELATIONSHIP_OPTIONS = {
-				:key => lambda {|object, query| query[:key] = object.id},
-				:include_docs => true
-			}
-
-			def relationship(name, path, *args, &block)
-				options = Hash === args.last ? args.pop : DEFAULT_RELATIONSHIP_OPTIONS
-				klass = block || args.pop || options[:class]
-
-				@relationships[name] = options
-
-				# This reduction returns a single result, so just provide the first row directly:
-				reduction = options.delete(:reduction)
-
-				options = options.dup
-
-				update_key_function(options, :key)
-				update_key_function(options, :startkey)
-				update_key_function(options, :endkey)
-
-				self.send(:define_method, name) do |query = {}|
-					query = query.merge(options)
-
-					[:key, :startkey, :endkey].each do |name|
-						if options[name].respond_to? :call
-							options[name].call(self, query)
-						end
-					end
-
-					recordset = Recordset.new(@database, @database.view(path, query), klass)
-
-					if reduction == :first
-						recordset.first
-					else
-						recordset
-					end
+			
+			def view(name, path = nil, klass: self, index: nil)
+				key = Key.new(path, index)
+				
+				if index
+					@keys[name] = key
+					@primary_key ||= key
+				end
+				
+				self.metaclass.send(:define_method, name) do |dataset, **arguments|
+					Recordset.new(dataset, key.prefix_path(self, **arguments), klass)
+				end
+				
+				self.metaclass.send(:define_method, "fetch_#{name}") do |dataset, **arguments|
+					self.fetch(dataset, key.object_path(self, **arguments))
+				end
+				
+				self.send(:define_method, name) do |**arguments|
+					Recordset.new(self.dataset, key.object_path(self, **arguments), self.class)
 				end
 			end
-
+			
 			def property(name, klass = nil)
-				name = name.to_s
-
 				@properties[name] = klass
 
 				self.send(:define_method, name) do
@@ -105,7 +106,7 @@ module Relaxo
 						if klass
 							value = @attributes[name]
 
-							@changed[name] = klass.convert_from_primative(@database, value)
+							@changed[name] = klass.convert_from_primative(dataset, value)
 						else
 							@changed[name] = @attributes[name]
 						end
@@ -130,26 +131,6 @@ module Relaxo
 					end
 				end
 			end
-			
-			private
-
-			# Used for generating key functions for relationships - subject to change so private for now.
-			def update_key_function(options, name)
-				key = options[name]
-				
-				if key == :self
-					options[name] = lambda do |object, query|
-						query[name] = object.id
-					end
-				elsif Array === key
-					index = key.index(:self)
-					
-					options[name] = lambda do |object, query|
-						query[name] = key.dup
-						query[name][index] = object.id
-					end
-				end
-			end
 		end
 	end
 end

data/lib/relaxo/model/component.rb

@@ -28,15 +28,30 @@ module Relaxo
 				child.send(:extend, Base)
 			end
 			
-			def initialize(database, attributes = {})
-				# Raw key-value database
+			def initialize(dataset, object = nil, changed = {}, **attributes)
+				@dataset = dataset
+				@object = object
+				@changed = changed
 				@attributes = attributes
-				@database = database
-				@changed = {}
+			end
+			
+			def load_object
+				if @object
+					attributes = MessagePack.load(@object.data, symbolize_keys: true)
+					
+					# We prefer existing @attributes over ones loaded from data. This allows the API to load from an object, but specify new attributes.
+					@attributes = attributes.merge(@attributes)
+				end
+			end
+			
+			def dump
+				flatten!
+				
+				MessagePack.dump(@attributes)
 			end
 
 			attr :attributes
-			attr :database
+			attr :dataset
 			attr :changed
 
 			def clear(key)
@@ -48,19 +63,19 @@ module Relaxo
 				enumerator = primative_attributes
 
 				if only == :all
-					enumerator = enumerator.select{|key, value| self.class.properties.include? key.to_s}
+					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|
-					key = key.to_s
+					key = key.to_sym
 
 					klass = self.class.properties[key]
 
 					if klass
 						# This might raise a validation error
-						value = klass.convert_from_primative(@database, value)
+						value = klass.convert_from_primative(@dataset, value)
 					end
 
 					self[key] = value
@@ -70,8 +85,6 @@ module Relaxo
 			end
 
 			def [] name
-				name = name.to_s
-
 				if self.class.properties.include? name
 					self.send(name)
 				else
@@ -80,8 +93,6 @@ module Relaxo
 			end
 
 			def []= name, value
-				name = name.to_s
-
 				if self.class.properties.include? name
 					self.send("#{name}=", value)
 				else
@@ -96,16 +107,18 @@ module Relaxo
 			def flatten!
 				# Flatten changed properties:
 				self.class.properties.each do |key, klass|
-					if @changed.include? key
+					if @changed.include?(key)
 						if klass
 							@attributes[key] = klass.convert_to_primative(@changed.delete(key))
 						else
 							@attributes[key] = @changed.delete(key)
 						end
+					elsif !@attributes.include?(key) and klass.respond_to?(:default)
+						@attributes[key] = klass.default
 					end
 				end
 
-				# Non-specific properties, serialised by JSON:
+				# Non-specific properties:
 				@changed.each do |key, value|
 					@attributes[key] = value
 				end

data/lib/relaxo/model/document.rb

@@ -20,6 +20,8 @@
 
 require 'relaxo/model/component'
 
+require 'msgpack'
+
 module Relaxo
 	module Model
 		class ValidationError < StandardError
@@ -45,8 +47,6 @@ module Relaxo
 		end
 		
 		module Document
-			TYPE = 'type'
-			
 			def self.included(child)
 				child.send(:include, Component)
 				child.send(:extend, ClassMethods)
@@ -54,8 +54,8 @@ module Relaxo
 			
 			module ClassMethods
 				# Create a new document with a particular specified type.
-				def create(database, properties = nil)
-					instance = self.new(database, {TYPE => @type})
+				def create(dataset, properties = nil)
+					instance = self.new(dataset, type: @type)
 
 					if properties
 						properties.each do |key, value|
@@ -67,48 +67,45 @@ module Relaxo
 
 					return instance
 				end
-
+				
+				def insert(dataset, properties)
+					instance = self.create(dataset, properties)
+					
+					instance.save(dataset)
+					
+					return instance
+				end
+				
 				# Fetch a record or create a model object from a hash of attributes.
-				def fetch(database, id_or_attributes)
-					if Hash === id_or_attributes
-						instance = self.new(database, id_or_attributes)
-					else
-						instance = self.new(database, database.get(id_or_attributes).to_hash)
+				def fetch(dataset, path = nil, **attributes)
+					if path and object = dataset.read(path)
+						instance = self.new(dataset, object, attributes)
+						
+						instance.load_object
+						
+						instance.after_fetch
+						
+						return instance
 					end
-
-					instance.after_fetch
-
-					return instance
 				end
 			end
 			
 			include Comparable
 			
-			def id
-				@attributes[ID]
-			end
-			
-			# A string suitable for use as a URL parameter.
-			alias to_param id
-			
 			def new_record?
-				!saved?
+				!persisted?
 			end
 			
-			def saved?
-				@attributes.key? ID
+			def persisted?
+				@object != nil
 			end
 			
 			def changed? key
 				@changed.include? key.to_s
 			end
 
-			def rev
-				@attributes[REV]
-			end
-
 			def type
-				@attributes[TYPE]
+				@attributes[:type]
 			end
 
 			def valid_type?
@@ -122,54 +119,96 @@ module Relaxo
 			def after_save
 			end
 
-			# Duplicate the model object, and possibly change the database it is connected to. You will potentially have two objects referring to the same record.
-			def dup(database = @database)
-				clone = self.class.new(database, @attributes.dup)
+			def to_s
+				if primary_key = self.class.primary_key
+					primary_key.object_path(self)
+				else
+					super
+				end
+			end
+
+			# Duplicate the model object, and possibly change the dataset it is connected to. You will potentially have two objects referring to the same record.
+			def dup
+				clone = self.class.new(@dataset, @object, @changed, **@attributes.dup)
 				
 				clone.after_fetch
 				
 				return clone
 			end
+			
+			def paths
+				return to_enum(:paths) unless block_given?
+				
+				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)
+				end
+			end
 
 			# Save the model object.
-			def save
-				return if saved? and @changed.empty?
+			def save(dataset)
+				return if persisted? and @changed.empty?
 				
 				before_save
-
+				
 				if errors = self.validate
 					return errors
 				end
 				
-				self.flatten!
-
-				@database.save(@attributes)
-
+				existing_paths = persisted? ? paths.to_a : []
+				
+				# Write data, check if any actual changes made:
+				object = dataset.append(self.dump)
+				return if object == @object
+				
+				existing_paths.each do |path|
+					dataset.delete(path)
+				end
+				
+				paths do |path|
+					if dataset.exist?(path)
+						raise KeyError, "Dataset already contains path: #{path}, when inserting #{@attributes.inspect}"
+					end
+						
+					dataset.write(path, object)
+				end
+				
+				@dataset = dataset
+				@object = object
+				
 				after_save
 				
 				return true
 			end
 
-			def save!
-				result = self.save
+			def save!(dataset)
+				result = self.save(dataset)
 				
 				if result != true
-					throw ValidationErrors.new(result)
+					raise ValidationErrors.new(result)
 				end
 				
 				return self
 			end
 
+			def reload(dataset)
+				@dataset = dataset
+			end
+
 			def before_delete
 			end
 
 			def after_delete
 			end
 
-			def delete
+			def delete(dataset)
 				before_delete
-
-				@database.delete(@attributes)
+				
+				@changed.clear
+				
+				paths.each do |path|
+					@dataset.delete(path)
+				end
 
 				after_delete
 			end

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

@@ -31,7 +31,7 @@ module Relaxo
 					@@attributes[klass] = Proc.new(&block)
 				end
 
-				def self.[] (klass, proc = nil)
+				def self.[](klass, proc = nil)
 					self.new(klass, &proc)
 				end
 
@@ -39,15 +39,15 @@ module Relaxo
 					@klass = klass
 
 					if block_given?
-						self.instance_eval &serialization
+						self.instance_eval(&serialization)
 					else
-						self.instance_eval &@@attributes[klass]
+						self.instance_eval(&@@attributes[klass])
 					end
 				end
 			end
 		
 			class Serialized
-				def self.[] (klass, proc = nil)
+				def self.[](klass, proc = nil)
 					self.new(klass, &proc)
 				end
 				
@@ -59,7 +59,7 @@ module Relaxo
 					@klass.dump(value)
 				end
 				
-				def convert_from_primative(database, value)
+				def convert_from_primative(dataset, value)
 					@klass.load(value)
 				end
 			end
@@ -83,11 +83,11 @@ module Relaxo
 					end
 				end
 
-				def convert_from_primative(database, value)
+				def convert_from_primative(dataset, value)
 					if value.nil? or value.empty?
 						nil
 					else
-						@klass.convert_from_primative(database, value)
+						@klass.convert_from_primative(dataset, value)
 					end
 				end
 			end
@@ -100,7 +100,7 @@ module Relaxo
 					value ? true : false
 				end
 
-				def convert_from_primative(database, value)
+				def convert_from_primative(dataset, value)
 					[true, "on", "true"].include?(value)
 				end
 			end
@@ -110,7 +110,7 @@ module Relaxo
 					value.to_i
 				end
 
-				def convert_from_primative(database, value)
+				def convert_from_primative(dataset, value)
 					value.to_i
 				end
 			end
@@ -120,7 +120,7 @@ module Relaxo
 					value.to_f
 				end
 
-				def convert_from_primative(database, value)
+				def convert_from_primative(dataset, value)
 					value.to_f
 				end
 			end
@@ -130,7 +130,7 @@ module Relaxo
 					value.iso8601
 				end
 
-				def convert_from_primative(database, value)
+				def convert_from_primative(dataset, value)
 					Date.parse(value)
 				end
 			end
@@ -140,7 +140,7 @@ module Relaxo
 					value.iso8601
 				end
 
-				def convert_from_primative(database, value)
+				def convert_from_primative(dataset, value)
 					DateTime.parse(value)
 				end
 			end
@@ -150,7 +150,7 @@ module Relaxo
 					value.to_s
 				end
 
-				def convert_from_primative(database, value)
+				def convert_from_primative(dataset, value)
 					value.to_s
 				end
 			end

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

@@ -28,7 +28,7 @@ module Relaxo
 					[value.salt, value.checksum]
 				end
 
-				def convert_from_primative(database, value)
+				def convert_from_primative(dataset, value)
 					if String === value
 						# If the primative value is a string, we are saving the password:
 						BCrypt::Password.create(value)

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

@@ -28,7 +28,7 @@ module Relaxo
 					value.to_s('F')
 				end
 
-				def convert_from_primative(database, value)
+				def convert_from_primative(dataset, value)
 					value.to_d
 				end
 			end

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

@@ -44,27 +44,18 @@ module Relaxo
 					@lookup[type]
 				end
 				
-				def convert_to_primative(object)
-					unless object.saved?
-						object.save
-					end
+				def convert_to_primative(document)
+					raise ArgumentError.new("Document must be saved before adding to relationship") unless document.persisted?
 
-					[object.type, object.id]
+					document.paths.first
 				end
 
-				def convert_from_primative(database, reference)
-					# Legacy support for old polymorphic types - to remove.
-					if Array === reference
-						type, id = reference
-					else
-						id = reference
-					end
+				def convert_from_primative(dataset, path)
+					type, _, _ = path.rpartition('/')
 					
-					attributes = database.get(id).to_hash
+					klass = lookup(type)
 					
-					klass = lookup(attributes['type'])
-					
-					klass.fetch(database, attributes)
+					klass.fetch(dataset, path)
 				end
 			end
 
@@ -81,39 +72,37 @@ module Relaxo
 					@klass = klass
 				end
 
-				def convert_to_primative(object)
-					unless object.saved?
-						object.save
-					end
-
-					object.id
+				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(database, id)
-					@klass.fetch(database, id)
+				def convert_from_primative(dataset, path)
+					@klass.fetch(dataset, path)
 				end
 			end
-		
+			
 			class HasOne < BelongsTo
 			end
 		
 			class HasMany < HasOne
-				def convert_to_primative(value)
-					value.each do |document|
-						document.save unless document.saved?
+				def convert_to_primative(documents)
+					documents.each do |document|
+						raise ArgumentError.new("Document must be saved before adding to relationship") unless document.persisted?
 					end
-				
-					value.collect{|document| document.id}
+					
+					documents.collect{|document| document.paths.first}
 				end
 
-				def convert_from_primative(database, value)
-					value.collect{|id| @klass.fetch(database, id)}
+				def convert_from_primative(dataset, value)
+					value.collect{|id| @klass.fetch(dataset, id)}
 				end
 			end
 			
 			# Returns the raw value, typically used for reductions:
 			module ValueOf
-				def self.new(database, value)
+				def self.new(dataset, value)
 					value
 				end
 			end
@@ -133,9 +122,9 @@ module Relaxo
 					end
 				end
 
-				def convert_from_primative(database, value)
+				def convert_from_primative(dataset, value)
 					value.collect do |item|
-						@klass.convert_from_primative(database, item)
+						@klass.convert_from_primative(dataset, item)
 					end
 				end
 			end

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

@@ -28,7 +28,7 @@ module Relaxo
 					[value.amount.to_s('F'), value.name]
 				end
 
-				def convert_from_primative(database, value)
+				def convert_from_primative(dataset, value)
 					if Array === value
 						@klass.new(value[0], value[1])
 					else

data/lib/relaxo/model/{attachments.rb → properties/uuid.rb}

@@ -1,4 +1,4 @@
-# Copyright (c) 2013 Samuel G. D. Williams. <http://www.oriontransfer.co.nz>
+# Copyright, 2017, 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,30 +18,22 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'relaxo/attachments'
-require 'relaxo/model/component'
+require 'securerandom'
 
 module Relaxo
 	module Model
-		module Component
-			ATTACHMENTS = '_attachments'
-			DEFAULT_ATTACHMENT_CONTENT_TYPE = 'application/octet-stream'
-			
-			# Attach a file to the document with a given path.
-			def attach(path, data, options = {})
-				options[:content_type] ||= DEFAULT_ATTACHMENT_CONTENT_TYPE
+		module Properties
+			module UUID
+				def self.default
+					SecureRandom.uuid
+				end
 				
-				@database.attach(@attributes, path, data, options)
-			end
-			
-			# Get all attachments, optionally filtering with a particular prefix path.
-			def attachments(prefix = nil)
-				all_attachments = (@attributes[ATTACHMENTS] || [])
+				def self.convert_to_primative(value)
+					value
+				end
 				
-				if prefix
-					all_attachments.select{|name, attachment| name.start_with? prefix}
-				else
-					all_attachments
+				def self.convert_from_primative(dataset, value)
+					value
 				end
 			end
 		end

data/lib/relaxo/model/properties.rb

@@ -20,3 +20,4 @@
 
 require 'relaxo/model/properties/attribute'
 require 'relaxo/model/properties/composite'
+require 'relaxo/model/properties/uuid'

data/lib/relaxo/model/recordset.rb

@@ -1,5 +1,4 @@
-
-# Copyright (c) 2012 Samuel G. D. Williams. <http://www.oriontransfer.co.nz>
+# Copyright, 2017, by 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
@@ -24,47 +23,28 @@ module Relaxo
 		class Recordset
 			include Enumerable
 		
-			def initialize(database, view, klass = nil)
-				@database = database
-				@view = view
-			
-				@klass = klass
+			def initialize(dataset, path, model)
+				@dataset = dataset
+				@path = path
+				@model = model
 			end
 		
 			attr :klass
 			attr :database
 			attr :view
 			
-			def count
-				rows.count
-			end
-		
-			def offset
-				@view["offset"]
+			def empty?
+				!@dataset.each(@path).any?
 			end
-		
-			def rows
-				@view["rows"]
-			end
-		
-			def each(klass = nil, &block)
-				klass ||= @klass
-				
-				if klass
-					if klass.respond_to? :call
-						rows.each do |row|
-							yield klass.call(@database, row)
-						end
-					else
-						rows.each do |row|
-							# If user specified :include_docs => true, row['doc'] contains the primary value:
-							yield klass.new(@database, row['doc'] || row['value'])
-						end
-					end
-				else
-					rows.each &block
+			
+			def each(model = @model, &block)
+				@dataset.each(@path) do |name, object|
+					object = model.new(@dataset, object)
+					object.load_object
+					
+					yield object
 				end
 			end
 		end
 	end
-end
+end

data/lib/relaxo/model/version.rb

@@ -20,6 +20,6 @@
 
 module Relaxo
 	module Model
-		VERSION = "0.5.1"
+		VERSION = "0.9.0"
 	end
 end

data/lib/relaxo/model.rb

@@ -22,7 +22,6 @@ require 'relaxo'
 
 require 'relaxo/model/document'
 require 'relaxo/model/properties'
-require 'relaxo/model/recordset'
 
 module Relaxo
 	module Model

data/relaxo-model.gemspec

@@ -22,7 +22,8 @@ Gem::Specification.new do |spec|
 	spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
 	spec.require_paths = ["lib"]
 	
-	spec.add_dependency("relaxo", "~> 0.4.0")
+	spec.add_dependency("relaxo", "~> 1.0")
+	spec.add_dependency("msgpack", "~> 1.0")
 	
 	spec.add_development_dependency "bundler", "~> 1.3"
 	spec.add_development_dependency "rspec", "~> 3.4.0"

data/spec/relaxo/model/document_spec.rb

@@ -0,0 +1,104 @@
+
+require 'relaxo/model'
+
+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]
+	
+	view :all, [:type], index: [:id]
+	
+	view :by_invoice, [:type, 'by_invoice', :invoice], index: [[:date, :id]]
+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 = 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 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).to_not be_empty
+	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
+		
+		database.commit(message: "Adding test model") do |dataset|
+			transaction.date = Date.today - 1
+			transaction.save(dataset)
+		end
+	end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaxo-model
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.9.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-24 00:00:00.000000000 Z
+date: 2017-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: relaxo
@@ -16,14 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: msgpack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -75,10 +89,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
+- ".simplecov"
+- ".travis.yml"
 - Gemfile
 - README.md
+- Rakefile
 - lib/relaxo/model.rb
-- lib/relaxo/model/attachments.rb
 - lib/relaxo/model/base.rb
 - lib/relaxo/model/component.rb
 - lib/relaxo/model/document.rb
@@ -88,10 +105,11 @@ files:
 - lib/relaxo/model/properties/bigdecimal.rb
 - lib/relaxo/model/properties/composite.rb
 - lib/relaxo/model/properties/latinum.rb
+- lib/relaxo/model/properties/uuid.rb
 - lib/relaxo/model/recordset.rb
 - lib/relaxo/model/version.rb
-- rakefile.rb
 - relaxo-model.gemspec
+- spec/relaxo/model/document_spec.rb
 homepage: http://www.codeotaku.com/projects/relaxo/model
 licenses:
 - MIT
@@ -116,4 +134,5 @@ rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: A model layer for CouchDB with minimal global state.
-test_files: []
+test_files:
+- spec/relaxo/model/document_spec.rb

data/rakefile.rb

@@ -1 +0,0 @@
-require "bundler/gem_tasks"