relaxo-model 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f91363b15fe3a9cbb463411d3fdebd0eb4ec259
-  data.tar.gz: b73842f29b12c806f97b6381fa40bcbe4203a235
+  metadata.gz: e37c4bdf8e7434134f7b4b4e0a8e28c0a677fadb
+  data.tar.gz: 7cd780a667b5e298f242a6388a7d8c662ccd9732
 SHA512:
-  metadata.gz: 9dcc4dd40a4ea74d76ea6b293f78a6ce19ea0b48d317666b07198964507f1e0f569ca3623556f52c9933f410e818ab55bca1b0a631bf0d9fcba41b66ed4d9bb5
-  data.tar.gz: 57f97f437019780516b513a1056226b665459171200ce61cf530d24fc570c531524cdd29e44dfbd0b7113f10d17a7a99c6596099137c825f198bd8d3fe63707e
+  metadata.gz: bfb8e303f72fb22c760a2f60db729d3432ec70b43977d1fe6d87b9d2151ec346df0dc9e564ec02061a6f41bfee3d95ba2a984378fc73ea24ceca79dc9e6b8ce4
+  data.tar.gz: 0cf6e81f2abac06015f0d91b2cd863874ada45c5fe759e3d79438e1c5f1a3cd1598a7f4ae1d9b864e197f0f139cf7940dd4786547463a2c0e952204fd8fea106

data/lib/relaxo/model/base.rb

@@ -119,7 +119,7 @@ module Relaxo
 				self.send(:define_method, "#{name}?") do
 					value = self.send(name)
 					
-					if value == nil || value == false
+					if value.nil? or value == false
 						false
 					elsif value.respond_to? :empty?
 						!value.empty?

data/lib/relaxo/model/component.rb

@@ -22,16 +22,6 @@ 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"
@@ -97,18 +87,16 @@ module Relaxo
 				end
 			end
 
-			def flatten!
-				errors = []
+			def validate
+				# Do nothing :)
+			end
 
+			def flatten!
 				# 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
+							@attributes[key] = klass.convert_to_primative(@changed.delete(key))
 						else
 							@attributes[key] = @changed.delete(key)
 						end
@@ -121,8 +109,6 @@ module Relaxo
 				end
 
 				@changed = {}
-
-				errors
 			end
 			
 			def to_hash

data/lib/relaxo/model/document.rb

@@ -22,20 +22,6 @@ 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'
 			
@@ -112,12 +98,17 @@ module Relaxo
 				return clone
 			end
 
-			# Save the model object, raises `ValidationErrors` if there are validation errors.
+			# Save the model object.
 			def save
+				return if @changed.empty?
+				
 				before_save
 
-				errors = self.flatten!
-				raise ValidationErrors.new(errors) if errors.size > 0
+				if errors = self.validate
+					return errors
+				end
+				
+				self.flatten!
 
 				@database.save(@attributes)
 
@@ -149,6 +140,10 @@ module Relaxo
 			def <=> other
 				self.id <=> other.id
 			end
+			
+			def empty?
+				@attributes.empty?
+			end
 		end
 	end
 end

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

@@ -53,16 +53,14 @@ module Relaxo
 				
 				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
+					@klass.dump(value)
 				end
 				
 				def convert_from_primative(database, value)
-					@klass.parse(value)
+					@klass.load(value)
 				end
 			end
 		
@@ -78,7 +76,7 @@ module Relaxo
 				end
 			
 				def convert_to_primative(value)
-					if value == nil || value == ''
+					if value.nil? or value.empty?
 						nil
 					else
 						@klass.convert_to_primative(value)
@@ -86,7 +84,7 @@ module Relaxo
 				end
 
 				def convert_from_primative(database, value)
-					if value == nil || value.empty?
+					if value.nil? or value.empty?
 						nil
 					else
 						@klass.convert_from_primative(database, value)

data/lib/relaxo/model/version.rb

@@ -20,6 +20,6 @@
 
 module Relaxo
 	module Model
-		VERSION = "0.4.3"
+		VERSION = "0.4.4"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaxo-model
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-08 00:00:00.000000000 Z
+date: 2016-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: relaxo
@@ -112,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: A model layer for CouchDB with minimal global state.