From c5ba9d529c88f5b04f047ea97428315cbe9089dc Mon Sep 17 00:00:00 2001
From: bertrand <bpinel@ippon.fr>
Date: Sun, 25 Nov 2018 18:59:53 +0100
Subject: [PATCH] Add new default blueprint for detecting proxy flag
---
README.md | 12 +++++-
blueprints/ember-aws-ehipster/index.js | 55 ++++++++++++++++++++++++++
blueprints/entity-factory/index.js | 6 +--
package.json | 2 +-
4 files changed, 69 insertions(+), 6 deletions(-)
create mode 100644 blueprints/ember-aws-ehipster/index.js
diff --git a/README.md b/README.md
index 6dad1bb..18a0394 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,9 @@
ember-aws-ehipster
==============================================================================
-[Short description of the addon.]
+This addon simplify the generation of code for model build with JDL Studio https://start.jhipster.tech/jdl-studio/
+It also guide you to set up a JSON-API server on top of AWS API Gateway, Lambda and DynamoDB.
+
Installation
------------------------------------------------------------------------------
@@ -14,8 +16,14 @@ ember install ember-aws-ehipster
Usage
------------------------------------------------------------------------------
-[Longer description of how to use the addon in apps.]
+For generating a application, first use the standard command :
+ ember new test-ember-aws-ehipster --no-welcome
+ cd test-ember-aws-ehipster
+ ember install ember-aws-ehipster
+Then generate a few entity through provided blueprints using the same syntax as the model blueprint :
+ ember g entity-factory blog title:string content:string order:number isVisible:boolean
+ ember g entity-factory post title:string content:string order:number visible:boolean
Contributing
------------------------------------------------------------------------------
diff --git a/blueprints/ember-aws-ehipster/index.js b/blueprints/ember-aws-ehipster/index.js
new file mode 100644
index 0000000..5cd364b
--- /dev/null
+++ b/blueprints/ember-aws-ehipster/index.js
@@ -0,0 +1,55 @@
+const EOL = require('os').EOL;
+const path = require('path');
+const fs = require('fs');
+
+/* eslint-env node */
+module.exports = {
+ description: '',
+
+ normalizeEntityName() {}, // no argument
+
+ // locals(options) {
+ // // Return custom template variables here.
+ // return {
+ // foo: options.entity.options.foo
+ // };
+ // }
+
+ afterInstall(options) {
+ // Perform extra work here.
+ // Add proxy check to config/environment.js
+ let configPath = (options.dummy) ? "tests/dummy/config/environment.js" : "config/environment.js";
+
+ let proxy = "\nfunction usingProxy() {\n"+
+ "\tvar usingProxyArg = !!process.argv.filter(function (arg) {\n"+
+ "\t\treturn arg.indexOf('--proxy') === 0 || arg.indexOf('-pr') === 0 || arg.indexOf('-pxy') === 0;\n"+
+ "\t}).length;\n\n"+
+ "\tvar hasGeneratedProxies = false;\n"+
+ "\tvar proxiesDir = process.env.PWD + '/server/proxies';\n"+
+ "\ttry {\n"+
+ "\t\tfs.lstatSync(proxiesDir);\n"+
+ "\t\thasGeneratedProxies = true;\n"+
+ "\t} catch (e) {}\n\n"+
+ "\treturn usingProxyArg || hasGeneratedProxies;\n}\n";
+ addLineToFile(this, configPath, /'use strict';/, proxy);
+ addLineToFile(this, configPath, /when it is created/, "\t\tproxy: usingProxy(),");
+ }
+};
+
+function addLineToFile(ctx, filePath, markerString, addedLine) {
+ let fileContents = fs.readFileSync(filePath, 'utf-8');
+
+ if (fileContents.indexOf(addedLine) === -1) {
+ ctx.ui.writeLine("\tAdd line "+addedLine+" to file "+filePath);
+ fileContents = fileContents.replace(markerString, [
+ '$&',
+ addedLine,
+ ].join('\n'));
+ }
+ if (fileContents.indexOf(addedLine) === -1) {
+ ctx.ui.writeWarnLine(
+ 'Unable to update '+filePath+'. You should update this file manually.');
+ } else {
+ fs.writeFileSync(filePath, fileContents, 'utf-8');
+ }
+}
diff --git a/blueprints/entity-factory/index.js b/blueprints/entity-factory/index.js
index 6d629b1..6f70157 100644
--- a/blueprints/entity-factory/index.js
+++ b/blueprints/entity-factory/index.js
@@ -161,7 +161,8 @@ module.exports = {
// Complete /mirage/config.js
let mirageConfigPath = (options.dummy) ? "tests/dummy/mirage/config.js" : "mirage/config.js";
- let configLine = "\t\tthis.get('/"+inflection.pluralize(entityName)+"', '"+inflection.pluralize(entityName)+"');"
+ let configLine = "\t\tthis.get('/"+inflection.pluralize(entityName)+"', '"+inflection.pluralize(entityName)+"');\n"+
+ "\t\tthis.post('/"+inflection.pluralize(entityName)+"');";
if (!fs.existsSync(mirageConfigPath)) {
this.ui.writeLine("Creating file "+mirageConfigPath);
let configContent = "import ENV from './../config/environment';\n"+
@@ -171,8 +172,7 @@ module.exports = {
"\t\tthis.passthrough();\n\t}\n}\n";
fs.writeFileSync(mirageConfigPath, configContent, 'utf-8','w+');
} else {
- //addLineToFile(this, mirageConfigPath, /this\.namespace = \'\';/, configLine);
- addLineToFile(this, mirageConfigPath, /if \(ENV\.APP\.proxy\) {/, configLine);
+ addLineToFile(this, mirageConfigPath, /if \(!ENV\.APP\.proxy\) {/, configLine);
}
// Add route in router.js for the entity page
diff --git a/package.json b/package.json
index e1f9e36..b088e51 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "ember-aws-ehipster",
- "version": "0.0.6",
+ "version": "0.1.1",
"description": "The default blueprint for ember-cli addons.",
"keywords": [
"ember-addon"
--
GitLab