wechat 0.15.0 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fce405bc512324a4f862cab6f746833ec387b6a5eed1fc9f720a9bda16e309da
-  data.tar.gz: 932fba467df6c8f357e713bd63e6a5537436fe8e34fc1a9c50f0c9d5010a6707
+  metadata.gz: a4b435dd326d145908b8d8bfd395a3c6f8238b0fcbba8c1c75610665f11dac23
+  data.tar.gz: 760ac7cb8cb35629c1f4724b6edad484702dd62f5ba1b9125aac1e3f2414310c
 SHA512:
-  metadata.gz: 6a2f9892ae32dd7c86f9e4f80d026cef254f738dbb93cab3d8ae3a411307144eb767077e0b781652d2fcc768d2a51cb504e3134bc0c4e0efc4b30066b78152ce
-  data.tar.gz: 2fba8e299e8cb2614852d587bd84287463a57ae91248dcc8d729ee0539038160ff2ec3f469c4ffad9e3906ae87c2b12020bc6c47501b12127593202da2483322
+  metadata.gz: ab4bddc39dcd6c471b128e7ba01dd8a5876215d26b8257b22db535355cfcd4a862c7740098d440fe86633f79191ea9dece7b0b4ff633e4f3994c3d121bc3ec22
+  data.tar.gz: f3ed54350f992c62584f3ddebb130b1162d8b73103ea99ddb86f5b99a9b60383b36b122b253ab37b6ddbe4303388319d858ec53b4f033255bd5261c39b992a50

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v0.15.1 (released at 2022-02-16)
+
+* fix "Psych::BadAlias (Unknown alias: default)" in ruby 3.1.0 #309, reported by @otorain
+
 ## v0.15.0 (released at 2021-12-21)
 
 * Add wechat message json format support, by @younthu #306

data/bin/wechat

@@ -232,7 +232,7 @@ class App < Thor
 
     desc 'media_uploadnews [MPNEWS_YAML_PATH]', '上传图文消息素材'
     def media_uploadnews(mpnews_yaml_path)
-      mpnew = YAML.load(File.read(mpnews_yaml_path))
+      mpnew = Wechat::ApiLoader.load_yaml(File.read(mpnews_yaml_path))
       puts wechat_api.media_uploadnews(Wechat::Message.new(MsgType: 'uploadnews').mpnews(mpnew[:articles]))
     end
 
@@ -349,13 +349,13 @@ class App < Thor
 
   desc 'menu_create [MENU_YAML_PATH]', '创建菜单'
   def menu_create(menu_yaml_path)
-    menu = YAML.load(File.read(menu_yaml_path))
+    menu = Wechat::ApiLoader.load_yaml(File.read(menu_yaml_path))
     puts 'Menu created' if wechat_api.menu_create(menu)
   end
 
   desc 'menu_addconditional [CONDITIONAL_MENU_YAML_PATH]', '创建个性化菜单'
   def menu_addconditional(conditional_menu_yaml_path)
-    conditional_menu = YAML.load(File.read(conditional_menu_yaml_path))
+    conditional_menu = Wechat::ApiLoader.load_yaml(File.read(conditional_menu_yaml_path))
     add_result = wechat_api.menu_addconditional(conditional_menu)
     puts "Conditional menu created: #{add_result}" if add_result
   end
@@ -408,7 +408,7 @@ class App < Thor
 
   desc 'material_add_news [MPNEWS_YAML_PATH]', '永久图文素材上传'
   def material_add_news(mpnews_yaml_path)
-    new = YAML.load(File.read(mpnews_yaml_path))
+    new = Wechat::ApiLoader.load_yaml(File.read(mpnews_yaml_path))
     puts wechat_api.material_add_news(Wechat::Message.new(MsgType: 'mpnews').mpnews(new['articles']))
   end
 
@@ -479,13 +479,13 @@ class App < Thor
 
   desc 'custom_news [OPENID, NEWS_YAML_PATH]', '发送图文客服消息'
   def custom_news(openid, news_yaml_path)
-    articles = YAML.load(File.read(news_yaml_path))
+    articles = Wechat::ApiLoader.load_yaml(File.read(news_yaml_path))
     puts wechat_api.custom_message_send Wechat::Message.to(openid).news(articles['articles'])
   end
 
   desc 'template_message [OPENID, TEMPLATE_YAML_PATH]', '模板消息接口'
   def template_message(openid, template_yaml_path)
-    template = YAML.load(File.read(template_yaml_path))
+    template = Wechat::ApiLoader.load_yaml(File.read(template_yaml_path))
     puts wechat_api.template_message_send Wechat::Message.to(openid).template(template['template'])
   end
 

data/lib/wechat/api_loader.rb

@@ -40,6 +40,10 @@ module Wechat
       @configs = loading_config!
     end
 
+    def self.load_yaml(result)
+      YAML.respond_to?(:unsafe_load) ? YAML.unsafe_load(result) : YAML.load(result)
+    end
+
     private_class_method def self.loading_config!
       configs = config_from_file || config_from_environment
       configs.merge!(config_from_db)
@@ -110,9 +114,7 @@ module Wechat
       return unless File.exist?(config_file)
 
       begin
-        # rubocop:disable Security/YAMLLoad
-        raw_data = YAML.load(ERB.new(File.read(config_file)).result)
-        # rubocop:enable Security/YAMLLoad
+        raw_data = load_yaml(ERB.new(File.read(config_file)).result)
       rescue NameError
         puts "WARNING: If using 'Rails.application.credentials.wechat_secret!' in wechat.yml, you need run in 'rails c' and access via 'Wechat.api' or gem 'figaro' instead."
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wechat
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.15.1
 platform: ruby
 authors:
 - Skinnyworm
@@ -35,7 +35,7 @@ cert_chain:
   ZM9IDtdMg8E/4ujwilV8HKmgU77vVN6vSMvxx8zQFSz9a6GbdpB4egPZ++peSk/Q
   uaIJtOX6M4VC6u7eZfotARKyUy6EcoN2zNqEAQ==
   -----END CERTIFICATE-----
-date: 2021-12-21 00:00:00.000000000 Z
+date: 2022-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -161,14 +161,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.1'
+- !ruby/object:Gem::Dependency
+  name: rspec-mocks
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.10.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.10.2
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -239,8 +253,8 @@ licenses:
 metadata:
   bug_tracker_uri: https://github.com/Eric-Guo/wechat/issues
   changelog_uri: https://github.com/Eric-Guo/wechat/releases
-  documentation_uri: https://github.com/Eric-Guo/wechat/tree/v0.15.0#readme
-  source_code_uri: https://github.com/Eric-Guo/wechat/tree/v0.15.0
+  documentation_uri: https://github.com/Eric-Guo/wechat/tree/v0.15.1#readme
+  source_code_uri: https://github.com/Eric-Guo/wechat/tree/v0.15.1
   rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
@@ -257,7 +271,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.11
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: DSL for wechat message handling and API