зеркало из
https://github.com/glebtv/telegram-bot.git
synced 2026-09-03 09:46:17 +03:00
Сравнить коммиты
2 Коммитов
| Автор | SHA1 | Дата | |
|---|---|---|---|
|
|
2d5ca981ce | ||
|
|
cf9bd87cf2 |
@@ -15,6 +15,7 @@ Style/DotPosition: {EnforcedStyle: trailing}
|
|||||||
Style/FirstParameterIndentation: {EnforcedStyle: consistent}
|
Style/FirstParameterIndentation: {EnforcedStyle: consistent}
|
||||||
Style/IfUnlessModifier: {Enabled: false}
|
Style/IfUnlessModifier: {Enabled: false}
|
||||||
Style/ModuleFunction: {Enabled: false}
|
Style/ModuleFunction: {Enabled: false}
|
||||||
|
Style/MultilineMethodCallIndentation: {EnforcedStyle: indented}
|
||||||
Style/MultilineOperationIndentation: {EnforcedStyle: indented}
|
Style/MultilineOperationIndentation: {EnforcedStyle: indented}
|
||||||
Style/NestedParenthesizedCalls: {Enabled: false}
|
Style/NestedParenthesizedCalls: {Enabled: false}
|
||||||
Style/PredicateName: {Enabled: false}
|
Style/PredicateName: {Enabled: false}
|
||||||
|
|||||||
@@ -1,6 +1,10 @@
|
|||||||
|
# 0.11.2
|
||||||
|
|
||||||
|
- Rails 5.1 deep symbolized secrets support.
|
||||||
|
|
||||||
# 0.11.1
|
# 0.11.1
|
||||||
|
|
||||||
# Fixed poller for typed response.
|
- Fixed poller for typed response.
|
||||||
|
|
||||||
# 0.11.0
|
# 0.11.0
|
||||||
|
|
||||||
|
|||||||
@@ -43,6 +43,12 @@ Or install it yourself as:
|
|||||||
|
|
||||||
$ gem install telegram-bot
|
$ gem install telegram-bot
|
||||||
|
|
||||||
|
Require if necessary:
|
||||||
|
|
||||||
|
```ruby
|
||||||
|
require 'telegram/bot'
|
||||||
|
```
|
||||||
|
|
||||||
## Usage
|
## Usage
|
||||||
|
|
||||||
### Configuration
|
### Configuration
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
require 'active_support/core_ext/hash/keys'
|
require 'active_support/core_ext/hash/keys'
|
||||||
require 'active_support/core_ext/hash/transform_values'
|
require 'active_support/core_ext/hash/transform_values'
|
||||||
|
require 'active_support/core_ext/hash/indifferent_access'
|
||||||
|
|
||||||
module Telegram
|
module Telegram
|
||||||
module Bot
|
module Bot
|
||||||
@@ -48,9 +49,10 @@ module Telegram
|
|||||||
def bots_config
|
def bots_config
|
||||||
@bots_config ||=
|
@bots_config ||=
|
||||||
if defined?(Rails.application)
|
if defined?(Rails.application)
|
||||||
telegram_config = Rails.application.secrets[:telegram] || {}
|
secrets = Rails.application.secrets.
|
||||||
(telegram_config['bots'] || {}).symbolize_keys.tap do |config|
|
fetch(:telegram, {}).with_indifferent_access
|
||||||
default = telegram_config['bot']
|
secrets.fetch(:bots, {}).symbolize_keys.tap do |config|
|
||||||
|
default = secrets[:bot]
|
||||||
config[:default] = default if default
|
config[:default] = default if default
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
module Telegram
|
module Telegram
|
||||||
module Bot
|
module Bot
|
||||||
VERSION = '0.11.1'.freeze
|
VERSION = '0.11.2'.freeze
|
||||||
|
|
||||||
def self.gem_version
|
def self.gem_version
|
||||||
Gem::Version.new VERSION
|
Gem::Version.new VERSION
|
||||||
|
|||||||
@@ -87,6 +87,12 @@ RSpec.describe Telegram::Bot::ConfigMethods do
|
|||||||
end
|
end
|
||||||
it { should include default: config[:bot] }
|
it { should include default: config[:bot] }
|
||||||
it { should include config[:bots] }
|
it { should include config[:bots] }
|
||||||
|
|
||||||
|
context 'on rails >5.1 (deep symbolized keys)' do
|
||||||
|
let(:secrets) { {telegram: config.deep_symbolize_keys} }
|
||||||
|
it { should include default: config[:bot] }
|
||||||
|
it { should include config[:bots] }
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user