telegram-bot-ruby 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46df3e677efb20c202616015ee9f147a8c9cb82378ddf4361cd77a982a4b9130
-  data.tar.gz: 2b48882f2251bb5200d7776dc7ba46cfdb92651dd7a94051e4ffea931942bee6
+  metadata.gz: b2cb7116b2990f0bccbc7fadb1e34106a1e2ffe5fe319f79ee7907f01f4ee918
+  data.tar.gz: 46965b28805fecefee9b2f8beaa8b8d5bca6f539ef3bdd390e5bd5d31b146ced
 SHA512:
-  metadata.gz: cd38e725718bd3e2eff039aa0c1fef81f98459d080646cbdfdd48c9d6db87819fd6b1ad7f3a406538d03b4520aa3ad531bed5a216296cb3b904aae1a09ec90e5
-  data.tar.gz: 6c94d7f6409777dcb8c89aa89f68f4d5f3281025e05700ae9f8905d98e0285b0b201db7a2b698033ad449a4998ed91df4a16e2ac73837915dae47a371d309c75
+  metadata.gz: e73e3e3690a75a9de50e87af8effa1fd53a95b281f325fa230bd09d9e4f8ac9129aa9811064573469fdc6e15de1000f0b3554af8af8d0f1ab4a17d94edb45e6c
+  data.tar.gz: 79699f7dbda65732c6b940a54e6d39d0ea880481a7614e3d786f50902cab9ef67955a094420db9f300237972ed752166be6b0dd4c2d5c6683dd4c2c297e7b502

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.9.1
+
+- Allow to configure API URL (thx [@markfrst][])
+
 ## 0.9.0
 
 - Implement [Bot API 4.2](https://core.telegram.org/bots/api-changelog#april-14-2019)
@@ -73,3 +77,4 @@
 - Let `Client#logger` be overwritten later (use `attr_accessor` instead of `attr_reader`)
 
 [@ivanovaleksey]: https://github.com/ivanovaleksey
+[@markfrst]: https://github.com/markfrst

data/README.md

@@ -56,6 +56,16 @@ Same thing about `message` object - it implements [Message](https://core.telegra
 
 If you are going to use [webhooks](https://core.telegram.org/bots/api#setwebhook) instead of [long polling](https://core.telegram.org/bots/api#getupdates), you need to implement your own webhook callbacks server. Take a look at [this repo](https://github.com/solyaris/BOTServer) as an example.
 
+## Proxy
+
+As some countries block access to Telegram, you can set up your own proxy and use it to access Telegram API. In this case you need to configure API url:
+
+```ruby
+Telegram::Bot::Client.run(token, url: 'https://proxy.example.com') do |bot|
+  # ...
+end
+```
+
 ## Custom keyboards
 
 You can use your own [custom keyboards](https://core.telegram.org/bots#keyboards). Here is an example:

data/lib/telegram/bot/api.rb

@@ -48,10 +48,11 @@ module Telegram
         Telegram::Bot::Types::InlineQueryResultCachedAudio
       ].freeze
 
-      attr_reader :token
+      attr_reader :token, :url
 
-      def initialize(token)
+      def initialize(token, url: 'https://api.telegram.org')
         @token = token
+        @url = url
       end
 
       def method_missing(method_name, *args, &block)
@@ -110,7 +111,7 @@ module Telegram
       end
 
       def conn
-        @conn ||= Faraday.new(url: 'https://api.telegram.org') do |faraday|
+        @conn ||= Faraday.new(url: url) do |faraday|
           faraday.request :multipart
           faraday.request :url_encoded
           faraday.adapter Telegram::Bot.configuration.adapter

data/lib/telegram/bot/client.rb

@@ -8,9 +8,9 @@ module Telegram
         new(*args).run(&block)
       end
 
-      def initialize(token, h = {})
-        @options = default_options.merge(h)
-        @api = Api.new(token)
+      def initialize(token, hash = {})
+        @options = default_options.merge(hash)
+        @api = Api.new(token, url: options.delete(:url))
         @logger = options.delete(:logger)
       end
 
@@ -44,7 +44,12 @@ module Telegram
       private
 
       def default_options
-        { offset: 0, timeout: 20, logger: NullLogger.new }
+        {
+          offset: 0,
+          timeout: 20,
+          logger: NullLogger.new,
+          url: 'https://api.telegram.org'
+        }
       end
 
       def log_incoming_message(message)

data/lib/telegram/bot/version.rb

@@ -1,5 +1,5 @@
 module Telegram
   module Bot
-    VERSION = '0.9.0'.freeze
+    VERSION = '0.9.1'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: telegram-bot-ruby
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Alexander Tipugin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-09 00:00:00.000000000 Z
+date: 2019-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday