From 70f7e48749c519836b49783225a172c823e3ba33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B1=E5=8D=9A=E4=BA=9E?= Date: Sat, 20 Nov 2021 22:58:24 +0800 Subject: [PATCH] update mongoid version --- announcement.gemspec | 34 ++++++++++++++++++++++++++++++++++ temp_file/Gemfile | 7 ++++--- 2 files changed, 38 insertions(+), 3 deletions(-) diff --git a/announcement.gemspec b/announcement.gemspec index a803c66..c0114e0 100644 --- a/announcement.gemspec +++ b/announcement.gemspec @@ -238,6 +238,40 @@ if bundle_update_flag end #system("cp -rf #{app_path}/temp_file/app #{env_pwd}") end + c = open("#{env_pwd}/config/mongoid.yml",'r'){|f| f.read} + if c.scan(/^[ \t]*sessions\:/).length != 0 + c = c.gsub(/^([ \t]*)sessions\:/,'\1clients:') + r = YAML.load(c) + r.each do |mode,v1| + v1.each do |clients,d| + d.each do |k,v| + if v["username"].present? + if !v["options"].present? + v["options"] = {} + end + v["options"]["user"] = v["username"] + v.delete "username" + end + if v["password"].present? + if !v["options"].present? + v["options"] = {} + end + v["options"]["password"] = v["password"] + v.delete "password" + end + if v["options"].present? && v["options"]["pool_size"].present? + v["options"]["max_pool_size"] = v["options"]["pool_size"] + v["options"].delete "pool_size" + end + if v["options"].present? && v["options"]["read"].class == String + v["options"]["read"] = {mode: v["options"]["read"]} + end + end + end + end + c = YAML.dump(r).sub("---\n",'') + open("#{env_pwd}/config/mongoid.yml",'w+'){|f| f.write(c)} + end end # Describe your gem and declare its dependencies: Gem::Specification.new do |s| diff --git a/temp_file/Gemfile b/temp_file/Gemfile index f633ed2..846219b 100644 --- a/temp_file/Gemfile +++ b/temp_file/Gemfile @@ -45,8 +45,9 @@ gem 'httparty' #database # gem 'mongoid', github: "mongoid/mongoid" -gem 'mongoid', '~> 4.0.2' - +gem 'bson', '~> 4.5.0' +gem 'mongo', '~> 2.10.5' +gem 'mongoid', '~> 5.4.1' # sockets # gem "websocket-rails" @@ -80,7 +81,7 @@ gem 'dynamic_form' eval(File.read(File.dirname(__FILE__) + '/built_in_extensions.rb')) #modules installed from the store unless File.exist?(File.dirname(__FILE__) + '/downloaded_extensions.rb') - File.open(File.dirname(__FILE__) + '/downloaded_extensions.rb','w+'){|f| f.write ""} + File.open(File.dirname(__FILE__) + '/downloaded_extensions.rb','w+'){|f| f.write ""} end eval(File.read(File.dirname(__FILE__) + '/downloaded_extensions.rb')) if File.exists?(File.dirname(__FILE__) + '/extra_gems.rb')