motion-http 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38301fffb680c2ff73c68cc0cafef260be772a4c09892c8f6706bb415014bdc6
-  data.tar.gz: 562ac8347a504aa3c061beeb6555ec54b73d0ec5c6d27266349150c1e4239c45
+  metadata.gz: 88e08d0e8132c9c56a98c4c06ab626ae647ea17818edb12bcfb0fc3d07f6b091
+  data.tar.gz: ea9eb01732c98423f6e109fe51b3cb925f63d620cbbd9a13304f955a116ccf84
 SHA512:
-  metadata.gz: d34d53372cd85ff50915ca586a36fdba710852a62e9f60c511139d0d72887084e974cc7a39faedc02a5737c96d858900e66ef661960572c22970aebccc613e32
-  data.tar.gz: 01d2e62e89ed670128c423c4f005383cc2ff46e351c3dc2163cf567a88ee7a5507257c3321cac4ba151f1bb91f2865af9ebd4ce1aae9f0c06b369d46ba63117a
+  metadata.gz: ac6c4d219bba2251d9361465a4f755d483ee2625d399e92c7e9809c3f269905184d764bdda3b26d0d949161763e84c30b15a45d8bed0295e36d50dd7377b8685
+  data.tar.gz: 43b654efcb82dd09d9822c3b7a7dd328077978aa25b40c247f69d48b1e5bfc3e9c5d419272ac9036177ee02046c6af71733a54737530491905cce7b3b6fac568

data/README.md

@@ -6,9 +6,9 @@ Supported platforms:
 - iOS, macOS, tvOS, watchOS
 - Android
 
-On Android, this gem depends on the super popular [OkHttp](http://square.github.io/okhttp/) networking library.
+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 and suggestions for improvement!
 
 ## Installation
 
@@ -19,13 +19,17 @@ Add this line to your application's Gemfile:
 And then execute:
 
     $ bundle
-    $ 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
 
@@ -202,12 +206,37 @@ HTTP.logger.disable!
 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/base64.rb

@@ -1,3 +1,26 @@
+# 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)

data/lib/android/json.rb

@@ -1,3 +1,26 @@
+# 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.parse(str)

data/lib/cocoa/base64.rb

@@ -1,3 +1,26 @@
+# 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/lib/cocoa/json.rb

@@ -1,3 +1,27 @@
+# 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)

data/lib/common/http/logger.rb

@@ -4,6 +4,7 @@ class Motion
       attr_reader :enabled
 
       def initialize(enabled = true)
+        # TODO: add ability to configure amount of logging (i.e. request URL only, no body, etc)
         @enabled = enabled
       end
 
@@ -15,63 +16,42 @@ class Motion
         @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)
-        puts colorize(color, message) if enabled
+        _logger.log(message, color) if enabled
       end
 
-      def error(message)
-        puts colorize(:red, message)
+      def error(message, color = :red)
+        _logger.error(message, color) # always log even if logging is disabled
       end
 
       def log_request(request)
-        log "\nRequest:\n#{request.http_method.to_s.upcase} #{request.url}", :dark_gray
-
-        if request.headers
-          request.headers.each do |k,v|
-            log "#{k}: #{v}", :dark_gray
-          end
+        debug "\nRequest:\n#{request.http_method.to_s.upcase} #{request.url}"
+        request.headers.each do |k,v|
+          debug "#{k}: #{v}"
         end
-
-        log(request.body, :dark_gray) if request.body
+        debug(request.body) if request.body
       end
 
       def log_response(response)
-        log "\nResponse:", :dark_gray
+        debug "\nResponse:"
         if response.original_request
-          log "URL: #{response.original_request.url}", :dark_gray
+          debug "URL: #{response.original_request.url}"
         end
-        log "Status: #{response.status_code}", :dark_gray
+        debug "Status: #{response.status_code}"
         response.headers.each do |k,v|
-          log "#{k}: #{v}", :dark_gray
+          debug "#{k}: #{v}"
         end
-        log "\n#{response.body}", :dark_gray
+        debug("\n#{response.body}")
       end
 
-      def colorize(color, string)
-        return string unless simulator? # Only colorize in the simulator
-
-        code = {
-          red: 31,
-          dark_gray: 90,
-        }[color]
-
-        if code
-          "\e[#{code}m#{string}\e[0m"
-        else
-          string
-        end
-      end
-
-      # Copied from https://github.com/rubymotion/BubbleWrap/blob/8eaf99a0966f2b375e774f5940279a704c10ad29/motion/core/ios/device.rb#L46
-      def simulator?
-        @simulator_state ||= begin
-          if defined?(NSObject) # iOS
-            !NSBundle.mainBundle.bundlePath.start_with?('/var/')
-          else # android
-            false
-          end
-        end
-      end
     end
   end
 end

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")))

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: motion-http
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Andrew Havens
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-28 00:00:00.000000000 Z
-dependencies: []
+date: 2020-08-05 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:
@@ -35,7 +49,7 @@ files:
 - 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: {}
@@ -54,8 +68,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: A cross-platform HTTP client for RubyMotion that's quick and easy to use.