Custom attributes serialization and access

lib/Model.php

@@ -329,7 +329,13 @@ public function &__get($name)
 			$value = $this->$name();
 			return $value;
 		}
-
+        // or a method with the same name as the property
+        else if (method_exists($this, $name))
+        {
+            $value = $this->$name();
+            return $value;
+        }
+        // delegete read_attribute()
 		return $this->read_attribute($name);
 	}
 

lib/Serialization.php

@@ -139,7 +139,14 @@ private function check_methods()
 			foreach ($this->options['methods'] as $method)
 			{
 				if (method_exists($this->model, $method))
+                {
 					$this->attributes[$method] = $this->model->$method();
+                }
+                else if (method_exists($this->model, "get_{$method}"))
+                {
+                    $getter = "get_{$method}";
+                    $this->attributes[$method] = $this->model->$getter();
+                }
 			}
 		}
 	}

test/SerializationTest.php

@@ -73,6 +73,16 @@ public function test_methods_method_same_as_attribute()
 		$this->assert_equals('ancient art of main tanking', $a['name']);
 	}
 
+    public function test_methods_uses_getter_if_method_does_not_exist() {
+        $a = $this->_a(array('methods' => 'lower_name'));
+		$this->assert_equals('ancient art of main tanking', $a['lower_name']);
+    }
+
+    public function test_methods_method_has_precedence_over_getter() {
+        $a = $this->_a(array('methods' => 'name'));
+        $this->assert_equals('ancient art of main tanking', $a['name']);
+    }
+
 	public function test_include()
 	{
 		$a = $this->_a(array('include' => array('author')));