relaxo-model 0.17.3 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f9a147ad023213a3a98ec44faf9893f09e8fd1cabbebeaa13f6d499dcd0f73a
-  data.tar.gz: a92a1cd906a27b04556d326a74305a1c94f8b1f04fa30216bcc63d97230685b6
+  metadata.gz: 43646c8e87ba1baad72dd21037a91817468427e6c990f82ed1f6201d319961f7
+  data.tar.gz: 3b7e4d1c13908a5fc015e2160e037b3492cf5c41f7ce1b17773de8aaa9bbea6b
 SHA512:
-  metadata.gz: bfc0059b36c22d21c497816ceff1eec5d7cb8ed3e0b8f2c046188ead5a5e9e4a307332699290b69476c08f757d17ac8b8578e5eb740c6f6cfdbf2b4196e7329b
-  data.tar.gz: 39c4da5c519955e5e5187dc358a648c57a1438ae3e2fb7841572c96c2afded168b460b206f94badb0198cef6f7fee0c389ec5a622a1ff8c7ab86635cca7e253f
+  metadata.gz: 7a34f73d1f6931122401aa1b3c678adf6894ed9c275ee03420f624d732eafeaac28e854a8f192e34ad3fb15eb3bc7bd2b77e72283620bc4fb165d31bc6924c91
+  data.tar.gz: 0dde3caeb52c3cb6ee779986db3568a7acef6fb1786be0b302505ab0c3ca8788be515c632cab06262ec634d4becf5a3f551168b0b3c0a3ae19593e5d65a2b1eb

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

@@ -68,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)
@@ -101,7 +101,7 @@ module Relaxo
 					raise KeyError.new(name)
 				end
 			end
-
+			
 			def []= name, value
 				if self.class.properties.include? name
 					self.send("#{name}=", value)
@@ -109,7 +109,7 @@ module Relaxo
 					raise KeyError.new(name)
 				end
 			end
-
+			
 			def validate(changeset)
 				# Do nothing :)
 			end

data/lib/relaxo/model/document.rb

@@ -109,7 +109,7 @@ module Relaxo
 			end
 
 			# Update any calculations:
-			def before_save
+			def before_save(changeset)
 			end
 
 			def after_save
@@ -148,34 +148,34 @@ module Relaxo
 			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
@@ -183,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)
@@ -199,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/version.rb

@@ -20,6 +20,6 @@
 
 module Relaxo
 	module Model
-		VERSION = "0.17.3"
+		VERSION = "0.18.0"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaxo-model
 version: !ruby/object:Gem::Version
-  version: 0.17.3
+  version: 0.18.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-29 00:00:00.000000000 Z
+date: 2020-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack