motion-http 0.1.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 295321b18316c5b3a47c29692b4831e25ed4b1c7
-  data.tar.gz: afcdbfc33304f05cf290fcdd33e339ad693fcb74
+SHA256:
+  metadata.gz: 9a2a08f70352d4ca6c4a4b3a79ab5825e806787ab90088bcad88350360d5c11f
+  data.tar.gz: 9bfc38b0f0138c7c4fb5ab98974ddb4ab852ed96e083d001ec683463d2e5f0ce
 SHA512:
-  metadata.gz: '095e68b01bca380833a6e93c2e25e5e6abd389727b6ff92aa1b39c9fef79132bec440ea2b280b4e0e5436535534dc158e234d1ed54bc9c99cc518a246fa5cf77'
-  data.tar.gz: 0667af5350564fb4f4199437a3ae827435f5ce942842ca333adba98ed46efaa7a8c4ff1dce85dc67c17b9fa382abdf28b7ba5645fa0e6064581cf405e9e3e5ed
+  metadata.gz: 2a3d796b3c9654461fb66b42456e7f43bfd6d896e5d3f0165c5d00dcb184ca5867b55a089d2eb75d2508b76697bec120bc1047874bc02530cb5e0c93896aa2ec
+  data.tar.gz: caf9553c2567c658ffd23c303dba63014a30fba3f5f4f111339753a8bab2c4b8bb9dbde0aa39d0d2e4dbac689bb826e75760123b502411687c4ea93dcee8c7cf

data/README.md

@@ -1,16 +1,14 @@
 # motion-http
 
-Motion::HTTP is a cross-platform HTTP Client for RubyMotion that's quick and easy to use.
+A cross-platform HTTP Client for RubyMotion that's quick and easy to use.
 
 Supported platforms:
 - iOS, macOS, tvOS, watchOS
 - Android
 
-This gem depends on two really popular networking libraries:
-- [AFNetworking](https://github.com/AFNetworking/AFNetworking) (for Cocoa platforms)
-- [OkHttp](http://square.github.io/okhttp/) (for Android)
+It makes use of the officially supported networking libraries provided by Apple and Google. The goal of this gem is to provide you with a stable alternative to using these libraries directly, using a syntax that is much easier to use.
 
-Please note that this library is still a work in progress. Please report bugs and suggestions for improvement!
+Please report any bugs or suggestions for improvement!
 
 ## Installation
 
@@ -21,33 +19,35 @@ Add this line to your application's Gemfile:
 And then execute:
 
     $ bundle
-    $ rake pod:install # for iOS apps
-    $ rake gradle:install # for Android apps
+    $ rake gradle:install # Android only
 
 ### iOS Specific Configuration
 
-If you will be making insecure HTTP requests (not HTTPS), you will need to explicitly allow insecure HTTP requests by adding this line to your app's configuration in your Rakefile:
+If you will be making insecure requests (not using HTTPS), you will need to explicitly allow insecure HTTP requests by adding this line to your app's configuration (in your `Rakefile`). You might want to do this if you are trying to access localhost in development.
 
-    app.info_plist['NSAppTransportSecurity'] = { 'NSAllowsArbitraryLoads' => true }
+```ruby
+app.development do
+  app.info_plist['NSAppTransportSecurity'] = { 'NSAllowsArbitraryLoads' => true }
+end
+```
 
 ## Usage
 
-Using `Motion::HTTP` is quick and easy. You can use the simple approach for making one-off requests, or the advanced approach of creating a reusable API client for further customization.
+Using `motion-http` is quick and easy. You can either make one-off requests or create a reusable API client for further customization.
 
-### Simple Usage
+### Basic Usage
 
-The basic syntax for a simple request looks like this:
+The basic syntax for a request looks like this:
 ```ruby
-Motion::HTTP.method(url, params) do |response|
-  # this block will be called asynchronously
+HTTP.method(url, options) do |response|
+  # this will be called asynchronously
 end
 ```
+Where `method` can be either `get`, `post`, `put`, `patch`, `delete`, `head`, `options`, or `trace`.
 
-To make a simple `GET` request:
+For example, to make a simple `GET` request:
 ```ruby
-Motion::HTTP.get("http://www.example.com") do |response|
-  puts "status code: #{response.status_code}"
-  puts "response body: #{response.body}"
+HTTP.get("http://www.example.com") do |response|
   if response.success?
     puts "Success!"
   else
@@ -56,16 +56,29 @@ Motion::HTTP.get("http://www.example.com") do |response|
 end
 ```
 
-You can specify query params as the second argument:
+If you need to specify query params:
 ```ruby
-Motion::HTTP.get("http://www.example.com/search", term: "my search term") do |response|
+HTTP.get("http://www.example.com/search", params: { term: "my search term" }) do |response|
   # ...
 end
 ```
 
-`Motion::HTTP` will automatically parse JSON responses:
+The response object contains the status code, headers, body, and shortcut methods for checking the response status:
+```ruby
+HTTP.get("http://example.com") do |response|
+  puts response.status_code.to_s
+  puts response.headers.inspect
+  puts response.body
+  response.success?      # 2xx status
+  response.redirect?     # 3xx status
+  response.client_error? # 4xx status
+  response.server_error? # 5xx status
+end
+```
+
+If the response body has a JSON content type it will automatically be parsed when requesting the `response.object`:
 ```ruby
-Motion::HTTP.get("http://api.example.com/people.json") do |response|
+HTTP.get("http://api.example.com/people.json") do |response|
   if response.success?
     response.object["people"].each do |person|
       puts "name: #{person["name"]}"
@@ -76,25 +89,66 @@ Motion::HTTP.get("http://api.example.com/people.json") do |response|
 end
 ```
 
-To make a simple `POST` request, the value passed as the second argument will be encoded as the request body:
+Use the `follow_redirects` option to specify whether or not to follow redirects. The default is `true`:
 ```ruby
-json = { widget: { name: "Foobar" } }
-Motion::HTTP.post("http://www.example.com/widgets", json) do |response|
+HTTP.get("http://example.com/redirect", follow_redirects: false) do |response|
+  # ...
+end
+```
+
+#### POST Requests
+
+When making a `POST` request, specifying the request body is easy:
+```ruby
+HTTP.post("http://www.example.com/endpoint", body: raw_request_body) do |response|
+  # ...
+end
+```
+
+Specify the `:form` option and it will automatically be encoded as `application/x-www-form-urlencoded` request body:
+```ruby
+HTTP.post("http://www.example.com/login", form: { user: 'andrew', password: 'secret'}) do |response|
   if response.success?
-    puts "Widget created!"
+    puts "Authenticated!"
   elsif response.client_error?
+    puts "Bad username or password"
+  else
+    puts "Oops! Something went wrong."
+  end
+end
+```
+
+Likewise, to send a JSON encoded request body, use the `:json` option:
+```ruby
+HTTP.post("http://www.example.com/widgets", json: { widget: { name: "Foobar" } }) do |response|
+  if response.success?
+    puts "Widget created!"
+  elsif response.status_code == 422
     puts "Oops, you did something wrong: #{response.object["error_message"]}"
   else
-    puts "Oops! Something else went wrong."
+    puts "Oops! Something went wrong."
   end
 end
 ```
 
-`PUT`, `PATCH`, and `DELETE` requests work the same way:
+To specify request specific headers, use the `:headers` option. This overrides any previously set headers. In this example, we override the default JSON content type:
+```ruby
+HTTP.post("http://www.example.com/widgets",
+    headers: { 'Content-Type' => 'application/vnd.api+json' },
+    json: { widget: { name: "Foobar" } }
+  ) do |response|
+  # ...
+end
+```
+
+All other HTTP method requests work the same way:
 ```ruby
-Motion::HTTP.put(url, params) { ... }
-Motion::HTTP.patch(url, params) { ... }
-Motion::HTTP.delete(url, params) { ... }
+HTTP.put(url, options) { ... }
+HTTP.patch(url, options) { ... }
+HTTP.delete(url, options) { ... }
+HTTP.head(url, options) { ... }
+HTTP.options(url, options) { ... }
+HTTP.trace(url, options) { ... }
 ```
 
 ### Advanced Usage
@@ -102,27 +156,63 @@ Motion::HTTP.delete(url, params) { ... }
 A common use case is to create a reusable HTTP client that uses a common base URL or request headers.
 
 ```ruby
-client = Motion::HTTP::Client.new("http://www.example.com")
+client = HTTP::Client.new("http://api.example.com")
 # Set or replace a single header:
 client.header "X-API-TOKEN", "abc123xyz"
+client.header["X-API-TOKEN"] = "abc123xyz"
 
 # To set or replace multiple headers:
 client.headers "X-API-TOKEN" => "abc123xyz",
                "Accept" => "application/json"
 
-# It is valid for some headers to appear multiple times (Accept, Vary, etc).
+# Note that it is valid for some headers to appear multiple times (Accept, Vary, etc).
 # To append multiple headers of the same key:
 client.add_header "Accept", "application/json"
-client.add_header "Accept", "application/vnd.api+json"
+client.headers.add "Accept", "application/json"
 ```
 
-Then make your requests relative to the base URL that you specified when creating your client.
+Then you can make your requests relative to the base URL that you specified when creating your client.
 ```ruby
 client.get("/people") do |response|
   # ...
 end
 ```
 
+### Basic Auth / Token Auth
+
+To make Basic Auth requests, either set the credentials before the request, or set it on your client:
+
+```ruby
+HTTP.basic_auth('username', 'password').get('https://example.com/protected')
+# or
+client.basic_auth('username', 'password')
+client.get('/protected')
+```
+
+The `auth` method is another shortcut for setting any value of the Authorization header:
+
+```ruby
+HTTP.auth("Token token=#{my_token}")
+# or
+client.auth("Token token=#{my_token}")
+# same as
+client.headers['Authorization'] = "Token token=#{my_token}"
+```
+
+### Logging
+
+Logging is disabled by default. To enable logging:
+
+```
+HTTP.logger.enable!
+```
+
+To disable it again:
+
+```
+HTTP.logger.disable!
+```
+
 ## Contributing
 
 1. Fork it
@@ -131,12 +221,37 @@ end
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
 
-## MIT License
+## License
 
-Copyright 2018 Andrew Havens
+Copyright 2018-2019 Andrew Havens
 
 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.
+
+Parts of the source are under the following license:
+
+Copyright (c) 2015-2016, HipByte (info@hipbyte.com) and contributors.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

data/lib/android/adapter.rb

@@ -1,58 +1,13 @@
 class Motion
   class HTTP
     class Adapter
-      JSONMediaType = Okhttp3::MediaType.parse("application/json; charset=utf-8")
-
-      def self.client
-        @client ||= Okhttp3::OkHttpClient.new
-      end
-
-      def self.request(http_method, url, headers, params = nil, &callback)
-        puts "starting #{http_method.to_s.upcase} #{url}"
-        request = OkHttp3::Request::Builder.new
-        request.url(url) # TODO: encode GET params and append to URL prior to calling this method
-        headers.each do |key, value|
-          if value.is_a? Array
-            value.each {|val| request.addHeader(key, val) }
-          else
-            request.header(key, value)
-          end
-        end
-        if http_method != :get
-          puts "would have set body for #{http_method.to_s.upcase} #{url}"
-          # body = OkHttp3::RequestBody.create(JSONMediaType, params) # TODO: allow other content types
-          # request.method(http_method.to_s, body)
-        end
-        client.newCall(request.build).enqueue(OkhttpCallback.new(callback))
+      def self.perform(request, &callback)
+        volley_request = VolleyRequest.create(request, callback)
+        queue.add(volley_request)
       end
 
-      class OkhttpCallback
-        def initialize(callback)
-          @callback = callback
-        end
-
-        def onFailure(call, e)
-          puts "Error: #{e.getMessage}"
-          @callback.call(Response.new(nil, Headers.new, e.getMessage))
-        end
-
-        def onResponse(call, response)
-          @callback.call(parse_response(response))
-        end
-
-        def parse_response(response)
-          headers = Headers.new
-          i = 0
-          while i < response.headers.size
-            key = response.headers.name(i)
-            value = response.headers.value(i)
-            headers.add(key, value)
-            i += 1
-          end
-          body_string = response.body.string
-          json = JSON.load(body_string) if headers['content-type'] =~ /application\/json/
-          Response.new(response.code, headers, body_string, json)
-        end
+      def self.queue
+        @queue ||= Com::Android::Volley::Toolbox::Volley.newRequestQueue(Motion::HTTP.application_context)
       end
     end
   end

data/lib/android/base64.rb

@@ -0,0 +1,36 @@
+# Copyright (c) 2015-2016, HipByte (info@hipbyte.com) and contributors.
+# All rights reserved.
+
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met: 
+
+# 1. Redistributions of source code must retain the above copyright notice, this
+#    list of conditions and the following disclaimer. 
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution. 
+
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Copied from https://github.com/HipByte/Flow/blob/44283b31a63bc826d2c068557b6357dc1195680b/flow/base64/android/base64.rb
+class Base64
+  def self.encode(string)
+    bytes = Java::Lang::String.new(string).getBytes("UTF-8")
+    Android::Util::Base64.encodeToString(bytes, Android::Util::Base64::NO_WRAP)
+  end
+
+  def self.decode(string)
+    java_string = Java::Lang::String.new(string)
+    bytes = Android::Util::Base64.decode(java_string, Android::Util::Base64::NO_WRAP)
+    Java::Lang::String.new(bytes, "UTF-8")
+  end
+end

data/lib/android/json.rb

@@ -1,6 +1,29 @@
+# Copyright (c) 2015-2016, HipByte (info@hipbyte.com) and contributors.
+# All rights reserved.
+
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met: 
+
+# 1. Redistributions of source code must retain the above copyright notice, this
+#    list of conditions and the following disclaimer. 
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution. 
+
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 # NOTE: Copied from https://github.com/HipByte/Flow/blob/master/flow/json/android/json.rb
 class JSON
-  def self.load(str)
+  def self.parse(str)
     tok = Org::JSON::JSONTokener.new(str)
     obj = tok.nextValue
     if obj == nil
@@ -34,3 +57,34 @@ class JSON
     end
   end
 end
+
+class Object
+  def to_json
+    # The Android JSON API expects real Java String objects.
+    @@fix_string ||= (lambda do |obj|
+      case obj
+        when String, Symbol
+          obj = obj.toString
+        when Hash
+          map = Hash.new
+          obj.each do |key, value|
+            key = key.toString if key.is_a?(String) || key.is_a?(Symbol)
+            value = @@fix_string.call(value)
+            map[key] = value
+          end
+          obj = map
+        when Array
+          obj = obj.map do |item|
+            (item.is_a?(String) || item.is_a?(Symbol)) ? item.toString : @@fix_string.call(item)
+          end
+      end
+      obj
+    end)
+
+    obj = Org::JSON::JSONObject.wrap(@@fix_string.call(self))
+    if obj == nil
+      raise "Can't serialize object to JSON"
+    end
+    obj.toString.to_s
+  end
+end

data/lib/android/params_encoder.rb

@@ -0,0 +1,5 @@
+class ParamsEncoder
+  def self.encode(arg)
+    Java::Net::URLEncoder.encode(arg, 'UTF-8')
+  end
+end

data/lib/android/volley_request.rb

@@ -0,0 +1,52 @@
+class VolleyRequest < Com::Android::Volley::Request
+  attr_accessor :original_request, :callback
+
+  METHOD_CODES = {
+    get: 0,
+    post: 1,
+    put: 2,
+    delete: 3,
+    head: 4,
+    options: 5,
+    trace: 6,
+    patch: 7,
+  }
+
+  def self.create(request, callback)
+    volley_request = new(METHOD_CODES[request.http_method], request.url, nil)
+    volley_request.original_request = request
+    volley_request.headers = request.headers.to_hash
+    volley_request.body = request.body
+    volley_request.callback = callback
+    volley_request
+  end
+
+  def parseNetworkResponse(networkResponse)
+    response = build_response(networkResponse)
+    Com::Android::Volley::Response.success(response, Com::Android::Volley::Toolbox::HttpHeaderParser.parseCacheHeaders(networkResponse))
+  end
+
+  def deliverResponse(response)
+    Motion::HTTP.logger.log_response(response)
+    callback.call(response) if callback
+  end
+
+  def deliverError(error)
+    if error.networkResponse
+      response = build_response(error.networkResponse)
+      deliverResponse(response)
+    else
+      Motion::HTTP.logger.error("Error while requesting #{original_request.url}: #{error.getMessage}")
+      error.getStackTrace.each do |line|
+        puts line.toString
+      end
+      response = Motion::HTTP::Response.new(original_request, nil, nil, error.getMessage)
+      callback.call(response) if callback
+    end
+  end
+
+  def build_response(networkResponse)
+    body = parse_body_from_response(networkResponse)
+    Motion::HTTP::Response.new(original_request, networkResponse.statusCode, Motion::HTTP::Headers.new(networkResponse.headers), body)
+  end
+end

data/lib/cocoa/adapter.rb

@@ -1,44 +1,61 @@
 class Motion
   class HTTP
     class Adapter
-      def self.manager
-        @manager ||= AFHTTPSessionManager.manager
+      def self.perform(request, &callback)
+        Motion::HTTP::Adapter::Request.new(request).perform(&callback)
       end
 
-      def self.request(http_method, url, headers, params = nil, &callback)
-        progress = nil
-        on_success = lambda do |task, response_object|
-          response = task.response
-          callback.call(Response.new(response.statusCode, Headers.new(response.allHeaderFields), nil, response_object))
+      class Request
+        def initialize(request)
+          @request = request
+          @session = NSURLSession.sessionWithConfiguration(NSURLSessionConfiguration.defaultSessionConfiguration, delegate: self, delegateQueue: nil)
         end
-        on_error = lambda do |operation, error|
-          NSLog("Error: %@", error)
-          response = operation.response
-          status_code = response.statusCode if response
-          response_headers = response.allHeaderFields if response
-          error_message = error.localizedDescription
-          error_message += error.userInfo[NSLocalizedDescriptionKey] if error.userInfo[NSLocalizedDescriptionKey]
-          callback.call(
-            Response.new(status_code, Headers.new(response_headers), error_message)
-          )
+
+        def perform(&callback)
+          # TODO: dataTask is good for general HTTP requests but not for file downloads
+          ns_url_request = build_ns_url_request
+          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)
+            else
+              response = Response.new(@request, response.statusCode, Headers.new(response.allHeaderFields), data.to_s)
+              Motion::HTTP.logger.log_response(response)
+            end
+            callback.call(response) if callback
+          })
+          task.resume
         end
 
-        case http_method
-        when :get
-          manager.GET url, parameters: params, progress: progress, success: on_success, failure: on_error
-        when :post
-          manager.POST url, parameters: params, progress: progress, success: on_success, failure: on_error
-        when :put
-          manager.PUT url, parameters: params, progress: progress, success: on_success, failure: on_error
-        when :patch
-          manager.PATCH url, parameters: params, progress: progress, success: on_success, failure: on_error
-        when :delete
-          manager.DELETE url, parameters: params, progress: progress, success: on_success, failure: on_error
+        def build_ns_url_request
+          ns_url_request = NSMutableURLRequest.alloc.initWithURL(NSURL.URLWithString(@request.url))
+          ns_url_request.HTTPMethod = @request.http_method.to_s.upcase
+          @request.headers.each do |key, value|
+            if value.is_a? Array
+              value.each {|v2| ns_url_request.addValue(v2, forHTTPHeaderField: key) }
+            else
+              ns_url_request.setValue(value, forHTTPHeaderField: key)
+            end
+          end
+
+          if @request.body
+            ns_url_request.HTTPBody = NSString.alloc.initWithString(@request.body).dataUsingEncoding(NSUTF8StringEncoding)
+          end
+
+          # TODO: add other headers
+          ns_url_request
         end
 
-        # FIXME: dynamically calling the method using send results in a crash
-        # method_signature = "#{http_method.to_s.upcase}:parameters:progress:success:failure:"
-        # # manager.send(method_signature, url, params, nil, on_success, on_error)
+        # NSURLSessionTaskDelegate methods
+
+        def URLSession(session, task: task, willPerformHTTPRedirection: response, newRequest: request, completionHandler: completion_handler)
+          if @request.options[:follow_redirects] == false
+            completion_handler.call(nil)
+          else
+            completion_handler.call(request)
+          end
+        end
       end
     end
   end

data/lib/cocoa/base64.rb

@@ -0,0 +1,35 @@
+# Copyright (c) 2015-2016, HipByte (info@hipbyte.com) and contributors.
+# All rights reserved.
+
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met: 
+
+# 1. Redistributions of source code must retain the above copyright notice, this
+#    list of conditions and the following disclaimer. 
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution. 
+
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Copied from https://github.com/HipByte/Flow/blob/44283b31a63bc826d2c068557b6357dc1195680b/flow/base64/cocoa/base64.rb
+class Base64
+  def self.encode(string)
+    data = string.dataUsingEncoding(NSUTF8StringEncoding)
+    data.base64EncodedStringWithOptions(0)
+  end
+
+  def self.decode(string)
+    data = NSData.alloc.initWithBase64EncodedString(string, options: 0)
+    NSString.alloc.initWithData(data, encoding: NSUTF8StringEncoding)
+  end
+end

data/lib/cocoa/json.rb

@@ -0,0 +1,50 @@
+# Copyright (c) 2015-2016, HipByte (info@hipbyte.com) and contributors.
+# All rights reserved.
+
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met: 
+
+# 1. Redistributions of source code must retain the above copyright notice, this
+#    list of conditions and the following disclaimer. 
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution. 
+
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Copied from https://github.com/HipByte/Flow/blob/44283b31a63bc826d2c068557b6357dc1195680b/flow/json/cocoa/json.rb
+class JSON
+  def self.parse(json_string)
+    error_ptr = Pointer.new(:id)
+    object = NSJSONSerialization.JSONObjectWithData(json_string.dataUsingEncoding(NSUTF8StringEncoding), options: 0, error: error_ptr)
+    unless object
+      raise error_ptr[0].description
+    end
+    object
+  end
+
+  def self.generate(object)
+    raise "Invalid JSON object" unless NSJSONSerialization.isValidJSONObject(object)
+    error_ptr = Pointer.new(:id)
+    data = NSJSONSerialization.dataWithJSONObject(object, options: 0, error: error_ptr)
+    unless data
+      raise error_ptr[0].description
+    end
+    data.to_s
+  end
+end
+
+class Object
+  def to_json
+    JSON.generate(self)
+  end
+end

data/lib/cocoa/params_encoder.rb

@@ -0,0 +1,8 @@
+class ParamsEncoder
+  # TODO: check if iOS implements anything more performant/reliable that we should be using.
+  def self.encode(arg)
+    arg.to_s.gsub(/([^ a-zA-Z0-9_.-]+)/) do |m|
+      '%' + m.unpack('H2' * m.bytesize).join('%').upcase
+    end.tr(' ', '+')
+  end
+end

data/lib/common/http/client.rb

@@ -3,9 +3,10 @@ class Motion
     class Client
       attr_reader :base_url
 
-      def initialize(base_url = nil)
-        @base_url = base_url || ""
-        @headers = Headers.new
+      def initialize(base_url = nil, options = nil)
+        @base_url = base_url || ''
+        options ||= {}
+        @headers = Headers.new(options.delete(:headers))
       end
 
       def header(key, value)
@@ -25,19 +26,57 @@ class Motion
         @headers
       end
 
-      # FIXME: doesn't work on Android
-      # [:get, :post, :put, :patch, :delete].each do |method|
-      #   define_method "#{method}", do |path, params = nil, &callback|
-      #     Request.new(method, base_url + path, headers, params, &callback).call
-      #   end
-      # end
+      def basic_auth(username, password)
+        header_value = 'Basic ' + Base64.encode("#{username}:#{password}")
+        auth(header_value)
+        self
+      end
+
+      def auth(header_value)
+        @headers.set 'Authorization', header_value
+        self
+      end
+
+      def get(path, options = nil, &callback)
+        request(:get, path, options, &callback)
+      end
+
+      def post(path, options = nil, &callback)
+        request(:post, path, options, &callback)
+      end
+
+      def put(path, options = nil, &callback)
+        request(:put, path, options, &callback)
+      end
 
-      def get(path, params = nil, &callback)
-        Request.new(:get, base_url + path, @headers, params, &callback).call
+      def patch(path, options = nil, &callback)
+        request(:patch, path, options, &callback)
       end
 
-      def post(path, params = nil, &callback)
-        Request.new(:post, base_url + path, @headers, params, &callback).call
+      def delete(path, options = nil, &callback)
+        request(:delete, path, options, &callback)
+      end
+
+      def head(path, options = nil, &callback)
+        request(:head, path, options, &callback)
+      end
+
+      def options(path, options = nil, &callback)
+        request(:options, path, options, &callback)
+      end
+
+      def trace(path, options = nil, &callback)
+        request(:trace, path, options, &callback)
+      end
+
+      def request(http_method, path, options = nil, &callback)
+        options ||= {}
+        headers_dup = headers.dup
+        if options[:headers]
+          options.delete(:headers).each {|key, value| headers_dup.set(key, value) }
+        end
+        options[:headers] = headers_dup
+        Request.new(http_method, base_url + path, options).perform(&callback)
       end
     end
   end

data/lib/common/http/headers.rb

@@ -2,12 +2,27 @@ class Motion
   class HTTP
     class Headers
       def initialize(headers = {})
-        @headers = headers
+        @headers = {}
+        if headers
+          headers.each {|key, value| set(key, value) }
+        end
+      end
+
+      def get(key)
+        @headers[key.downcase]
+      end
+      # alias :[] :get # FIXME: doesn't work in Android
+      def [](key)
+        get(key)
       end
 
       def set(key, value)
         @headers[key.downcase] = value
       end
+      # alias :[]= :set # FIXME: doesn't work in Android
+      def []=(key, value)
+        set(key, value)
+      end
 
       def add(key, value)
         key = key.downcase
@@ -17,13 +32,22 @@ class Motion
         end
         @headers[key] << value
       end
+      # alias :<< :add # FIXME: doesn't work in Android
+      def <<(key, value)
+        add(key, value)
+      end
 
       def each(&block)
         @headers.each(&block)
       end
 
-      def [](key)
-        @headers[key.downcase]
+      def to_hash
+        @headers # TODO: flatten array values
+      end
+
+      # FIXME: Android doesn't support dup (Java exception raised: java.lang.CloneNotSupportedException: Class com.yourcompany.motion_http.Headers doesn't implement Cloneable)
+      def dup
+        Headers.new(@headers)
       end
     end
   end

data/lib/common/http/logger.rb

@@ -0,0 +1,56 @@
+class Motion
+  class HTTP
+    class Logger
+      attr_reader :enabled
+
+      def initialize
+        @enabled = false # logging is disabled by default
+      end
+
+      def enable!
+        @enabled = true
+      end
+
+      def disable!
+        @enabled = false
+      end
+
+      def _logger
+        @_logger ||= Motion::Lager.new
+      end
+
+      def debug(message, color = :gray)
+        _logger.debug(message, color) if enabled
+      end
+
+      def log(message, color = :white)
+        _logger.log(message, color) if enabled
+      end
+
+      def error(message, color = :red)
+        _logger.error(message, color) # always log even if logging is disabled
+      end
+
+      def log_request(request)
+        debug "\nRequest:\n#{request.http_method.to_s.upcase} #{request.url}"
+        request.headers.each do |k,v|
+          debug "#{k}: #{v}"
+        end
+        debug(request.body) if request.body
+      end
+
+      def log_response(response)
+        debug "\nResponse:"
+        if response.original_request
+          debug "URL: #{response.original_request.url}"
+        end
+        debug "Status: #{response.status_code}"
+        response.headers.each do |k,v|
+          debug "#{k}: #{v}"
+        end
+        debug("\n#{response.body}")
+      end
+
+    end
+  end
+end

data/lib/common/http/request.rb

@@ -1,19 +1,60 @@
 class Motion
   class HTTP
     class Request
-      attr_reader :method, :url, :headers, :body, :callback
+      attr_reader :http_method, :url, :headers, :body, :options
 
-      def initialize(method, url, headers = nil, params = nil, &callback)
-        @method = method
+      def initialize(http_method, url, options = nil)
+        @http_method = http_method
         @url = url
-        @headers = headers || Headers.new
-        @body = params # TODO: turn params into body and set content-type?
-        @callback = callback || ->(response) {}
+        @options = options ||= {}
+        @headers = @options.delete(:headers) || Headers.new
+        @body = @options.delete(:body)
+
+        if @options[:params]
+          @params = @options.delete(:params)
+          flatten_params!
+          encode_params!
+          @url = "#{url}?#{@params.map{|k,v|"#{k}=#{v}"}.join('&')}"
+
+        elsif @options[:form]
+          @headers['Content-Type'] ||= 'application/x-www-form-urlencoded'
+          @params = @options.delete(:form)
+          flatten_params!
+          encode_params!
+          @body = @params.map{|k,v|"#{k}=#{v}"}.join('&')
+
+        elsif @options[:json]
+          @headers['Content-Type'] ||= 'application/json; charset=utf-8'
+          @body = @options.delete(:json).to_json
+        end
+      end
+
+      def flatten_params!
+        new_params = {}
+        @params.each do |k,v|
+          if v.is_a? Hash
+            v.each do |nested_k, nested_v|
+              new_params["#{k}[#{nested_k}]"] = nested_v
+            end
+          else
+            new_params[k] = v
+          end
+        end
+        @params = new_params
+        flatten_params! if @params.any? {|k,v| v.is_a? Hash }
+      end
+
+      def encode_params!
+        new_params = {}
+        @params.each do |k,v|
+          new_params[ParamsEncoder.encode(k)] = ParamsEncoder.encode(v)
+        end
+        @params = new_params
       end
 
-      def call
-        # TODO: maybe pass self instead of args
-        Adapter.request(method, url, headers, body, &callback)
+      def perform(&callback)
+        Motion::HTTP.logger.log_request(self)
+        Adapter.perform(self, &callback)
       end
     end
   end

data/lib/common/http/response.rb

@@ -1,22 +1,42 @@
 class Motion
   class HTTP
     class Response
-      attr_reader :status_code, :headers, :body, :object
+      attr_reader :original_request, :status_code, :headers, :body
 
-      def initialize(status_code, headers, body_string, body_object = nil)
+      def initialize(original_request, status_code, headers, body)
+        @original_request = original_request
         @status_code = status_code
         @headers = headers
-        @body = body_string
-        @object = body_object
+        @body = body
       end
 
       def success?
-        return false unless status_code
-        status_code >= 200 && status_code < 300
+        status_code && (200..299) === status_code
+      end
+
+      def redirect?
+        status_code && (300..399) === status_code
+      end
+
+      def client_error?
+        status_code && (400..499) === status_code
+      end
+
+      def server_error?
+        status_code && (500..599) === status_code
+      end
+
+      def object
+        @object ||= case headers['Content-Type']
+          when /^application\/json/, /^application\/vnd.api\+json/
+            JSON.parse(body)
+          else
+            body
+          end
       end
 
       def inspect
-        "<Motion::HTTP::Response status_code:#{status_code} headers:<#{headers.class}> body:<#{body.class}>>"
+        "<Motion::HTTP::Response status_code:#{status_code} headers:#{headers.inspect} body:#{body.inspect}>"
       end
     end
   end

data/lib/common/http.rb

@@ -1,36 +1,57 @@
 class Motion
   class HTTP
     class << self
-      def client
-        @client ||= Client.new
+      attr_accessor :application_context # Android
+
+      def logger
+        @logger ||= Logger.new
+      end
+
+      def client(*args)
+        Client.new(*args)
       end
 
-      # FIXME: doesn't work on Android
-      # [:get, :post, :put, :patch, :delete].each do |method|
-      #   define_method "#{method}", do |url, params = nil, &callback|
-      #     client.send(method, url, params, &callback)
-      #   end
-      # end
+      def basic_auth(username, password)
+        client.basic_auth(username, password)
+      end
 
-      def get(url, params = nil, &callback)
-        client.get(url, params, &callback)
+      def auth(header_value)
+        client.auth(header_value)
       end
 
-      def post(url, params = nil, &callback)
-        client.post(url, params, &callback)
+      def get(url, options = nil, &callback)
+        client.get(url, options, &callback)
       end
 
-      def put(url, params = nil, &callback)
-        client.put(url, params, &callback)
+      def post(url, options = nil, &callback)
+        client.post(url, options, &callback)
       end
 
-      def patch(url, params = nil, &callback)
-        client.patch(url, params, &callback)
+      def put(url, options = nil, &callback)
+        client.put(url, options, &callback)
       end
 
-      def delete(url, params = nil, &callback)
-        client.delete(url, params, &callback)
+      def patch(url, options = nil, &callback)
+        client.patch(url, options, &callback)
+      end
+
+      def delete(url, options = nil, &callback)
+        client.delete(url, options, &callback)
+      end
+
+      def head(url, options = nil, &callback)
+        client.head(url, options, &callback)
+      end
+
+      def options(url, options = nil, &callback)
+        client.options(url, options, &callback)
+      end
+
+      def trace(url, options = nil, &callback)
+        client.trace(url, options, &callback)
       end
     end
   end
 end
+
+HTTP = Motion::HTTP # alias as simply HTTP

data/lib/motion-http.rb

@@ -4,6 +4,8 @@ unless defined?(Motion::Project::Config)
   raise "This gem is only intended to be used in a RubyMotion project."
 end
 
+require 'motion-lager'
+
 lib_dir_path = File.dirname(File.expand_path(__FILE__))
 Motion::Project::App.setup do |app|
   app.files.unshift(*Dir.glob(File.join(lib_dir_path, "common/**/*.rb")))
@@ -12,15 +14,10 @@ Motion::Project::App.setup do |app|
   when :android
     require "motion-gradle"
     app.files.unshift(*Dir.glob(File.join(lib_dir_path, "android/**/*.rb")))
-    app.gradle do
-      dependency "com.squareup.okhttp3:okhttp:3.9.0"
-    end
+    app.permissions << :internet
+    app.gradle { dependency 'com.android.volley:volley:1.1.1' }
   when :ios, :tvos, :osx, :watchos, :'ios-extension'
-    require "motion-cocoapods"
     app.files.unshift(*Dir.glob(File.join(lib_dir_path, "cocoa/**/*.rb")))
-    app.pods do
-      pod "AFNetworking", "~> 3.1"
-    end
   else
     raise "Project template #{Motion::Project::App.template} not supported by motion-http"
   end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: motion-http
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Andrew Havens
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-03-26 00:00:00.000000000 Z
-dependencies: []
+date: 2021-10-20 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: motion-lager
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A cross-platform HTTP client for RubyMotion that's quick and easy to
   use.
 email:
@@ -20,19 +34,26 @@ extra_rdoc_files: []
 files:
 - README.md
 - lib/android/adapter.rb
+- lib/android/base64.rb
 - lib/android/json.rb
+- lib/android/params_encoder.rb
+- lib/android/volley_request.rb
 - lib/cocoa/adapter.rb
+- lib/cocoa/base64.rb
+- lib/cocoa/json.rb
+- lib/cocoa/params_encoder.rb
 - lib/common/http.rb
 - lib/common/http/client.rb
 - lib/common/http/headers.rb
+- lib/common/http/logger.rb
 - lib/common/http/request.rb
 - lib/common/http/response.rb
 - lib/motion-http.rb
-homepage: https://github.com/andrewhavens/motion-http
+homepage: https://github.com/rubymotion-community/motion-http
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -47,9 +68,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: A cross-platform HTTP client for RubyMotion that's quick and easy to use.
 test_files: []