Merge pull request infinum#30 from infinum/relese/v2.2.0

Relese/v2.2.0

Example/Japx.xcodeproj/project.pbxproj

@@ -7,8 +7,14 @@
  objects = {
 
 /* Begin PBXBuildFile section */
+ 0A30B5C9231111820041F828 /* MissingRelationshipObject-JsonApi.json in Resources */ = {isa = PBXBuildFile; fileRef = 0A30B5C62311117C0041F828 /* MissingRelationshipObject-JsonApi.json */; };
+ 0A30B5CA231111850041F828 /* MissingRelationshipObject-Json.json in Resources */ = {isa = PBXBuildFile; fileRef = 0A30B5C52311117C0041F828 /* MissingRelationshipObject-Json.json */; };
+ 0A30B5CD231111A60041F828 /* MissingRelationshipObjects-Json.json in Resources */ = {isa = PBXBuildFile; fileRef = 0A30B5CB231111A60041F828 /* MissingRelationshipObjects-Json.json */; };
+ 0A30B5CE231111A60041F828 /* MissingRelationshipObjects-JsonApi.json in Resources */ = {isa = PBXBuildFile; fileRef = 0A30B5CC231111A60041F828 /* MissingRelationshipObjects-JsonApi.json */; };
  0A4CEF7621FF560400D3F0B8 /* RelationshipNoInclude-Json.json in Resources */ = {isa = PBXBuildFile; fileRef = 0A4CEF7421FF560400D3F0B8 /* RelationshipNoInclude-Json.json */; };
  0A4CEF7721FF560400D3F0B8 /* RelationshipNoInclude-JsonApi.json in Resources */ = {isa = PBXBuildFile; fileRef = 0A4CEF7521FF560400D3F0B8 /* RelationshipNoInclude-JsonApi.json */; };
+ 0A57D7FD231119AC0009FBEB /* MissingRelationshipObjectNull-Json.json in Resources */ = {isa = PBXBuildFile; fileRef = 0A57D7FC231119AB0009FBEB /* MissingRelationshipObjectNull-Json.json */; };
+ 0A57D7FF231119C10009FBEB /* MissingRelationshipObjectsEmpty-Json.json in Resources */ = {isa = PBXBuildFile; fileRef = 0A57D7FE231119C10009FBEB /* MissingRelationshipObjectsEmpty-Json.json */; };
  0A6C2FEF21FB3BB900D16186 /* EmptyRelationship-JsonApi.json in Resources */ = {isa = PBXBuildFile; fileRef = 0A6C2FEE21FB3BB900D16186 /* EmptyRelationship-JsonApi.json */; };
  0A6C2FF121FB3BD000D16186 /* EmptyRelationship-Json.json in Resources */ = {isa = PBXBuildFile; fileRef = 0A6C2FF021FB3BD000D16186 /* EmptyRelationship-Json.json */; };
  0A6C2FF621FB3F4900D16186 /* EmptyRelationshipDeep-Json.json in Resources */ = {isa = PBXBuildFile; fileRef = 0A6C2FF321FB3F4100D16186 /* EmptyRelationshipDeep-Json.json */; };
@@ -42,6 +48,9 @@
  E18795132018D76300E472C4 /* SimpleEncoding-Json.json in Resources */ = {isa = PBXBuildFile; fileRef = E187950C2018D76300E472C4 /* SimpleEncoding-Json.json */; };
  E18795142018D76300E472C4 /* ExtraParams-Json.json in Resources */ = {isa = PBXBuildFile; fileRef = E187950E2018D76300E472C4 /* ExtraParams-Json.json */; };
  E18795152018D76300E472C4 /* ExtraParams-JsonApi.json in Resources */ = {isa = PBXBuildFile; fileRef = E187950F2018D76300E472C4 /* ExtraParams-JsonApi.json */; };
+ E1F83D0D237D9A8C009F91CA /* Meta-NotAdded-JsonApi.json in Resources */ = {isa = PBXBuildFile; fileRef = E1F83D0A237D9A8B009F91CA /* Meta-NotAdded-JsonApi.json */; };
+ E1F83D0E237D9A8C009F91CA /* Meta-Added-JsonApi.json in Resources */ = {isa = PBXBuildFile; fileRef = E1F83D0B237D9A8C009F91CA /* Meta-Added-JsonApi.json */; };
+ E1F83D0F237D9A8C009F91CA /* Meta-Json.json in Resources */ = {isa = PBXBuildFile; fileRef = E1F83D0C237D9A8C009F91CA /* Meta-Json.json */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -55,8 +64,14 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
+ 0A30B5C52311117C0041F828 /* MissingRelationshipObject-Json.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "MissingRelationshipObject-Json.json"; sourceTree = "<group>"; };
+ 0A30B5C62311117C0041F828 /* MissingRelationshipObject-JsonApi.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "MissingRelationshipObject-JsonApi.json"; sourceTree = "<group>"; };
+ 0A30B5CB231111A60041F828 /* MissingRelationshipObjects-Json.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "MissingRelationshipObjects-Json.json"; sourceTree = "<group>"; };
+ 0A30B5CC231111A60041F828 /* MissingRelationshipObjects-JsonApi.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "MissingRelationshipObjects-JsonApi.json"; sourceTree = "<group>"; };
  0A4CEF7421FF560400D3F0B8 /* RelationshipNoInclude-Json.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "RelationshipNoInclude-Json.json"; sourceTree = "<group>"; };
  0A4CEF7521FF560400D3F0B8 /* RelationshipNoInclude-JsonApi.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "RelationshipNoInclude-JsonApi.json"; sourceTree = "<group>"; };
+ 0A57D7FC231119AB0009FBEB /* MissingRelationshipObjectNull-Json.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "MissingRelationshipObjectNull-Json.json"; sourceTree = "<group>"; };
+ 0A57D7FE231119C10009FBEB /* MissingRelationshipObjectsEmpty-Json.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "MissingRelationshipObjectsEmpty-Json.json"; sourceTree = "<group>"; };
  0A6C2FEE21FB3BB900D16186 /* EmptyRelationship-JsonApi.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = "EmptyRelationship-JsonApi.json"; sourceTree = "<group>"; };
  0A6C2FF021FB3BD000D16186 /* EmptyRelationship-Json.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = "EmptyRelationship-Json.json"; sourceTree = "<group>"; };
  0A6C2FF321FB3F4100D16186 /* EmptyRelationshipDeep-Json.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "EmptyRelationshipDeep-Json.json"; sourceTree = "<group>"; };
@@ -108,6 +123,9 @@
  E187950C2018D76300E472C4 /* SimpleEncoding-Json.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "SimpleEncoding-Json.json"; sourceTree = "<group>"; };
  E187950E2018D76300E472C4 /* ExtraParams-Json.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "ExtraParams-Json.json"; sourceTree = "<group>"; };
  E187950F2018D76300E472C4 /* ExtraParams-JsonApi.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "ExtraParams-JsonApi.json"; sourceTree = "<group>"; };
+ E1F83D0A237D9A8B009F91CA /* Meta-NotAdded-JsonApi.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "Meta-NotAdded-JsonApi.json"; sourceTree = "<group>"; };
+ E1F83D0B237D9A8C009F91CA /* Meta-Added-JsonApi.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "Meta-Added-JsonApi.json"; sourceTree = "<group>"; };
+ E1F83D0C237D9A8C009F91CA /* Meta-Json.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "Meta-Json.json"; sourceTree = "<group>"; };
  E817D346E8E2BDDF0DC5F3F3 /* Pods_Japx_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Japx_Tests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
@@ -131,6 +149,35 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+ 0A30B5C2231111360041F828 /* Include */ = {
+ isa = PBXGroup;
+ children = (
+ E18794FE2018CA7100E472C4 /* MissingRelationship-Json.json */,
+ E18794FF2018CA7100E472C4 /* MissingRelationship-JsonApi.json */,
+ );
+ path = Include;
+ sourceTree = "<group>";
+ };
+ 0A30B5C3231111400041F828 /* Object */ = {
+ isa = PBXGroup;
+ children = (
+ 0A30B5C52311117C0041F828 /* MissingRelationshipObject-Json.json */,
+ 0A30B5C62311117C0041F828 /* MissingRelationshipObject-JsonApi.json */,
+ 0A57D7FC231119AB0009FBEB /* MissingRelationshipObjectNull-Json.json */,
+ );
+ path = Object;
+ sourceTree = "<group>";
+ };
+ 0A30B5C4231111460041F828 /* Array */ = {
+ isa = PBXGroup;
+ children = (
+ 0A57D7FE231119C10009FBEB /* MissingRelationshipObjectsEmpty-Json.json */,
+ 0A30B5CB231111A60041F828 /* MissingRelationshipObjects-Json.json */,
+ 0A30B5CC231111A60041F828 /* MissingRelationshipObjects-JsonApi.json */,
+ );
+ path = Array;
+ sourceTree = "<group>";
+ };
  0A4CEF7321FF560400D3F0B8 /* RelationshipNoInclude */ = {
  isa = PBXGroup;
  children = (
@@ -284,6 +331,7 @@
  E18794EE2018ABA000E472C4 /* Encoding */ = {
  isa = PBXGroup;
  children = (
+ E1F83D09237D99A9009F91CA /* MetaParams */,
  E187950D2018D76300E472C4 /* ExtraParams */,
  E18795072018D76300E472C4 /* RecursivRelationships */,
  E187950A2018D76300E472C4 /* SimpleEncoding */,
@@ -325,8 +373,9 @@
  E18794FD2018CA7100E472C4 /* MissingRelationship */ = {
  isa = PBXGroup;
  children = (
- E18794FE2018CA7100E472C4 /* MissingRelationship-Json.json */,
- E18794FF2018CA7100E472C4 /* MissingRelationship-JsonApi.json */,
+ 0A30B5C2231111360041F828 /* Include */,
+ 0A30B5C3231111400041F828 /* Object */,
+ 0A30B5C4231111460041F828 /* Array */,
  );
  path = MissingRelationship;
  sourceTree = "<group>";
@@ -367,6 +416,16 @@
  path = ExtraParams;
  sourceTree = "<group>";
  };
+ E1F83D09237D99A9009F91CA /* MetaParams */ = {
+ isa = PBXGroup;
+ children = (
+ E1F83D0C237D9A8C009F91CA /* Meta-Json.json */,
+ E1F83D0B237D9A8C009F91CA /* Meta-Added-JsonApi.json */,
+ E1F83D0A237D9A8B009F91CA /* Meta-NotAdded-JsonApi.json */,
+ );
+ path = MetaParams;
+ sourceTree = "<group>";
+ };
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -460,16 +519,24 @@
  E18794FB2018AEC900E472C4 /* RecursivSample-Json.json in Resources */,
  2C5FA429202CA35D00399CC7 /* Images.xcassets in Resources */,
  0A4CEF7721FF560400D3F0B8 /* RelationshipNoInclude-JsonApi.json in Resources */,
+ E1F83D0D237D9A8C009F91CA /* Meta-NotAdded-JsonApi.json in Resources */,
  E18794FC2018AEC900E472C4 /* RecursivSample-JsonApi.json in Resources */,
+ 0A57D7FD231119AC0009FBEB /* MissingRelationshipObjectNull-Json.json in Resources */,
  E18795042018CA7100E472C4 /* MissingRelationship-JsonApi.json in Resources */,
  E18795062018CA7100E472C4 /* ArticleExample-Json.json in Resources */,
+ 0A30B5CE231111A60041F828 /* MissingRelationshipObjects-JsonApi.json in Resources */,
  E18794F32018ABA000E472C4 /* ArticlePerson-Json.json in Resources */,
  2C5FA42C202CA39500399CC7 /* Main.storyboard in Resources */,
  E18795132018D76300E472C4 /* SimpleEncoding-Json.json in Resources */,
+ E1F83D0E237D9A8C009F91CA /* Meta-Added-JsonApi.json in Resources */,
+ E1F83D0F237D9A8C009F91CA /* Meta-Json.json in Resources */,
  E18795102018D76300E472C4 /* RecursivRelationships-Json.json in Resources */,
  0A6C2FF121FB3BD000D16186 /* EmptyRelationship-Json.json in Resources */,
+ 0A57D7FF231119C10009FBEB /* MissingRelationshipObjectsEmpty-Json.json in Resources */,
  E18795152018D76300E472C4 /* ExtraParams-JsonApi.json in Resources */,
  E18795112018D76300E472C4 /* RecursivRelationships-JsonApi.json in Resources */,
+ 0A30B5CD231111A60041F828 /* MissingRelationshipObjects-Json.json in Resources */,
+ 0A30B5CA231111850041F828 /* MissingRelationshipObject-Json.json in Resources */,
  E18795142018D76300E472C4 /* ExtraParams-Json.json in Resources */,
  E18795122018D76300E472C4 /* SimpleEncoding-JsonApi.json in Resources */,
  E18795032018CA7100E472C4 /* MissingRelationship-Json.json in Resources */,
@@ -478,6 +545,7 @@
  0A6C2FF621FB3F4900D16186 /* EmptyRelationshipDeep-Json.json in Resources */,
  2C5FA42D202CA39700399CC7 /* LaunchScreen.xib in Resources */,
  0A4CEF7621FF560400D3F0B8 /* RelationshipNoInclude-Json.json in Resources */,
+ 0A30B5C9231111820041F828 /* MissingRelationshipObject-JsonApi.json in Resources */,
  0A6C2FEF21FB3BB900D16186 /* EmptyRelationship-JsonApi.json in Resources */,
  );
  runOnlyForDeploymentPostprocessing = 0;

Example/Podfile.lock

@@ -1,25 +1,25 @@
 PODS:
- - Alamofire (4.8.2)
- - Japx/Alamofire (2.1.0):
- - Alamofire (~> 4.8)
+ - Alamofire (4.9.1)
+ - Japx/Alamofire (2.2.0):
+ - Alamofire (~> 4.9)
  - Japx/Core
- - Japx/Codable (2.1.0):
+ - Japx/Codable (2.2.0):
  - Japx/Core
- - Japx/CodableAlamofire (2.1.0):
+ - Japx/CodableAlamofire (2.2.0):
  - Japx/Alamofire
  - Japx/Codable
- - Japx/Core (2.1.0)
- - Japx/ObjC (2.1.0):
+ - Japx/Core (2.2.0)
+ - Japx/ObjC (2.2.0):
  - Japx/Core
- - Japx/RxAlamofire (2.1.0):
+ - Japx/RxAlamofire (2.2.0):
  - Japx/Alamofire
  - RxSwift (~> 5.0)
- - Japx/RxCodableAlamofire (2.1.0):
+ - Japx/RxCodableAlamofire (2.2.0):
  - Japx/CodableAlamofire
  - Japx/RxAlamofire
  - Nimble (8.0.1)
  - Quick (2.1.0)
- - RxSwift (5.0.0)
+ - RxSwift (5.0.1)
 
 DEPENDENCIES:
  - Japx/ObjC (from `../`)
@@ -28,23 +28,24 @@ DEPENDENCIES:
  - Quick
 
 SPEC REPOS:
- https://github.com/cocoapods/specs.git:
- - Alamofire
+ https://github.com/CocoaPods/Specs.git:
  - Nimble
  - Quick
+ trunk:
+ - Alamofire
  - RxSwift
 
 EXTERNAL SOURCES:
  Japx:
  :path: "../"
 
 SPEC CHECKSUMS:
- Alamofire: ae5c501addb7afdbb13687d7f2f722c78734c2d3
- Japx: 7efe9c1b93b6f3cdb561e41f23fbc607a603d03b
+ Alamofire: 85e8a02c69d6020a0d734f6054870d7ecb75cf18
+ Japx: 339108c7da597bf4e2ce1e846c5e6c3f624e8332
  Nimble: 45f786ae66faa9a709624227fae502db55a8bdd0
  Quick: 4be43f6634acfa727dd106bdf3929ce125ffa79d
- RxSwift: 8b0671caa829a763bbce7271095859121cbd895f
+ RxSwift: e2dc62b366a3adf6a0be44ba9f405efd4c94e0c4
 
 PODFILE CHECKSUM: 0854e6acc1d6ac3258147607046a63ceb040b5e5
 
-COCOAPODS: 1.7.0.rc.2
+COCOAPODS: 1.8.3