net folder renamed to http

Vladimir Enchev · Vladimir Enchev · commit ca4c04badcce · 2014-04-28T15:40:00.000+03:00
diff --git a/BCL.csproj b/BCL.csproj
@@ -128,16 +128,16 @@
     </TypeScriptCompile>
     <TypeScriptCompile Include="Utils\utils_android.ts" />
     <TypeScriptCompile Include="Utils\utils_ios.ts" />
-    <TypeScriptCompile Include="net\http_request.android.ts">
+    <TypeScriptCompile Include="http\http_request.android.ts">
       <DependentUpon>http_request.d.ts</DependentUpon>
     </TypeScriptCompile>
-    <TypeScriptCompile Include="net\http_request.ios.ts">
+    <TypeScriptCompile Include="http\http_request.ios.ts">
       <DependentUpon>http_request.d.ts</DependentUpon>
     </TypeScriptCompile>
-    <TypeScriptCompile Include="net\http_request.d.ts" />
+    <TypeScriptCompile Include="http\http_request.d.ts" />
   </ItemGroup>
   <ItemGroup>
-    <TypeScriptCompile Include="net\index.ts" />
+    <TypeScriptCompile Include="http\index.ts" />
     <TypeScriptCompile Include="UserPreferences\index.ts" />
     <TypeScriptCompile Include="Location\index.ts" />
     <TypeScriptCompile Include="Image\index.ts" />
@@ -148,7 +148,7 @@
     <TypeScriptCompile Include="android17.d.ts" />
     <TypeScriptCompile Include="promises\promises.ts" />
     <TypeScriptCompile Include="promises\index.ts" />
-    <TypeScriptCompile Include="net\http.ts" />
+    <TypeScriptCompile Include="http\http.ts" />
     <TypeScriptCompile Include="ios7.d.ts" />
     <Content Include="_references.ts" />
     <TypeScriptCompile Include="Console\console.android.ts">
@@ -168,7 +168,7 @@
     <Content Include="UserPreferences\Readme.md" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="net\Readme.md" />
+    <Content Include="http\Readme.md" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Readme.md" />
diff --git a/http/Readme.md b/http/Readme.md
@@ -1,6 +1,6 @@
 ﻿Sample code:
 ```js
-    var http = require("net");
+    var http = require("http");
     
     // Universal request method. You can use HttpRequestOptions to set varios properties like url, headers, etc., 
     // HttpResponse to get status code, headers and content and HttpContent to get body of response:
diff --git a/http/http.ts b/http/http.ts
@@ -1,6 +1,6 @@
 import image_module = require("Image/image");
 import promises = require("promises/promises");
-import http = require("net/http_request");
+import http = require("http/http_request");
 
 // merge request
 declare var exports;
diff --git a/http/http_request.android.ts b/http/http_request.android.ts
@@ -2,7 +2,7 @@
   * Android specific http client implementation.
   */
 import promises = require("promises/promises");
-import http = require("net/http_request");
+import http = require("http/http_request");
 
 // TODO: Replace with similar to iOS implementation!
 export function request(options: http.HttpRequestOptions): promises.Promise<http.HttpResponse> {
@@ -31,6 +31,7 @@ export function request(options: http.HttpRequestOptions): promises.Promise<http
                 } else {
                     d.resolve({
                         content: {
+                            raw: data,
                             toString: () => { return data },
                             toJSON: () => { return JSON.parse(data) },
                             toImage: () => { return require("Image/image").Image.imageFromNativeBitmap(data); }
diff --git a/http/http_request.d.ts b/http/http_request.d.ts
@@ -20,6 +20,7 @@ export interface HttpResponse {
 }
 
 export interface HttpContent {
+    raw: any;
     toString: () => string;
     toJSON: () => any;
     toImage: () => image_module.Image;
diff --git a/http/http_request.ios.ts b/http/http_request.ios.ts
@@ -2,7 +2,7 @@
   * iOS specific http client implementation.
   */
 import promises = require("promises/promises");
-import http = require("net/http_request");
+import http = require("http/http_request");
 
 export function request(options: http.HttpRequestOptions): promises.Promise<http.HttpResponse> {
     var d = promises.defer<http.HttpResponse>();
@@ -38,7 +38,6 @@ export function request(options: http.HttpRequestOptions): promises.Promise<http
                 if (error) {
                     d.reject(new Error(error.localizedDescription()));
                 } else {
-
                     var headers = {};
                     var headerFields = response.allHeaderFields();
                     var keys = headerFields.allKeys();
@@ -50,11 +49,11 @@ export function request(options: http.HttpRequestOptions): promises.Promise<http
 
                     d.resolve({
                         content: {
+                            raw: data,
                             toString: () => { return NSDataToString(data); },
                             toJSON: () => { return JSON.parse(NSDataToString(data)); },
                             toImage: () => { return require("Image/image").Image.imageFromData(data); }
                         },
-                        data : data,
                         statusCode: response.statusCode(),
                         headers: headers
                     });
diff --git a/http/index.ts b/http/index.ts
@@ -0,0 +1,2 @@
+﻿declare var module, require;
+module.exports = require("http/http");
diff --git a/net/index.ts b/net/index.ts

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ export interface HttpResponse {`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`export interface HttpContent {`
	`23`	`+ raw: any;`
`23`	`24`	`toString: () => string;`
`24`	`25`	`toJSON: () => any;`
`25`	`26`	`toImage: () => image_module.Image;`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+declare var module, require;`
	`2`	`+module.exports = require("http/http");`