raml2code - npm Package Compare versions

Comparing version 0.0.11 to 0.0.12

lib/generators/groovy/jaxrsInterface.js

@@ -40,2 +40,3 @@ var commonHelpers, dirname, fs, generator, path, template, util, _;
   });
+  data.extra["package"] = "" + data.extra["package"] + "." + data.version;
   for (k in resourceGroup) {
@@ -52,3 +53,3 @@ v = resourceGroup[k];
     parsed.push({
-      name: model.className + ".groovy",
+      name: "" + data.version + "/" + model.className + ".groovy",
       model: model
@@ -55,0 +56,0 @@ });

lib/generators/groovy/pojo.js

@@ -1,2 +0,2 @@
-var capitalize, commonHelpers, dirname, fs, generator, path, sanitize, template, util;
+var commonHelpers, dirname, fs, generator, path, sanitize, template, util;
 
@@ -21,6 +21,2 @@ fs = require('fs');
 
-capitalize = function(str) {
-  return str.charAt(0).toUpperCase() + str.slice(1);
-};
-
 sanitize = function(str) {
@@ -31,3 +27,3 @@ var aux, res;
   aux.forEach(function(it) {
-    return res += capitalize(it);
+    return res += util.capitalize(it);
   });
@@ -40,2 +36,3 @@ return res;
   parsed = [];
+  datos.extra["package"] = "" + datos.extra["package"] + "." + datos.version;
   _ref = datos.schemas;
@@ -52,3 +49,3 @@ for (_i = 0, _len = _ref.length; _i < _len; _i++) {
         ref = data.items['$ref'].replace("#/", "").split(".")[0];
-        ref = capitalize(ref);
+        ref = util.capitalize(ref);
         model.classMembers.push({
@@ -67,3 +64,3 @@ name: "items",
       parsed.push({
-        name: capitalize("" + (sanitize(schemaName)) + ".groovy"),
+        name: datos.version + "/" + util.capitalize("" + (sanitize(schemaName)) + ".groovy"),
         model: model
@@ -70,0 +67,0 @@ });

lib/generators/groovy/retrofitClient.js

@@ -43,3 +43,3 @@ var commonHelpers, dirname, fs, generator, path, template, util;
   parsed.push({
-    name: model.className + ".java",
+    name: "" + data.version + "/" + model.className + ".java",
     model: model
@@ -46,0 +46,0 @@ });

lib/generators/groovy/tmpl/retrofitClient.hbs

@@ -16,3 +16,3 @@ package {{extra.package}};
 
-interface {{{className}}} {
+public interface {{{className}}} {
 
@@ -19,0 +19,0 @@ {{#methods}}

lib/generators/groovy/util.js

@@ -120,2 +120,6 @@ var util;
 
+util.capitalize = function(str) {
+  return str.charAt(0).toUpperCase() + str.slice(1);
+};
+
 module.exports = util;

package.json

 {
   "name": "raml2code",
-  "version": "0.0.11",
+  "version": "0.0.12",
   "description": "Raml spec to code",
@@ -5,0 +5,0 @@ "main": "index.js",

src/generators/groovy/jaxrsInterface.coffee

@@ -28,2 +28,3 @@ fs = require('fs')
 
+  data.extra.package = "#{data.extra.package}.#{data.version}"
   for k,v of resourceGroup
@@ -36,3 +37,3 @@ model = {}
     model.methods = v
-    parsed.push {name: model.className + ".groovy" , model}
+    parsed.push {name: "#{data.version}/#{model.className}.groovy" , model}
   parsed
@@ -39,0 +40,0 @@

src/generators/groovy/pojo.coffee

@@ -12,4 +12,2 @@ fs = require('fs')
 
-capitalize = (str)->
-  str.charAt(0).toUpperCase() + str.slice(1)
 
@@ -20,3 +18,3 @@ sanitize = (str)->
   aux.forEach (it)->
-    res += capitalize(it)
+    res += util.capitalize(it)
   res
@@ -26,2 +24,3 @@
   parsed = []
+  datos.extra.package = "#{datos.extra.package}.#{datos.version}"
   for row in datos.schemas
@@ -37,3 +36,3 @@ for schemaName of row
         ref = data.items['$ref'].replace("#/", "").split(".")[0]
-        ref = capitalize(ref)
+        ref = util.capitalize(ref)
         model.classMembers.push {name: "items", type: "List<#{ref}>"}
@@ -44,3 +43,3 @@ for key of data.properties
       model.extra = datos.extra if datos.extra
-      parsed.push {name: capitalize("#{sanitize(schemaName)}.groovy") , model}
+      parsed.push {name: datos.version + "/" + util.capitalize("#{sanitize(schemaName)}.groovy") , model}
   parsed
@@ -47,0 +46,0 @@

src/generators/groovy/retrofitClient.coffee

@@ -28,5 +28,5 @@ fs = require('fs')
   model.className = data.title.split(" ").join("")
-  parsed.push {name: model.className + ".java" , model}
+  parsed.push {name: "#{data.version}/#{model.className}.java" , model}
   parsed
 
 module.exports = generator

src/generators/groovy/tmpl/retrofitClient.hbs

@@ -16,3 +16,3 @@ package {{extra.package}};
 
-interface {{{className}}} {
+public interface {{{className}}} {
 
@@ -19,0 +19,0 @@ {{#methods}}

src/generators/groovy/util.coffee

@@ -81,3 +81,5 @@ util = {}
 
+util.capitalize = (str)->
+  str.charAt(0).toUpperCase() + str.slice(1)
 
 module.exports = util

test/examples/CatDTO.groovy

@@ -1,2 +0,2 @@
-package org.gex
+package org.gex.v1
 import groovy.transform.*
@@ -3,0 +3,0 @@ /**

test/examples/GatitosApi.java

@@ -14,3 +14,3 @@ package org.gex.client;
 
-interface GatitosAPI {
+public interface GatitosAPI {
 
@@ -17,0 +17,0 @@ @GET("/v1/cats")

test/examples/GatitosResource.groovy

@@ -1,2 +0,2 @@
-package org.gex
+package org.gex.v1
 import javax.ws.rs.*
@@ -3,0 +3,0 @@ import javax.ws.rs.core.*

test/groovy/jasrxInterface-spec.js

@@ -28,3 +28,3 @@ var raml2code =require('../..');
       var content = file.contents.toString('utf8');
-      if(file.path == 'GatitosResource.groovy'){
+      if(file.path == 'v1/GatitosResource.groovy'){
 
@@ -31,0 +31,0 @@ wrapAssertion(function () {

test/groovy/pojo-spec.js

@@ -28,3 +28,3 @@ var raml2code =require('../..');
     raml2codeInstance.on('data', function(file){
-      if(file.path == 'Cat.groovy'){
+      if(file.path == 'v1/Cat.groovy'){
         wrapAssertion(function () {
@@ -31,0 +31,0 @@ file.isBuffer().should.equal(true);

test/groovy/retrofitClient-spec.js

@@ -29,3 +29,3 @@ var raml2code =require('../..');
 
-       if(file.path == 'GatitosAPI.java'){
+       if(file.path == 'v1/GatitosAPI.java'){
         wrapAssertion(function () {
@@ -32,0 +32,0 @@ file.isBuffer().should.equal(true);

No alert changes

Improved metrics

Total package byte prevSize

35317

1.36%

Lines of code

663

0.3%

No dependency changes