raml2code - npm Package Compare versions

Comparing version 0.8.39 to 0.8.40

History.md

+
+0.8.40 / 2015-02-09
+==================
+
+  * Now the pojo generator can handle nested resources and fix primitives types on list issue #7
+
+0.8.39
+==================
+Fixing issue #4
+
+0.8.38
+==================
+Changing Versioning, adding support to generate a js client
+
+- Moving retrofit client to src/generators/java this could break some already setup projects
+- Now it generates jsClient it uses [raml-client-generator](https://github.com/mulesoft/raml-client-generator)
+- Updating data2code to 0.0.3
+
+0.0.37
+==================
+Adding support to optional properties for retrofit client, now it generates a permutations of the methods with the optional arguments
+
+- Refactor on util.js
+- Some test where change to support the new properties

index.js

@@ -19,9 +19,10 @@ var through = require('through2');
         results.forEach(function (element, index, array) {
-          if (element.name && element.content) {
+          var key = Object.keys(element)[0];
+          if (key && element[key]) {
             var fileG = new gutil.File({
-              path: element.name,
-              contents: new Buffer(element.content)
+              path: key,
+              contents: new Buffer(element[key])
             });
             self.push(fileG);
-            gutil.log(gutil.colors.cyan('Generating file'), element.name);
+            gutil.log(gutil.colors.cyan('Generating file'), key);
           } else {
@@ -28,0 +29,0 @@ self.emit('error', new PluginError(PLUGIN_NAME, 'Data array element must contain name and content properties'));

lib/generators/groovy/jaxrsInterface.js

@@ -24,3 +24,3 @@ var commonHelpers, customAdapter, generator, parseResource, utilSchemas, _;
 generator.parser = function(data) {
-  var first, k, methodParse, model, options, parsed, resource, resourceGroup, schemas, v, _i, _len, _ref;
+  var first, k, methodParse, model, options, parsed, resource, resourceGroup, result, schemas, v, version, _i, _len, _ref;
   parsed = [];
@@ -68,6 +68,6 @@ schemas = utilSchemas.loadSchemas(data);
     model.methods = v;
-    parsed.push({
-      name: "" + data.version + "/" + model.className + ".groovy",
-      model: model
-    });
+    result = {};
+    version = data.version ? "" + data.version + "/" : "";
+    result["" + version + model.className + ".groovy"] = model;
+    parsed.push(result);
   }
@@ -74,0 +74,0 @@ return parsed;

lib/generators/groovy/pojo.js

@@ -1,64 +0,16 @@
-var commonHelpers, deref, generator, utilMapProperty, utilSchemas, utilText;
+var originalParser, schema2groovy, utilSchemas;
 
-commonHelpers = require("../helpers/common").helpers();
+schema2groovy = require('json-schema-2-groovy-pojo/lib/generators/pojo');
 
-utilText = require('../util/text');
-
 utilSchemas = require('../util/schemas');
 
-utilMapProperty = require('../util/mapProperty');
+console.log(schema2groovy);
 
-generator = {};
+originalParser = schema2groovy.parser;
 
-generator.helpers = commonHelpers;
-
-generator.template = require("./tmpl/pojo.hbs");
-
-generator.partials = {
-  classMembers: require("./tmpl/classMembersPartial.hbs")
+schema2groovy.parser = function(datos) {
+  datos.schemas = utilSchemas.loadSchemas(datos);
+  return originalParser(datos);
 };
 
-deref = require('deref')();
-
-generator.parser = function(datos) {
-  var mapping, model, normSchema, parsed, schema, schemas, someData, _base, _i, _len, _ref;
-  mapping = {
-    'string': "String",
-    'boolean': "Boolean",
-    'number': "BigDecimal",
-    'integer': "Long",
-    'array': "List",
-    'object': "Map",
-    'file': "InputStream"
-  };
-  parsed = [];
-  schemas = utilSchemas.loadSchemas(datos);
-  if (datos.extra) {
-    datos.extra["package"] = "" + datos.extra["package"] + "." + datos.version;
-    if ((_base = datos.extra).enableAnnotations == null) {
-      _base.enableAnnotations = true;
-    }
-  }
-  for (_i = 0, _len = schemas.length; _i < _len; _i++) {
-    schema = schemas[_i];
-    normSchema = deref(schema, schemas);
-    model = {};
-    model.className = utilText.capitalize(normSchema.title);
-    model.classDescription = (_ref = normSchema.description) != null ? _ref : "";
-    someData = utilMapProperty.mapProperties(normSchema, deref.refs, mapping);
-    model.classMembers = someData.classMembers;
-    model.innerClasses = someData.innerClasses;
-    model.extra = datos.extra;
-    if (someData.classMembers.length > 0) {
-      parsed.push({
-        name: datos.version + ("/" + model.className + ".groovy"),
-        model: model
-      });
-    } else {
-      console.log("----> " + model.className + ".groovy is too abstract to create a file using List or Map");
-    }
-  }
-  return parsed;
-};
-
-module.exports = generator;
+module.exports = schema2groovy;

lib/generators/java/retrofitClient.js

@@ -37,3 +37,3 @@ var arrayFromMask, commonHelpers, customAdapter, generator, parseResource, resolveArrayByMask, utilSchemas, utilText, _;
 generator.parser = function(data) {
-  var arg, d, method, methodParse, methodParsePermuted, model, name, newArgs, notReqArgs, options, parsed, permutations, permuted, reqArgs, resource, schemas, shallowMethod, _i, _j, _k, _len, _len1, _len2, _ref;
+  var arg, d, method, methodParse, methodParsePermuted, model, name, newArgs, notReqArgs, options, parsed, permutations, permuted, reqArgs, resource, result, schemas, shallowMethod, version, _i, _j, _k, _len, _len1, _len2, _ref;
   parsed = [];
@@ -102,7 +102,7 @@ schemas = utilSchemas.loadSchemas(data);
   }
+  result = {};
+  version = data.version ? "" + data.version + "/" : "";
   model.className = data.title.split(" ").join("");
-  parsed.push({
-    name: "" + data.version + "/" + model.className + ".java",
-    model: model
-  });
+  result["" + version + model.className + ".java"] = model;
+  parsed.push(result);
   return parsed;
@@ -109,0 +109,0 @@ };

lib/generators/javascript/jsClient.js

@@ -34,3 +34,3 @@ var camelCase, context, defaultHelpers, extend, generator, helpers, languages;
 generator.parser = function(data) {
-  var model, parsed, spec;
+  var model, parsed, result, spec, version;
   parsed = [];
@@ -43,6 +43,6 @@ spec = {
   model = context(data, spec);
-  parsed.push({
-    name: model.version + ("/" + (camelCase(model.title)) + "Client.js"),
-    model: model
-  });
+  result = {};
+  version = data.version ? "" + data.version + "/" : "";
+  result["" + version + (camelCase(model.title)) + "Client.js"] = model;
+  parsed.push(result);
   return parsed;
@@ -49,0 +49,0 @@ };

package.json

 {
   "name": "raml2code",
-  "version": "0.8.39",
+  "version": "0.8.40",
   "description": "Raml spec to code",
@@ -26,3 +26,3 @@ "main": "index.js",
   "dependencies": {
-    "data2code": "0.0.3",
+    "data2code": "0.0.4",
     "gulp-util": "3.0.1",
@@ -33,2 +33,3 @@ "raml-parser": "0.8.7",
     "deref": "0.2.6",
+    "json-schema-2-groovy-pojo": "0.0.3",
     "raml-client-generator" : "0.0.6"
@@ -35,0 +36,0 @@ },

ReleaseNotes.md

-## 0.8.39
-Fixing issue #4
-
-## 0.8.38
-Changing Versioning, adding support to generate a js client
-
-- Moving retrofit client to src/generators/java this could break some already setup projects
-- Now it generates jsClient it uses [raml-client-generator](https://github.com/mulesoft/raml-client-generator)
-- Updating data2code to 0.0.3
-
-## 0.0.37
-Adding support to optional properties for retrofit client, now it generates a permutations of the methods with the optional arguments
-
-- Refactor on util.js
-- Some test where change to support the new properties

No alert changes

Worsened metrics

Total package byte prevSize

32909

-3.09%

Dependency count

8

14.29%

Lines of code

727

-5.46%

Dependency changes

• + Added

  json-schema-2-groovy-pojo@0.0.3

• + Added

  data2code@0.0.4
  (transitive)

• + Added

  json-schema-2-groovy-pojo@0.0.3
  (transitive)

• + Added

  json-schema-java-mapper-utils@0.0.6
  (transitive)

• + Added

  pascal-case@1.1.0
  (transitive)

• - Removed

  data2code@0.0.3
  (transitive)

• - Removed

  pascal-case@1.1.2
  (transitive)

• Updated

  data2code@0.0.4