Merge pull request #118 from verygoodsecurity/canary

Public release 1.4.0

.circleci/config.yml

@@ -10,13 +10,13 @@ jobs:
           command: sudo gem install cocoapods -v 1.8.4
       - run:
           name: Install pods
-          command: cd framework; pod install
+          command: pod install
       - run:
           name: Run Tests
-          command: cd framework; fastlane scan
+          command: fastlane scan
           environment:
             SCAN_DEVICE: iPhone 8
-            SCAN_SCHEME: VGSFramework
+            SCAN_SCHEME: VGSCollectSDK
 
 workflows:
   version: 2

.gitignore

@@ -2,9 +2,9 @@
 **.xcworkspace
 **/Pods
 demoapp/build
-framework/build
-framework/docs
+build
 
 .build/**
-framework/Podfile.lock
+Podfile.lock
 demoapp/Podfile.lock
+Carthage

framework/.jazzy.yaml → .jazzy.yaml

@@ -4,17 +4,17 @@
 # 2. jazzy command should be running form framework root dir
 ####################
 #names
-module: VGSFramework
+module: VGSCollectSDK
 title: VGSCollectSDK
 author: Very Good Security
 author_url: https://verygoodsecurity.com
 github_url: https://github.com/verygoodsecurity/vgs-collect-ios
-github_file_prefix: https://github.com/verygoodsecurity/vgs-collect-ios/tree/dev/framework
-readme: ../README.md
+github_file_prefix: https://github.com/verygoodsecurity/vgs-collect-ios/tree/master
+readme: README.md
 #output folder
-output: ../docs
+output: docs
 #path to project
-framework_root: framework/
+framework_root: ../
 sdk: iphonesimulator
 #settings
 clean: true
@@ -23,7 +23,7 @@ skip_undocumented: true
 hide_documentation_coverage: true
 theme: fullwidth
 exclude:
-    Sources/VGSFramework/Core/Utils.swift
+    Sources/VGSCollectSDK/Core/Utils.swift
 custom_categories:
 - name: UI Elements
   children:

framework/.swiftlint.yml → .swiftlint.yml

@@ -16,4 +16,5 @@ line_length: 180
 type_body_length: 400 
 reporter: "xcode"
 excluded: # paths to ignore during linting. Takes precedence over `included`. 
-  - Pods
+  - Pods
+  - Carthage

Cartfile

@@ -0,0 +1,2 @@
+github "verygoodsecurity/card.io-iOS-source"
+github "Alamofire/Alamofire" "4.9.1"

Cartfile.resolved

@@ -0,0 +1,2 @@
+github "Alamofire/Alamofire" "4.9.1"
+github "verygoodsecurity/card.io-iOS-source" "5.5.2"

framework/Podfile → Podfile

@@ -2,7 +2,7 @@ platform :ios, '10.0'
 
 workspace 'VGSCollectSDK'
 
-target 'VGSFramework' do
+target 'VGSCollectSDK' do
   use_frameworks!
   pod 'Alamofire', "4.9.1"
 
@@ -13,7 +13,7 @@ end
 
 
 # The workaround starts here !!!!!
-targetWorkaround = "Pods-VGSFrameworkTests"
+targetWorkaround = "Pods-FrameworkTests"
 
 post_install do |installer|
   installer.pods_project.targets.each do |target|
@@ -27,4 +27,3 @@ post_install do |installer|
     end
   end
 end
-

README.md

@@ -16,6 +16,7 @@ Table of contents
    * [Before you start](#before-you-start)
    * [Integration](#integration)
       * [CocoaPods](#cocoapods)
+      * [Carthage](#carthage)
    * [Usage](#usage)
       * [Create VGSCollect instance and VGS UI Elements](#create-vgscollect-instance-and-vgs-ui-elements)
       * [Scan Credit Card Data](#scan-credit-card-data)
@@ -45,6 +46,24 @@ You should have your organization registered at <a href="https://dashboard.veryg
 pod 'VGSCollectSDK'
 ```
 
+### Carthage
+
+VGCollectSDK is also available through [Carthage](https://github.com/Carthage/Carthage).
+Add the following line  to your `Cartfile`:
+
+```ruby
+github "verygoodsecurity/vgs-collect-ios"
+```
+
+then run:
+
+```ruby
+carthage update --platform iOS
+```
+
+Note that `VGCollectSDK` use `Alamofire` and `CardIO` as dependencies. You should also link them to your project. Follow the [Carthage instructions](https://github.com/Carthage/Carthage#adding-frameworks-to-an-application)
+
+
 ## Usage
 
 ### Import SDK into your file

framework/Sources/VGSFramework/Core/APIClient.swift → Sources/VGSCollectSDK/Core/APIClient.swift

@@ -1,6 +1,6 @@
 //
 //  APIClient.swift
-//  VGSFramework
+//  VGSCollectSDK
 //
 //  Created by Vitalii Obertynskyi on 8/19/19.
 //  Copyright © 2019 Vitalii Obertynskyi. All rights reserved.
@@ -61,13 +61,13 @@ class APIClient {
         let path = baseURL.appendingPathComponent(path)
         // Fetch Request
         Alamofire.request(path,
-                          method: .post,
+                          method: method,
                           parameters: body,
                           encoding: JSONEncoding.default,
                           headers: headers)
             .validate(statusCode: 200..<300)
             .responseJSON { response in
-                
+
                 switch response.result {
                 case .success(let data):
                     guard let dict = data as? JsonData else {
@@ -82,5 +82,6 @@ class APIClient {
                     return
                 }
         }
+        block(nil, nil)
     }
 }

framework/Sources/VGSFramework/Core/Enums.swift → Sources/VGSCollectSDK/Core/Enums.swift

@@ -1,6 +1,6 @@
 //
 //  Enums.swift
-//  VGSFramework
+//  VGSCollectSDK
 //
 //  Created by Vitalii Obertynskyi on 8/14/19.
 //  Copyright © 2019 Vitalii Obertynskyi. All rights reserved.

framework/Sources/VGSFramework/Core/Storage.swift → Sources/VGSCollectSDK/Core/Storage.swift

@@ -1,6 +1,6 @@
 //
 //  Storage.swift
-//  VGSFramework
+//  VGSCollectSDK
 //
 //  Created by Vitalii Obertynskyi on 8/14/19.
 //  Copyright © 2019 Vitalii Obertynskyi. All rights reserved.

framework/Sources/VGSFramework/Core/String+extension.swift → Sources/VGSCollectSDK/Core/String+extension.swift

@@ -1,6 +1,6 @@
 //
 //  String+extension.swift
-//  VGSFramework
+//  VGSCollectSDK
 //
 //  Created by Dima on 10.01.2020.
 //  Copyright © 2020 VGS. All rights reserved.

framework/Sources/VGSFramework/Core/Utils.swift → Sources/VGSCollectSDK/Core/Utils.swift

@@ -1,6 +1,6 @@
 //
 //  Utils.swift
-//  VGSFramework
+//  VGSCollectSDK
 //
 //  Created by Dima on 10.03.2020.
 //  Copyright © 2020 VGS. All rights reserved.

framework/Sources/VGSFramework/Core/VGSCollect+extension.swift → Sources/VGSCollectSDK/Core/VGSCollect+extension.swift

@@ -1,6 +1,6 @@
 //
 //  VGSForm+extension.swift
-//  VGSFramework
+//  VGSCollectSDK
 //
 //  Created by Vitalii Obertynskyi on 9/2/19.
 //  Copyright © 2019 Vitalii Obertynskyi. All rights reserved.

framework/Sources/VGSFramework/Core/VGSCollect+internal.swift → Sources/VGSCollectSDK/Core/VGSCollect+internal.swift

@@ -1,6 +1,6 @@
 //
 //  VGSCollect+internal.swift
-//  VGSFramework
+//  VGSCollectSDK
 //
 //  Created by Dima on 10.03.2020.
 //  Copyright © 2020 VGS. All rights reserved.

framework/Sources/VGSFramework/Core/VGSCollect.swift → Sources/VGSCollectSDK/Core/VGSCollect.swift

@@ -1,6 +1,6 @@
 //
 //  VGSForm.swift
-//  VGSFramework
+//  VGSCollectSDK
 //
 //  Created by Vitalii Obertynskyi on 8/26/19.
 //  Copyright © 2019 Vitalii Obertynskyi. All rights reserved.

framework/Sources/VGSFramework/Core/VGSConfiguration.swift → Sources/VGSCollectSDK/Core/VGSConfiguration.swift

@@ -1,6 +1,6 @@
 //
 //  VGSModel.swift
-//  VGSFramework
+//  VGSCollectSDK
 //
 //  Created by Vitalii Obertynskyi on 8/21/19.
 //  Copyright © 2019 Vitalii Obertynskyi. All rights reserved.

framework/Sources/VGSFramework/Core/VGSError.swift → Sources/VGSCollectSDK/Core/VGSError.swift

@@ -1,6 +1,6 @@
 //
 //  VGSError.swift
-//  VGSFramework
+//  VGSCollectSDK
 //
 //  Created by Dima on 24.02.2020.
 //  Copyright © 2020 VGS. All rights reserved.

framework/Sources/VGSFramework/Core/VGSErrorInfo.swift → Sources/VGSCollectSDK/Core/VGSErrorInfo.swift

@@ -1,6 +1,6 @@
 //
 //  VGSErrorInfo.swift
-//  VGSFramework
+//  VGSCollectSDK
 //
 //  Created by Dima on 27.02.2020.
 //  Copyright © 2020 VGS. All rights reserved.

framework/Sources/VGSFramework/Core/VGSErrorInfoKey.swift → Sources/VGSCollectSDK/Core/VGSErrorInfoKey.swift

@@ -1,6 +1,6 @@
 //
 //  VGSErrorInfoKey.swift
-//  VGSFramework
+//  VGSCollectSDK
 //
 //  Created by Dima on 27.02.2020.
 //  Copyright © 2020 VGS. All rights reserved.

framework/Sources/VGSFramework/Integrations/CardIO/VGSCardIOHandler.swift → Sources/VGSCollectSDK/Integrations/CardIO/VGSCardIOHandler.swift

@@ -1,6 +1,6 @@
 //
 //  VGSCardIOHandler.swift
-//  VGSFramework
+//  VGSCollectSDK
 //
 //  Created by Dima on 17.01.2020.
 //  Copyright © 2020 VGS. All rights reserved.

framework/Sources/VGSFramework/Integrations/CardIO/VGSCardIOScanController.swift → Sources/VGSCollectSDK/Integrations/CardIO/VGSCardIOScanController.swift

@@ -1,6 +1,6 @@
 //
 //  VGSCardIOScanController.swift
-//  VGSFramework
+//  VGSCollectSDK
 //
 //  Created by Dima on 17.01.2020.
 //  Copyright © 2020 VGS. All rights reserved.

framework/Sources/VGSFramework/Integrations/CardIO/VGSCardIOScanControllerDelegate.swift → Sources/VGSCollectSDK/Integrations/CardIO/VGSCardIOScanControllerDelegate.swift

@@ -1,6 +1,6 @@
 //
 //  VGSCardIOScanControllerDelegate.swift
-//  VGSFramework
+//  VGSCollectSDK
 //
 //  Created by Dima on 20.01.2020.
 //  Copyright © 2020 VGS. All rights reserved.

framework/Sources/VGSFramework/UIElements/FilePicker/VGSDocumentPicker.swift → Sources/VGSCollectSDK/UIElements/FilePicker/VGSDocumentPicker.swift

@@ -1,6 +1,6 @@
 //
 //  VGSDocumentPicker.swift
-//  VGSFramework
+//  VGSCollectSDK
 //
 //  Created by Dima on 13.02.2020.
 //  Copyright © 2020 VGS. All rights reserved.

framework/Sources/VGSFramework/UIElements/FilePicker/VGSFileInfo.swift → Sources/VGSCollectSDK/UIElements/FilePicker/VGSFileInfo.swift

@@ -1,6 +1,6 @@
 //
 //  VGSFileMetaData.swift
-//  VGSFramework
+//  VGSCollectSDK
 //
 //  Created by Dima on 17.02.2020.
 //  Copyright © 2020 VGS. All rights reserved.

framework/Sources/VGSFramework/UIElements/FilePicker/VGSFilePickerConfiguration.swift → Sources/VGSCollectSDK/UIElements/FilePicker/VGSFilePickerConfiguration.swift

@@ -1,6 +1,6 @@
 //
 //  VGSFilePickerConfiguration.swift
-//  VGSFramework
+//  VGSCollectSDK
 //
 //  Created by Dima on 17.02.2020.
 //  Copyright © 2020 VGS. All rights reserved.

framework/Sources/VGSFramework/UIElements/FilePicker/VGSFilePickerController+internal.swift → Sources/VGSCollectSDK/UIElements/FilePicker/VGSFilePickerController+internal.swift

@@ -1,6 +1,6 @@
 //
 //  VGSFilePickerController+internal.swift
-//  VGSFramework
+//  VGSCollectSDK
 //
 //  Created by Dima on 17.02.2020.
 //  Copyright © 2020 VGS. All rights reserved.

framework/Sources/VGSFramework/UIElements/FilePicker/VGSFilePickerController.swift → Sources/VGSCollectSDK/UIElements/FilePicker/VGSFilePickerController.swift

@@ -1,6 +1,6 @@
 //
 //  VGSFilePickerController.swift
-//  VGSFramework
+//  VGSCollectSDK
 //
 //  Created by Dima on 14.02.2020.
 //  Copyright © 2020 VGS. All rights reserved.

framework/Sources/VGSFramework/UIElements/FilePicker/VGSFilePickerControllerDelegate.swift → Sources/VGSCollectSDK/UIElements/FilePicker/VGSFilePickerControllerDelegate.swift

@@ -1,6 +1,6 @@
 //
 //  VGSFilePickerControllerDelegate.swift
-//  VGSFramework
+//  VGSCollectSDK
 //
 //  Created by Dima on 17.03.2020.
 //  Copyright © 2020 VGS. All rights reserved.

framework/Sources/VGSFramework/UIElements/FilePicker/VGSFileSource.swift → Sources/VGSCollectSDK/UIElements/FilePicker/VGSFileSource.swift

@@ -1,6 +1,6 @@
 //
 //  ButtonType.swift
-//  VGSFramework
+//  VGSCollectSDK
 //
 //  Created by Vitalii Obertynskyi on 11.02.2020.
 //  Copyright © 2020 VGS. All rights reserved.

framework/Sources/VGSFramework/UIElements/FilePicker/VGSImagePicker.swift → Sources/VGSCollectSDK/UIElements/FilePicker/VGSImagePicker.swift

@@ -1,6 +1,6 @@
 //
 //  VGSImagePicker.swift
-//  VGSFramework
+//  VGSCollectSDK
 //
 //  Created by Dima on 13.02.2020.
 //  Copyright © 2020 VGS. All rights reserved.

framework/Sources/VGSFramework/UIElements/Text Field/Mask/MaskedTextField+padding.swift → Sources/VGSCollectSDK/UIElements/Text Field/Mask/MaskedTextField+padding.swift

@@ -1,6 +1,6 @@
 //
 //  MaskedTextField+padding.swift
-//  VGSFramework
+//  VGSCollectSDK
 //
 //  Created by Vitalii Obertynskyi on 9/28/19.
 //  Copyright © 2019 Vitalii Obertynskyi. All rights reserved.

framework/Sources/VGSFramework/UIElements/Text Field/Mask/MaskedTextField.swift → Sources/VGSCollectSDK/UIElements/Text Field/Mask/MaskedTextField.swift

@@ -1,6 +1,6 @@
 //
 //  MaskedTextField.swift
-//  VGSFramework
+//  VGSCollectSDK
 //
 //  Created by Vitalii Obertynskyi on 9/28/19.
 //  Copyright © 2019 Vitalii Obertynskyi. All rights reserved.

framework/Sources/VGSFramework/UIElements/Text Field/VGSCardTextField.swift → Sources/VGSCollectSDK/UIElements/Text Field/VGSCardTextField.swift

@@ -1,6 +1,6 @@
 //
 //  VGSCardTextField.swift
-//  VGSFramework
+//  VGSCollectSDK
 //
 //  Created by Vitalii Obertynskyi on 24.11.2019.
 //  Copyright © 2019 Vitalii Obertynskyi. All rights reserved.

framework/Sources/VGSFramework/UIElements/Text Field/VGSTextField+CVC.swift → Sources/VGSCollectSDK/UIElements/Text Field/VGSTextField+CVC.swift

@@ -1,6 +1,6 @@
 //
 //  VGSTextField+patternFormat.swift
-//  VGSFramework
+//  VGSCollectSDK
 //
 //  Created by Vitalii Obertynskyi on 22.12.2019.
 //  Copyright © 2019 VGS. All rights reserved.

framework/Sources/VGSFramework/UIElements/Text Field/VGSTextField+UIBuilder.swift → Sources/VGSCollectSDK/UIElements/Text Field/VGSTextField+UIBuilder.swift

@@ -1,6 +1,6 @@
 //
 //  VGSTextField+UIBuilder.swift
-//  VGSFramework
+//  VGSCollectSDK
 //
 //  Created by Vitalii Obertynskyi on 9/28/19.
 //  Copyright © 2019 Vitalii Obertynskyi. All rights reserved.

framework/Sources/VGSFramework/UIElements/Text Field/VGSTextField+state.swift → Sources/VGSCollectSDK/UIElements/Text Field/VGSTextField+state.swift

@@ -1,6 +1,6 @@
 //
 //  VGSTextField+state.swift
-//  VGSFramework
+//  VGSCollectSDK
 //
 //  Created by Vitalii Obertynskyi on 9/10/19.
 //  Copyright © 2019 Vitalii Obertynskyi. All rights reserved.

framework/Sources/VGSFramework/UIElements/Text Field/VGSTextField.swift → Sources/VGSCollectSDK/UIElements/Text Field/VGSTextField.swift

@@ -1,6 +1,6 @@
 //
 //  VGSTextField.swift
-//  VGSFramework
+//  VGSCollectSDK
 //
 //  Created by Vitalii Obertynskyi on 8/14/19.
 //  Copyright © 2019 Vitalii Obertynskyi. All rights reserved.