telegram-bot 0.13.0 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: fd54d434c70a78a128767db94de31a6fbf07ca11
-  data.tar.gz: 669957947937536ba2257af7362d97c75e82a236
+SHA256:
+  metadata.gz: 9d72dfb00c1dab4bf5b80276354ff102737b537a02c1ba40656bb9ab6eb28288
+  data.tar.gz: ed15a4fa045c319c035ab4b5ec9b06169b4a7455004de59fbaeac7656de7c795
 SHA512:
-  metadata.gz: abaa6ac4240292eb5200fca36b3fc30e9e30a9232a4694cf797ef3754eb8240c728203718b6a29bf8b29792b0e9312b93bfbccc5682cfaef250a12ec95e6e9e6
-  data.tar.gz: 77715ec8f7cc3f2f9752d1ab3faa821dbbbaf748f8c90dcc450c351e8786150301c84e1d78c87f2ae974b5413e12a49c5617fdec737d5864837ba0cc3fb1ad3a
+  metadata.gz: d2cd894d342bb01a901b2c24a243165b580adfd5bcbaef632d3d272693424b5b2f13b7236edcf32dcb897d123f68410c97e0c3235106e31f4de06ace5a712406
+  data.tar.gz: cb95a89bcf60e2993d6011203c7f6e4e56f725e2455cbe31e351f60fd72f9e2e40296da284c1147f36f4dcb5f9d004efa2f99aa8791563e3282e8ece64c29499

data/.travis.yml

@@ -1,17 +1,34 @@
 language: ruby
 cache: bundler
 rvm:
-  - 2.5
-  - 2.4
-  - 2.3
+- 2.5
+- 2.4
 gemfile:
-  - gemfiles/rails_52.gemfile
-  - gemfiles/rails_51.gemfile
-  - gemfiles/rails_50.gemfile
-  - gemfiles/rails_42.gemfile
+- gemfiles/rails_52.gemfile
+- gemfiles/rails_51.gemfile
+matrix:
+  include:
+  # old rails
+  - rvm: 2.5
+    gemfile: gemfiles/rails_50.gemfile
+  - rvm: 2.5
+    gemfile: gemfiles/rails_42.gemfile
+  # old rubies
+  - rvm: 2.3
+    gemfile: gemfiles/rails_52.gemfile
+  # future rails
+  - rvm: 2.5
+    gemfile: gemfiles/rails_60.gemfile
+  # Allow rails 6 to fail while master branch is used
+  allow_failures:
+  - rvm: 2.5
+    gemfile: gemfiles/rails_60.gemfile
 notifications:
   email: false
 
-# for 2.5.0 until 2.5.1 is released: https://github.com/travis-ci/travis-ci/issues/8978
+# for 2.5.0 until 2.5.1 is released:
+#   https://github.com/travis-ci/travis-ci/issues/8978
+#   https://github.com/travis-ci/travis-ci/issues/8969#issuecomment-354135622
 before_install:
   - gem update --system
+  - gem install bundler

data/Appraisals

@@ -1,3 +1,10 @@
+appraise 'rails-60' do
+  git 'https://github.com/rails/rails.git' do
+    gem 'actionpack', '~> 6.0.0.alpha'
+    gem 'railties', '~> 6.0.0.alpha'
+  end
+end
+
 appraise 'rails-52' do
   gem 'actionpack', '~> 5.2.0.beta2'
   gem 'railties', '~> 5.2.0.beta2'

data/CHANGELOG.md

@@ -1,4 +1,8 @@
-# Unreleased
+# 0.13.1
+
+- Extracted typed response mappings to telegram-bot-types gem.
+  It now provides definitions for all API v3.5 methods.
+- Fix #chat for non-message updates with TypedUpdates enabled
 
 # 0.13.0
 

data/Gemfile

@@ -8,7 +8,7 @@ group :development do
   gem 'pry-byebug', '~> 3.2.0'
   gem 'sdoc', '~> 0.4.1'
 
-  gem 'telegram-bot-types', '~> 0.3.0'
+  gem 'telegram-bot-types', '~> 0.6.0'
 
   gem 'rspec', '~> 3.5.0'
   gem 'rspec-its', '~> 1.1.0'

data/README.md

@@ -11,7 +11,7 @@ in development, but you can use poller in production if you want.
 
 Package contains:
 
-- Ligthweight client for bot API (with fast and thread-safe
+- Lightweight client for bot API (with fast and thread-safe
   [httpclient](https://github.com/nahi/httpclient) under the hood).
 - Controller with message parser: define methods for commands, not `case` branches.
 - Middleware and routes helpers for production env.

data/gemfiles/rails_42.gemfile

@@ -10,7 +10,7 @@ group :development do
   gem "pry", "~> 0.10.1"
   gem "pry-byebug", "~> 3.2.0"
   gem "sdoc", "~> 0.4.1"
-  gem "telegram-bot-types", "~> 0.3.0"
+  gem "telegram-bot-types", "~> 0.6.0"
   gem "rspec", "~> 3.5.0"
   gem "rspec-its", "~> 1.1.0"
   gem "rspec-rails", "~> 3.5.0"

data/gemfiles/rails_50.gemfile

@@ -10,7 +10,7 @@ group :development do
   gem "pry", "~> 0.10.1"
   gem "pry-byebug", "~> 3.2.0"
   gem "sdoc", "~> 0.4.1"
-  gem "telegram-bot-types", "~> 0.3.0"
+  gem "telegram-bot-types", "~> 0.6.0"
   gem "rspec", "~> 3.5.0"
   gem "rspec-its", "~> 1.1.0"
   gem "rspec-rails", "~> 3.5.0"

data/gemfiles/rails_51.gemfile

@@ -10,7 +10,7 @@ group :development do
   gem "pry", "~> 0.10.1"
   gem "pry-byebug", "~> 3.2.0"
   gem "sdoc", "~> 0.4.1"
-  gem "telegram-bot-types", "~> 0.3.0"
+  gem "telegram-bot-types", "~> 0.6.0"
   gem "rspec", "~> 3.5.0"
   gem "rspec-its", "~> 1.1.0"
   gem "rspec-rails", "~> 3.5.0"

data/gemfiles/rails_52.gemfile

@@ -10,7 +10,7 @@ group :development do
   gem "pry", "~> 0.10.1"
   gem "pry-byebug", "~> 3.2.0"
   gem "sdoc", "~> 0.4.1"
-  gem "telegram-bot-types", "~> 0.3.0"
+  gem "telegram-bot-types", "~> 0.6.0"
   gem "rspec", "~> 3.5.0"
   gem "rspec-its", "~> 1.1.0"
   gem "rspec-rails", "~> 3.5.0"

data/gemfiles/rails_60.gemfile

@@ -0,0 +1,23 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+git "https://github.com/rails/rails.git" do
+  gem "actionpack", "~> 6.0.0.alpha"
+  gem "railties", "~> 6.0.0.alpha"
+end
+
+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.6.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: "../"

data/lib/telegram/bot/client/typed_response.rb

@@ -1,35 +1,23 @@
+require 'telegram/bot/client/api_helper'
+require 'active_support/core_ext/string/inflections'
+
 module Telegram
   module Bot
     class Client
       # Actions with type-casted results. Install `telegram-bot-types` gem first.
       module TypedResponse
-        {
-          getFile:              :File,
-          getMe:                :User,
-          getUpdates:           [:Update],
-          getUserProfilePhotos: :UserProfilePhotos,
+        # First we define methods for every available api method to return `result`
+        # field instead of object.
+        ApiHelper.methods_list.each do |method|
+          define_method(method.to_s.underscore) do |*args|
+            super(*args)['result']
+          end
+        end
 
-          forwardMessage:       :Message,
-          sendAudio:            :Message,
-          sendDocument:         :Message,
-          sendLocation:         :Message,
-          sendMessage:          :Message,
-          sendPhoto:            :Message,
-          sendSticker:          :Message,
-          sendVideo:            :Message,
-          sendVoice:            :Message,
-        }.each do |method, type|
-          next unless type
-          if type.is_a?(Array)
-            type_class = Types.const_get(type.first)
-            define_method(method.to_s.underscore) do |*args|
-              request(method, *args)['result'].map { |x| type_class.new(x) }
-            end
-          else
-            type_class = Types.const_get(type)
-            define_method(method.to_s.underscore) do |*args|
-              type_class.new request(method, *args)['result']
-            end
+        # And then override some of them which has castable results.
+        Types::Response::WRAPPED_METHODS.each do |method, type|
+          define_method(method.to_s.underscore) do |*args|
+            Types::Response.wrap(super(*args)['result'], type)
           end
         end
       end

data/lib/telegram/bot/config_methods.rb

@@ -1,5 +1,4 @@
 require 'active_support/core_ext/hash/keys'
-require 'active_support/core_ext/hash/transform_values'
 require 'active_support/core_ext/hash/indifferent_access'
 
 module Telegram
@@ -43,7 +42,7 @@ module Telegram
 
       # Hash of botan clients made from #bots.
       def botans
-        @botans ||= bots.transform_values(&:botan)
+        @botans ||= bots.map { |k, v| [k, v.botan] }.to_h
       end
 
       # Returns config for .bots method. By default uses `telegram['bots']` section

data/lib/telegram/bot/updates_controller.rb

@@ -157,7 +157,14 @@ module Telegram
       #
       # Can be overriden with `chat` option for #initialize.
       def chat
-        @_chat ||= payload.try! { |x| x['chat'] || x['message'] && x['message']['chat'] }
+        @_chat ||=
+          if payload
+            if payload.is_a?(Hash)
+              payload['chat'] || payload['message'] && payload['message']['chat']
+            else
+              payload.try(:chat) || payload.try(:message).try!(:chat)
+            end
+          end
       end
 
       # Accessor to `'from'` field of payload. Can be overriden with `from` option

data/lib/telegram/bot/updates_controller/rspec_helpers.rb

@@ -35,7 +35,7 @@ RSpec.shared_context 'telegram/bot/updates_controller' do
   def deep_stringify(input)
     case input
     when Array then input.map(&method(__callee__))
-    when Hash then input.transform_keys(&:to_s).transform_values(&method(__callee__))
+    when Hash then input.map { |k, v| [k.to_s, deep_stringify(v)] }.to_h
     else input
     end
   end

data/lib/telegram/bot/version.rb

@@ -1,6 +1,6 @@
 module Telegram
   module Bot
-    VERSION = '0.13.0'.freeze
+    VERSION = '0.13.1'.freeze
 
     def self.gem_version
       Gem::Version.new VERSION

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: telegram-bot
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.13.1
 platform: ruby
 authors:
 - Max Melentiev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-02 00:00:00.000000000 Z
+date: 2018-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -119,6 +119,7 @@ files:
 - gemfiles/rails_50.gemfile
 - gemfiles/rails_51.gemfile
 - gemfiles/rails_52.gemfile
+- gemfiles/rails_60.gemfile
 - lib/tasks/telegram-bot.rake
 - lib/telegram/bot.rb
 - lib/telegram/bot/async.rb
@@ -173,7 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Library for building Telegram Bots with Rails integration