Merge pull request #7 from studyplus/update

Update

Author: masashi-sutou

Cartfile

@@ -1 +1 @@
-github "kishikawakatsumi/KeychainAccess" == 3.1.0
+github "kishikawakatsumi/KeychainAccess" == 3.1.1

Cartfile.resolved

@@ -1 +1 @@
-github "kishikawakatsumi/KeychainAccess" "v3.1.0"
+github "kishikawakatsumi/KeychainAccess" "v3.1.1"

Demo/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1.1</string>
+	<string>2.0.0</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>

Podfile

@@ -3,5 +3,5 @@ platform :ios, '8.0'
 use_frameworks!
 
 target :Demo do
-    pod 'KeychainAccess', '3.1.0'
+    pod 'KeychainAccess', '3.1.1'
 end

Podfile.lock

@@ -1,12 +1,16 @@
 PODS:
-  - KeychainAccess (3.1.0)
+  - KeychainAccess (3.1.1)
 
 DEPENDENCIES:
-  - KeychainAccess (= 3.1.0)
+  - KeychainAccess (= 3.1.1)
+
+SPEC REPOS:
+  https://github.com/cocoapods/specs.git:
+    - KeychainAccess
 
 SPEC CHECKSUMS:
-  KeychainAccess: 94c5540b32eabf7bc32bfb976a268e8ea05fd6da
+  KeychainAccess: 7bd430028059754a3debab3cfc0bd1fc7fb85df3
 
-PODFILE CHECKSUM: 5d59a864df1b8c7fb07b7cc4f11a87235ba9692c
+PODFILE CHECKSUM: 252d5377b931f703238854e56df200aab4d237d9
 
-COCOAPODS: 1.4.0
+COCOAPODS: 1.5.3

StudyplusSDK-V2.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name                  = "StudyplusSDK-V2"
-  s.version               = "1.1.1"
+  s.version               = "2.0.0"
   s.summary               = "StudyplusSDK-V2 is Studyplus iOS SDK for Swift"
   s.homepage              = "http://info.studyplus.jp"
   s.license               = { :type => "MIT", :file => "LICENSE" }
@@ -11,6 +11,6 @@ Pod::Spec.new do |s|
   s.ios.deployment_target = '8.0'
   s.ios.frameworks        = ['UIKit', 'Foundation']
   s.author                = { "studyplus" => "[email protected]" }
-  s.dependency 'KeychainAccess', '3.1.0'
+  s.dependency 'KeychainAccess', '3.1.1'
 end
 

StudyplusSDK.xcodeproj/project.pbxproj

@@ -280,7 +280,6 @@
 				183FDA821E7510F00085589F /* Frameworks */,
 				183FDA831E7510F00085589F /* Resources */,
 				764BEF1941D689B54DF91C96 /* [CP] Embed Pods Frameworks */,
-				0D84BAE00562247D34CA7850 /* [CP] Copy Pods Resources */,
 				48D53DAA1F72346A00FDB105 /* Embed Frameworks */,
 			);
 			buildRules = (
@@ -400,21 +399,6 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		0D84BAE00562247D34CA7850 /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Demo/Pods-Demo-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		764BEF1941D689B54DF91C96 /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;

StudyplusSDK/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1.1</string>
+	<string>2.0.0</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>

StudyplusSDK/StudyplusAPIRequest.swift

@@ -76,7 +76,7 @@ internal struct StudyplusAPIRequest {
             return
         }
 
-        request.addValue("OAuth " + accessToken, forHTTPHeaderField: "HTTP_AUTHORIZATION")
+        request.addValue("OAuth " + accessToken, forHTTPHeaderField: "Authorization")
 
         let task = URLSession.shared.dataTask(with: request) { (data, response, error) in
 

StudyplusSDK/StudyplusRecord.swift

@@ -34,6 +34,20 @@ private let formatter: DateFormatter = {
     return f
 }()
 
+fileprivate enum DateLocalePattern {
+    case current
+    case enUSPOSIX
+    
+    var value: Locale {
+        switch self {
+        case .current:
+            return Locale.current
+        case .enUSPOSIX:
+            return Locale(identifier: "en_US_POSIX")
+        }
+    }
+}
+
 private extension Date {
 
     init?(dateString: String, dateFormat: String = "yyyy-MM-dd'T'HH:mm:ssZ") {
@@ -42,8 +56,8 @@ private extension Date {
         self = date
     }
 
-    func string(format: String = "yyyy-MM-dd'T'HH:mm:ssZ") -> String {
-        formatter.locale = Locale.current
+    func string(format: String = "yyyy-MM-dd'T'HH:mm:ssZ", locale: DateLocalePattern) -> String {
+        formatter.locale = locale.value
         formatter.dateFormat = format
         return formatter.string(from: self)
     }
@@ -109,7 +123,7 @@ public struct StudyplusRecord {
         var params: [String: Any] = [:]
 
         params["duration"] = NSNumber(value: self.duration)
-        params["recorded_at"] = self.recordedAt.string(format: "yyyy-MM-dd HH:mm:ss")
+        params["recorded_at"] = self.recordedAt.string(format: "yyyy-MM-dd HH:mm:ss", locale: .enUSPOSIX)
 
         if let comment = self.comment {
             params["comment"] = comment