From 4faced08aa327a548f0ee2a076e4efd5f978136b Mon Sep 17 00:00:00 2001
From: Vladimir Enchev <vladimir.enchev@telerik.com>
Date: Fri, 16 May 2014 09:53:34 +0300
Subject: [PATCH] http internal references refactored

---
 BCL.csproj                       |  4 +---
 http/{http.ts => http-common.ts} |  3 ---
 http/http.d.ts                   | 25 ++++++++++++++++++++++++-
 http/index.ts                    |  2 +-
 4 files changed, 26 insertions(+), 8 deletions(-)
 rename http/{http.ts => http-common.ts} (86%)

diff --git a/BCL.csproj b/BCL.csproj
index 322f34cca..836dfc5b4 100644
--- a/BCL.csproj
+++ b/BCL.csproj
@@ -159,9 +159,6 @@
     <TypeScriptCompile Include="android17.d.ts" />
     <TypeScriptCompile Include="promises\promises.ts" />
     <TypeScriptCompile Include="promises\index.ts" />
-    <TypeScriptCompile Include="http\http.ts">
-      <DependentUpon>http.d.ts</DependentUpon>
-    </TypeScriptCompile>
     <TypeScriptCompile Include="ios7.d.ts" />
     <TypeScriptCompile Include="globals\index.ts" />
     <TypeScriptCompile Include="timer\index.ts" />
@@ -190,6 +187,7 @@
       <DependentUpon>http-request.d.ts</DependentUpon>
     </TypeScriptCompile>
     <TypeScriptCompile Include="application\application-common.ts" />
+    <TypeScriptCompile Include="http\http-common.ts" />
     <Content Include="image-source\Readme.md" />
     <TypeScriptCompile Include="http\http.d.ts" />
     <TypeScriptCompile Include="local-settings\index.ts" />
diff --git a/http/http.ts b/http/http-common.ts
similarity index 86%
rename from http/http.ts
rename to http/http-common.ts
index c5dbfe793..b30a83701 100644
--- a/http/http.ts
+++ b/http/http-common.ts
@@ -4,9 +4,6 @@ import http = require("http/http-request");
 
 // merge request
 export var request = http.request;
-export interface HttpResponse extends http.HttpResponse { }
-export interface HttpRequestOptions extends http.HttpRequestOptions { }
-export interface HttpContent extends http.HttpContent { }
 
 /**
   * Gets string from url.
diff --git a/http/http.d.ts b/http/http.d.ts
index 5611a20fd..5a453cc4f 100644
--- a/http/http.d.ts
+++ b/http/http.d.ts
@@ -9,4 +9,27 @@ export declare function getJSON<T>(url: string): promises.Promise<T>
 export declare function getJSON<T>(options: request.HttpRequestOptions): promises.Promise<T>
 
 export declare function getImage(url: string): promises.Promise<image.ImageSource>
-export declare function getImage(options: request.HttpRequestOptions): promises.Promise<image.ImageSource>
\ No newline at end of file
+export declare function getImage(options: request.HttpRequestOptions): promises.Promise<image.ImageSource>
+
+export declare function request(options: HttpRequestOptions): promises.Promise<HttpResponse>;
+
+export interface HttpRequestOptions {
+    url: string;
+    method: string;
+    headers?: any;
+    content?: any;
+    timeout?: number;
+}
+
+export interface HttpResponse {
+    statusCode: number;
+    headers: any;
+    content?: HttpContent;
+}
+
+export interface HttpContent {
+    raw: any;
+    toString: () => string;
+    toJSON: () => any;
+    toImage: () => image.ImageSource;
+}
\ No newline at end of file
diff --git a/http/index.ts b/http/index.ts
index 3c912a54c..5b9df928d 100644
--- a/http/index.ts
+++ b/http/index.ts
@@ -1,2 +1,2 @@
 declare var module, require;
-module.exports = require("http/http");
\ No newline at end of file
+module.exports = require("http/http-common");
\ No newline at end of file