Some refactoring and fixes for ACF.

Author: elpete

models/HyperRequest.cfc

@@ -84,8 +84,7 @@ component accessors="true" {
             throw( type = "NoUrlException" );
         }
 
-        var res = new Hyper.models.HyperResponse( this );
-        res.populateFromCFHTTP( makeCFHTTPRequest() );
+        var res = new Hyper.models.HyperResponse( this, makeCFHTTPRequest() );
 
         if ( res.isRedirect() ) {
             if ( shouldFollowRedirect() ) {
@@ -119,7 +118,7 @@ component accessors="true" {
     private function makeCFHTTPRequest() {
         local.res = "";
         cfhttp(
-            result = "local.res"
+            result = "local.res",
             url = getUrl(),
             method = getMethod(),
             redirect = false

models/HyperResponse.cfc

@@ -1,11 +1,15 @@
-component accessors="true" setters="false" {
+component accessors="true" {
 
-    property name="statusCode" default="200";
-    property name="data" default="";
-    property name="request";
+    property name="statusCode" default="200" setter="false";
+    property name="data" default="" setter="false";
+    property name="request" setter="false";
+    property name="charset" setter="false";
+    property name="timestamp" setter="false";
 
-    function init( req ) {
+    function init( req, cfhttpResponse, timestamp = now() ) {
         variables.request = req;
+        populateFromCFHTTP( cfhttpResponse );
+        variables.timestamp = arguments.timestamp;
         return this;
     }
 
@@ -16,7 +20,8 @@ component accessors="true" setters="false" {
         return deserializeJSON( getData() );
     }
 
-    function populateFromCFHTTP( res ) {
+    private function populateFromCFHTTP( res ) {
+        variables.charset = res.charset;
         variables.statusCode = res.responseheader.status_code;
         res.responseheader.each( function( name, value ) {
             variables.headers[ lcase( name ) ] = value;

tests/specs/integration/BuilderPassThroughSpec.cfc

@@ -15,7 +15,7 @@ component extends="tests.resources.ModuleIntegrationSpec" appMapping="/app" {
             it( "passes through all other methods to the HyperRequest", function() {
                 var res = hyper.setUrl( "https://jsonplaceholder.typicode.com/posts/1" ).get();
                 expect( res ).toBeInstanceOf(
-                    "HyperResponse",
+                    "Hyper.models.HyperResponse",
                     "A HyperResponse object should have been returned."
                 );
                 var data = res.json();

tests/specs/integration/GetSpec.cfc

@@ -15,7 +15,7 @@ component extends="tests.resources.ModuleIntegrationSpec" appMapping="/app" {
             it( "can make a GET request", function() {
                 var res = hyper.get( "https://jsonplaceholder.typicode.com/posts/1" );
                 expect( res ).toBeInstanceOf(
-                    "HyperResponse",
+                    "Hyper.models.HyperResponse",
                     "A HyperResponse object should have been returned."
                 );
                 var data = res.json();
@@ -33,7 +33,7 @@ component extends="tests.resources.ModuleIntegrationSpec" appMapping="/app" {
             it( "has access to the original HyperRequest in the HyperResponse", function() {
                 var res = hyper.get( "https://jsonplaceholder.typicode.com/posts/1" );
                 expect( res ).toBeInstanceOf(
-                    "HyperResponse",
+                    "Hyper.models.HyperResponse",
                     "A HyperResponse object should have been returned."
                 );
                 var req = res.getRequest();

tests/specs/unit/HyperResponseSpec.cfc

@@ -3,8 +3,13 @@ component extends="testbox.system.BaseSpec" {
     function run() {
         describe( "HyperResponse", function() {
             it( "throws an exception when requesting json data but the data is not json", function() {
-                var res = new Hyper.models.HyperResponse( createStub() );
-                res.setData( "definitely not json" );
+                var res = new Hyper.models.HyperResponse( createStub(), {
+                    "charset" = "UTF-8",
+                    "responseheader" = {
+                        "status_code" = "200"
+                    },
+                    "filecontent" = "definitely not json"
+                } );
                 expect( function() {
                     var json = res.json();
                 } ).toThrow( "DeserializeJsonException" );