bobot 3.0.7 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b049008070aae88b76717e5d73e2d26a761cc41
-  data.tar.gz: 7934bbe21c9a742d30c03ea6dff7e115854a9a04
+  metadata.gz: a5b25b546109e860f892b4500d1361a1e1257607
+  data.tar.gz: 3128aa03dd6a6823f5de3d12ae84a053bfcc3512
 SHA512:
-  metadata.gz: 8210786c2b553d7b9aa4c59903d649c42b42a89c0916831fb3076c6d432f4f53d92fbf0e6b1b6a520987ac596b0236b32bf2788a1b1c1a9a8e270762260b4608
-  data.tar.gz: 9c51a7fa9f562f23e18536566ed16a23f2dc4d9f55ad45dfb6d1346fd4e4a7ba37b729c8bd43633dce4ab3dddd1e875d0cc9204ac242e0033b19bd2439e87336
+  metadata.gz: 1c47070ab60590fe1b2903d361fde6ed675fa5daddee567396bc4b9985d04f6dff446e7204c988664c68b86d1d5a0fc847ffd615d480f1c5233b26d442ae6da7
+  data.tar.gz: 068e5a8226ba52fb45242c671cb268cb08f67f3c498a6323590cd560e21e00208e6a41ea31783dcaed0eda934ced1dcc7ee87f5f69e42af457a5a05170d67523

data/app/controllers/bobot/webhook_controller.rb

@@ -29,8 +29,8 @@ module Bobot
 
     def receive
       check_integrity
-      return_json = trigger(parsed_body)
-      render plain: ActiveSupport::JSON.encode(return_json), status: :ok
+      trigger(parsed_body)
+      head :ok
     rescue BadRequestError => error
       render plain: error.message, status: :ok
     end

data/lib/bobot/commander.rb

@@ -24,37 +24,26 @@ module Bobot
       end
 
       def on(event, &block)
-        unless EVENTS.include? event
-          raise Error.new("#{event} is not a valid event; available events are #{EVENTS.join(',')}")
+        if EVENTS.include? event
+          hooks[event] = block
+        else
+          warn "[bobot trigger] Ignoring #{event.class} (not available in [#{EVENTS.join(', ')}])"
         end
-        hooks[event] = block
       end
 
       def receive(payload)
-        event = Bobot::Event.parse(payload)
-        hooks.fetch(Bobot::Event::EVENTS.invert[event.class].to_sym)
-        Rails.logger.debug "[ActiveJob] << Bobot::HookJob with event #{event.class}"
-        # event.mark_as_seen
-        job = Bobot::CommanderJob
-        if Bobot.config.async
-          job.perform_later(payload: payload)
-        else
-          job.perform_now(payload: payload)
-        end
-      rescue KeyError
-        warn "[receive] Ignoring #{event.class} (no hook registered)"
+        Bobot::CommanderJob.send(
+          Bobot.config.async ? :perform_later : :perform_now,
+          { payload: payload }
+        )
       end
 
       def trigger(payload)
         event = Bobot::Event.parse(payload)
         hook = hooks.fetch(Bobot::Event::EVENTS.invert[event.class].to_sym)
-        Rails.logger.debug "[ActiveJob] >> Bobot::HookJob related to event #{name.class}"
-        # event.show_typing(state: true)
         hook.call(event)
-        # event.show_typing(state: false)
-        event
       rescue KeyError
-        warn "[trigger] Ignoring #{event.class} (no hook registered)"
+        warn "[bobot trigger] Ignoring #{event.class} (no hook registered)"
       end
 
       def hooks

data/lib/bobot/graph_facebook.rb

@@ -9,15 +9,12 @@ module Bobot
     module ClassMethods
       def graph_get(path, query: {})
         url = "#{GRAPH_FB_URL}#{path}".freeze
-        req = ::Typhoeus::Request.new(
+        response = ::Typhoeus::Request.get(
           url,
-          method: :get,
           params: URI.encode_www_form(query.reverse_merge(include_headers: false)),
           headers: GRAPH_HEADERS,
           ssl_verifypeer: false,
-          verbose: false,
         )
-        response = req.run
         json = ActiveSupport::JSON.decode(response.send(:body) || '{}')
         Rails.logger.debug "[GET] >> #{url}"
         Rails.logger.debug "[GET] << #{json}"
@@ -28,16 +25,13 @@ module Bobot
 
       def graph_post(path, query: {}, body: {})
         url = "#{GRAPH_FB_URL}#{path}".freeze
-        req = ::Typhoeus::Request.new(
+        response = ::Typhoeus::Request.post(
           url,
-          method: :post,
           params: URI.encode_www_form(query.reverse_merge(include_headers: false)),
           body: ActiveSupport::JSON.encode(body),
           headers: GRAPH_HEADERS,
           ssl_verifypeer: false,
-          verbose: false,
         )
-        response = req.run
         json = ActiveSupport::JSON.decode(response.send(:body) || '{}')
         Rails.logger.debug "[POST] >> #{url}"
         Rails.logger.debug "[POST] << #{json}"
@@ -48,16 +42,13 @@ module Bobot
 
       def graph_delete(path, query: {}, body: {})
         url = "#{GRAPH_FB_URL}#{path}".freeze
-        req = ::Typhoeus::Request.new(
+        response = ::Typhoeus::Request.delete(
           url,
-          method: :delete,
           params: URI.encode_www_form(query.reverse_merge(include_headers: false)),
           body: ActiveSupport::JSON.encode(body),
           headers: GRAPH_HEADERS,
           ssl_verifypeer: false,
-          verbose: false,
         )
-        response = req.run
         json = ActiveSupport::JSON.decode(response.send(:body) || '{}')
         Rails.logger.debug "[DELETE] >> #{url}"
         Rails.logger.debug "[DELETE] << #{json}"

data/lib/bobot/page.rb

@@ -36,12 +36,14 @@ module Bobot
 
     def deliver(payload_template:, to:)
       raise Bobot::FieldFormat.new('payload_template is required.') unless payload_template.present?
-      job = Bobot::DeliverJob
-      if Bobot.config.async
-        job.perform_later(target_facebook_uid: to, access_token: page_access_token, payload_template: payload_template)
-      else
-        job.perform_now(target_facebook_uid: to, access_token: page_access_token, payload_template: payload_template)
-      end
+      Bobot::Commander.deliver(
+        body: {
+          recipient: { id: to },
+        }.merge(payload_template),
+        query: {
+          access_token: page_access_token,
+        },
+      )
     end
 
     def sender_action(sender_action:, to: nil)

data/lib/bobot/version.rb

@@ -1,8 +1,8 @@
 module Bobot
   class Version
     MAJOR = 3
-    MINOR = 0
-    PATCH = 7
+    MINOR = 5
+    PATCH = 0
     PRE = nil
 
     class << self

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bobot
 version: !ruby/object:Gem::Version
-  version: 3.0.7
+  version: 3.5.0
 platform: ruby
 authors:
 - Navid EMAD
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-04 00:00:00.000000000 Z
+date: 2017-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -75,7 +75,6 @@ files:
 - app/controllers/bobot/webhook_controller.rb
 - app/jobs/bobot/application_job.rb
 - app/jobs/bobot/commander_job.rb
-- app/jobs/bobot/deliver_job.rb
 - config/locales/bobot.en.yml
 - config/routes.rb
 - lib/bobot.rb

data/app/jobs/bobot/deliver_job.rb

@@ -1,22 +0,0 @@
-module Bobot
-  class DeliverJob < ApplicationJob
-    queue_as do
-      if Bobot.config.commander_queue_name.present?
-        Bobot.config.commander_queue_name
-      else
-        :default
-      end
-    end
-
-    def perform(target_facebook_uid:, access_token:, payload_template:)
-      Bobot::Commander.deliver(
-        body: {
-          recipient: { id: target_facebook_uid },
-        }.merge(payload_template),
-        query: {
-          access_token: access_token,
-        },
-      )
-    end
-  end
-end