vanilla-jet 1.0.2 → 1.0.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/framework/request.js +89 -125
  2. package/package.json +1 -1
package/framework/request.js CHANGED
@@ -1,147 +1,111 @@
1
- /**
2
- Version 3.0
3
- Created by: nalancer08 <https://github.com/nalancer08>
4
- **/
5
-
6
- var url = require('url');
7
- var querystring = require('querystring');
8
-
9
- function Request(req, options) {
10
-
11
- this.params = {
12
- get: {},
13
- post: {},
14
- body: ''
15
- };
16
- this.format = 'html';
17
- this.type = 'get';
18
- this.controller = 'index';
19
- this.action = 'index';
20
- this.id = '';
21
- this.path = '';
22
- this.parts = [];
23
- // Call initialization callback
24
- this.init(req, options);
25
- }
26
-
27
- Request.prototype.init = function(req, options) {
28
-
29
- var obj = this,
30
- body = '',
31
- options = options || {},
32
- parsed = url.parse(req.url, true),
33
- server = require('../../index').server;
34
-
35
- //console.log(obj);
36
-
37
- // Save callbacks
38
- obj.onDataReceived = options.onDataReceived || obj.onDataReceived;
39
- // Save request method (get, post, etc)
40
- obj.type = req.method.toLowerCase();
41
- // Parse path parts
42
- obj.path = parsed.pathname.replace(/\/$/, ''); // This is important
43
- obj.parts = parsed.pathname.replace(/(^\/|\/$)/, '').split('/');
44
-
45
- // // Try to guess MVC parameters
46
- // obj.controller = obj.parts[0] || '';
47
- // obj.action = obj.parts[1] || '';
48
- // obj.id = obj.parts[2] || '';
49
- obj.controller = 'app';
50
- obj.action = obj.parts[0];
51
- obj.id = obj.parts[1] || null;
52
-
53
- // Patch for hanlde default route
54
- if (obj.action == '' && obj.path == '') {
55
- if ( server != null && server.getDefaultRoute() != '') {
56
- obj.path = server.getDefaultRoute();
57
- }
1
+ let url = require('url');
2
+ let querystring = require('querystring');
3
+
4
+ class Request {
5
+
6
+ constructor(req, options) {
7
+
8
+ this.params = {
9
+ get: {},
10
+ post: {},
11
+ body: ''
12
+ };
13
+ this.format = 'html';
14
+ this.type = 'get';
15
+ this.controller = 'index';
16
+ this.action = 'index';
17
+ this.id = '';
18
+ this.path = '';
19
+ this.parts = [];
20
+ this.init(req, options);
58
21
  }
59
22
 
60
- /*console.log("======= Start ========");
61
- console.log(obj.action);
62
- console.log(obj.path);
63
- console.log("======= End ========");*/
23
+ init(req, options) {
64
24
 
65
- // Patch for catch if not pass second parameter
66
- if (obj.id == undefined || obj.id === 'undefined' || obj.id == null) {
67
- obj.id = null;
68
- }
25
+ var obj = this, body = '', options = options || {}, parsed = url.parse(req.url, true);
26
+
27
+ // Save callbacks
28
+ obj.onDataReceived = options.onDataReceived || obj.onDataReceived;
29
+ // Save request method (get, post, etc)
30
+ obj.type = req.method.toLowerCase();
31
+ // Parse path parts
32
+ obj.path = parsed.pathname.replace(/\/$/, '');
33
+ obj.parts = parsed.pathname.replace(/(^\/|\/$)/, '').split('/');
69
34
 
70
- /*console.log("======= Start ========");
71
- console.log(obj.id);
72
- console.log("======= End ========");*/
35
+ // -- Defaults
36
+ obj.controller = 'app';
37
+ obj.action = obj.parts[0];
38
+ obj.id = obj.parts[1] || null;
73
39
 
74
- // Get output format (if specified)
75
- //if (obj.id && obj.id != undefined && obj.id !== 'undefined') {
76
- var matches = (obj.id == null) ? null : obj.id.match(/\.([a-z0-9]+)$/);
77
- if (matches) {
40
+ // Patch for catch if not pass second parameter
41
+ if (obj.id == undefined || obj.id === 'undefined' || obj.id == null) {
42
+ obj.id = null;
43
+ }
44
+
45
+ // Matches
46
+ var matches = (obj.id == null) ? null : obj.id.match(/\.([a-z0-9]+)$/);
47
+ if (matches) {
78
48
  obj.format = matches[1] || 'html';
79
49
  obj.id = obj.id.replace(/\.([a-z0-9]+)$/, '');
50
+ }
51
+
52
+ // Stream request body
53
+ req.on('data', function (chunk) {
54
+ body += chunk.toString();
55
+ });
56
+ // Parse GET and POST params
57
+ obj.params.get = parsed.query;
58
+ req.on('end', function (chunk) {
59
+ obj.params.body = body;
60
+ obj.params.post = querystring.parse(body);
61
+ obj.onDataReceived.call(obj);
62
+ });
80
63
  }
81
- //}
82
-
83
- // Stream request body
84
- req.on('data', function(chunk) {
85
- body += chunk.toString();
86
- });
87
- // Parse GET and POST params
88
- obj.params.get = parsed.query;
89
- req.on('end', function(chunk) {
90
- obj.params.body = body;
91
- obj.params.post = querystring.parse(body);
92
- obj.onDataReceived.call(obj);
93
- });
94
- }
95
64
 
96
- /**
97
- * This method try to get a parameter from GET OR POST global parameters
98
- * @param name: Name of the parameter
99
- * @param value: Default value if the parameter is missing
100
- **/
101
- Request.prototype.param = function(name, value) {
102
-
103
- var obj = this,
104
- ret = value || '';
105
- // Try to retrieve parameter from both, POST and GET objects
106
- if ( typeof obj.params.post[name] !== 'undefined' ) {
107
- ret = obj.params.post[name];
108
- } else if ( typeof obj.params.get[name] !== 'undefined' ) {
109
- ret = obj.params.get[name];
65
+ /**
66
+ * This method try to get a parameter from GET OR POST global parameters
67
+ * @param name: Name of the parameter
68
+ * @param value: Default value if the parameter is missing
69
+ **/
70
+ param(name, value) {
71
+
72
+ var obj = this, ret = value || '';
73
+ // Try to retrieve parameter from both, POST and GET objects
74
+ if (typeof obj.params.post[name] !== 'undefined') {
75
+ ret = obj.params.post[name];
76
+ } else if (typeof obj.params.get[name] !== 'undefined') {
77
+ ret = obj.params.get[name];
78
+ }
79
+ return ret;
110
80
  }
111
- return ret;
112
- }
113
81
 
114
- Request.prototype.post = function(name, value) {
82
+ post(name, value) {
115
83
 
116
- var obj = this,
117
- ret = value || '';
118
- // Try to retrieve parameter from POST object
119
- if ( typeof obj.params.post[name] !== 'undefined' ) {
120
- ret = obj.params.post[name];
84
+ var obj = this, ret = value || '';
85
+ // Try to retrieve parameter from POST object
86
+ if (typeof obj.params.post[name] !== 'undefined') {
87
+ ret = obj.params.post[name];
88
+ }
89
+ return ret;
121
90
  }
122
- return ret;
123
- }
124
91
 
125
- Request.prototype.get = function(name, value) {
92
+ get(name, value) {
126
93
 
127
- var obj = this,
128
- ret = value || '';
129
- // Try to retrieve parameter from GET object
130
- if ( typeof obj.params.get[name] !== 'undefined' ) {
131
- ret = obj.params.get[name];
94
+ var obj = this, ret = value || '';
95
+ // Try to retrieve parameter from GET object
96
+ if (typeof obj.params.get[name] !== 'undefined') {
97
+ ret = obj.params.get[name];
98
+ }
99
+ return ret;
132
100
  }
133
- return ret;
134
- }
135
101
 
136
- Request.prototype.body = function(name, value) {
102
+ body() {
137
103
 
138
- var obj = this;
139
- return obj.params.body;
104
+ var obj = this;
105
+ return obj.params.body;
106
+ }
140
107
  }
141
108
 
142
- Request.prototype.onDataReceived = function() {
143
-
144
- // Interface
145
- }
109
+ Request.prototype.onDataReceived = function() {}
146
110
 
147
111
  module.exports = Request;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "vanilla-jet",
3
- "version": "1.0.2",
3
+ "version": "1.0.3",
4
4
  "description": "VannilaJet framework",
5
5
  "main": "index.js",
6
6
  "scripts": {