Code

Add IncludeDirective#merge method#27

Code

Closed

iMacTia wants to merge 7 commits intobeauby:masterbeauby/jsonapi:masterfrom iMacTia:masteriMacTia/jsonapi:masterCopy head branch name to clipboard

+68-3

Commits

Commits on Jul 13, 2016

• Added attr_readers for IncludeDirective #hash and #options

  Show description for 37daf54
  iMacTia

  committed
  37daf54

  Copy full SHA for 37daf54

• improved tests to cover new #merge! method as well

  iMacTia

  committed
  12e5dc4

  Copy full SHA for 12e5dc4

Commits on Jul 14, 2016

• removed dependency with activesupport and using Parser#deep_merge! instead

  iMacTia

  committed
  20b99e3

  Copy full SHA for 20b99e3

• minor syntax fixes

  iMacTia

  committed
  cd113f5

  Copy full SHA for cd113f5

Commits on Jul 15, 2016

• added separate #merge_options method to make it clearer

  iMacTia

  committed
  59ed259

  Copy full SHA for 59ed259

Commits on Jul 22, 2016

• as a result of A.merge(B), options of A will be used and options of B discarded, no more options merge

  Show description for 092abaf
  iMacTia

  committed
  092abaf

  Copy full SHA for 092abaf

• fixed typo

  iMacTia

  committed
  9eba292

  Copy full SHA for 9eba292