telegram-bot-ruby 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6f6cfeeb86c2fef83ec55beb9de0d3f72729e42
-  data.tar.gz: 6be069ef2d2df8ff9ca36248d26353311c5a29c3
+  metadata.gz: f01d9b0fd236b5c87c09deccacdba46363e55148
+  data.tar.gz: bfa4dececda70c249f63ad9ff4bf5e09f766620d
 SHA512:
-  metadata.gz: b51532587af460e2fbe1a04b4014b6583ebcb6841e7abe457ecd1e575550681ddaa8ad0d221ee852c9bed62b5064641ac7e2a78906285ab01daaf38e083fa769
-  data.tar.gz: fa0df882d0c9c61726d8eccfb6cda2b746f7634ab50ec451ce34aeaf86ced773149c9bb69d91c3e3b8e73d421589d673edbfd0bb135fae21732f95e959e937ba
+  metadata.gz: 03f6f64efcd6ec0bf0b9c3dcd94c05f5a34d08dfaa5b22ede9e2d378afc236d1f9241c32167536324fcb26d7208f60e5953293dffb9801970931b24a9bbbc96b
+  data.tar.gz: c886b45e77283d3dc1bbbb078b07994a492e75f3a50799d0a07a00f2e7e2ed6a8412fb03b1d4a209145f6a5f150b85e9e13266b3ac0c623485a1c10b3a4c9734

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.8.4
+
+- Implement [Bot API 3.3](https://core.telegram.org/bots/api#august-23-2017) (thx [@ivanovaleksey][])
+
 ## 0.8.3
 
 - Implement [Bot API 3.2](https://core.telegram.org/bots/api#july-21-2017) (thx [@ivanovaleksey][])

data/README.md

@@ -171,33 +171,6 @@ Telegram::Bot::Client.run(token, logger: Logger.new($stderr)) do |bot|
 end
 ```
 
-## Botan.io support
-
-Gem provides support of [Botan.io](http://botan.io/) analytics out of box. All you need is to obtain a token (follow the instructions from https://github.com/botanio/sdk). To track events you're interested in just call `#track` method. See example below:
-
-```ruby
-require 'telegram/bot'
-require 'telegram/bot/botan' # Botan.io extension isn't loaded by default, so make sure you required it.
-
-token = 'YOUR_TELEGRAM_BOT_API_TOKEN'
-
-Telegram::Bot::Client.run(token) do |bot|
-  bot.enable_botan!('YOUR_BOTAN_TOKEN')
-  bot.listen do |message|
-    case message.text
-    when '/start'
-      bot.track('Started', message.from.id, type_of_chat: message.chat.class.name)
-      # ...
-    end
-  end
-end
-```
-
-`#track` method accepts 3 arguments:
-- name of event (required)
-- Telegram's user id (required)
-- hash of additional properties (optional)
-
 ## Connection adapters
 
 Since version `0.5.0` we rely on [faraday](https://github.com/lostisland/faraday) under the hood. You can use any of supported adapters (for example, `net/http/persistent`):

data/lib/telegram/bot.rb

@@ -1,4 +1,5 @@
 require 'virtus'
+require 'inflecto'
 require 'logger'
 require 'json'
 require 'faraday'

data/lib/telegram/bot/client.rb

@@ -33,7 +33,7 @@ module Telegram
         response['result'].each do |data|
           update = Types::Update.new(data)
           @options[:offset] = update.update_id.next
-          message = extract_message(update)
+          message = update.current_message
           log_incoming_message(message)
           yield message
         end
@@ -47,17 +47,6 @@ module Telegram
         { offset: 0, timeout: 20, logger: NullLogger.new }
       end
 
-      def extract_message(update)
-        types = %w(inline_query
-                   chosen_inline_result
-                   callback_query
-                   edited_message
-                   message
-                   channel_post
-                   edited_channel_post)
-        types.inject(nil) { |acc, elem| acc || update.public_send(elem) }
-      end
-
       def log_incoming_message(message)
         uid = message.from ? message.from.id : nil
         logger.info(

data/lib/telegram/bot/types.rb

@@ -1,3 +1,4 @@
+require 'telegram/bot/types/compactable'
 require 'telegram/bot/types/base'
 require 'telegram/bot/types/user'
 require 'telegram/bot/types/audio'
@@ -66,3 +67,5 @@ require 'telegram/bot/types/labeled_price'
 require 'telegram/bot/types/shipping_option'
 require 'telegram/bot/types/chat_member'
 require 'telegram/bot/types/user_profile_photos'
+
+Virtus.finalize

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

@@ -3,19 +3,7 @@ module Telegram
     module Types
       class Base
         include Virtus.model
-
-        def to_compact_hash
-          Hash[attributes.dup.delete_if { |_, v| v.nil? }.map do |key, value|
-            value =
-              if value.class.ancestors.include?(Telegram::Bot::Types::Base)
-                value.to_compact_hash
-              else
-                value
-              end
-
-            [key, value]
-          end]
-        end
+        include Compactable
       end
     end
   end

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

@@ -1,7 +1,10 @@
 module Telegram
   module Bot
     module Types
-      class Chat < Base
+      class Chat
+        include Virtus.model(finalize: false)
+        include Compactable
+
         attribute :id, Integer
         attribute :type, String
         attribute :title, String
@@ -12,6 +15,7 @@ module Telegram
         attribute :photo, ChatPhoto
         attribute :description, String
         attribute :invite_link, String
+        attribute :pinned_message, 'Telegram::Bot::Types::Message'
       end
     end
   end

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

@@ -0,0 +1,20 @@
+module Telegram
+  module Bot
+    module Types
+      module Compactable
+        def to_compact_hash
+          Hash[attributes.dup.delete_if { |_, v| v.nil? }.map do |key, value|
+            value =
+              if value.class.ancestors.include?(Telegram::Bot::Types::Base)
+                value.to_compact_hash
+              else
+                value
+              end
+
+            [key, value]
+          end]
+        end
+      end
+    end
+  end
+end

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

@@ -9,9 +9,11 @@ module Telegram
         attribute :forward_from, User
         attribute :forward_from_chat, Chat
         attribute :forward_from_message_id, Integer
+        attribute :forward_signature, String
         attribute :forward_date, Integer
         attribute :reply_to_message, Message
         attribute :edit_date, Integer
+        attribute :author_signature, String
         attribute :text, String
         attribute :entities, Array[MessageEntity]
         attribute :audio, Audio

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

@@ -12,6 +12,11 @@ module Telegram
         attribute :callback_query, CallbackQuery
         attribute :shipping_query, ShippingQuery
         attribute :pre_checkout_query, PreCheckoutQuery
+
+        def current_message
+          @current_message ||=
+            Hash[*attributes.find { |k, v| k != :update_id && v }].values.first
+        end
       end
     end
   end

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

@@ -3,6 +3,7 @@ module Telegram
     module Types
       class User < Base
         attribute :id, Integer
+        attribute :is_bot, Boolean
         attribute :first_name, String
         attribute :last_name, String
         attribute :username, String

data/lib/telegram/bot/version.rb

@@ -1,5 +1,5 @@
 module Telegram
   module Bot
-    VERSION = '0.8.3'.freeze
+    VERSION = '0.8.4'.freeze
   end
 end

data/telegram-bot-ruby.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'faraday'
   spec.add_dependency 'virtus'
+  spec.add_dependency 'inflecto'
 
   spec.add_development_dependency 'bundler', '~> 1.9'
   spec.add_development_dependency 'rake', '~> 10.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: telegram-bot-ruby
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors:
 - Alexander Tipugin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-01 00:00:00.000000000 Z
+date: 2017-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: inflecto
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -143,8 +157,6 @@ files:
 - examples/bot.rb
 - lib/telegram/bot.rb
 - lib/telegram/bot/api.rb
-- lib/telegram/bot/botan.rb
-- lib/telegram/bot/botan/api.rb
 - lib/telegram/bot/client.rb
 - lib/telegram/bot/configuration.rb
 - lib/telegram/bot/exceptions.rb
@@ -161,6 +173,7 @@ files:
 - lib/telegram/bot/types/chat_member.rb
 - lib/telegram/bot/types/chat_photo.rb
 - lib/telegram/bot/types/chosen_inline_result.rb
+- lib/telegram/bot/types/compactable.rb
 - lib/telegram/bot/types/contact.rb
 - lib/telegram/bot/types/document.rb
 - lib/telegram/bot/types/file.rb

data/lib/telegram/bot/botan.rb

@@ -1,21 +0,0 @@
-require 'telegram/bot/botan/api'
-
-module Telegram
-  module Bot
-    module Botan
-      attr_reader :botan
-
-      def enable_botan!(token)
-        @botan ||= Botan::Api.new(token)
-      end
-
-      def track(*args)
-        botan.track(*args) if defined?(botan)
-      end
-    end
-  end
-end
-
-if defined?(Telegram::Bot::Client)
-  Telegram::Bot::Client.send(:include, Telegram::Bot::Botan)
-end

data/lib/telegram/bot/botan/api.rb

@@ -1,27 +0,0 @@
-module Telegram
-  module Bot
-    module Botan
-      class Api
-        attr_reader :token
-
-        def initialize(token)
-          @token = token
-        end
-
-        def track(event, uid, properties = {})
-          query_str = URI.encode_www_form(token: token, name: event, uid: uid)
-          conn.post("/track?#{query_str}", properties.to_json)
-        end
-
-        private
-
-        def conn
-          @conn ||= Faraday.new(url: 'https://api.botan.io') do |faraday|
-            faraday.request :url_encoded
-            faraday.adapter Telegram::Bot.configuration.adapter
-          end
-        end
-      end
-    end
-  end
-end