Merge pull request #1 from gperdomor/feature/unbox-integration

Feature/unbox integration

Author: gperdomor

.travis.yml

@@ -7,27 +7,39 @@ cache:
   directories:
   - Carthage
 
-xcode_project: MoyaModelMapper.xcodeproj 
+xcode_project: MoyaUnbox.xcodeproj 
 
 xcode_scheme:
-  - MoyaModelMapper
-  - RxMoyaModelMapper
-  - ReactiveMoyaModelMapper
+  - MoyaUnbox
+  - RxMoyaUnbox
+  - ReactiveMoyaUnbox
 
 env:
   - CACHE_NAME=iOS       PLATFORM=iOS
   - CACHE_NAME=macOS     PLATFORM=macOS
   - CACHE_NAME=tvOS      PLATFORM=tvOS
   - CACHE_NAME=watchOS   PLATFORM=watchOS
 
+matrix:
+  allow_failures:
+  - xcode_project: MoyaUnbox.xcodeproj
+    xcode_scheme: MoyaUnbox
+    env: CACHE_NAME=watchOS   PLATFORM=watchOS
+  - xcode_project: MoyaUnbox.xcodeproj
+    xcode_scheme: RxMoyaUnbox
+    env: CACHE_NAME=watchOS   PLATFORM=watchOS
+  - xcode_project: MoyaUnbox.xcodeproj
+    xcode_scheme: ReactiveMoyaUnbox
+    env: CACHE_NAME=watchOS   PLATFORM=watchOS
+
 before_install:
   - brew update
   # Cocoapod
-  - brew install cocoapods || brew upgrade cocoapods
+  - brew outdated cocoapods || brew upgrade cocoapods
   # SwiftLint
-  - brew install swiftlint || brew upgrade swiftlint
+  - brew outdated swiftlint || brew upgrade swiftlint
   # Carthage tools
-  - brew install carthage || brew upgrade carthage
+  - brew outdated carthage || brew upgrade carthage
   - curl -L -O https://github.com/YPlan/CartfileDiff/releases/download/0.1/CartfileDiff.pkg
   - sudo installer -pkg CartfileDiff.pkg -target /
   # xcpretty
@@ -60,7 +72,7 @@ before_script:
         ;;
     esac
 
-  - if [ ${SCHEME} == "MoyaModelMapper-iOS" ]; then
+  - if [ ${SCHEME} == "MoyaUnbox-iOS" ]; then
       export POD_LINT="YES";
     fi
 
@@ -69,14 +81,15 @@ before_script:
   - PLATFORM=${PLATFORM} ./scripts/bootstrap-if-needed
 
 script:
+  - printenv
   - set -o pipefail
   - xcodebuild -version
   - xcodebuild -showsdks
 
   - xcodebuild clean -project "${TRAVIS_XCODE_PROJECT}" -scheme "${SCHEME}" | xcpretty
 
   # Build Framework in Debug and Run Tests if specified
-  - echo "BUILD FOR DEBUG"
+  - echo "BUILD FOR DEBUG ---> RUN_TESTS = ${RUN_TESTS}"
   - if [ ${RUN_TESTS} == "YES" ]; then
       xcodebuild -project "${TRAVIS_XCODE_PROJECT}" -scheme "${SCHEME}" -sdk "${SDK}" -destination "${DESTINATION}" -configuration Debug ONLY_ACTIVE_ARCH=NO ENABLE_TESTABILITY=YES test | xcpretty;
     else
@@ -86,7 +99,7 @@ script:
   - xcodebuild clean -project "$TRAVIS_XCODE_PROJECT" -scheme "$SCHEME" | xcpretty
 
   # Build Framework in Release and Run Tests if specified
-  - echo "BUILD FOR RELEASE"
+  - echo "BUILD FOR RELEASE ---> RUN_TESTS = ${RUN_TESTS}"
   - if [ ${RUN_TESTS} == "YES" ]; then
       xcodebuild -project "${TRAVIS_XCODE_PROJECT}" -scheme "${SCHEME}" -sdk "${SDK}" -destination "${DESTINATION}" -configuration Release ONLY_ACTIVE_ARCH=NO ENABLE_TESTABILITY=YES test | xcpretty;
     else

CHANGELOG.md

@@ -1,11 +1,5 @@
 # Next
 
-# 1.0.1
-
-- Minor fixes.
-- Improved docs.
-- Updated deps.
-
 # 1.0.0
 
 - Initial release.

Cartfile

@@ -1,2 +1,2 @@
 github "Moya/Moya" ~> 8.0
-github "lyft/mapper" ~> 6.0
+github "johnsundell/unbox" ~> 2.4

Cartfile.resolved

@@ -5,4 +5,4 @@ github "Quick/Quick" "v1.1.0"
 github "ReactiveCocoa/ReactiveSwift" "1.1.0"
 github "ReactiveX/RxSwift" "3.2.0"
 github "antitypical/Result" "3.2.1"
-github "lyft/mapper" "6.0.0"
+github "johnsundell/unbox" "2.4.0"

Configs/MoyaModelMapper.plist Configs/MoyaUnbox.plistConfigs/MoyaModelMapper.plist renamed to Configs/MoyaUnbox.plist

@@ -22,7 +22,7 @@ end
 # Carthage Xcode project to avoid breaking things for our Carthage users.
 added_swift_library_files = git.added_files.grep(/Sources.*\.swift/).empty?
 deleted_swift_library_files = git.deleted_files.grep(/Sources.*\.swift/).empty?
-modified_carthage_xcode_project = !(git.deleted_files.grep(/MoyaModelMapper\.xcodeproj/).empty?)
+modified_carthage_xcode_project = !(git.deleted_files.grep(/MoyaUnbox\.xcodeproj/).empty?)
 if (added_swift_library_files || deleted_swift_library_files) && modified_carthage_xcode_project
   fail("Added or removed library files require the Carthage Xcode project to be updated.")
 end
@@ -35,7 +35,7 @@ end
 
 # Warn when either the podspec or Cartfile + Cartfile.resolved has been updated,
 # but not both.
-podspec_updated = !git.modified_files.grep(/MoyaModelMapper.podspec/).empty?
+podspec_updated = !git.modified_files.grep(/MoyaUnbox.podspec/).empty?
 cartfile_updated = !git.modified_files.grep(/Cartfile/).empty?
 cartfile_resolved_updated = !git.modified_files.grep(/Cartfile.resolved/).empty?
 

Configs/MoyaModelMapperTests.plist Configs/MoyaUnboxTests.plistConfigs/MoyaModelMapperTests.plist renamed to Configs/MoyaUnboxTests.plist

@@ -2,7 +2,7 @@
 //  AppDelegate.swift
 //  Demo
 //
-//  Created by Gustavo Perdomo on 2/20/17.
+//  Created by Gustavo Perdomo on 3/5/17.
 //  Copyright (c) 2017 Gustavo Perdomo. Licensed under the MIT license, as follows:
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy

Dangerfile

@@ -2,7 +2,7 @@
 //  GitHubAPI.swift
 //  Demo
 //
-//  Created by Gustavo Perdomo on 2/20/17.
+//  Created by Gustavo Perdomo on 3/5/17.
 //  Copyright (c) 2017 Gustavo Perdomo. Licensed under the MIT license, as follows:
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy

Demo/Demo/AppDelegate.swift

@@ -2,7 +2,7 @@
 //  Issue.swift
 //  Demo
 //
-//  Created by Gustavo Perdomo on 2/20/17.
+//  Created by Gustavo Perdomo on 3/5/17.
 //  Copyright (c) 2017 Gustavo Perdomo. Licensed under the MIT license, as follows:
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -25,18 +25,18 @@
 //
 
 import Foundation
-import Mapper
+import Unbox
 
-class Issue: Mappable {
+struct Issue: Unboxable {
     let identifier: Int
     let number: Int
     let title: String
     let body: String
-
-    required init(map: Mapper) throws {
-        try identifier = map.from("id")
-        try number = map.from("number")
-        try title = map.from("title")
-        try body = map.from("body")
+    
+    init(unboxer: Unboxer) throws {
+        identifier = try unboxer.unbox(key: "id")
+        number = try unboxer.unbox(key: "number")
+        title = try unboxer.unbox(key: "title")
+        body = try unboxer.unbox(key: "body")
     }
 }