telegram-bot 0.7.4 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b21ff9c397fda79a83ef6ff4e2c67baaf2d49755
-  data.tar.gz: 0bb03cd6e521d6ab7ad20b23b18da992e0f4464b
+  metadata.gz: cd93b336f2b1953328663119cc121ff43ff00fee
+  data.tar.gz: 7be5d289e11d1fb3c45ac1557923265fa23a35bf
 SHA512:
-  metadata.gz: 9c6ccdf272c91d9a65a26beb1f31598c7294af91edc3d63268517d0da18fe3f61fa91ff31c7367094a00fe97a725027842bacd2bec848a3c7bc0fc5fbc7741b2
-  data.tar.gz: 511a05ba78a2801a8e868f3e6ab6918a62e91bb9f0a734026189048164755533e6222a5d578456e86ca80100017085a4ccabd72e981a6dafdf244b612339130c
+  metadata.gz: 8a28a28b2650f95f1360d6d7e015ea959e6f5e79d9d93c809468db1319087dffd7c5c69294f2f06ef429246b5860267d047a16c6f9f779b583b44fcc5ef52b0a
+  data.tar.gz: 1af5cc258b0b0e453369b3a52bb3fb5231b568de23b0f132aac24a779c6c557dadbd37d6f487922062c740bc1cd1f285fb655b8837c63ddb391622d8e45436d4

data/.travis.yml

@@ -2,5 +2,8 @@ language: ruby
 cache: bundler
 rvm:
   - 2.2.3
+env:
+  - RAILS=4
+  - RAILS=5
 notifications:
   email: false

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+# 0.8.0
+
+- Fixed `#reply_with`, now it sets `reply_to_message_id` as it's supposed to.
+  Added `#respond_with` which works the same way, but doesn't set `reply_to_message_id`.
+  Please, replace all occurrences of `reply_with` to `respond_with` to
+  keep it working the old way.
+- Fixes for Rails 5:
+  - Controller callbacks
+  - Middleware
+  - Setup travis builds
+
 # 0.7.4
 
 - Rails 5 support by @dreyks (#4).

data/Gemfile

@@ -1,6 +1,13 @@
 source 'https://rubygems.org'
 gemspec
 
+case ENV['RAILS']
+when '5'
+  gem 'actionpack', '5.0.0.rc1'
+when '4'
+  gem 'actionpack', '~> 4.2'
+end
+
 group :development do
   gem 'sdoc', '~> 0.4.1'
   gem 'pry', '~> 0.10.1'

data/README.md

@@ -131,9 +131,10 @@ class Telegram::WebhookController < Telegram::Bot::UpdatesController
 
     # There are `chat` & `from` shortcut methods.
     response = from ? "Hello #{from['username']}!" : 'Hi there!'
-    # There is `reply_with` helper to set basic fields
-    # like `reply_to_message` & `chat_id`.
-    reply_with :message, text: response
+    # There is `respond_with` helper to set `chat_id` from received message:
+    respond_with :message, text: response
+    # `reply_with` also sets `reply_to_message_id`:
+    reply_with :photo, photo: File.open('party.jpg')
   end
 
   private
@@ -188,7 +189,7 @@ class Telegram::WebhookController < Telegram::Bot::UpdatesController
   end
 
   def read
-    reply_with :message, text: session[:text]
+    respond_with :message, text: session[:text]
   end
 
   private
@@ -214,23 +215,23 @@ class Telegram::WebhookController < Telegram::Bot::UpdatesController
   def rename(*)
     # set context for the next message
     save_context :rename
-    reply_with :message, text: 'What name do you like?'
+    respond_with :message, text: 'What name do you like?'
   end
 
   # register context handlers to handle this context
   context_handler :rename do |*words|
     update_name words[0]
-    reply_with :message, text: 'Renamed!'
+    respond_with :message, text: 'Renamed!'
   end
 
   # You can do it in other way:
   def rename(name = nil, *)
     if name
       update_name name
-      reply_with :message, text: 'Renamed!'
+      respond_with :message, text: 'Renamed!'
     else
       save_context :rename
-      reply_with :message, text: 'What name do you like?'
+      respond_with :message, text: 'What name do you like?'
     end
   end
 
@@ -383,6 +384,16 @@ To release a new version, update the version number in `version.rb`,
 and then run `bundle exec rake release`, which will create a git tag for the version,
 push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
+### Different Rails versions
+
+To setup development for specific major Rails version use:
+
+```
+RAILS=5 bundle install
+# or
+RAILS=5 bundle update
+```
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/telegram-bot-rb/telegram-bot.

data/lib/telegram/bot/middleware.rb

@@ -1,6 +1,8 @@
 require 'active_support/concern'
+require 'active_support/core_ext/hash/indifferent_access'
+require 'active_support/json'
 require 'action_dispatch/http/mime_type'
-require 'action_dispatch/middleware/params_parser'
+require 'action_dispatch/http/request'
 
 module Telegram
   module Bot
@@ -13,7 +15,8 @@ module Telegram
       end
 
       def call(env)
-        update = env['action_dispatch.request.request_parameters']
+        request = ActionDispatch::Request.new(env)
+        update = request.request_parameters
         controller.dispatch(bot, update)
         [200, {}, ['']]
       end

data/lib/telegram/bot/updates_controller.rb

@@ -21,7 +21,7 @@ module Telegram
     #     end
     #
     #     def help(*)
-    #       reply_with :message, text:
+    #       respond_with :message, text:
     #     end
     #
     # To process plain text messages (without commands) or other updates just
@@ -29,7 +29,7 @@ module Telegram
     # as an argument.
     #
     #     def message(message)
-    #       reply_with :message, text: "Echo: #{message['text']}"
+    #       respond_with :message, text: "Echo: #{message['text']}"
     #     end
     #
     #     def inline_query(query)
@@ -63,7 +63,7 @@ module Telegram
 
       include AbstractController::Callbacks
       # Redefine callbacks with default terminator.
-      if ActiveSupport.gem_version >= Gem::Version.new('5')
+      if ActiveSupport::VERSION::MAJOR >= 5
         define_callbacks  :process_action,
                           skip_after_callbacks_if_terminated: true
       else

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

@@ -35,13 +35,13 @@ module Telegram
           end
         end
 
-        def reply_with(type, *)
-          Instrumentation.instrument(:reply_with, type: type) { super }
+        def respond_with(type, *)
+          Instrumentation.instrument(:respond_with, type: type) { super }
         end
 
         %i(answer_callback_query answer_inline_query).each do |type|
           define_method(type) do |*args|
-            Instrumentation.instrument(:reply_with, type: type) { super(*args) }
+            Instrumentation.instrument(:respond_with, type: type) { super(*args) }
           end
         end
 

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

@@ -22,8 +22,8 @@ module Telegram
           end
         end
 
-        def reply_with(event)
-          info { "Replied with #{event.payload[:type]}" }
+        def respond_with(event)
+          info { "Responded with #{event.payload[:type]}" }
         end
 
         def halted_callback(event)

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

@@ -2,21 +2,23 @@ module Telegram
   module Bot
     class UpdatesController
       module ReplyHelpers
-        # Helper to call bot's `send_#{type}` method with already set `chat_id` and
-        # `reply_to_message_id`:
+        # Helper to call bot's `send_#{type}` method with already set `chat_id`:
         #
-        #     reply_with :message, text: 'Hello!'
-        #     reply_with :message, text: '__Hello!__', parse_mode: :Markdown
-        #     reply_with :photo, photo: File.open(photo_to_send), caption: "It's incredible!"
-        def reply_with(type, params)
-          method = "send_#{type}"
+        #     respond_with :message, text: 'Hello!'
+        #     respond_with :message, text: '__Hello!__', parse_mode: :Markdown
+        #     respond_with :photo, photo: File.open(photo_to_send), caption: "It's incredible!"
+        def respond_with(type, params)
           chat = self.chat
+          chat_id = chat && chat['id'] or raise 'Can not respond_with when chat is not present'
+          bot.public_send("send_#{type}", params.merge(chat_id: chat_id))
+        end
+
+        # Same as respond_with but also sets `reply_to_message_id`.
+        def reply_with(type, params)
           payload = self.payload
-          params = params.merge(
-            chat_id: (chat && chat['id'] or raise 'Can not reply_with when chat is not present'),
-            reply_to_message: payload && payload['message_id'],
-          )
-          bot.public_send(method, params)
+          message_id = payload && payload['message_id']
+          params = params.merge(reply_to_message_id: message_id) if message_id
+          respond_with(type, params)
         end
 
         # Same as reply_with, but for inline queries.

data/lib/telegram/bot/version.rb

@@ -1,6 +1,6 @@
 module Telegram
   module Bot
-    VERSION = '0.7.4'.freeze
+    VERSION = '0.8.0'.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.7.4
+  version: 0.8.0
 platform: ruby
 authors:
 - Max Melentiev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-31 00:00:00.000000000 Z
+date: 2016-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport