mini_program 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04f5a8d75c16656473df0c93306b9d83833c272037d7fb60e894756eed9f4b1c
-  data.tar.gz: '0868870f615a9e08047465024b8293be7af4080d64fa4b1d7313ea7b56926e4a'
+  metadata.gz: d22da41804b5da0abdf4611a9288900a9081a2068ef27e3beeef5fe4a260eabd
+  data.tar.gz: 3376f32e041db22b411686cdd490332028686ebc227812a4d6dfb5c35aa9249e
 SHA512:
-  metadata.gz: ee4c68f56483b9acdbee602db221033ea503738ddd63409288b864d130ea37ca23a291fc2392a3f146ea0c5991236e8acd0f1f48a4f05ae8f817ef4f5792e100
-  data.tar.gz: e1ec32db171b7e4fe2168ac715668e9f6ed9e3704e276c7a61b7e6dbc30a6b30858bec73acf83c406459ef32c85382954c89e6e2efdf29ce40c86fae733d3a86
+  metadata.gz: 795f96b99ec9dfd2813c1970fc853cbbe2c870638d245c1fb027cded08ed3205b0978f9a71489bca1fcbad16f357c5488613ca37bf0d32550823f7bd8b780e35
+  data.tar.gz: b95cb3012c65c8ec132ea7cb9dff5ef5bc4547c55e1ad8fa3d1689aa21c99f39681b4d2ee8297f1a2b88db64fc36f035c2b01bffbbf1a47b1df2d8cfe037a09f

data/README.md

@@ -51,7 +51,10 @@ iv = "5tiyfVEHNVgHN4n8lzDrUA=="
 result = mp.get_phone_num(code: code, encrypted_data: encrypted_data, iv: iv)
 
 if result.success?
-  phone_num = result[:phone_num]
+  phone_num = result.data[:phone] 
+  
+  # 或者直接使用 [] 方法获取
+  # phone_num = result[:phone_num]
 end
 
 ```
@@ -81,7 +84,7 @@ msg = MiniProgram::Msg.new(:progress, {
 })
 
 # send_to 的参数可以是 openid(字符串)，或者是带有 open_id 方法的对象，返回 MiniProgram::ServiceResult
-result msg.send_to("ogT7J5YddGnll-ippRvJq62Nv5W0")
+result = msg.send_to("ogT7J5YddGnll-ippRvJq62Nv5W0")
 
 # or
 user = User.first

data/Rakefile

@@ -1,5 +1,10 @@
 require "bundler/setup"
 
+APP_RAKEFILE = File.expand_path("test/dummy/Rakefile", __dir__)
+load "rails/tasks/engine.rake"
+
+load "rails/tasks/statistics.rake"
+
 require "bundler/gem_tasks"
 
 require "rake/testtask"

data/app/assets/config/mini_program_manifest.js

@@ -0,0 +1 @@
+//= link_directory ../stylesheets/mini_program .css

data/app/assets/stylesheets/mini_program/application.css

@@ -0,0 +1,15 @@
+/*
+ * This is a manifest file that'll be compiled into application.css, which will include all the files
+ * listed below.
+ *
+ * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
+ * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path.
+ *
+ * You're free to add application-wide styles to this file and they'll appear at the bottom of the
+ * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS
+ * files in this directory. Styles in this file should be added after the last require_* statement.
+ * It is generally better to create a new file per style scope.
+ *
+ *= require_tree .
+ *= require_self
+ */

data/app/assets/stylesheets/mini_program/wechat.css

@@ -0,0 +1,4 @@
+/*
+  Place all the styles related to the matching controller here.
+  They will automatically be included in application.css.
+*/

data/app/controllers/mini_program/application_controller.rb

@@ -0,0 +1,4 @@
+module MiniProgram
+  class ApplicationController < ActionController::Base
+  end
+end

data/app/controllers/mini_program/wechat_controller.rb

@@ -0,0 +1,34 @@
+require_dependency "mini_program/application_controller"
+
+module MiniProgram
+  class WechatController < ApplicationController
+    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[:session_key] = result.data["session_key"]
+        render json: current_mp_user
+      else
+        render json: { errors: result.errors }
+      end
+    end
+
+    # POST /wechat/phone_num
+    def phone_num
+      client = MiniProgram::Client.new
+      result = client.get_phone_num(code: params[:code], encrypted_data: params[:encrypted_data], iv: params[:iv])
+
+      if result.success?
+        cookies.signed[:phone_num] = result.data[:phone_num]
+
+        render json: result.data
+      else
+        render json: { errors: result.errors }
+      end
+    end
+  end
+end

data/app/helpers/mini_program/application_helper.rb

@@ -0,0 +1,4 @@
+module MiniProgram
+  module ApplicationHelper
+  end
+end

data/app/helpers/mini_program/wechat_helper.rb

@@ -0,0 +1,4 @@
+module MiniProgram
+  module WechatHelper
+  end
+end

data/app/jobs/mini_program/application_job.rb

@@ -0,0 +1,4 @@
+module MiniProgram
+  class ApplicationJob < ActiveJob::Base
+  end
+end

data/app/mailers/mini_program/application_mailer.rb

@@ -0,0 +1,6 @@
+module MiniProgram
+  class ApplicationMailer < ActionMailer::Base
+    default from: 'from@example.com'
+    layout 'mailer'
+  end
+end

data/app/models/mini_program/application_record.rb

@@ -0,0 +1,5 @@
+module MiniProgram
+  class ApplicationRecord < ActiveRecord::Base
+    self.abstract_class = true
+  end
+end

data/app/views/layouts/mini_program/application.html.erb

@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Mini program</title>
+  <%= csrf_meta_tags %>
+  <%= csp_meta_tag %>
+
+  <%= stylesheet_link_tag    "mini_program/application", media: "all" %>
+</head>
+<body>
+
+<%= yield %>
+
+</body>
+</html>

data/app/views/mini_program/wechat/login.html.erb

@@ -0,0 +1,2 @@
+<h1>Wechat#login</h1>
+<p>Find me in app/views/mini_program/wechat/login.html.erb</p>

data/config/routes.rb

@@ -0,0 +1,4 @@
+MiniProgram::Engine.routes.draw do
+  post 'wechat/login'
+  post 'wechat/phone_num'
+end

data/lib/application_controller_ext.rb

@@ -0,0 +1,10 @@
+
+
+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])
+  end
+end

data/lib/mini_program/client.rb

@@ -20,14 +20,16 @@ module MiniProgram
     end
 
     def get_access_token(fresh: false)
-      access_token = redis.get("mp-#{appid}-access-token")
+      access_token = redis.get(access_token_store_key)
+
       if access_token.present? && !fresh
         return MiniProgram::ServiceResult.new(success: true, data: {access_token: access_token})
       end
 
       result = request_access_token
+
       if result.success?
-        redis.setex "mp-#{appid}-access-token",  1.5.hours.to_i, access_token
+        redis.setex access_token_store_key,  1.5.hours.to_i, result.data["access_token"]
       end
 
       yield result if block_given?
@@ -56,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, data: result, message: result["errmsg"])
       end
 
       MiniProgram::ServiceResult.new(success: true, data: result)
@@ -190,7 +192,7 @@ module MiniProgram
     end
 
     def access_token_store_key
-      "mp-#{appid}-access-token"
+      @access_token_store_key ||= "mp-#{appid}-access-token"
     end
 
     def msg_logger

data/lib/mini_program/engine.rb

@@ -0,0 +1,5 @@
+module MiniProgram
+  class Engine < ::Rails::Engine
+    isolate_namespace MiniProgram
+  end
+end

data/lib/mini_program/user.rb

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

data/lib/mini_program/version.rb

@@ -1,3 +1,3 @@
 module MiniProgram
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

data/lib/mini_program.rb

@@ -1,16 +1,19 @@
 require "mini_program/version"
-require "mini_program/railtie"
+require "mini_program/engine"
 require "mini_program/client"
 require "mini_program/msg"
+require "mini_program/user"
+require "application_controller_ext"
 require "r_logger"
 require "service_result"
 require "redis"
+require "mocha"
 
 module MiniProgram
-  # Your code goes here...
   mattr_accessor :appid, :app_secret
 
   def self.setup
     yield self if block_given?
   end
+
 end

data/lib/service_result.rb

@@ -15,7 +15,7 @@ module MiniProgram
                    data: {})
       self.success = success
       self.data = (data.presence || {}).with_indifferent_access
-      self.errors = errors.is_a?(Enumerable) ? errors : [errors]
+      self.errors = errors.is_a?(Array) ? errors : [errors]
       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.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - ian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-18 00:00:00.000000000 Z
+date: 2021-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -39,20 +39,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-rails
+  name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 登录授权，发送订阅消息
+description: include login, send subscribe message, get phone number function of mini
+  program
 email:
 - ianlynxk@gmail.com
 executables: []
@@ -62,6 +63,20 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- app/assets/config/mini_program_manifest.js
+- app/assets/stylesheets/mini_program/application.css
+- app/assets/stylesheets/mini_program/wechat.css
+- app/controllers/mini_program/application_controller.rb
+- app/controllers/mini_program/wechat_controller.rb
+- app/helpers/mini_program/application_helper.rb
+- app/helpers/mini_program/wechat_helper.rb
+- app/jobs/mini_program/application_job.rb
+- app/mailers/mini_program/application_mailer.rb
+- app/models/mini_program/application_record.rb
+- app/views/layouts/mini_program/application.html.erb
+- app/views/mini_program/wechat/login.html.erb
+- config/routes.rb
+- lib/application_controller_ext.rb
 - lib/generators/mini_program/install/USAGE
 - lib/generators/mini_program/install/install_generator.rb
 - lib/generators/mini_program/install/templates/initializer.rb
@@ -70,19 +85,20 @@ files:
 - lib/generators/mini_program/msg_config/templates/subscribe_msg.yml
 - lib/mini_program.rb
 - lib/mini_program/client.rb
+- lib/mini_program/engine.rb
 - lib/mini_program/msg.rb
-- lib/mini_program/railtie.rb
+- lib/mini_program/user.rb
 - lib/mini_program/version.rb
 - lib/r_logger.rb
 - lib/service_result.rb
 - lib/tasks/mini_program_tasks.rake
-homepage: https://github.com/otorain
+homepage: https://github.com/bkyz/mini_program
 licenses:
 - MIT
 metadata:
-  homepage_uri: https://github.com/otorain
-  source_code_uri: https://github.com/otorain/mini_program
-  changelog_uri: https://github.com/otorain/mini_program/CHANGELOG.md
+  homepage_uri: https://github.com/bkyz/mini_program
+  source_code_uri: https://github.com/bkyz/mini_program
+  changelog_uri: https://github.com/bkyz/mini_program/CHANGELOG.md
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -101,5 +117,5 @@ requirements: []
 rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
-summary: 小程序api开发工具
+summary: a engine for develop mini program
 test_files: []

data/lib/mini_program/railtie.rb

@@ -1,4 +0,0 @@
-module MiniProgram
-  class Railtie < ::Rails::Railtie
-  end
-end