Merge pull request #161 from ishkawa/2.0-development

APIKit 2.0

Author: ishkawa

.gitmodules

@@ -3,4 +3,4 @@
 	url = https://github.com/antitypical/Result.git
 [submodule "Carthage/Checkouts/OHHTTPStubs"]
 	path = Carthage/Checkouts/OHHTTPStubs
-	url = https://github.com/AliSoftware/OHHTTPStubs.git
+	url = https://github.com/ishkawa/OHHTTPStubs.git

.travis.yml

@@ -17,8 +17,8 @@ script:
   - pod lib lint
   - set -o pipefail
   - xcodebuild test -workspace APIKit.xcworkspace -scheme APIKit | xcpretty -c
-  - xcodebuild test -workspace APIKit.xcworkspace -scheme APIKit -sdk iphonesimulator -destination 'name=iPhone 6,OS=9.1' | xcpretty -c
-  - xcodebuild build -workspace APIKit.xcworkspace -scheme APIKit -sdk appletvsimulator -destination 'name=Apple TV 1080p,OS=9.1' | xcpretty -c
+  - xcodebuild test -workspace APIKit.xcworkspace -scheme APIKit -sdk iphonesimulator | xcpretty -c
+  - xcodebuild test -workspace APIKit.xcworkspace -scheme APIKit -sdk appletvsimulator | xcpretty -c
 
 before_deploy:
   - ./script/import-certificates

APIKit.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name     = "APIKit"
-  s.version  = "1.4.1"
+  s.version  = "2.0.0"
   s.summary  = "A networking library for building type safe web API client in Swift."
   s.homepage = "https://github.com/ishkawa/APIKit"
 
@@ -9,15 +9,15 @@ Pod::Spec.new do |s|
   }
 
   s.ios.deployment_target = "8.0"
-  s.osx.deployment_target = "10.9"
+  s.osx.deployment_target = "10.10"
   if s.respond_to?(:watchos)
     s.watchos.deployment_target = "2.0"
   end
   if s.respond_to?(:tvos)
     s.tvos.deployment_target = "9.0"
   end
 
-  s.source_files = "Sources/*.swift"
+  s.source_files = "Sources/**/*.{swift,h,m}"
   s.source = {
       :git => "https://github.com/ishkawa/APIKit.git",
       :tag => "#{s.version}",
@@ -26,7 +26,7 @@ Pod::Spec.new do |s|
   s.license = {
     :type => "MIT",
     :text => <<-LICENSE
-      Copyright (c) 2015 Yosuke Ishikawa
+      Copyright (c) 2015 - 2016 Yosuke Ishikawa
       Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
       The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
       THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

APIKit.xcodeproj/project.pbxproj

@@ -1 +1 @@
-github "AliSoftware/OHHTTPStubs" ~> 4.6.0
+github "ishkawa/OHHTTPStubs" "75f74c9c19620a37f436b38e2bc20a07310b999e"

Cartfile.private

@@ -1,2 +1,2 @@
-github "AliSoftware/OHHTTPStubs" "4.6.0"
+github "ishkawa/OHHTTPStubs" "75f74c9c19620a37f436b38e2bc20a07310b999e"
 github "antitypical/Result" "2.0.0"

Cartfile.resolved

@@ -25,7 +25,7 @@ VERSION_INFO_PREFIX =
 VERSIONING_SYSTEM = apple-generic
 
 CODE_SIGN_IDENTITY[sdk=iphoneos*] = iPhone Developer
-MACOSX_DEPLOYMENT_TARGET = 10.9
+MACOSX_DEPLOYMENT_TARGET = 10.10
 IPHONEOS_DEPLOYMENT_TARGET = 8.0
 WATCHOS_DEPLOYMENT_TARGET = 2.0
 TVOS_DEPLOYMENT_TARGET = 9.0

Carthage/Checkouts/OHHTTPStubs

@@ -47,13 +47,10 @@ struct GetRateLimitRequest: GitHubRequestType {
         return "/rate_limit"
     }
 
-    func responseFromObject(object: AnyObject, URLResponse: NSHTTPURLResponse) -> Response? {
-        guard let dictionary = object as? [String: AnyObject] else {
-            return nil
-        }
-
-        guard let rateLimit = RateLimit(dictionary: dictionary) else {
-            return nil
+    func responseFromObject(object: AnyObject, URLResponse: NSHTTPURLResponse) throws -> Response {
+        guard let dictionary = object as? [String: AnyObject],
+              let rateLimit = RateLimit(dictionary: dictionary) else {
+            throw ResponseError.UnexpectedObject(object)
         }
 
         return rateLimit
@@ -66,10 +63,10 @@ let request = GetRateLimitRequest()
 Session.sendRequest(request) { result in
     switch result {
     case .Success(let rateLimit):
-        debugPrint("count: \(rateLimit.count)")
-        debugPrint("reset: \(rateLimit.resetDate)")
+        print("count: \(rateLimit.count)")
+        print("reset: \(rateLimit.resetDate)")
 
     case .Failure(let error):
-        debugPrint("error: \(error)")
+        print("error: \(error)")
     }
 }

Configurations/Base.xcconfig

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<playground version='5.0' target-platform='ios' requires-full-environment='true' display-mode='raw'>
+<playground version='5.0' target-platform='ios' display-mode='raw'>
     <timeline fileName='timeline.xctimeline'/>
 </playground>