Schemas are now merged in deeped, so currency is now set automaticall…

…y. json-schema added to package.json. Version bumped
mlegenhausen · Mar 1, 2012 · bbab55f · bbab55f
1 parent 4d34d3e
commit bbab55f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -39,7 +39,7 @@ Create your first order request:
 
 ```
 var order = ogone.createOrderRequest({
-	orderid: '123,
+	orderid: '123',
 	amount: 1.50, // Amount is automatically multiplied by 100
 	brand: 'VISA',
 	ed: '09/12',

diff --git a/lib/ogone.js b/lib/ogone.js
@@ -32,19 +32,19 @@ function Ogone(mode, defaults) {
 
 Ogone.prototype.createOrderRequest = function(json, algorithm, key) {
 	json = json || {};
-    Object.merge(json, this.defaults);
+    Object.merge(json, this.defaults, true);
     return new OrderRequest(this.mode, json, algorithm, key);
 };
 
 Ogone.prototype.createMaintenanceOrder = function(json) {
 	json = json || {};
-    Object.merge(json, this.defaults);
+    Object.merge(json, this.defaults, true);
     return new MaintenanceRequest(this.mode, json);
 };
 
 Ogone.prototype.createQueryRequest = function(json) {
 	json = json || {};
-    Object.merge(json, this.defaults);
+    Object.merge(json, this.defaults, true);
     return new QueryRequest(this.mode, json);
 };
 
@@ -65,7 +65,7 @@ function Request(url, json, schema) {
                 required: true
             }
         }
-    });
+    }, true);
     var result = JSONSchema.validate(json, schema);
     if (!result.valid) throw new Error(result.errors);
     this.query = Object.clone(json) || {};
@@ -143,7 +143,8 @@ function OrderRequest(mode, json, algorithm, key) {
             },
             currency: {
                 type: 'string',
-                'default': 'EUR'
+                'default': 'EUR',
+                required: true
             },
             brand: {
                 type: 'string',

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
     "author": "Malte Legenhausen <mlegenhausen@gmail.com>",
     "name": "ogone-directlink",
     "description": "Thin wrapper around the directlink http api of the ogone payment service",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "repository": {
         "type": "git",
         "url": "git://github.com/mlegenhausen/node-ogone-directlink.git"
@@ -16,7 +16,8 @@
     "dependencies": {
         "xml2js": "0.x.x",
         "sugar": "1.x.x",
-        "request": "1.x.x"
+        "request": "1.x.x",
+        "json-schema": "0.x.x"
     },
     "devDependencies": {
         "nodeunit": "0.x.x"