Merge pull request #8 from maxmind/greg/isset

Fix isset for models/records

src/GeoIp2/Model/Country.php

@@ -93,6 +93,14 @@ class Country implements \JsonSerializable
         throw new \RuntimeException("Unknown attribute: $attr");
     }
 
+    /**
+     * @ignore
+     */
+    public function __isset($attr)
+    {
+        return $attr != "instance" && isset($this->$attr);
+    }
+
     public function jsonSerialize()
     {
         return $this->raw;

src/GeoIp2/Record/AbstractRecord.php

@@ -19,19 +19,34 @@ abstract class AbstractRecord implements \JsonSerializable
      */
     public function __get($attr)
     {
-        $valid = in_array($attr, $this->validAttributes);
         // XXX - kind of ugly but greatly reduces boilerplate code
-        $key = strtolower(preg_replace('/([A-Z])/', '_\1', $attr));
+        $key = $this->attributeToKey($attr);
 
-        if ($valid && isset($this->record[$key])) {
+        if ($this->__isset($attr)) {
             return $this->record[$key];
-        } elseif ($valid) {
+        } elseif ($this->validAttribute($attr)) {
             return null;
         } else {
             throw new \RuntimeException("Unknown attribute: $attr");
         }
     }
 
+    public function __isset($attr)
+    {
+        return $this->validAttribute($attr) &&
+             isset($this->record[$this->attributeToKey($attr)]);
+    }
+
+    private function attributeToKey($attr)
+    {
+        return strtolower(preg_replace('/([A-Z])/', '_\1', $attr));
+    }
+
+    private function validAttribute($attr)
+    {
+        return in_array($attr, $this->validAttributes);
+    }
+
     public function jsonSerialize()
     {
         return $this->record;

tests/GeoIp2/Test/Model/CountryTest.php

@@ -190,4 +190,20 @@ class CountryTest extends \PHPUnit_Framework_TestCase
             'json_encode can be called on the record object directly'
         );
     }
+
+    public function testIsSet()
+    {
+        $this->assertTrue(isset($this->model->traits), 'traits is set');
+        $this->assertFalse(isset($this->model->unknown), 'unknown is not set');
+
+        $this->assertTrue(
+            isset($this->model->traits->ipAddress),
+            'ip_address is set'
+        );
+        $this->assertFalse(
+            isset($this->model->traits->unknown),
+            'unknown trait is not set'
+        );
+
+    }
 }