Merge pull request #23 from transloadit/swift-development

Bump TUSKit version
transloadit · Mar 22, 2021 · 015497c · 015497c
2 parents f320932 + 412c751
commit 015497c
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 18 deletions.
diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -11,9 +11,9 @@ PODS:
     - FBSnapshotTestCase (~> 2.0)
     - Nimble (~> 7.0)
   - Quick (1.2.0)
-  - Transloadit (2.1.1.alpha):
-    - TUSKit (~> 2.1.5.alpha)
-  - TUSKit (2.1.5.alpha)
+  - Transloadit (2.1.0):
+    - TUSKit (~> 2.1.0)
+  - TUSKit (2.1.0)
 
 DEPENDENCIES:
   - FBSnapshotTestCase (~> 2.1.4)
@@ -39,8 +39,8 @@ SPEC CHECKSUMS:
   Nimble: 051e3d8912d40138fa5591c78594f95fb172af37
   Nimble-Snapshots: f5459b5b091678dc942d03ec4741cacb58ba4a52
   Quick: 58d203b1c5e27fff7229c4c1ae445ad7069a7a08
-  Transloadit: 04579bc6c47e394226ad990dcd1f50988c8cf2cd
-  TUSKit: 848e7da5efd00aedb649e838ff968fb11dd664d5
+  Transloadit: 37ec9471fb4d82119bcd788e6a0305995642fd9f
+  TUSKit: 2fe53b42c248596a219c991096ca785997e72eb2
 
 PODFILE CHECKSUM: c54fe98a78e285d7620018f91160940d9909bc2a
 

diff --git a/Example/Transloadit/ViewController.swift b/Example/Transloadit/ViewController.swift
@@ -94,7 +94,12 @@ class ViewController: UIViewController, UIImagePickerControllerDelegate, UINavig
 
     func transloaditProcessing(forObject: APIObject, withResult: TransloaditResponse) {
         if (withResult.success) {
-            print("We did it!")
+            if(withResult.processing) {
+                print("Processing")
+            } else {
+                var assembly: Assembly = forObject as! Assembly
+                print("Processed")
+            }
         } else {
             print(withResult.error)
         }

diff --git a/Transloadit.podspec b/Transloadit.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'Transloadit'
-  s.version          = '2.0.1'
+  s.version          = '2.0.2'
   s.summary          = 'A short description of Transloadit.'
   s.swift_version = '5.0'
 
@@ -40,5 +40,5 @@ TODO: Add long description of the pod here.
   # s.public_header_files = 'Pod/Classes/**/*.h'
   # s.frameworks = 'UIKit', 'MapKit'
   # s.dependency 'AFNetworking', '~> 2.3'
-    s.dependency 'TUSKit', '~> 2.0.0'
+    s.dependency 'TUSKit', '~> 2.1.0'
 end
diff --git a/Transloadit/Classes/Assembly.swift b/Transloadit/Classes/Assembly.swift
@@ -13,7 +13,7 @@ public class Assembly: APIObject {
     var numberOfFiles: Int?
 
     internal var tusUpload: TUSUpload?
-    internal var assemblyURL: String?
+    public var assemblyURL: String?
 
 
     internal var steps: NSMutableDictionary = [:]
@@ -25,9 +25,6 @@ public class Assembly: APIObject {
     }
 
 
-    public func addFile(withData: Data) {
-
-    }
 
     public func addFile(withPathURL: URL) {
         tusUpload = TUSUpload(withId: withPathURL.lastPathComponent, andFilePathURL: withPathURL, andFileType: withPathURL.pathExtension)

diff --git a/Transloadit/Classes/TransloaditExecutor.swift b/Transloadit/Classes/TransloaditExecutor.swift
@@ -56,8 +56,8 @@ class TransloaditExecutor: TUSDelegate {
         self.urlRequest(withMethod: "POST", andObject: object, callback: { response in
             if (response.success) {
                 if object.isKind(of: Assembly.self) {
-                    print(response.tusURL)
-                    TUSClient.shared.uploadURL = URL(string: response.tusURL)
+                    Transloadit.shared.delegate?.transloaditCreation(forObject: object as! Assembly, withResult: response)
+                    TUSClient.shared.uploadURL = URL(string: response.tusURL)!
                     //TUSClient.shared.startOrResume(forUpload: (object as! Assembly).tusUpload!, withExisitingURL: "")
                     (object as! Assembly).tusUpload?.metadata = ["fieldname": "file-input",
                                                                  "assembly_url": response.assemblyURL,
@@ -72,7 +72,7 @@ class TransloaditExecutor: TUSDelegate {
 
             } else {
                 if object.isKind(of: Assembly.self) {
-//                    Transloadit.shared.delegate?.transloaditCreationResult(forObject: object)
+                    Transloadit.shared.delegate?.transloaditCreation(forObject: object as! Assembly, withResult: response)
                 }
                 if object.isKind(of: Template.self) {
 //                    Transloadit.shared.delegate?.transloaditTemplateCreationError()
@@ -238,10 +238,10 @@ class TransloaditExecutor: TUSDelegate {
                 }
             } catch let error as NSError {
                 print(error)
+                transloaditResponse.error = error.debugDescription
+                callback(transloaditResponse)
+
             }
-            //let outputStr  = String(data: data!, encoding: String.Encoding.utf8) as String!
-            // print(outputStr)
-
 
         }