jmessage 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e79ae88456d2339886f77c2b84f668924a9d29b
-  data.tar.gz: 72f27f750a53db83d9482f10846fb53ee73791c1
+  metadata.gz: fe48aba88abceff77307ec91b14da5134db543d1
+  data.tar.gz: 2aecfbaa44dae26c36f3333a67b8bdf61007e896
 SHA512:
-  metadata.gz: 7648c32302e1ff127ac0ff92a184fe50ccce699ab72eddbc3b6e8e9694ff7dc2d06aff2708826858b57708ba0db75125ec33c8c6202db22abc683d5409f6fdeb
-  data.tar.gz: c82b8d9014e434c3bb8fddb89dee768e16a8acc1cffd7e694c05ac9c31be814f8fcf0048a7edc12eaeb7235596b7dfaeab0dd424c12b7f1156e5a6050023ff10
+  metadata.gz: ac6ddcf84fef5c7639ce4f79b595fb17d7cfe7ef9999fb64f297ee72359babb3715159b779adca6655c843a04fb758bfbe180506d1f72597dd415f5be56b9465
+  data.tar.gz: 246e76f12663816ae831f66b030a89ead68d600307fbd8ef047e9600f7c3fd2d6279b9147be1515e3aae7a1eb56373aed57a8285054fd1a608393dc6054c00b0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    jmessage (0.1.0)
+    jmessage (0.1.1)
 
 GEM
   remote: https://rubygems.org/

data/lib/jmessage/http.rb

@@ -5,59 +5,72 @@ module Jmessage
   class Http
     attr_accessor :conn, :response
 
-    def initialize
+    def initialize(form=false)
       self.conn = Faraday.new(url: remote_path) do |faraday|
+        faraday.request  :multipart if form
         faraday.request  :url_encoded             # form-encode POST params
         faraday.response :logger                  # log requests to STDOUT
+        faraday.headers = headers
         faraday.adapter  Faraday.default_adapter  # make requests with Net::HTTP
       end
     end
 
     def get(uri)
-      self.response = conn.get do |req|
-        req.url uri
-        req.headers['Content-Type'] = 'application/json'
-        req.headers['Authorization'] = "Basic #{Jmessage::Sign.authorize}"
-        req.options.timeout = 10
-      end
+      self.response = conn.get { |req| set_req(req, uri) }
       parse_body
     end
 
     def post(uri, params = {})
-      self.response = conn.post do |req|
-        req.url uri
-        req.headers['Content-Type'] = 'application/json'
-        req.headers['Authorization'] = "Basic #{Jmessage::Sign.authorize}"
-        req.options.timeout = 10
-        req.body = JSON(params)
-      end
+      self.response = conn.post { |req| set_req(req, uri, params) }
       parse_body
     end
 
     def put(uri, params = {})
-      self.response = conn.put do |req|
-        req.url uri
-        req.headers['Content-Type'] = 'application/json'
-        req.headers['Authorization'] = "Basic #{Jmessage::Sign.authorize}"
-        req.options.timeout = 10
-        req.body = JSON(params)
-      end
+      self.response = conn.put { |req| set_req(req, uri, params) }
     end
 
     def delete(uri, params = {})
-      self.response = conn.delete do |req|
+      self.response = conn.delete { |req| set_req(req, uri, params) }
+    end
+
+    def post_image(uri, params={})
+      self.response = conn.post do |req|
         req.url uri
-        req.headers['Content-Type'] = 'application/json'
-        req.headers['Authorization'] = "Basic #{Jmessage::Sign.authorize}"
-        req.options.timeout = 10
-        req.body = JSON(params)
+        req.body = { image: imageio(params[:image]) }
       end
+      parse_body
     end
 
     def parse_body
       JSON(response.body)
     end
 
+    def imageio(image)
+      if image.instance_of?(Tempfile)
+        return Faraday::UploadIO.new(image.path, image.content_type, tempfile_name(image))
+      end
+      Faraday::UploadIO.new(image.path, image.content_type)
+    end
+
+    def tempfile_name(file)
+      extension = file.content_type.split('/').last
+      extension = extension.downcase.eql?('jpeg') ? 'jpg' : extension
+      File.basename(file) + '.' + extension
+    end
+
+    def headers
+      {
+        'Authorization' => "Basic #{Jmessage::Sign.authorize}",
+        'Accept' => 'application/json'
+      }
+    end
+
+    def set_req(req, uri, params = {})
+      req.url uri
+      req.headers['Content-Type'] = 'application/json'
+      req.body = JSON(params) unless params.empty?
+    end
+
     def remote_path
       'https://api.im.jpush.cn'
     end

data/lib/jmessage/user.rb

@@ -13,7 +13,7 @@ module Jmessage
       end
 
       # 获取用户列表
-      def user_list
+      def user_list(params = {})
         start = params[:start] || 0
         count = params[:count] || 10
         Jmessage::Http.new.get("/v1/users?start=#{start}&count=#{count}")
@@ -52,8 +52,8 @@ module Jmessage
       end
 
       # 修改密码
-      def update_pwd(username)
-        Jmessage::Http.new.put("/v1/users/#{username}/password", params)
+      def update_pwd(username, new_pwd = '')
+        Jmessage::Http.new.put("/v1/users/#{username}/password", { new_password: new_pwd })
       end
 
       # 删除用户
@@ -82,8 +82,8 @@ module Jmessage
       end
 
       # 文件上传
-      def upload_image(type, filename)
-        Jmessage::Http.new.post("/v1/resource?type=#{type}", image: filename)
+      def upload_image(resource)
+        Jmessage::Http.new(true).post_image("/v1/resource?type=image", { image: resource })
       end
     end
   end

data/lib/jmessage/version.rb

@@ -1,3 +1,3 @@
 module Jmessage
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jmessage
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Ricky
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-04 00:00:00.000000000 Z
+date: 2018-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler