telegram-bot-ruby 0.21.1 → 0.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfb8f0ed318a78b59914b9b7a327e56d8b013e09d1610f3996b8175e5081a757
-  data.tar.gz: c0de4d9c1517be81dd6d5f6c6b066b20966b071739018285d4b57a7669ea0775
+  metadata.gz: 7bca107deda1051398ddcbc2e07373d9391b1bd28ca076d7610d164bd80ff24b
+  data.tar.gz: 70d72be64d6706cedc45c125d439c15502c8b7f9d75821646455b0a30466fbc6
 SHA512:
-  metadata.gz: 47807a0830d8d9b0fe2911ef74f412c7c5b5a001ecd8ccd0702b2913f0256f773cf79e36c2f701c3cd1471162e8d28824dff0ce7a53bef5c33227e95964bb249
-  data.tar.gz: 93ea12e21f9a8157d4424ef87f52da5175bffd0e0c148742400115b864781554e93829fc82f5780007ed16a8768cb09fd9b32ce441a610e097660be110f3b2fd
+  metadata.gz: a436f947e37fdf9642e48208d0dadae058499c9b9b99994819459be7b2a6819139c4c8f1651eb50fc52e8bcbe601417e0f8f7d1929d5420c36d50a6f39879024
+  data.tar.gz: 2bee228283223aa1c6bdeb29ffe54e72c2c7fe39b43a3e60f158d20e1fdeace5e68a53a02cafde29b91fee3e622b7ca6a9d8587599f657925cf25912c26676a9

data/.github/workflows/ci.yml

@@ -0,0 +1,47 @@
+---
+name: CI
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby:
+          - 2.7
+          - 3.1
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - name: Run Rubocop
+        run: bundle exec rubocop
+
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby:
+          - 2.7
+          - 3.1
+    env:
+      BOT_API_ENV: test
+      BOT_API_TOKEN: ${{ secrets.BOT_API_TOKEN }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - name: Run specs
+        run: bundle exec rspec

data/.rubocop.yml

@@ -5,10 +5,15 @@ require:
 
 AllCops:
   NewCops: enable
+  TargetRubyVersion: 2.7
 
 Style/Documentation:
   Enabled: false
 
+Style/FrozenStringLiteralComment:
+  Exclude:
+    - bin/console
+
 Metrics/BlockLength:
   IgnoredMethods:
     - context

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 0.23.0
+
+- Rename `Telegram::Bot.configuration` options:
+  - `timeout` to `connection_timeout`
+  - `open_timeout` to `connection_open_timeout`
+- Fix issue with missing default value for long-polling timeout
+
 ## 0.21.0
 
 - Implement [Bot API 6.1](https://core.telegram.org/bots/api#june-20-2022)

data/README.md

@@ -3,8 +3,8 @@
 Ruby wrapper for [Telegram's Bot API](https://core.telegram.org/bots/api).
 
 [![Gem Version](https://badge.fury.io/rb/telegram-bot-ruby.svg)](http://badge.fury.io/rb/telegram-bot-ruby)
+[![Build Status](https://github.com/atipugin/telegram-bot-ruby/actions/workflows/ci.yml/badge.svg)](https://github.com/atipugin/telegram-bot-ruby/actions)
 [![Maintainability](https://api.codeclimate.com/v1/badges/7e61fbf5bec86e118fb1/maintainability)](https://codeclimate.com/github/atipugin/telegram-bot-ruby/maintainability)
-[![Build Status](https://travis-ci.org/atipugin/telegram-bot-ruby.svg?branch=master)](https://travis-ci.org/atipugin/telegram-bot-ruby)
 [![Say Thanks!](https://img.shields.io/badge/Say%20Thanks!-🦉-1EAEDB.svg)](https://saythanks.io/to/atipugin)
 
 ## Installation
@@ -50,6 +50,9 @@ end
 
 Note that `bot.api` object implements [Telegram Bot API methods](https://core.telegram.org/bots/api#available-methods) as is. So you can invoke any method inside the block without any problems. All methods are available in both *snake_case* and *camelCase* notations.
 
+If you need to start a bot on development mode you have to pass `enviroment: :test` <br>
+example: `Telegram::Bot::Client.run(token, enviroment: :test)` 
+
 Same thing about `message` object - it implements [Message](https://core.telegram.org/bots/api#message) spec, so you always know what to expect from it.
 
 ## Webhooks

data/examples/bot.rb

@@ -7,13 +7,16 @@ token = 'replace-me-with-your-real-token'
 
 Telegram::Bot::Client.run(token) do |bot|
   bot.listen do |message|
-    case message.text
-    when '/start'
-      bot.api.send_message(chat_id: message.chat.id, text: "Hello, #{message.from.first_name}!")
-    when '/end'
-      bot.api.send_message(chat_id: message.chat.id, text: "Bye, #{message.from.first_name}!")
-    else
-      bot.api.send_message(chat_id: message.chat.id, text: "I don't understand you :(")
+    case message
+    when Telegram::Bot::Types::Message
+      case message.text
+      when '/start'
+        bot.api.send_message(chat_id: message.chat.id, text: "Hello, #{message.from.first_name}!")
+      when '/end'
+        bot.api.send_message(chat_id: message.chat.id, text: "Bye, #{message.from.first_name}!")
+      else
+        bot.api.send_message(chat_id: message.chat.id, text: "I don't understand you :(")
+      end
     end
   end
 end

data/lib/telegram/bot/api.rb

@@ -29,11 +29,12 @@ module Telegram
         getMyDefaultAdministratorRights createInvoiceLink
       ].freeze
 
-      attr_reader :token, :url
+      attr_reader :token, :url, :environment
 
-      def initialize(token, url: 'https://api.telegram.org')
+      def initialize(token, url: 'https://api.telegram.org', environment: :production)
         @token = token
         @url = url
+        @environment = environment.downcase.to_sym
       end
 
       def method_missing(method_name, *args, &block)
@@ -52,13 +53,13 @@ module Telegram
 
       def call(endpoint, raw_params = {})
         params = build_params(raw_params)
-        response = conn.post("/bot#{token}/#{endpoint}", params)
-        if response.status == 200
-          JSON.parse(response.body)
-        else
-          raise Exceptions::ResponseError.new(response),
-                'Telegram API has returned the error.'
+        path = build_path(endpoint)
+        response = conn.post(path, params)
+        unless response.status == 200
+          raise Exceptions::ResponseError.new(response), 'Telegram API has returned the error.'
         end
+
+        JSON.parse(response.body)
       end
 
       private
@@ -69,6 +70,12 @@ module Telegram
         end
       end
 
+      def build_path(endpoint)
+        path = "/bot#{token}/"
+        path += 'test/' if environment == :test
+        path + endpoint
+      end
+
       def sanitize_value(value)
         jsonify_value(value)
       end
@@ -92,8 +99,8 @@ module Telegram
           faraday.request :multipart
           faraday.request :url_encoded
           faraday.adapter Telegram::Bot.configuration.adapter
-          faraday.options.timeout = Telegram::Bot.configuration.timeout
-          faraday.options.open_timeout = Telegram::Bot.configuration.open_timeout
+          faraday.options.timeout = Telegram::Bot.configuration.connection_timeout
+          faraday.options.open_timeout = Telegram::Bot.configuration.connection_open_timeout
         end
       end
     end

data/lib/telegram/bot/client.rb

@@ -12,7 +12,7 @@ module Telegram
 
       def initialize(token, hash = {})
         @options = default_options.merge(hash)
-        @api = Api.new(token, url: options.delete(:url))
+        @api = Api.new(token, url: options.delete(:url), environment: options.delete(:environment))
         @logger = options.delete(:logger)
       end
 
@@ -52,8 +52,10 @@ module Telegram
       def default_options
         {
           offset: 0,
+          timeout: 20,
           logger: NullLogger.new,
-          url: 'https://api.telegram.org'
+          url: 'https://api.telegram.org',
+          environment: :production
         }
       end
 

data/lib/telegram/bot/configuration.rb

@@ -3,12 +3,12 @@
 module Telegram
   module Bot
     class Configuration
-      attr_accessor :adapter, :open_timeout, :timeout
+      attr_accessor :adapter, :connection_open_timeout, :connection_timeout
 
       def initialize
         @adapter = Faraday.default_adapter
-        @open_timeout = 20
-        @timeout = 20
+        @connection_open_timeout = 20
+        @connection_timeout = 20
       end
     end
   end

data/lib/telegram/bot/types/compactable.rb

@@ -5,7 +5,7 @@ module Telegram
     module Types
       module Compactable
         def to_compact_hash
-          attributes.dup.delete_if { |_, v| v.nil? }.map do |key, value|
+          attributes.dup.delete_if { |_, v| v.nil? }.to_h do |key, value|
             value =
               if value.respond_to?(:to_compact_hash)
                 value.to_compact_hash
@@ -14,7 +14,7 @@ module Telegram
               end
 
             [key, value]
-          end.to_h
+          end
         end
 
         def to_json(*args)

data/lib/telegram/bot/version.rb

@@ -2,6 +2,6 @@
 
 module Telegram
   module Bot
-    VERSION = '0.21.1'
+    VERSION = '0.23.0'
   end
 end

data/telegram-bot-ruby.gemspec

@@ -19,6 +19,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
+  spec.required_ruby_version = '>= 2.7'
+  spec.metadata['rubygems_mfa_required'] = 'true'
+
   spec.add_dependency 'dry-inflector'
   spec.add_dependency 'faraday', '~> 2.0'
   spec.add_dependency 'faraday-multipart', '~> 1.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: telegram-bot-ruby
 version: !ruby/object:Gem::Version
-  version: 0.21.1
+  version: 0.23.0
 platform: ruby
 authors:
 - Alexander Tipugin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-28 00:00:00.000000000 Z
+date: 2022-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-inflector
@@ -157,10 +157,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -304,7 +304,8 @@ files:
 - telegram-bot-ruby.gemspec
 homepage: https://github.com/atipugin/telegram-bot
 licenses: []
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -313,7 +314,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/.travis.yml

@@ -1,7 +0,0 @@
-language: ruby
-rvm:
-  - 2.6.6
-  - 2.7.2
-script:
-  - bundle exec rubocop
-  - bundle exec rspec