Merge branch 'develop' into feature/no-null-postman-header-value

luckymarmot · Dec 6, 2017 · b836f28 · b836f28
2 parents 02508d3 + 376bcf4
commit b836f28
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 23 deletions.
diff --git a/README.md b/README.md
@@ -95,7 +95,7 @@ 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)
+You can find more information about the internal structure of API-Flow in [src](https://github.com/JonathanMontane/API-Flow/tree/develop/src). We've also created a set of templates to help speed up the extension process: [loader](https://github.com/JonathanMontane/API-Flow/tree/develop/src/loaders/template/v1.0), [parser](https://github.com/JonathanMontane/API-Flow/tree/develop/src/parsers/template/v1.0/), and [environment](https://github.com/JonathanMontane/API-Flow/tree/develop/src/environments/template)
 
 ## License
 
@@ -104,4 +104,4 @@ Copyright © 2016 Paw Inc.
 
 ## Contributors
 
-See [Contributors](https://github.com/luckymarmot/API-Flow/graphs/contributors).
+See [Contributors](https://github.com/JonathanMontane/API-Flow/graphs/contributors).
diff --git a/configs/node/api-flow-config.js b/configs/node/api-flow-config.js
@@ -1,35 +1,35 @@
 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 RAMLV1Loader from '../../src/loaders/raml/Loader'
+import PostmanCollectionV2Loader 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 PostmanCollectionV2Parser from '../../src/parsers/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 PostmanCollectionV2Serializer from '../../src/serializers/postman/v2.0/Serializer'
 import InternalSerializer from '../../src/serializers/internal/Serializer'
 
 export const loaders = [
   SwaggerLoader,
   RAMLLoader,
-  PostmanV2Loader
+  PostmanCollectionV2Loader
 ]
 
 export const parsers = [
   SwaggerV2Parser,
   RAMLV1Parser,
-  PostmanV2Parser
+  PostmanCollectionV2Parser
 ]
 
 export const serializers = [
   SwaggerV2Serializer,
   RAMLV1Serializer,
   InternalSerializer,
-  PostmanV2Serializer
+  PostmanCollectionV2Serializer
 ]
 
 export const environment = Environment
diff --git a/configs/web/api-flow-config.js b/configs/web/api-flow-config.js
@@ -2,21 +2,21 @@ 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 PostmanCollectionV2Loader 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 PostmanCollectionV2Parser from '../../src/parsers/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 PostmanCollectionV2Serializer from '../../src/serializers/postman/v2.0/Serializer'
 import InternalSerializer from '../../src/serializers/internal/Serializer'
 
 export const loaders = [
   SwaggerLoader,
   RAMLLoader,
-  PostmanV2Loader
+  PostmanCollectionV2Loader
 ]
 
 export const parsers = [
@@ -29,7 +29,7 @@ export const serializers = [
   SwaggerV2Serializer,
   RAMLV1Serializer,
   InternalSerializer,
-  PostmanV2Serializer
+  PostmanCollectionV2Serializer
 ]
 
 export const environment = Environment
diff --git a/configs/webworker/api-flow-config.js b/configs/webworker/api-flow-config.js
@@ -2,34 +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 PostmanCollectionV2Loader 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 PostmanCollectionV2Parser from '../../src/parsers/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 PostmanCollectionV2Serializer from '../../src/serializers/postman/v2.0/Serializer'
 import InternalSerializer from '../../src/serializers/internal/Serializer'
 
 export const loaders = [
   SwaggerLoader,
   RAMLLoader,
-  PostmanV2Loader
+  PostmanCollectionV2Loader
 ]
 
 export const parsers = [
   SwaggerV2Parser,
   RAMLV1Parser,
-  PostmanV2Parser
+  PostmanCollectionV2Parser
 ]
 
 export const serializers = [
   SwaggerV2Serializer,
   RAMLV1Serializer,
   InternalSerializer,
-  PostmanV2Serializer
+  PostmanCollectionV2Serializer
 ]
 
 export const environment = Environment
diff --git a/configs/webworker/webpack.config.babel.js b/configs/webworker/webpack.config.babel.js
@@ -4,7 +4,7 @@ const config = {
   target: 'webworker',
   entry: path.resolve(__dirname, './api-flow.js'),
   output: {
-    path: path.resolve(__dirname, '../../../dist/node/'),
+    path: path.resolve(__dirname, '../../../dist/webworker/'),
     filename: 'api-flow.js',
     libraryTarget: 'umd'
   },

diff --git a/src/api-flow-config.js b/src/api-flow-config.js
@@ -13,7 +13,7 @@ import PostmanCollectionV2Parser from './parsers/postman/v2.0/Parser'
 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 PostmanCollectionV2Serializer from './serializers/postman/v2.0/Serializer'
 import ApiBlueprint1ASerializer from './serializers/api-blueprint/1A/Serializer'
 
 export const loaders = [
@@ -34,7 +34,7 @@ export const serializers = [
   SwaggerV2Serializer,
   RAMLV1Serializer,
   InternalSerializer,
-  PostmanV2Serializer,
+  PostmanCollectionV2Serializer,
   ApiBlueprint1ASerializer
 ]