diff --git a/.travis.yml b/.travis.yml index 4ac3c53..a9e092b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,5 +6,6 @@ gemfile: - gemfiles/rails_42.gemfile - gemfiles/rails_50.gemfile - gemfiles/rails_51.gemfile + - gemfiles/rails_52.gemfile notifications: email: false diff --git a/Appraisals b/Appraisals index 2a17e94..6b2670d 100644 --- a/Appraisals +++ b/Appraisals @@ -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 gem 'actionpack', '~> 5.1' gem 'railties', '~> 5.1' diff --git a/gemfiles/rails_42.gemfile b/gemfiles/rails_42.gemfile index 8f81710..c37751a 100644 --- a/gemfiles/rails_42.gemfile +++ b/gemfiles/rails_42.gemfile @@ -14,7 +14,7 @@ group :development do gem "rspec", "~> 3.5.0" gem "rspec-its", "~> 1.1.0" gem "rspec-rails", "~> 3.5.0" - gem "rubocop", "~> 0.51.0" + gem "rubocop", "~> 0.52.1" gem "coveralls", "~> 0.8.2", require: false end diff --git a/gemfiles/rails_50.gemfile b/gemfiles/rails_50.gemfile index a929f66..3e30385 100644 --- a/gemfiles/rails_50.gemfile +++ b/gemfiles/rails_50.gemfile @@ -14,7 +14,7 @@ group :development do gem "rspec", "~> 3.5.0" gem "rspec-its", "~> 1.1.0" gem "rspec-rails", "~> 3.5.0" - gem "rubocop", "~> 0.51.0" + gem "rubocop", "~> 0.52.1" gem "coveralls", "~> 0.8.2", require: false end diff --git a/gemfiles/rails_51.gemfile b/gemfiles/rails_51.gemfile index 9b4e1ad..cfd2f47 100644 --- a/gemfiles/rails_51.gemfile +++ b/gemfiles/rails_51.gemfile @@ -14,7 +14,7 @@ group :development do gem "rspec", "~> 3.5.0" gem "rspec-its", "~> 1.1.0" gem "rspec-rails", "~> 3.5.0" - gem "rubocop", "~> 0.51.0" + gem "rubocop", "~> 0.52.1" gem "coveralls", "~> 0.8.2", require: false end diff --git a/gemfiles/rails_52.gemfile b/gemfiles/rails_52.gemfile new file mode 100644 index 0000000..c65533e --- /dev/null +++ b/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: "../" diff --git a/lib/telegram/bot/config_methods.rb b/lib/telegram/bot/config_methods.rb index be4ef2e..459534b 100644 --- a/lib/telegram/bot/config_methods.rb +++ b/lib/telegram/bot/config_methods.rb @@ -53,7 +53,8 @@ module Telegram def bots_config @bots_config ||= 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 secrets.fetch(:bots, {}).symbolize_keys.tap do |config| default = secrets[:bot] diff --git a/spec/integration_helper.rb b/spec/integration_helper.rb index 908eb0c..b78bc13 100644 --- a/spec/integration_helper.rb +++ b/spec/integration_helper.rb @@ -15,14 +15,21 @@ class TestApplication < Rails::Application config.eager_load = false config.log_level = :debug config.action_dispatch.show_exceptions = false - secrets[:secret_key_base] = 'test' - secrets[:telegram] = { + + telegram_config = { bot: 'default_token', bots: { other: {token: 'other_token'}, 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 Rails.application.initialize!