mini_program 0.10.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b6b0f269a1a426f83bacbf5257dae849d4fe4572f767e27acf30ba6cb03eb93
-  data.tar.gz: 446d8d31ec3c4191ce89c1b6828ae30d37cb564b82fdcb26085ad5cd4e468aa3
+  metadata.gz: 0c391213117d9d3978a0b1f466851236d2752a735b16b64f319b062909aa3a0b
+  data.tar.gz: f094303a749a75013fe60064ee7788168493f4c467e20a2a01e5cc9b644ccce8
 SHA512:
-  metadata.gz: e7d0d588b54601429f8491c88014ab6154d764d985a80295e046ad6f11df77eaf40a5b5c8d3a75701d0dbebe8b45d63761fc8c90b1791879c62d38e9f6b0bcb7
-  data.tar.gz: 66b5c55fbe64302ebed24e17d9bac0e78bcefdceea7be09b19656d57fd9e8a3e93ccc92521fbb6d26ba70e233fc0665e5b1a87b3db18c345b7b53e8cd6f8d406
+  metadata.gz: 5d8ea19affc522a1f2080360ec068c553d779bf39a6c2d3e5315259a20ee7762a31ed8f1cb1afd2e9b7f89aa69e31f8568a9d33033e485febe569aa0e3ca6830
+  data.tar.gz: 16ad088437eb8c3d880f2cab92b0b794fd3ea5cd2b78dd82044690041f219f3ad4a728882b2f69c1cfdefd9d1299c0167b06ef144578b1f2b99e2c3de040e7e6

data/README.md

@@ -32,7 +32,7 @@ mp = MiniProgram::Client.new
 # code 是在小程序端调用 wx.login 拿到的
 result = mp.login(code)
 if result.success?
-  open_id = result.data[:openid]
+  openid = result.data[:openid]
   session_key = result.data[:session_key]
 end
 ```
@@ -71,11 +71,11 @@ end
 #   page: "/pages/index/index"
 #   data:
 #     thing2:
-#     value: "%{title}"
-#   phrase4:
-#     value: "%{state}"
-#   thing1:
-#     value: "%{detail}"
+#       value: "%{title}"
+#     phrase4:
+#       value: "%{state}"
+#     thing1:
+#       value: "%{detail}"
 
 msg = MiniProgram::Msg.new(:progress, {
   title: "测试",
@@ -83,12 +83,12 @@ msg = MiniProgram::Msg.new(:progress, {
   detail: "测试已完成"
 })
 
-# send_to 的参数可以是 openid(字符串)，或者是带有 open_id 方法的对象，返回 MiniProgram::ServiceResult
+# send_to 的参数可以是 openid(字符串)，或者是带有 openid 方法的对象，返回 MiniProgram::ServiceResult
 result = msg.send_to("ogT7J5YddGnll-ippRvJq62Nv5W0")
 
 # or
 user = User.first
-user.open_id # => ogT7J5YddGnll-ippRvJq62Nv5W0
+user.openid # => ogT7J5YddGnll-ippRvJq62Nv5W0
 result = msg.send_to(user)
 
 if result.success?

data/app/controllers/mini_program/application_controller.rb

@@ -1,4 +1,7 @@
 module MiniProgram
-  class ApplicationController < ActionController::Base
+  class ApplicationController < ApplicationController
+    include AbstractController::Helpers
+    include ActionController::Cookies
+
   end
 end

data/app/controllers/mini_program/wechat_controller.rb

@@ -2,18 +2,22 @@ require_dependency "mini_program/application_controller"
 
 module MiniProgram
   class WechatController < ApplicationController
-    skip_forgery_protection
+    skip_forgery_protection if respond_to? :skip_forgery_protection
 
     # POST /wechat/login
     def login
       result = MiniProgram::Client.new.login(params["code"])
 
       if result.success?
-        cookies.signed[:open_id] = result.data["openid"]
+        cookies.signed[:openid] = result.data["openid"]
         cookies.signed[:session_key] = result.data["session_key"]
+        cookies.signed[:options] = params[:options].permit!
+
+        after_mp_login if respond_to? :after_mp_login
+
         render json: current_mp_user
       else
-        render json: { errors: result.errors }
+        render json: { error: result.error }
       end
     end
 
@@ -27,7 +31,7 @@ module MiniProgram
 
         render json: result.data
       else
-        render json: { errors: result.errors }
+        render json: { error: result.error }
       end
     end
   end

data/lib/application_controller_ext.rb

@@ -1,10 +1,21 @@
 
 
-ActionController::Base.class_eval do 
+ActionController::Base.class_eval do
   def current_mp_user
     MiniProgram::User.new(open_id: cookies.signed[:open_id],
                           nickname: cookies.signed[:nickname],
                           phone_num: cookies.signed[:phone_num],
-                          session_key: cookies.signed[:session_key])
+                          session_key: cookies.signed[:session_key],
+                          options: cookies.signed[:options])
+  end
+end
+
+ActionController::API.class_eval do
+  def current_mp_user
+    MiniProgram::User.new(open_id: cookies.signed[:open_id],
+                          nickname: cookies.signed[:nickname],
+                          phone_num: cookies.signed[:phone_num],
+                          session_key: cookies.signed[:session_key],
+                          options: cookies.signed[:options])
   end
 end

data/lib/mini_program/client.rb

@@ -58,7 +58,7 @@ module MiniProgram
         api: #{api} 
         error: #{result}
         ERROR
-        return MiniProgram::ServiceResult.new(success: false, errors: result, message: result["errmsg"])
+        return MiniProgram::ServiceResult.new(success: false, error: result, message: result["errmsg"])
       end
 
       MiniProgram::ServiceResult.new(success: true, data: result)
@@ -80,13 +80,13 @@ module MiniProgram
 
       result = JSON.parse(response)
 
-      if result["errcode"].to_s != "0"
+      if result["errcode"] && result["errcode"].to_s != "0"
         logger.error <<~ERROR
         Get session key failed.
         api: #{api}
         result: #{result}
         ERROR
-        return MiniProgram::ServiceResult.new(errors: result, message: result["errmsg"])
+        return MiniProgram::ServiceResult.new(error: result, message: result["errmsg"])
       end
 
       MiniProgram::ServiceResult.new(success: true, data: result)
@@ -94,11 +94,11 @@ module MiniProgram
 
     # 发送订阅消息
     # @param [MiniProgram::Msg] msg
-    # @param [String] to 用户的open id
+    # @param [String] to 用户的openid
     def send_msg(msg, to: )
-      open_id = to.try(:open_id) || to
+      openid = to.try(:openid) || to
 
-      payload = msg.as_json.merge!(touser: open_id)
+      payload = msg.as_json.merge!(touser: openid)
 
       # 获取 access_token
       get_token_result = get_access_token
@@ -111,7 +111,7 @@ module MiniProgram
 
       if result["errcode"].to_s != "0"
         msg_logger.error {"{params: #{payload}, response: #{result}}"}
-        return MiniProgram::ServiceResult.new(success: false, errors: result["errmsg"])
+        return MiniProgram::ServiceResult.new(success: false, error: result)
       end
 
       msg_logger.info {"{params: #{payload}, response: #{result}}"}
@@ -123,7 +123,7 @@ module MiniProgram
     # 现在小程序的模板消息功能关闭了，就只剩下发送模板消息到公众号这个功能了
     #
     def send_uniform_msg(msg, to: )
-      open_id = to.try(:open_id) || to
+      openid = to.try(:openid) || to
 
       payload = msg.as_json
 
@@ -134,13 +134,13 @@ module MiniProgram
 
       api = "https://api.weixin.qq.com/cgi-bin/message/wxopen/template/uniform_send?access_token=#{get_token_result["access_token"]}"
       result = post(api, {
-        touser: open_id,
+        touser: openid,
         mp_template_msg: payload
       })
 
       if result["errcode"].to_s != "0"
         msg_logger.error {"{params: #{payload}, response: #{result}}"}
-        return MiniProgram::ServiceResult.new(success: false, errors: result["errmsg"])
+        return MiniProgram::ServiceResult.new(success: false, error: result["errmsg"])
       end
 
       msg_logger.info { "{params: #{payload}, response: #{result}}"}
@@ -152,7 +152,7 @@ module MiniProgram
       login_result = login(code)
       return login_result if login_result.failure?
 
-      open_id = login_result.data[:openid]
+      openid = login_result.data[:openid]
       session_key = login_result.data[:session_key]
 
       data = decrypt_phone_data(encrypted_data, iv, session_key)
@@ -162,7 +162,7 @@ module MiniProgram
       MiniProgram::ServiceResult.new(
         success: true,
         data: {
-          openid: open_id,
+          openid: openid,
           phone_num: phone_num
       })
     end
@@ -234,4 +234,4 @@ module MiniProgram
     end
 
   end
-end
+end

data/lib/mini_program/user.rb

@@ -1,14 +1,16 @@
 
 class MiniProgram::User
-  attr_accessor :open_id, :nickname, :phone_num, :session_key
- 
+  attr_accessor :open_id, :nickname, :phone_num, :session_key, :options
+
   def initialize(open_id: :blank_open_id,
                  nickname: :blank_nickname,
                  phone_num: :blank_phone_num,
-                 session_key: :blank_session_key)
+                 session_key: :blank_session_key,
+                 options: nil)
     @open_id = open_id
     @nickname = nickname
     @phone_num = phone_num
     @session_key = session_key
+    @options = options
   end
 end

data/lib/mini_program/version.rb

@@ -1,3 +1,3 @@
 module MiniProgram
-  VERSION = '0.10.0'
+  VERSION = '1.0.1'
 end

data/lib/service_result.rb

@@ -1,7 +1,7 @@
 module MiniProgram
   class ServiceResult
     attr_accessor :success,
-                  :errors,
+                  :error,
                   :data,
                   :message,
                   :message_type
@@ -9,13 +9,13 @@ module MiniProgram
     delegate :[], :[]=, to: :data
 
     def initialize(success: false,
-                   errors: nil,
+                   error: nil,
                    message: nil,
                    message_type: nil,
                    data: {})
       self.success = success
       self.data = (data.presence || {}).with_indifferent_access
-      self.errors = errors.is_a?(Array) ? errors : [errors]
+      self.error = error
       self.message = message
       self.message_type = message_type
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mini_program
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 1.0.1
 platform: ruby
 authors:
 - ian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-09 00:00:00.000000000 Z
+date: 2021-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails