mini_program 0.11.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33eb5ef599719b87fa6f41511075a9a63583aa0a09b7889cf198fff54b23ad9d
-  data.tar.gz: 5c7384b8a9b7f8b87476e3a4f9664a2011106eadbb02e4727ae3ee5a40074396
+  metadata.gz: c4c2f36cd55294e1243e4933d5e7c2dccb8b81e7bf857fcdde911bdde0555a8b
+  data.tar.gz: f1be92b59ef4de422756391b3e7545c651b9950ddfd4cab825f20818e0636389
 SHA512:
-  metadata.gz: 5926356805f658544866838ac1f5222aeb463fe97d35d8fd2c1bfec31f9238f5089b530c8e8b594e4328c1ff527372aa24d4116878f792ad180e6323dd6cd638
-  data.tar.gz: 3d6a4b3e3250b1639c53c211854c41616d24959f830816e70a2d097db58d7eef8b0323d9e1cd6bab48ac9819cb3f11886c984d7810cfc712570c1fdac50f37a5
+  metadata.gz: 15518ae9daa62e14d63b513432f2e707d012eeea7123d54f62e54913c623adad1301c614455e5ec198940cf4c0cabf3695b6d2d2bd3e4ce0effc125014156f8b
+  data.tar.gz: e6511f4151d75cdd0622ebb5cf932ba0aae5cc3bcd621a46792672056f7d53b9ac05aceff84ad6dfd89b54f87de697b3ffdd745dbdfd27122b0379fbbb5c2fde

data/README.md

@@ -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: "测试",

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

@@ -20,7 +20,7 @@ module MiniProgram
     end
 
     def get_access_token(fresh: false)
-      access_token = redis.get(access_token_store_key)
+      access_token = Rails.cache.read(access_token_store_key)
 
       if access_token.present? && !fresh
         return MiniProgram::ServiceResult.new(success: true, data: {access_token: access_token})
@@ -29,7 +29,11 @@ module MiniProgram
       result = request_access_token
 
       if result.success?
-        redis.setex access_token_store_key,  1.5.hours.to_i, result.data["access_token"]
+        # redis.setex access_token_store_key,  1.5.hours.to_i, result.data["access_token"]
+        Rails.cache.write(access_token_store_key,
+                          result.data["access_token"],
+                          expires_in: 1.5.hours.to_i,
+                          race_condition_ttl: 10)
       end
 
       yield result if block_given?
@@ -58,7 +62,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 +84,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)
@@ -111,7 +115,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}}"}
@@ -140,7 +144,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["errmsg"])
       end
 
       msg_logger.info { "{params: #{payload}, response: #{result}}"}
@@ -221,10 +225,6 @@ module MiniProgram
       @logger ||= MiniProgram::RLogger.make("mini_program")
     end
 
-    def redis
-      @redis ||= Redis.current
-    end
-
     def access_token_store_key
       @access_token_store_key ||= "mp-#{appid}-access-token"
     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.11.0'
+  VERSION = '1.0.2'
 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.11.0
+  version: 1.0.2
 platform: ruby
 authors:
 - ian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-09 00:00:00.000000000 Z
+date: 2021-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 6.1.4
-- !ruby/object:Gem::Dependency
-  name: redis
-  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'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement