motion-http 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6fdd9853db4edb1720e95dac2ab15074cfe361e21a8c80b940854d22a8c1fe38
-  data.tar.gz: eb9b3042d28b232921fd1adda2ece8e17fd4397a63bf6a7bdeaba0fcd045929a
+  metadata.gz: f008cdd4f451d3c07f846a6129ee78759ef8c3b2a1eb0ff0374f2cf05f2b6f8e
+  data.tar.gz: 83d1124e7b3a3afcbec2a8d28436586eb0392b12922b4bd30174439d32f86cda
 SHA512:
-  metadata.gz: 1c151143736e9dc4ca7e9b4ace845ffec8a6deb1316fcfd083c0ec9ce1577d3f32b41059f27fe228d3161076a3b63bda26f514c2c4f0573d464f9a43088da9f8
-  data.tar.gz: 7f5525e0c1f1f7155feda2ef235ad8a124a34da785d180aa211d5c04e2dc8d5b355eea3abb912fd7af8a192f132bb06a38fcf66b9302ff1da9236ec51324b66b
+  metadata.gz: 40bec4425a0992d25cce5407c0edd47f675d5a255cc01368f3f7441abb2ecd2c8920895f83e5b0e6b569709b7d59025f9a2fcca35b19e47bd522ecb579d9456d
+  data.tar.gz: 7fe5336df48fac9bd7c58e16bae95da6cc05333a07e95ead7406d278cf3b3bb20a92bbb686e1d2e168765259a9ac1df5ef46546ccc3879bbd5eb5658638d07e3

data/lib/cocoa/adapter.rb

@@ -14,11 +14,48 @@ class Motion
         def perform(&callback)
           # TODO: dataTask is good for general HTTP requests but not for file downloads
           ns_url_request = build_ns_url_request
+          if @request.options[:download]
+            perform_download_request(ns_url_request, &callback)
+          else
+            perform_normal_http_request(ns_url_request, &callback)
+          end
+        end
+
+        def perform_download_request(ns_url_request, &callback)
+          # TODO: need to set up delegate methods when using a background session
+          # @background_session = NSURLSession.sessionWithConfiguration(NSURLSessionConfiguration.backgroundSessionConfigurationWithIdentifier("motion-http"))
+          # task = @background_session.downloadTaskWithRequest(ns_url_request, completionHandler: -> (location, response, error) {
+          task = @session.downloadTaskWithRequest(ns_url_request, completionHandler: -> (location, response, error) {
+            if error
+              log_error "Error while requesting #{@request.url}: #{error_description(error)}"
+              response = Response.new(@request, response&.statusCode, Headers.new(response&.allHeaderFields), error_description(error))
+            else
+              if @request.options[:to]
+                error_ptr = Pointer.new(:object)
+                file_data = NSFileManager.defaultManager.contentsAtPath(location)
+                file_data.writeToFile(@request.options[:to], options: NSDataWritingAtomic, error: error_ptr)
+
+                if error_ptr[0]
+                  log_error "Error while saving downloaded file: #{error_description(error_ptr[0])}"
+                  response = Response.new(@request, response.statusCode, Headers.new(response.allHeaderFields), error_description(error_ptr[0]))
+                else
+                  response = Response.new(@request, response.statusCode, Headers.new(response.allHeaderFields), nil)
+                end
+              else
+                log_error "No local save path specified."
+              end
+              Motion::HTTP.logger.log_response(response)
+            end
+            callback.call(response) if callback
+          })
+          task.resume
+        end
+
+        def perform_normal_http_request(ns_url_request, &callback)
           task = @session.dataTaskWithRequest(ns_url_request, completionHandler: -> (data, response, error) {
             if error
-              error_message = "#{error.localizedDescription} #{error.userInfo['NSLocalizedDescriptionKey']}"
-              Motion::HTTP.logger.error("Error while requesting #{@request.url}: #{error_message}")
-              response = Response.new(@request, response&.statusCode, Headers.new(response&.allHeaderFields), error_message)
+              log_error "Error while requesting #{@request.url}: #{error_description(error)}"
+              response = Response.new(@request, response&.statusCode, Headers.new(response&.allHeaderFields), error_description(error))
             else
               response = Response.new(@request, response.statusCode, Headers.new(response.allHeaderFields), data.to_s)
               Motion::HTTP.logger.log_response(response)
@@ -52,6 +89,14 @@ class Motion
           ns_url_request
         end
 
+        def log_error(message, error = nil)
+          Motion::HTTP.logger.error(message)
+        end
+
+        def error_description(error)
+          "#{error.localizedDescription} #{error.userInfo['NSLocalizedDescriptionKey']}"
+        end
+
         # NSURLSessionTaskDelegate methods
 
         def URLSession(session, task: task, willPerformHTTPRedirection: response, newRequest: request, completionHandler: completion_handler)

data/lib/common/http/client.rb

@@ -69,6 +69,13 @@ class Motion
         request(:trace, path, options, &callback)
       end
 
+      def download(remote_path, options = nil, &callback)
+        options ||= {}
+        http_method = options[:method] || :get
+        options[:download] = true
+        request(http_method, remote_path, options, &callback)
+      end
+
       def request(http_method, path, options = nil, &callback)
         options ||= {}
         headers_dup = headers.dup

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motion-http
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Andrew Havens
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-22 00:00:00.000000000 Z
+date: 2021-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: motion-lager