1
0
зеркало из https://github.com/glebtv/telegram-bot.git synced 2026-09-07 19:35:52 +03:00

Support for :credentials on Rails v5.2.x. (#60)

Этот коммит содержится в:
Yuri S
2018-01-17 12:40:24 +05:00
коммит произвёл printercu
родитель 5407c5028f
Коммит 66991d3653
8 изменённых файлов: 41 добавлений и 6 удалений

Просмотреть файл

@@ -6,5 +6,6 @@ gemfile:
- gemfiles/rails_42.gemfile - gemfiles/rails_42.gemfile
- gemfiles/rails_50.gemfile - gemfiles/rails_50.gemfile
- gemfiles/rails_51.gemfile - gemfiles/rails_51.gemfile
- gemfiles/rails_52.gemfile
notifications: notifications:
email: false email: false

Просмотреть файл

@@ -1,3 +1,8 @@
appraise 'rails-52' do
gem 'actionpack', '~> 5.2.0.beta2'
gem 'railties', '~> 5.2.0.beta2'
end
appraise 'rails-51' do appraise 'rails-51' do
gem 'actionpack', '~> 5.1' gem 'actionpack', '~> 5.1'
gem 'railties', '~> 5.1' gem 'railties', '~> 5.1'

Просмотреть файл

@@ -14,7 +14,7 @@ group :development do
gem "rspec", "~> 3.5.0" gem "rspec", "~> 3.5.0"
gem "rspec-its", "~> 1.1.0" gem "rspec-its", "~> 1.1.0"
gem "rspec-rails", "~> 3.5.0" gem "rspec-rails", "~> 3.5.0"
gem "rubocop", "~> 0.51.0" gem "rubocop", "~> 0.52.1"
gem "coveralls", "~> 0.8.2", require: false gem "coveralls", "~> 0.8.2", require: false
end end

Просмотреть файл

@@ -14,7 +14,7 @@ group :development do
gem "rspec", "~> 3.5.0" gem "rspec", "~> 3.5.0"
gem "rspec-its", "~> 1.1.0" gem "rspec-its", "~> 1.1.0"
gem "rspec-rails", "~> 3.5.0" gem "rspec-rails", "~> 3.5.0"
gem "rubocop", "~> 0.51.0" gem "rubocop", "~> 0.52.1"
gem "coveralls", "~> 0.8.2", require: false gem "coveralls", "~> 0.8.2", require: false
end end

Просмотреть файл

@@ -14,7 +14,7 @@ group :development do
gem "rspec", "~> 3.5.0" gem "rspec", "~> 3.5.0"
gem "rspec-its", "~> 1.1.0" gem "rspec-its", "~> 1.1.0"
gem "rspec-rails", "~> 3.5.0" gem "rspec-rails", "~> 3.5.0"
gem "rubocop", "~> 0.51.0" gem "rubocop", "~> 0.52.1"
gem "coveralls", "~> 0.8.2", require: false gem "coveralls", "~> 0.8.2", require: false
end end

21
gemfiles/rails_52.gemfile Обычный файл
Просмотреть файл

@@ -0,0 +1,21 @@
# This file was generated by Appraisal
source "https://rubygems.org"
gem "actionpack", "~> 5.2.0.beta2"
gem "railties", "~> 5.2.0.beta2"
group :development do
gem "appraisal", "~> 2.2"
gem "pry", "~> 0.10.1"
gem "pry-byebug", "~> 3.2.0"
gem "sdoc", "~> 0.4.1"
gem "telegram-bot-types", "~> 0.3.0"
gem "rspec", "~> 3.5.0"
gem "rspec-its", "~> 1.1.0"
gem "rspec-rails", "~> 3.5.0"
gem "rubocop", "~> 0.52.1"
gem "coveralls", "~> 0.8.2", require: false
end
gemspec path: "../"

Просмотреть файл

@@ -53,7 +53,8 @@ module Telegram
def bots_config def bots_config
@bots_config ||= @bots_config ||=
if defined?(Rails.application) if defined?(Rails.application)
secrets = Rails.application.secrets. app = Rails.application
secrets = (app.respond_to?(:credentials) ? app.credentials : app.secrets).
fetch(:telegram, {}).with_indifferent_access fetch(:telegram, {}).with_indifferent_access
secrets.fetch(:bots, {}).symbolize_keys.tap do |config| secrets.fetch(:bots, {}).symbolize_keys.tap do |config|
default = secrets[:bot] default = secrets[:bot]

Просмотреть файл

@@ -15,14 +15,21 @@ class TestApplication < Rails::Application
config.eager_load = false config.eager_load = false
config.log_level = :debug config.log_level = :debug
config.action_dispatch.show_exceptions = false config.action_dispatch.show_exceptions = false
secrets[:secret_key_base] = 'test'
secrets[:telegram] = { telegram_config = {
bot: 'default_token', bot: 'default_token',
bots: { bots: {
other: {token: 'other_token'}, other: {token: 'other_token'},
named: {token: 'named_token', username: 'TestBot'}, named: {token: 'named_token', username: 'TestBot'},
}, },
} }
if Rails.application.respond_to?(:credentials)
Rails.application.credentials.config[:telegram] = telegram_config
else
secrets[:secret_key_base] = 'test'
secrets[:telegram] = telegram_config
end
end end
Rails.application.initialize! Rails.application.initialize!