relaxo-model 0.3.0 → 0.3.6

data/README.md

@@ -7,6 +7,64 @@ 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.
 
+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")
+
+	$trees = [
+		{:name => 'Hinoki', :planted => Date.parse("1948/4/2")},
+		{:name => 'Rimu', :planted => Date.parse("1962/8/7")}
+	]
+	
+	class Tree
+		include Relaxo::Model
+	
+		property :name
+		property :planted, Attribute[Date]
+	
+		# Ensure you've loaded an appropriate design document:
+		view :all, 'catalog/tree', Tree
+	end
+
+	$trees.each do |doc|
+		tree = Tree.create($database, doc)
+	
+		tree.save
+	end
+
+	Tree.all($database).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
+	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 
+
 License
 -------
 

data/lib/relaxo/model.rb

@@ -18,18 +18,20 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'relaxo/model/base'
-require 'relaxo/recordset'
-require 'relaxo/properties'
+require 'relaxo'
+
+require 'relaxo/model/document'
+require 'relaxo/model/properties'
+require 'relaxo/model/recordset'
 
 module Relaxo
 	module Model
 		def self.included(child)
 			# Include all available properties
-			child.send(:include, Relaxo::Properties)
-			child.send(:include, Relaxo::Model::Base)
-			
-			child.send(:extend, Relaxo::Model::ClassMethods)
+
+			# $stderr.puts "#{self} included -> #{child} include Properties, Document"
+			child.send(:include, Relaxo::Model::Properties)
+			child.send(:include, Relaxo::Model::Document)
 		end
 	end
 end

data/lib/relaxo/model/base.rb

@@ -18,26 +18,30 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
+require 'relaxo/model/recordset'
+
 module Relaxo
 	module Model
-		module ClassMethods
-			DEFAULT_VIEW_OPTIONS = {:include_docs => true}
-			
+		module Base
 			def self.extended(child)
+				# $stderr.puts "#{self} extended -> #{child} (setup Base)"
 				child.instance_variable_set(:@properties, {})
 				child.instance_variable_set(:@relationships, {})
-				
+
 				default_type = child.name.split('::').last.gsub(/(.)([A-Z])/,'\1_\2').downcase!
 				child.instance_variable_set(:@type, default_type)
 			end
-			
+
 			def metaclass
 				class << self; self; end
 			end
-			
+
+			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]
@@ -48,20 +52,52 @@ module Relaxo
 				end
 			end
 
-			def relationship(name, path, *args)
-				options = Hash === args.last ? args.pop : {}
-				klass = args.pop || options[:class]
+			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)
+
+				# Specify a composite key, e.g. :key => :self or :key => [:self]
+				if key = options[:key]
+					options = options.dup
+					
+					if key == :self
+						options[:key] = lambda do |object, query|
+							query[:key] = object.id
+						end
+					elsif Array === key
+						index = key.index(:self)
+						
+						options[:key] = lambda do |object, query|
+							query[:key] = key.dup
+							query[:key][index] = object.id
+						end
+					end
+				end
+
 				self.send(:define_method, name) do |query = {}|
 					query = query.merge(options)
 
-					unless query.include? :key
-						query[:key] = self.id
+					if options[:key].respond_to? :call
+						options[:key].call(self, query)
 					end
 
-					Recordset.new(@database, @database.view(path, query), klass)
+					recordset = Recordset.new(@database, @database.view(path, query), klass)
+
+					if reduction == :first
+						recordset.first
+					else
+						recordset
+					end
 				end
 			end
 
@@ -73,11 +109,13 @@ module Relaxo
 				self.send(:define_method, name) do
 					if @changed.include? name
 						return @changed[name]
-					elsif @document.include? name
+					elsif @attributes.include? name
 						if klass
-							@changed[name] = klass.convert_from_document(@database, @document[name])
+							value = @attributes[name]
+
+							@changed[name] = klass.convert_from_primative(@database, value)
 						else
-							@changed[name] = @document[name]
+							@changed[name] = @attributes[name]
 						end
 					else
 						nil
@@ -87,125 +125,18 @@ module Relaxo
 				self.send(:define_method, "#{name}=") do |value|
 					@changed[name] = value
 				end
-			end
-			
-			def create(database, properties)
-				instance = self.new(database, {'type' => @type})
-
-				properties.each do |key, value|
-					instance[key] = value
-				end
-
-				instance.after_create
-
-				return instance
-			end
-			
-			def fetch(database, id)
-				instance = self.new(database, database.get(id).to_hash)
-
-				instance.after_fetch
-
-				return instance
-			end
-		end
-		
-		module Base
-			def initialize(database, document = {})
-				# Raw key-value database
-				@document = document
-				@database = database
-				@changed = {}
-			end
-
-			attr :database
-
-			def id
-				@document[ID]
-			end
-
-			def rev
-				@document[REV]
-			end
-
-			def clear(key)
-				@changed.delete(key)
-				@document.delete(key)
-			end
-
-			def [] name
-				name = name.to_s
-
-				if self.class.properties.include? name
-					self.send(name)
-				else
-					raise KeyError.new(name)
-				end
-			end
-
-			def []= name, value
-				name = name.to_s
-
-				if self.class.properties.include? name
-					self.send("#{name}=", value)
-				else
-					raise KeyError.new(name)
-				end
-			end
-
-			# Update any calculations:
-			def before_save
-			end
-
-			def after_save
-			end
-
-			def save
-				before_save
-
-				return if @changed.size == 0 && self.id
-
-				# Flatten changed properties:
-				self.class.properties.each do |key, klass|
-					if @changed.include? key
-						if klass
-							@document[key] = klass.convert_to_document(@changed.delete(key))
-						else
-							@document[key] = @changed.delete(key)
-						end
+				
+				self.send(:define_method, "#{name}?") do
+					value = self.send(name)
+					
+					if value == nil || value == false
+						false
+					elsif value.respond_to? :empty?
+						!value.empty?
+					else
+						true
 					end
 				end
-
-				# Non-specific properties, serialised by JSON:
-				@changed.each do |key, value|
-					@document[key] = value
-				end
-
-				@changed = {}
-				@database.save(@document)
-
-				after_save
-			end
-
-			def before_delete
-			end
-
-			def after_delete
-			end
-
-			def delete
-				before_delete
-
-				@database.delete(@document)
-
-				after_delete
-			end
-
-			def after_fetch
-			end
-
-			# Set any default values:
-			def after_create
 			end
 		end
 	end

data/lib/relaxo/model/component.rb

@@ -0,0 +1,133 @@
+# 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/model/base'
+
+module Relaxo
+	module Model
+		class Error
+			def initialize(key, exception)
+				@key = key
+				@exception = exception
+			end
+			
+			attr :key
+			attr :exception
+		end
+		
+		module Component
+			def self.included(child)
+				# $stderr.puts "#{self} included -> #{child} extend Base"
+				child.send(:extend, Base)
+			end
+			
+			def initialize(database, attributes = {})
+				# Raw key-value database
+				@attributes = attributes
+				@database = database
+				@changed = {}
+			end
+
+			attr :attributes
+			attr :database
+			attr :changed
+
+			def clear(key)
+				@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_s}
+				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
+
+					klass = self.class.properties[key]
+
+					if klass
+						# This might raise a validation error
+						value = klass.convert_from_primative(@database, value)
+					end
+
+					self[key] = value
+				end
+			end
+
+			def [] name
+				name = name.to_s
+
+				if self.class.properties.include? name
+					self.send(name)
+				else
+					raise KeyError.new(name)
+				end
+			end
+
+			def []= name, value
+				name = name.to_s
+
+				if self.class.properties.include? name
+					self.send("#{name}=", value)
+				else
+					raise KeyError.new(name)
+				end
+			end
+
+			def flatten!
+				errors = []
+
+				# Flatten changed properties:
+				self.class.properties.each do |key, klass|
+					if @changed.include? key
+						if klass
+							begin
+								@attributes[key] = klass.convert_to_primative(@changed.delete(key))
+							rescue StandardError => error
+								errors << Error.new(key, error)
+							end
+						else
+							@attributes[key] = @changed.delete(key)
+						end
+					end
+				end
+
+				# Non-specific properties, serialised by JSON:
+				@changed.each do |key, value|
+					@attributes[key] = value
+				end
+
+				@changed = {}
+
+				errors
+			end
+			
+			def to_hash
+				@attributes
+			end
+		end
+	end
+end

data/lib/relaxo/model/document.rb

@@ -0,0 +1,148 @@
+# 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/model/component'
+
+module Relaxo
+	module Model
+		class ValidationErrors < StandardError
+			def self.message_for_errors(errors)
+				errors.map{|error| "#{error.key} (#{error.exception.message})"}.join(', ')
+			end
+			
+			def initialize(errors)
+				super "Model validation errors occurred: #{self.class.message_for_errors(errors)}"
+				
+				@errors = errors
+			end
+			
+			attr :errors
+		end
+		
+		module Document
+			TYPE = 'type'
+			
+			def self.included(child)
+				# $stderr.puts "#{self} included -> #{child} extend ClassMethods"
+				child.send(:include, Component)
+				child.send(:extend, ClassMethods)
+			end
+			
+			module ClassMethods
+				def create(database, properties = nil)
+					instance = self.new(database, {TYPE => @type})
+
+					if properties
+						properties.each do |key, value|
+							instance[key] = value
+						end
+					end
+
+					instance.after_create
+
+					return instance
+				end
+
+				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)
+					end
+
+					instance.after_fetch
+
+					return instance
+				end
+			end
+			
+			include Comparable
+			
+			def id
+				@attributes[ID]
+			end
+
+			def saved?
+				@attributes.key? ID
+			end
+
+			def rev
+				@attributes[REV]
+			end
+
+			def type
+				@attributes[TYPE]
+			end
+
+			# Update any calculations:
+			def before_save
+			end
+
+			def after_save
+			end
+
+			# Reconnect this document with a new database session, typically used for updating an existing model within a session. Changes to the original object may be lost.
+			def attach(database)
+				clone = self.class.new(database, @attributes.dup)
+				
+				clone.after_fetch
+				
+				return clone
+			end
+
+			def save
+				before_save
+
+				errors = self.flatten!
+				raise ValidationErrors.new(errors) if errors.size > 0
+
+				@database.save(@attributes)
+
+				after_save
+			end
+
+			def before_delete
+			end
+
+			def after_delete
+			end
+
+			def delete
+				before_delete
+
+				@database.delete(@attributes)
+
+				after_delete
+			end
+
+			def after_fetch
+			end
+
+			# Set any default values:
+			def after_create
+			end
+			
+			# Equality is done only on id
+			def <=> other
+				self.id <=> other.id
+			end
+		end
+	end
+end

data/lib/{relaxo-model.rb → relaxo/model/properties.rb}

@@ -18,4 +18,5 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'relaxo/model'
+require 'relaxo/model/properties/attribute'
+require 'relaxo/model/properties/composite'

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

@@ -0,0 +1,160 @@
+# 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 'date'
+
+module Relaxo
+	module Model
+		module Properties
+			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
+						self.instance_eval &@@attributes[klass]
+					end
+				end
+			end
+		
+			class Serialized
+				def self.[] (klass, proc = nil)
+					self.new(klass, &proc)
+				end
+				
+				def initialize(klass, &serialization)
+					@klass = klass
+					
+					raise ArgumentError.new("Klass doesn't respond to parse!") unless @klass.respond_to? :parse
+				end
+				
+				def convert_to_primative(value)
+					value.to_s
+				end
+				
+				def convert_from_primative(database, value)
+					@klass.parse(value)
+				end
+			end
+		
+			Required = Attribute
+		
+			class Optional
+				def self.[] klass
+					self.new(klass)
+				end
+
+				def initialize(klass)
+					@klass = klass
+				end
+			
+				def convert_to_primative(value)
+					if value == nil || value == ''
+						nil
+					else
+						@klass.convert_to_primative(value)
+					end
+				end
+
+				def convert_from_primative(database, value)
+					if value == nil || value.empty?
+						nil
+					else
+						@klass.convert_from_primative(database, 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(database, 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(database, value)
+					value.to_i
+				end
+			end
+		
+			Attribute.for_class(Float) do
+				def convert_to_primative(value)
+					value.to_f
+				end
+
+				def convert_from_primative(database, value)
+					value.to_f
+				end
+			end
+
+			Attribute.for_class(Date) do
+				def convert_to_primative(value)
+					value.iso8601
+				end
+
+				def convert_from_primative(database, value)
+					Date.parse(value)
+				end
+			end
+
+			Attribute.for_class(DateTime) do
+				def convert_to_primative(value)
+					value.iso8601
+				end
+
+				def convert_from_primative(database, value)
+					DateTime.parse(value)
+				end
+			end
+
+			Attribute.for_class(String) do
+				def convert_to_primative(value)
+					value.to_s
+				end
+
+				def convert_from_primative(database, value)
+					value.to_s
+				end
+			end
+		end
+	end
+end

data/lib/relaxo/{properties/money.rb → model/properties/bigdecimal.rb}

@@ -18,17 +18,19 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'money'
+require 'bigdecimal'
 
 module Relaxo
-	module Properties
-		Attribute.for_class(Money) do
-			def convert_to_document(value)
-				[value.cents, value.currency.to_s]
-			end
+	module Model
+		module Properties
+			Attribute.for_class(BigDecimal) do
+				def convert_to_primative(value)
+					value.to_s('F')
+				end
 
-			def convert_from_document(database, value)
-				Money.new(value[0], value[1])
+				def convert_from_primative(database, value)
+					value.to_d
+				end
 			end
 		end
 	end

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

@@ -0,0 +1,144 @@
+# 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.
+
+module Relaxo
+	module Model
+		module Properties
+			
+			class Polymorphic
+				def self.[] *klasses
+					self.new(klasses)
+				end
+				
+				def initialize(klasses)
+					@klasses = klasses
+					@lookup = nil
+				end
+				
+				def lookup(type)
+					unless @lookup
+						@lookup = {}
+						
+						@klasses.each do |klass|
+							@lookup[klass.type] = klass
+						end
+					end
+					
+					@lookup[type]
+				end
+				
+				def convert_to_primative(object)
+					unless object.saved?
+						object.save
+					end
+
+					[object.type, object.id]
+				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
+					
+					attributes = database.get(id).to_hash
+					
+					klass = lookup(attributes['type'])
+					
+					klass.fetch(database, attributes)
+				end
+			end
+
+			class BelongsTo
+				def self.[] *klasses
+					if klasses.size == 1
+						self.new(klasses[0])
+					else
+						Polymorphic.new(*klasses)
+					end
+				end
+			
+				def initialize(klass)
+					@klass = klass
+				end
+
+				def convert_to_primative(object)
+					unless object.saved?
+						object.save
+					end
+
+					object.id
+				end
+
+				def convert_from_primative(database, id)
+					@klass.fetch(database, id)
+				end
+			end
+		
+			class HasOne < BelongsTo
+			end
+		
+			class HasMany < HasOne
+				def convert_to_primative(value)
+					value.each do |document|
+						document.save unless value.id
+					end
+				
+					value.collect{|document| document.id}
+				end
+
+				def convert_from_primative(database, value)
+					value.collect{|id| @klass.fetch(database, id)}
+				end
+			end
+			
+			# Returns the raw value, typically used for reductions:
+			module ValueOf
+				def self.new(database, value)
+					value
+				end
+			end
+			
+			class ArrayOf
+				def self.[] klass
+					self.new(klass)
+				end
+				
+				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(database, value)
+					value.collect do |item|
+						@klass.convert_from_primative(database, item)
+					end
+				end
+			end
+		end
+	end
+end

data/lib/relaxo/{recordset.rb → model/properties/latinum.rb}

@@ -1,4 +1,3 @@
-
 # 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
@@ -19,42 +18,23 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
+require 'latinum/resource'
+
 module Relaxo
-	class Recordset
-		include Enumerable
-		
-		def initialize(database, view, klass = nil)
-			@database = database
-			@view = view
-			
-			@klass = klass
-		end
-		
-		attr :klass
-		attr :database
-		
-		def count
-			@view["total_rows"]
-		end
-		
-		def offset
-			@view["offset"]
-		end
-		
-		def rows
-			@view["rows"]
-		end
-		
-		def each(klass = nil, &block)
-			klass ||= @klass
-			
-			if klass
-				rows.each do |row|
-					# If user specified :include_docs => true, row['doc'] contains the primary value:
-					yield klass.new(@database, row['doc'] || row['value'])
+	module Model
+		module Properties
+			Attribute.for_class(Latinum::Resource) do
+				def convert_to_primative(value)
+					[value.amount.to_s('F'), value.name]
+				end
+
+				def convert_from_primative(database, value)
+					if Array === value
+						@klass.new(value[0], value[1])
+					else
+						@klass.parse(value)
+					end
 				end
-			else
-				rows.each &block
 			end
 		end
 	end

data/lib/relaxo/model/recordset.rb

@@ -0,0 +1,69 @@
+
+# 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.
+
+module Relaxo
+	module Model
+		class Recordset
+			include Enumerable
+		
+			def initialize(database, view, klass = nil)
+				@database = database
+				@view = view
+			
+				@klass = klass
+			end
+		
+			attr :klass
+			attr :database
+		
+			def count
+				@view["total_rows"]
+			end
+		
+			def offset
+				@view["offset"]
+			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
+				end
+			end
+		end
+	end
+end

data/lib/relaxo/model/version.rb

@@ -23,7 +23,7 @@ module Relaxo
 		module VERSION
 			MAJOR = 0
 			MINOR = 3
-			TINY  = 0
+			TINY  = 6
 
 			STRING = [MAJOR, MINOR, TINY].join('.')
 		end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: relaxo-model
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-11 00:00:00.000000000 Z
+date: 2012-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: relaxo
@@ -50,12 +50,16 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/relaxo/model/base.rb
+- lib/relaxo/model/component.rb
+- lib/relaxo/model/document.rb
+- lib/relaxo/model/properties/attribute.rb
+- lib/relaxo/model/properties/bigdecimal.rb
+- lib/relaxo/model/properties/composite.rb
+- lib/relaxo/model/properties/latinum.rb
+- lib/relaxo/model/properties.rb
+- lib/relaxo/model/recordset.rb
 - lib/relaxo/model/version.rb
 - lib/relaxo/model.rb
-- lib/relaxo/properties/money.rb
-- lib/relaxo/properties.rb
-- lib/relaxo/recordset.rb
-- lib/relaxo-model.rb
 - README.md
 homepage: http://www.oriontransfer.co.nz/gems/relaxo
 licenses: []
@@ -82,3 +86,4 @@ signing_key:
 specification_version: 3
 summary: Relaxo Model is a high level business logic framework for CouchDB/Relaxo.
 test_files: []
+has_rdoc: 

data/lib/relaxo/properties.rb

@@ -1,129 +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 'date'
-
-module Relaxo
-	module Properties
-		class Attribute
-			@@attributes = {}
-			
-			def self.for_class(klass, &block)
-				@@attributes[klass] = Proc.new(&block)
-			end
-			
-			def self.[] klass
-				self.new(klass)
-			end
-			
-			def initialize(klass)
-				@klass = klass
-				
-				self.instance_eval &@@attributes[klass]
-			end
-		end
-		
-		Attribute.for_class(Integer) do
-			def convert_to_document(value)
-				value.to_i
-			end
-
-			def convert_from_document(database, value)
-				value.to_i
-			end
-		end
-		
-		Attribute.for_class(Float) do
-			def convert_to_document(value)
-				value.to_f
-			end
-
-			def convert_from_document(database, value)
-				value.to_f
-			end
-		end
-		
-		Attribute.for_class(Date) do
-			def convert_to_document(value)
-				value.iso8601
-			end
-
-			def convert_from_document(database, string)
-				Date.parse(string)
-			end
-		end
-
-		Attribute.for_class(DateTime) do
-			def convert_to_document(value)
-				value.iso8601
-			end
-
-			def convert_from_document(database, string)
-				DateTime.parse(string)
-			end
-		end
-
-		Attribute.for_class(String) do
-			def convert_to_document(value)
-				value.to_s
-			end
-
-			def convert_from_document(database, string)
-				string.to_s
-			end
-		end
-
-		class BelongsTo
-			def self.[] klass
-				self.new(klass)
-			end
-			
-			def initialize(klass)
-				@klass = klass
-			end
-
-			def convert_to_document(value)
-				unless value.id
-					value.save
-				end
-
-				value.id
-			end
-
-			def convert_from_document(database, string)
-				@klass.fetch(database, string)
-			end
-		end
-		
-		class Lookup
-			def self.[] klass
-				self.class.new(klass)
-			end
-
-			def initialize(klass)
-				@klass = klass
-			end
-
-			def new(database, id)
-				@klass.fetch(database, id)
-			end
-		end
-	end
-end