More resourcename hacks

twilio · Oct 9, 2012 · b78a44a · b78a44a
1 parent a306689
commit b78a44a
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 14 deletions.
diff --git a/Services/Twilio/Resource.php b/Services/Twilio/Resource.php
@@ -80,6 +80,13 @@ public static function decamelize($word)
         );
     }
 
+    public function __get($key) {
+        if ($subresource = $this->getSubresources($key)) {
+            return $subresource;
+        }
+        return $this->$key;
+    }
+
     /**
      * Return camelized version of a word
      * Examples: sms_messages => SMSMessages, calls => Calls, 

diff --git a/Services/Twilio/Rest/Records.php b/Services/Twilio/Rest/Records.php
@@ -1,6 +1,6 @@
 <?php
 
-class Services_Twilio_Rest_Records extends Services_Twilio_ListResource {
+class Services_Twilio_Rest_Records extends Services_Twilio_TimeRangeResource {
 
     public function init($client, $uri) {
         $this->setupSubresources(
@@ -16,22 +16,18 @@ public function init($client, $uri) {
     }
 }
 
-class Services_Twilio_Rest_Today extends Services_Twilio_TimeRangeResource {
+class Services_Twilio_Rest_Today extends Services_Twilio_TimeRangeResource { } 
 
-}
+class Services_Twilio_Rest_Yesterday extends Services_Twilio_TimeRangeResource { }
 
-class Services_Twilio_Rest_Yesterday extends Services_Twilio_TimeRangeResource {
+class Services_Twilio_Rest_LastMonth extends Services_Twilio_TimeRangeResource { }
 
-}
+class Services_Twilio_Rest_ThisMonth extends Services_Twilio_TimeRangeResource { }
 
-class Services_Twilio_Rest_LastMonth extends Services_Twilio_TimeRangeResource {
+class Services_Twilio_Rest_AllTime extends Services_Twilio_TimeRangeResource { }
 
-}
+class Services_Twilio_Rest_Daily extends Services_Twilio_ListResource { }
 
-class Services_Twilio_Rest_ThisMonth extends Services_Twilio_TimeRangeResource {
+class Services_Twilio_Rest_Monthly extends Services_Twilio_ListResource { }
 
-}
-
-class Services_Twilio_Rest_AllTime extends Services_Twilio_TimeRangeResource {
-
-}
+class Services_Twilio_Rest_Yearly extends Services_Twilio_ListResource { }
diff --git a/Services/Twilio/Rest/Triggers.php b/Services/Twilio/Rest/Triggers.php
@@ -0,0 +1,6 @@
+<?php
+
+class Services_Twilio_Rest_Triggers extends Services_Twilio_ListResource {
+
+}
+
diff --git a/Services/Twilio/Rest/UsageRecord.php b/Services/Twilio/Rest/UsageRecord.php
@@ -0,0 +1,6 @@
+<?php
+
+class Services_Twilio_Rest_UsageRecord extends Services_Twilio_InstanceResource
+{
+}
+
diff --git a/Services/Twilio/TimeRangeResource.php b/Services/Twilio/TimeRangeResource.php
@@ -6,7 +6,7 @@
  * @license  http://creativecommons.org/licenses/MIT/ MIT
  * @link     http://pear.php.net/package/Services_Twilio
  */
-class TimeRangeResource extends ListResource {
+class Services_Twilio_TimeRangeResource extends Services_Twilio_ListResource {
 
     /**
      * Return a UsageRecord corresponding to the given category.
@@ -30,4 +30,10 @@ public function getCategory($category) {
         }
         return $page->usage_records[0];
     }
+
+    public function getResourceName($camelized = false) {
+        $this->instance_name = 'Services_Twilio_Rest_UsageRecord';
+        return $camelized ? 'UsageRecords' : 'usage_records';
+    }
+
 }