telegrammer 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e7d63ced4d594d0750cff564f42d74cc737ee9c
-  data.tar.gz: 47b850bb589fb3c4ee0a9be1e5ed2a70ed77c0cd
+  metadata.gz: 224d03bc70f9c37278200814817ae37b1540b861
+  data.tar.gz: 643f7ba2ce3150bff36c5adfde1f59733477939a
 SHA512:
-  metadata.gz: 514d1f49af6ca9fb18264f6eaaaac6d4b541efc8d150f0fe8140b8b19ae125af08b67b2bbdba6e93958d47e88c0c145bbb2f6e9fa827aee9d2cd903472cdaab3
-  data.tar.gz: bf8d83bdbac9e10b21ffe557fce10f4b669edca9b586f11b0b7f70076c0d1c5b4afac66c024dc1164f946882478779d21a25f2fff74277accd8f0bf5767a228f
+  metadata.gz: 0399b80941d6235db752b752f21d29d4c48c84e1aaf9d513f3e7d78ea8b18d86f50cb31614914edb4f69b6318ea11168cf05b88819e4e7689f3584fe7ea1f171
+  data.tar.gz: f7cba215caea44098d7bdbca2ff1a616c364fbba6446ed79341f9cd083b3a32012149128eb776eabad113b4202f15781e608c2edd91e3413c989dbb2d5862929

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+v0.7.1
+======
+
+* Fixed order loading Telegrammer classes for inline mode (reported by markkuit in #17).
+* Better examples in the docs for get_updates & answer_inline_query methods.
+
 v0.7.0
 ======
 

data/lib/telegrammer.rb

@@ -15,6 +15,14 @@ require 'telegrammer/data_types/sticker'
 require 'telegrammer/data_types/video'
 require 'telegrammer/data_types/voice'
 
+require 'telegrammer/data_types/chosen_inline_result'
+require 'telegrammer/data_types/inline_query'
+require 'telegrammer/data_types/inline_query_result_article'
+require 'telegrammer/data_types/inline_query_result_gif'
+require 'telegrammer/data_types/inline_query_result_mpeg4_gif'
+require 'telegrammer/data_types/inline_query_result_photo'
+require 'telegrammer/data_types/inline_query_result_video'
+
 require 'telegrammer/data_types/document'
 require 'telegrammer/data_types/file'
 require 'telegrammer/data_types/force_reply'
@@ -26,14 +34,6 @@ require 'telegrammer/data_types/reply_keyboard_markup'
 require 'telegrammer/data_types/update'
 require 'telegrammer/data_types/user_profile_photos'
 
-require 'telegrammer/data_types/chosen_inline_result'
-require 'telegrammer/data_types/inline_query'
-require 'telegrammer/data_types/inline_query_result_article'
-require 'telegrammer/data_types/inline_query_result_gif'
-require 'telegrammer/data_types/inline_query_result_mpeg4_gif'
-require 'telegrammer/data_types/inline_query_result_photo'
-require 'telegrammer/data_types/inline_query_result_video'
-
 require 'telegrammer/bot'
 require 'telegrammer/api_response'
 

data/lib/telegrammer/bot.rb

@@ -34,17 +34,21 @@ module Telegrammer
     # @example
     #     bot = Telegrammer::Bot.new('[YOUR TELEGRAM TOKEN]')
     #
-    #     bot.get_updates do |message|
-    #       puts "In chat #{message.chat.id}, @#{message.from.username} said: #{message.text}"
-    #       bot.send_message(chat_id: message.chat.id, text: "You said: #{message.text}")
+    #     bot.get_updates do |update|
+    #       if update.is_a?(Telegrammer::DataTypes::Message)
+    #         puts "In chat #{update.chat.id}, @#{update.from.username} said: #{update.text}"
+    #         bot.send_message(chat_id: update.chat.id, text: "You said: #{update.text}")
+    #       end
     #
     #       # Here you can also process message text to detect user commands
     #       # To learn more about commands, see https://core.telegram.org/bots#commands
     #     end
     #
     #     bot.get_updates({fail_silently:true, timeout:20}) do |message|
-    #       puts "In chat #{message.chat.id}, @#{message.from.username} said: #{message.text}"
-    #       bot.send_message(chat_id: message.chat.id, text: "You said: #{message.text}")
+    #       if update.is_a?(Telegrammer::DataTypes::Message)
+    #         puts "In chat #{message.chat.id}, @#{message.from.username} said: #{update.text}"
+    #         bot.send_message(chat_id: message.chat.id, text: "You said: #{update.text}")
+    #       end
     #
     #       # Here you can also process message text to detect user commands
     #       # To learn more about commands, see https://core.telegram.org/bots#commands
@@ -64,7 +68,7 @@ module Telegrammer
         response.result.each do |raw_update|
           update = Telegrammer::DataTypes::Update.new(raw_update)
           @offset = update.update_id + 1
-          yield update.message
+          yield (update.inline_query ? update.inline_query : update.message)
         end
       end
     end
@@ -462,16 +466,18 @@ module Telegrammer
     # @example
     #     bot = Telegrammer::Bot.new('[YOUR TELEGRAM TOKEN]')
     #
-    #     bot.get_updates do |message|
-    #       inline_query = message.inline_query
+    #     bot.get_updates do |update|
+    #       if update.is_a?(Telegrammer::DataTypes::InlineQuery)
+    #         inline_query = message.inline_query
     #
-    #       if inline_query
-    #         results = the_search_in_my_app(inline_query.query)
+    #         if inline_query
+    #           results = the_search_in_my_app(inline_query.query)
     #
-    #         bot.answer_inline_query(
-    #           inline_query_id: "my-internal-query-id",
-    #           results: results
-    #         )
+    #           bot.answer_inline_query(
+    #             inline_query_id: "my-internal-query-id",
+    #             results: results
+    #           )
+    #         end
     #       end
     #     end
 

data/lib/telegrammer/data_types/inline_query_result_article.rb

@@ -17,7 +17,7 @@ module Telegrammer
     #
     # See more at https://core.telegram.org/bots/api#inlinequeryresultarticle
     class InlineQueryResultArticle < Telegrammer::DataTypes::Base
-      attribute :type, String
+      attribute :type, String, default: 'article'
       attribute :id, String
       attribute :title, String
       attribute :message_text, String

data/lib/telegrammer/data_types/inline_query_result_gif.rb

@@ -16,7 +16,7 @@ module Telegrammer
     #
     # See more at https://core.telegram.org/bots/api#inlinequeryresultgif
     class InlineQueryResultGif < Telegrammer::DataTypes::Base
-      attribute :type, String
+      attribute :type, String, default: 'gif'
       attribute :id, String
       attribute :gif_url, String
       attribute :gif_width, Integer

data/lib/telegrammer/data_types/inline_query_result_mpeg4_gif.rb

@@ -16,7 +16,7 @@ module Telegrammer
     #
     # See more at https://core.telegram.org/bots/api#inlinequeryresultmpeg4gif
     class InlineQueryResultMpeg4Gif < Telegrammer::DataTypes::Base
-      attribute :type, String
+      attribute :type, String, default: 'mpeg4_gif'
       attribute :id, String
       attribute :mpeg4_url, String
       attribute :mpeg4_width, Integer

data/lib/telegrammer/data_types/inline_query_result_photo.rb

@@ -2,7 +2,7 @@ module Telegrammer
   module DataTypes
     # Telegram InlineQueryResultPhoto data type
     #
-    # @attr [String] type Type of the result, must be article
+    # @attr [String] type Type of the result, must be photo
     # @attr [String] id Unique identifier for this result, 1-64 Bytes
     # @attr [String] photo_url A valid URL of the photo. Photo must be in jpeg format. Photo size must not exceed 5MB
     # @attr [Integer] photo_width Optional. Width of the photo
@@ -17,7 +17,7 @@ module Telegrammer
     #
     # See more at https://core.telegram.org/bots/api#inlinequeryresultphoto
     class InlineQueryResultPhoto < Telegrammer::DataTypes::Base
-      attribute :type, String
+      attribute :type, String, default: 'photo'
       attribute :id, String
       attribute :photo_url, String
       attribute :photo_width, Integer

data/lib/telegrammer/data_types/inline_query_result_video.rb

@@ -18,7 +18,7 @@ module Telegrammer
     #
     # See more at https://core.telegram.org/bots/api#inlinequeryresultvideo
     class InlineQueryResultVideo < Telegrammer::DataTypes::Base
-      attribute :type, String
+      attribute :type, String, default: 'video'
       attribute :id, String
       attribute :video_url, String
       attribute :mime_type, String

data/lib/telegrammer/version.rb

@@ -1,3 +1,3 @@
 module Telegrammer
-  VERSION = '0.7.0'
+  VERSION = '0.7.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: telegrammer
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Luis Mayoral
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-11 00:00:00.000000000 Z
+date: 2016-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
@@ -144,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Ruby client for the Telegram's Bots API