Merge pull request #85 from OpenBuildings/jam-save-model-docblock

jam save exception docblock

Author: stanstst

classes/Kohana/Jam/Model.php

@@ -236,6 +236,8 @@ public function update_fields($values, $value = NULL)
 	 *
 	 * @param   bool|null        $validate
 	 * @return  $this
+	 * @throws Kohana_Exception
+	 * @throws Jam_Exception_Validation
 	 */
 	public function save($validate = NULL)
 	{
@@ -246,9 +248,9 @@ public function save($validate = NULL)
 		$key = $this->_original[$this->meta()->primary_key()];
 
 		// Run validation
-		if ($validate !== FALSE)
+		if ($validate !== FALSE && !$this->check())
 		{
-			$this->check_insist();
+			throw new Jam_Exception_Validation('There was an error validating the :model: :errors', $this);
 		}
 
 		$this->_is_saving = TRUE;

classes/Kohana/Jam/Validated.php

@@ -345,8 +345,16 @@ public function check($force = FALSE)
 		return $this->is_valid();
 	}
 
+	/**
+	 * @return $this
+	 * @throws Jam_Exception_Validation
+	 *
+	 * @deprecated Since 0.5.24 Use try-catch around save() instead. This might be removed in future version.
+	 */
 	public function check_insist()
 	{
+		@trigger_error('check_insist() is deprecated and might be removed in future version.', E_USER_DEPRECATED);
+
 		if ( ! $this->check())
 			throw new Jam_Exception_Validation('There was an error validating the :model: :errors', $this);