Swagger Examples E2E tests fail...

.gitignore

@@ -56,3 +56,4 @@ lib/
 .DS_Store
 deploy-script.sh
 coverage/
+.nyc_output/

README.md

@@ -94,6 +94,9 @@ API-Flow is one of the main components of [Console.REST](https://github.com/luck
 PRs are welcomed!
 Our sole requirement is that organizations that want to extend API-Flow to support their format write both a parser and a serializer, and not simply a serializer.
 
+## Documentation
+You can find more information about the internal structure of API-Flow in [src](https://github.com/luckymarmot/API-Flow/tree/develop/src). We've also created a set of templates to help speed up the extension process: [loader](https://github.com/luckymarmot/API-Flow/tree/develop/src/loaders/template/v1.0), [parser](https://github.com/luckymarmot/API-Flow/tree/develop/src/parsers/template/v1.0/), and [environment](https://github.com/luckymarmot/API-Flow/tree/develop/src/environments/template)
+
 ## License
 
 This repository is released under the [MIT License](LICENSE). Feel free to fork, and modify!

configs/node/api-flow-config.js

@@ -2,28 +2,34 @@ import Environment from '../../src/environments/node/Environment'
 
 import SwaggerLoader from '../../src/loaders/swagger/Loader'
 import RAMLLoader from '../../src/loaders/raml/Loader'
+import PostmanV2Loader from '../../src/loaders/postman/v2.0/Loader'
 
 import SwaggerV2Parser from '../../src/parsers/swagger/v2.0/Parser'
 import RAMLV1Parser from '../../src/parsers/raml/v1.0/Parser'
+import PostmanV2Parser from '../../src/loaders/postman/v2.0/Parser'
 
 import SwaggerV2Serializer from '../../src/serializers/swagger/v2.0/Serializer'
 import RAMLV1Serializer from '../../src/serializers/raml/v1.0/Serializer'
+import PostmanV2Serializer from '../../src/serializers/postman/v2.0/Serializer'
 import InternalSerializer from '../../src/serializers/internal/Serializer'
 
 export const loaders = [
   SwaggerLoader,
-  RAMLLoader
+  RAMLLoader,
+  PostmanV2Loader
 ]
 
 export const parsers = [
   SwaggerV2Parser,
-  RAMLV1Parser
+  RAMLV1Parser,
+  PostmanV2Parser
 ]
 
 export const serializers = [
   SwaggerV2Serializer,
   RAMLV1Serializer,
-  InternalSerializer
+  InternalSerializer,
+  PostmanV2Serializer
 ]
 
 export const environment = Environment

configs/paw/generators/postman2/api-flow-config.js

@@ -21,7 +21,7 @@ export const serializers = [
 export const target = {
   identifier: 'com.luckymarmot.PawExtensions.PostmanCollectionGenerator',
   title: 'PostmanCollectionGenerator',
-  humanTitle: 'Postman Collection v2.0',
+  humanTitle: 'Postman Collection 2.0',
   format: PostmanV2Serializer.__meta__.format,
   version: PostmanV2Serializer.__meta__.version
 }

configs/paw/generators/raml1/api-flow-config.js

@@ -21,7 +21,7 @@ export const serializers = [
 export const target = {
   identifier: 'com.luckymarmot.PawExtensions.RAML1Generator',
   title: 'RAML1Generator',
-  humanTitle: 'RAML v1.0',
+  humanTitle: 'RAML 1.0',
   format: RAMLV1Serializer.__meta__.format,
   version: RAMLV1Serializer.__meta__.version
 }

configs/paw/generators/swagger/api-flow-config.js

@@ -21,7 +21,7 @@ export const serializers = [
 export const target = {
   identifier: 'com.luckymarmot.PawExtensions.SwaggerGenerator',
   title: 'SwaggerGenerator',
-  humanTitle: 'Swagger v2.0',
+  humanTitle: 'Swagger 2.0',
   format: SwaggerV2Serializer.__meta__.format,
   version: SwaggerV2Serializer.__meta__.version
 }

configs/paw/importers/Importer.js

@@ -11,7 +11,7 @@ const methods = {}
 @registerImporter // eslint-disable-line
 class SwaggerImporter {
   static identifier = source.identifier
-  static title = source.title
+  static title = source.humanTitle
 
   static fileExtensions = [];
 

configs/paw/importers/postman2/api-flow-config.js

@@ -21,6 +21,7 @@ export const serializers = [
 export const source = {
   identifier: 'com.luckymarmot.PawExtensions.PostmanCollectionV2Importer',
   title: 'PostmanCollectionV2Importer',
+  humanTitle: 'Postman Collection 2.0 Importer',
   format: PostmanCollectionV2Parser.__meta__.format,
   version: PostmanCollectionV2Parser.__meta__.version
 }

configs/paw/importers/raml1/api-flow-config.js

@@ -21,6 +21,7 @@ export const serializers = [
 export const source = {
   identifier: 'com.luckymarmot.PawExtensions.RAML1Importer',
   title: 'RAML1Importer',
+  humanTitle: 'RAML 1.0 Importer',
   format: RAMLV1Parser.__meta__.format,
   version: RAMLV1Parser.__meta__.version
 }

configs/paw/importers/swagger/api-flow-config.js

@@ -21,6 +21,7 @@ export const serializers = [
 export const source = {
   identifier: 'com.luckymarmot.PawExtensions.SwaggerImporter',
   title: 'SwaggerImporter',
+  humanTitle: 'Swagger 2.0 Importer',
   format: SwaggerV2Parser.__meta__.format,
   version: SwaggerV2Parser.__meta__.version
 }

configs/web/api-flow-config.js

@@ -2,28 +2,34 @@ import Environment from '../../src/environments/web/Environment'
 
 import SwaggerLoader from '../../src/loaders/swagger/Loader'
 import RAMLLoader from '../../src/loaders/raml/Loader'
+import PostmanV2Loader from '../../src/loaders/postman/v2.0/Loader'
 
 import SwaggerV2Parser from '../../src/parsers/swagger/v2.0/Parser'
 import RAMLV1Parser from '../../src/parsers/raml/v1.0/Parser'
+import PostmanV2Parser from '../../src/loaders/postman/v2.0/Parser'
 
 import SwaggerV2Serializer from '../../src/serializers/swagger/v2.0/Serializer'
 import RAMLV1Serializer from '../../src/serializers/raml/v1.0/Serializer'
+import PostmanV2Serializer from '../../src/serializers/postman/v2.0/Serializer'
 import InternalSerializer from '../../src/serializers/internal/Serializer'
 
 export const loaders = [
   SwaggerLoader,
-  RAMLLoader
+  RAMLLoader,
+  PostmanV2Loader
 ]
 
 export const parsers = [
   SwaggerV2Parser,
-  RAMLV1Parser
+  RAMLV1Parser,
+  PostmanV2Parser
 ]
 
 export const serializers = [
   SwaggerV2Serializer,
   RAMLV1Serializer,
-  InternalSerializer
+  InternalSerializer,
+  PostmanV2Serializer
 ]
 
 export const environment = Environment

configs/webworker/api-flow-config.js

@@ -2,28 +2,34 @@ import Environment from '../../src/environments/web/Environment'
 
 import SwaggerLoader from '../../src/loaders/swagger/Loader'
 import RAMLLoader from '../../src/loaders/raml/Loader'
+import PostmanV2Loader from '../../src/loaders/postman/v2.0/Loader'
 
 import SwaggerV2Parser from '../../src/parsers/swagger/v2.0/Parser'
 import RAMLV1Parser from '../../src/parsers/raml/v1.0/Parser'
+import PostmanV2Parser from '../../src/loaders/postman/v2.0/Parser'
 
 import SwaggerV2Serializer from '../../src/serializers/swagger/v2.0/Serializer'
 import RAMLV1Serializer from '../../src/serializers/raml/v1.0/Serializer'
+import PostmanV2Serializer from '../../src/serializers/postman/v2.0/Serializer'
 import InternalSerializer from '../../src/serializers/internal/Serializer'
 
 export const loaders = [
   SwaggerLoader,
-  RAMLLoader
+  RAMLLoader,
+  PostmanV2Loader
 ]
 
 export const parsers = [
   SwaggerV2Parser,
-  RAMLV1Parser
+  RAMLV1Parser,
+  PostmanV2Parser
 ]
 
 export const serializers = [
   SwaggerV2Serializer,
   RAMLV1Serializer,
-  InternalSerializer
+  InternalSerializer,
+  PostmanV2Serializer
 ]
 
 export const environment = Environment

package.json

@@ -22,6 +22,7 @@
     "babel-plugin-transform-flow-strip-types": "6.3.15",
     "babel-polyfill": "6.3.14",
     "babel-runtime": "6.3.19",
+    "drafter.js": "^2.6.6",
     "immutable": "^3.8.1",
     "js-yaml": "3.5.5",
     "json-schema-faker": "^0.3.7",

scripts/pack.sh

@@ -11,9 +11,13 @@ do
   echo "extension: $extension"
   if [ -d "$extension" ]
   then
+    cd "$extension/.."
+    echo "in $extension --- $(ls)"
     package=$(echo "$extension" | sed -E 's-.*/([^/]+)-\1-')
-    zip -r "$package.zip" "$extension/";
+    echo "package --- $package"
+    zip -r "$package.zip" "./$package";
     mv "./$package.zip" "$base/releases/paw/";
+    cd "$base"
   fi;
 done;
 cd "$base"

src/api-flow-config.js

@@ -14,6 +14,7 @@ import SwaggerV2Serializer from './serializers/swagger/v2.0/Serializer'
 import RAMLV1Serializer from './serializers/raml/v1.0/Serializer'
 import InternalSerializer from './serializers/internal/Serializer'
 import PostmanV2Serializer from './serializers/postman/v2.0/Serializer'
+import ApiBlueprint1ASerializer from './serializers/api-blueprint/1A/Serializer'
 
 export const loaders = [
   SwaggerLoader,
@@ -33,7 +34,8 @@ export const serializers = [
   SwaggerV2Serializer,
   RAMLV1Serializer,
   InternalSerializer,
-  PostmanV2Serializer
+  PostmanV2Serializer,
+  ApiBlueprint1ASerializer
 ]
 
 export const environment = Environment

src/loaders/internal/Loader.js

@@ -70,11 +70,12 @@ methods.parseJSON = (str) => {
 
 methods.resolve = (options, uri, { $ref = '' } = {}) => {
   const uriToLoad = resolve(uri, $ref)
-  if (parse(uriToLoad).protocol === 'file:') {
-    return options.fsResolver.resolve(uriToLoad.split('#')[0])
+  const protocol = parse(uriToLoad).protocol
+  if (protocol && protocol.substr(0, 4) === 'http') {
+    return options.httpResolver.resolve(uriToLoad.split('#')[0])
   }
 
-  return options.httpResolver.resolve(uriToLoad.split('#')[0])
+  return options.fsResolver.resolve(uriToLoad.split('#')[0])
 }
 
 

src/loaders/postman/v2.0/Loader.js

@@ -87,11 +87,11 @@ methods.isParsable = (content) => {
 methods.resolve = (options, uri, { $ref = '' } = {}) => {
   const uriToLoad = resolve(uri, $ref)
   const protocol = parse(uriToLoad).protocol
-  if (protocol === 'file:' || protocol === 'file') {
-    return options.fsResolver.resolve(uriToLoad.split('#')[0])
+  if (protocol && protocol.substr(0, 4) === 'http') {
+    return options.httpResolver.resolve(uriToLoad.split('#')[0])
   }
 
-  return options.httpResolver.resolve(uriToLoad.split('#')[0])
+  return options.fsResolver.resolve(uriToLoad.split('#')[0])
 }
 
 methods.normalizeRequestItem = (item) => {

src/loaders/swagger/Loader.js

@@ -122,11 +122,12 @@ methods.traverse = (content, { $ref = '#/' } = {}) => {
 
 methods.resolve = (options, uri, { $ref = '' } = {}) => {
   const uriToLoad = resolve(uri, $ref)
-  if (parse(uriToLoad).protocol === 'file:') {
-    return options.fsResolver.resolve(uriToLoad.split('#')[0])
+  const protocol = parse(uriToLoad).protocol
+  if (protocol && protocol.substr(0, 4) === 'http') {
+    return options.httpResolver.resolve(uriToLoad.split('#')[0])
   }
 
-  return options.httpResolver.resolve(uriToLoad.split('#')[0])
+  return options.fsResolver.resolve(uriToLoad.split('#')[0])
 }
 
 methods.objectMap = (obj, func) => {
@@ -159,9 +160,22 @@ methods.fixRemotePaths = (options, uri, swagger) => {
   })
 }
 
+methods.fixImplicitHost = (uri) => {
+  if (!uri) {
+    return 'localhost'
+  }
+
+  const host = parse(uri).host
+  if (!host) {
+    return 'localhost'
+  }
+
+  return host
+}
+
 methods.fixImplicitUriReferences = (options, uri, swagger) => {
   if (!swagger.host) {
-    swagger.host = uri ? parse(uri).host : 'localhost'
+    swagger.host = methods.fixImplicitHost(uri)
   }
 
   if (!swagger.schemes || !swagger.schemes.length) {

src/loaders/template/v1.0/Loader.js

@@ -125,11 +125,11 @@ methods.isParsable = (content) => {
 methods.resolve = (options, uri, { $ref = '' } = {}) => {
   const uriToLoad = resolve(uri, $ref)
   const protocol = parse(uriToLoad).protocol
-  if (protocol === 'file:' || protocol === 'file' || !protocol) {
-    return options.fsResolver.resolve(uriToLoad.split('#')[0])
+  if (protocol && protocol.substr(0, 4) === 'http') {
+    return options.httpResolver.resolve(uriToLoad.split('#')[0])
   }
 
-  return options.httpResolver.resolve(uriToLoad.split('#')[0])
+  return options.fsResolver.resolve(uriToLoad.split('#')[0])
 }
 
 /**