Skip to content

Commit

Permalink
Merge pull request #88 from apiaryio/honzajavorek/upgrade-minim
Browse files Browse the repository at this point in the history
Upgrade minim, fury.js, and fury adapters
  • Loading branch information
Michal Holasek committed Aug 16, 2017
2 parents e8b3c40 + 7f6f62e commit 0f48cc5
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 11 deletions.
8 changes: 4 additions & 4 deletions package.json
Expand Up @@ -22,10 +22,10 @@
"dependencies": {
"caseless": "^0.12.0",
"clone": "^2.1.1",
"fury": "3.0.0-beta.3",
"fury-adapter-apib-parser": "0.8.0",
"fury-adapter-swagger": "0.12.0",
"minim": "0.18.1",
"fury": "^3.0.0-beta.4",
"fury-adapter-apib-parser": "^0.9.0",
"fury-adapter-swagger": "^0.13.1",
"minim": "^0.19.1",
"sift": "^3.3.10",
"traverse": "^0.6.6",
"uri-template": "^1.0.0"
Expand Down
11 changes: 4 additions & 7 deletions src/compile.coffee
Expand Up @@ -60,9 +60,7 @@ findRelevantTransactions = (mediaType, refract, apiElements) ->
# This gets deleted once we're fully on minim
refractTransitions = children(refract, {element: 'transition'})

apiElements.findRecursive('transition').forEach((transitionElement, transitionNoElement) ->
transitionNo = transitionNoElement.toValue()

apiElements.findRecursive('transition').forEach((transitionElement, transitionNo) ->
# This gets deleted once we're fully on minim
refractTransition = refractTransitions[transitionNo]
refractHttpTransactions = children(refractTransition, {element: 'httpTransaction'})
Expand All @@ -84,8 +82,7 @@ findRelevantTransactions = (mediaType, refract, apiElements) ->
# each transaction example. We iterate over available transactions and
# skip those, which are not first within a particular example.
exampleNo = 0
transitionElement.transactions.forEach((httpTransactionElement, httpTransactionNoElement) ->
httpTransactionNo = httpTransactionNoElement.toValue()
transitionElement.transactions.forEach((httpTransactionElement, httpTransactionNo) ->
httpTransactionExampleNo = exampleNumbersPerTransaction[httpTransactionNo]

relevantTransaction =
Expand All @@ -100,9 +97,9 @@ findRelevantTransactions = (mediaType, refract, apiElements) ->
)
else
# All other formats then API Blueprint
transitionElement.transactions.forEach((httpTransactionElement, httpTransactionNoElement) ->
transitionElement.transactions.forEach((httpTransactionElement, httpTransactionNo) ->
relevantTransactions.push(
refract: refractHttpTransactions[httpTransactionNoElement.toValue()]
refract: refractHttpTransactions[httpTransactionNo]
apiElements: httpTransactionElement
)
)
Expand Down
1 change: 1 addition & 0 deletions src/parse.coffee
Expand Up @@ -32,6 +32,7 @@ parse = (source, callback) ->

if apiElements
apiElements.unshift(warning) if warning
apiElements.freeze() # Adds 'parent' properties, prevents mutation
else
apiElements = null

Expand Down

0 comments on commit 0f48cc5

Please sign in to comment.