nx-http 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca5a2913361cd569bf8111137517ffa3f59eb52ac73e2d2a152ad6bac3b6a980
-  data.tar.gz: 5e48b239e63b54775f09480031a68d72d08b7cc8b38bef18b7904b02a4f3dacf
+  metadata.gz: 77ece682f337723392a39b0879637b82d2c177eb21ffee22147403285c7f61c4
+  data.tar.gz: b4cdefb0bd341993abb031946e659790cb01ceb25a7a9d2336d13bf3e5440b95
 SHA512:
-  metadata.gz: f83d2ca6b3614c00aca6068839945bbd57159f8282aee36a095a4225ad40ec7fb201520d7647b53701a9d04881f84eb9af6d3de554e4e19357a676936e80dabc
-  data.tar.gz: 2af1d40b910260031c82dbd127434d0ba0ce59ddb8c5d82a98c64a56aada95e28a55fe032a38e20d5c8bc50de60394766bc0958b40a929cd14fa07d1327b07f3
+  metadata.gz: c41793dd4e41dffde12b3d9d08aabf62d1d7bb744cd065988bab67d6dddce56691175390d7a9ddafcdcb14605bbf9bb7a910ea1817c8587c3a5ed7221e313103
+  data.tar.gz: d3c185c427fc7e5a7656096517edb32584706b26f57d6501de31c8d2211e0a687e5e908e5a75b6ee6a4b2d1a9bd5f6a921b08e0700e5e127edf86692253fa3cf

data/__tests__/app_upload.rb

@@ -4,7 +4,7 @@ require_relative "../lib/nx-http"
 # p Nx::ContentType::JSON
 tempfile = open("https://tva1.sinaimg.cn/large/da432263gy1gcj74ifcokj205f06gjre.jpg")
 res = Nx::Http.upload("https://picupload.weibo.com/interface/pic_upload.php", { pic1: tempfile }) do |http, request|
-  request["Cookie"] = "SUB=_2A25zZYAzDeRhGeVI7VMZ8yzEyz-IHXVQEvb7rDV8PUNbmtAKLVPMkW9NTBpP0VsITWW-3vSzKJ0qcv_7qLmry_H2; Path=/; Domain=.weibo.com; HttpOnly"
+  request["Cookie"] = "SUB=_2A25zYkVLDeRhGeVI7VMZ8yzEyz-IHXVQFjGDrDV8PUNbmtAKLXLQkW9NTBpP0Tnizi_36CKgyQIO4Vzqxh9l_8Q2; Path=/; Domain=.weibo.com; HttpOnly"
 end
 
 p res.body

data/lib/nx/http.rb

@@ -1,17 +1,11 @@
 module Nx
   class Http
     def self.upload(in_url, in_data)
-      url = URI(in_url)
-      http = Net::HTTP.new(url.host, url.port)
-      http.use_ssl = url.scheme == "https"
-
-      data = DataTransform.multipart(in_data)
-      request = Net::HTTP::Post.new(url.path)
-      request.set_form(data, ContentType::MULTIPART)
-      if block_given?
-        yield(http, request)
+      post(in_url, in_data) do |http, request, uri, method|
+        data = DataTransform.multipart(in_data)
+        request.set_form(data, ContentType::MULTIPART)
+        yield(http, request, uri, method)
       end
-      http.request(request)
     end
 
     def self.request(in_method, in_url, in_data = {}, in_options = {})
@@ -25,24 +19,18 @@ module Nx
 
       # request:
       method_class = Net::HTTP.const_get method.capitalize
-      request = method_class.new(in_url)
+      request = method_class.new(uri)
 
       # callback area:
       if method == "get"
         uri.query = URI.encode_www_form(in_data)
       else
         in_options.each do |key, value|
-          if key == :content_type
-            request[key] = ContentType.const_get value.upcase
-          else
-            request[key] = value
-          end
+          request[key] = value
         end
       end
 
-      if block_given?
-        yield(http, request)
-      end
+      yield(http, request, uri, method) if block_given?
 
       begin
         http.request(request)

data/lib/nx/version.rb

@@ -1,5 +1,5 @@
 module Nx
   class Http
-    VERSION = "0.1.9"
+    VERSION = "0.1.10"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nx-http
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - afeiship
@@ -69,7 +69,7 @@ files:
 - lib/nx/data_transform.rb
 - lib/nx/http.rb
 - lib/nx/version.rb
-- nx-http-0.1.8.gem
+- nx-http-0.1.9.gem
 - nx-http.gemspec
 - package.json
 homepage: https://github.com/afeiship/nx-http