mini_program 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c391213117d9d3978a0b1f466851236d2752a735b16b64f319b062909aa3a0b
-  data.tar.gz: f094303a749a75013fe60064ee7788168493f4c467e20a2a01e5cc9b644ccce8
+  metadata.gz: 37c63081055d2c0dd101fc9ccbe07ca68c182eeec4135ad624d3fd5e48311a07
+  data.tar.gz: 510fbf6f3cdf68776835665905383d0e08ff7a35162325fd18082a9805fc9e79
 SHA512:
-  metadata.gz: 5d8ea19affc522a1f2080360ec068c553d779bf39a6c2d3e5315259a20ee7762a31ed8f1cb1afd2e9b7f89aa69e31f8568a9d33033e485febe569aa0e3ca6830
-  data.tar.gz: 16ad088437eb8c3d880f2cab92b0b794fd3ea5cd2b78dd82044690041f219f3ad4a728882b2f69c1cfdefd9d1299c0167b06ef144578b1f2b99e2c3de040e7e6
+  metadata.gz: e1b79d2709a70d0d8960b2f90bf852a52d5b243b8322502e78b4ab869bbc8c4793017e90f27de2c15f7c00e4f08bdcc9ee355f53e2467122515488fca9470425
+  data.tar.gz: 33ffd68bd36f16073d13f61d4476d81e1ad42cf71e4983cc5d4528318176cc81041ed62e9d8170661bccbeb9a78a779a091c4421d46a8cd91149e5fb9de1f4b5

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?
@@ -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

data/lib/mini_program/version.rb

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

data/lib/mini_program.rb

@@ -6,7 +6,6 @@ require "mini_program/user"
 require "application_controller_ext"
 require "r_logger"
 require "service_result"
-require "redis"
 require "mocha"
 
 module MiniProgram

data/lib/service_result.rb

@@ -2,6 +2,7 @@ module MiniProgram
   class ServiceResult
     attr_accessor :success,
                   :error,
+                  :error_type,
                   :data,
                   :message,
                   :message_type
@@ -45,5 +46,16 @@ module MiniProgram
         :error
       end
     end
+
+    def as_json(options = nil)
+      {
+        success: success,
+        data: data,
+        message: message,
+        message_type: get_message_type,
+        error: error,
+        error_type: error_type
+      }
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mini_program
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - ian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-18 00:00:00.000000000 Z
+date: 2022-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,28 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.4
+        version: 7.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !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'
+        version: 7.0.1
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: a engine for develop mini program