bobot 3.0.3 → 3.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b79d3269f2178d1f8a3825912664eb946bae922f
-  data.tar.gz: 1eb07574a6eddb697bc19ca7be39d7668b00e606
+  metadata.gz: 1604e92019fb451807c99f8a6ecaf3ba969a53a5
+  data.tar.gz: 62de9467eec07cdeb073421d9f7c212581d62348
 SHA512:
-  metadata.gz: f26648d7412c6c182071f26f7916c5bdd6329ff7b641caa21a2ab549ae4313f0689859730369aadebc700d80dd2f11685896d39e48ea02b9e6a7975739081e6d
-  data.tar.gz: f55c0a78335543bd9fe0b7322a3a430909c9dff7f2e95720c6343783aeaf70bd3b0c4b1f9568ed06ad05b6a24ed1b9d9c7afd219aee5df08253b718fc5153283
+  metadata.gz: f8733aef1551529ee91a8869e510676a36ae79e6b3c331317fbf34420dc273ab2fd385d744ebe919d04c6d2b69354a8625c1d5769777439f98b940076959d8de
+  data.tar.gz: b640a5c455189c74aca047303b907f37f1262b20f160a9e3de9308c8c67f9510852e97e17e43b05017a8bcfb8a8d344615cce3edad6db8dedca4f0cefbaa9b63

data/app/jobs/bobot/commander_job.rb

@@ -1,6 +1,5 @@
 module Bobot
   class CommanderJob < ApplicationJob
-    
     queue_as do
       if Bobot.config.commander_queue_name.present?
         Bobot.config.commander_queue_name

data/app/jobs/bobot/deliver_job.rb

@@ -1,6 +1,5 @@
 module Bobot
   class DeliverJob < ApplicationJob
-    
     queue_as do
       if Bobot.config.commander_queue_name.present?
         Bobot.config.commander_queue_name

data/lib/bobot.rb

@@ -1,6 +1,3 @@
-require 'net/https'
-require 'uri'
-
 require 'bobot/engine'
 require 'bobot/exceptions'
 require 'bobot/error_parser'

data/lib/bobot/graph_facebook.rb

@@ -1,25 +1,24 @@
+require "Typhoeus"
+require "uri"
+
 module Bobot
   module GraphFacebook
-    GRAPH_FB_URL = 'https://graph.facebook.com'.freeze
-    GRAPH_FB_VERSION = 'v2.11'.freeze
+    GRAPH_FB_URL = 'https://graph.facebook.com/v2.11/'.freeze
+    GRAPH_HEADERS = { Accept: "application/json", "Content-Type" => "application/json; charset=utf-8" }.freeze
 
     module ClassMethods
       def graph_get(path, query: {})
-        uri = URI.parse(File.join(GRAPH_FB_URL, GRAPH_FB_VERSION, path))
-        uri.query = URI.encode_www_form(query)
-        req = Net::HTTP::Get.new(uri.request_uri)
-        req['Content-Type'] = 'application/json; charset=utf-8'
-        req['Accept'] = 'application/json'
-        req['User-Agent'] = nil
-        req['Accept-Encoding'] = nil
-        https = Net::HTTP.new(uri.host, uri.port).tap do |http|
-          http.use_ssl = true
-          http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-          http.read_timeout = 300
-        end
-        res = https.request(req)
-        json = ActiveSupport::JSON.decode(res.send(:body) || '{}')
-        Rails.logger.debug "[GET] >> #{uri.request_uri}"
+        url = "#{GRAPH_FB_URL}#{path}".freeze
+        req = Typhoeus::Request.new(
+          url,
+          method: :get,
+          params: URI.encode_www_form(query.reverse_merge(include_headers: false)),
+          headers: GRAPH_HEADERS,
+          ssl_verifypeer: false,
+        ).run
+        response = req.run
+        json = ActiveSupport::JSON.decode(response.send(:body) || '{}')
+        Rails.logger.debug "[GET] >> #{url}"
         Rails.logger.debug "[GET] << #{json}"
         Bobot::ErrorParser.raise_errors_from(json)
         json
@@ -27,22 +26,18 @@ module Bobot
       module_function :graph_get
 
       def graph_post(path, query: {}, body: {})
-        uri = URI.parse(File.join(GRAPH_FB_URL, GRAPH_FB_VERSION, path))
-        uri.query = URI.encode_www_form(query)
-        req = Net::HTTP::Post.new(uri.request_uri)
-        req['Content-Type'] = 'application/json; charset=utf-8'
-        req['Accept'] = 'application/json'
-        req['User-Agent'] = nil
-        req['Accept-Encoding'] = nil
-        req.body = ActiveSupport::JSON.encode(body)
-        https = Net::HTTP.new(uri.host, uri.port).tap do |http|
-          http.use_ssl = true
-          http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-          http.read_timeout = 300
-        end
-        res = https.request(req)
-        json = ActiveSupport::JSON.decode(res.send(:body) || '{}')
-        Rails.logger.debug "[POST] >> #{uri.request_uri}"
+        url = "#{GRAPH_FB_URL}#{path}".freeze
+        req = Typhoeus::Request.new(
+          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,
+        )
+        response = req.run
+        json = ActiveSupport::JSON.decode(response.send(:body) || '{}')
+        Rails.logger.debug "[POST] >> #{url}"
         Rails.logger.debug "[POST] << #{json}"
         Bobot::ErrorParser.raise_errors_from(json)
         json
@@ -50,22 +45,18 @@ module Bobot
       module_function :graph_post
 
       def graph_delete(path, query: {}, body: {})
-        uri = URI.parse(File.join(GRAPH_FB_URL, GRAPH_FB_VERSION, path))
-        uri.query = URI.encode_www_form(query)
-        req = Net::HTTP::Delete.new(uri.request_uri)
-        req['Content-Type'] = 'application/json; charset=utf-8'
-        req['Accept'] = 'application/json'
-        req['User-Agent'] = nil
-        req['Accept-Encoding'] = nil
-        req.body = ActiveSupport::JSON.encode(body)
-        https = Net::HTTP.new(uri.host, uri.port).tap do |http|
-          http.use_ssl = true
-          http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-          http.read_timeout = 300
-        end
-        res = https.request(req)
-        json = ActiveSupport::JSON.decode(res.send(:body) || '{}')
-        Rails.logger.debug "[DELETE] >> #{uri.request_uri}"
+        url = "#{GRAPH_FB_URL}#{path}".freeze
+        req = Typhoeus::Request.new(
+          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,
+        )
+        response = req.run
+        json = ActiveSupport::JSON.decode(response.send(:body) || '{}')
+        Rails.logger.debug "[DELETE] >> #{url}"
         Rails.logger.debug "[DELETE] << #{json}"
         Bobot::ErrorParser.raise_errors_from(json)
         json

data/lib/bobot/version.rb

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

data/spec/bobot/profile_spec.rb

@@ -7,8 +7,7 @@ RSpec.describe Bobot::Profile do
   let(:messenger_profile_url) do
     File.join(
       described_class::GRAPH_FB_URL,
-      described_class::GRAPH_FB_VERSION,
-      '/me/messenger_profile'
+      '/me/messenger_profile?include_headers=false'
     )
   end
 

data/spec/bobot/subscription_spec.rb

@@ -8,9 +8,8 @@ RSpec.describe Bobot::Subscription do
   let(:subscription_url) do
     File.join(
       described_class::GRAPH_FB_URL,
-      described_class::GRAPH_FB_VERSION,
       "/#{page_id}",
-      '/subscribed_apps',
+      '/subscribed_apps?include_headers=false',
     )
   end
 

data/spec/bobot/user_spec.rb

@@ -10,8 +10,7 @@ RSpec.describe Bobot::User do
   let(:user_url) do
     File.join(
       described_class::GRAPH_FB_URL,
-      described_class::GRAPH_FB_VERSION,
-      "/#{fb_id}"
+      "/#{fb_id}?include_headers=false"
     )
   end
 

data/spec/dummy/log/development.log

@@ -43,3 +43,5 @@ Processing by Rails::WelcomeController#index as HTML
 Completed 200 OK in 8ms (Views: 5.7ms)
 
 
+ETHON: Libcurl initialized
+ETHON: performed EASY effective_url=https://graph.facebook.com/v2.11//me/messages response_code=400 return_code=ok total_time=3.42639

data/spec/dummy/log/test.log

@@ -26,3 +26,10 @@
 [ActiveJob] Enqueued Bobot::CommanderJob (Job ID: e1b4f1e1-13d8-4243-948c-c2bbdab9f212) to Test(default) with arguments: {"sender"=>{"id"=>"2"}, "recipient"=>{"id"=>"3"}, "timestamp"=>1457764197627, "message"=>{"mid"=>"mid.1457764197618:41d102a3e1ae206a38", "seq"=>73, "text"=>"Hello, bot!"}}
 [ActiveJob] Enqueued Bobot::CommanderJob (Job ID: 1c5e3b4b-4ae4-4213-bafb-4164a16a0a4c) to Test(default) with arguments: {"sender"=>{"id"=>"2"}, "recipient"=>{"id"=>"3"}, "timestamp"=>1457764197627, "message"=>{"mid"=>"mid.1457764197618:41d102a3e1ae206a38", "seq"=>73, "text"=>"Hello, bot!"}}
 [ActiveJob] Enqueued Bobot::CommanderJob (Job ID: 56732598-6966-4ce2-b00c-0b7632f4a14b) to Test(default) with arguments: {"sender"=>{"id"=>"2"}, "recipient"=>{"id"=>"3"}, "timestamp"=>1457764197627, "message"=>{"mid"=>"mid.1457764197618:41d102a3e1ae206a38", "seq"=>73, "text"=>"Hello, bot!"}}
+[ActiveJob] Enqueued Bobot::CommanderJob (Job ID: 7bdaa668-ea63-4a68-9576-95f2bc8197a9) to Test(default) with arguments: {"sender"=>{"id"=>"2"}, "recipient"=>{"id"=>"3"}, "timestamp"=>1457764197627, "message"=>{"mid"=>"mid.1457764197618:41d102a3e1ae206a38", "seq"=>73, "text"=>"Hello, bot!"}}
+ETHON: Libcurl initialized
+[ActiveJob] Enqueued Bobot::CommanderJob (Job ID: 6a6034d0-25d7-4aea-93f9-e56f3d212cda) to Test(default) with arguments: {"sender"=>{"id"=>"2"}, "recipient"=>{"id"=>"3"}, "timestamp"=>1457764197627, "message"=>{"mid"=>"mid.1457764197618:41d102a3e1ae206a38", "seq"=>73, "text"=>"Hello, bot!"}}
+[ActiveJob] Enqueued Bobot::CommanderJob (Job ID: 30f17782-94b0-481e-a3f3-f667225b0ecc) to Test(default) with arguments: {"sender"=>{"id"=>"2"}, "recipient"=>{"id"=>"3"}, "timestamp"=>1457764197627, "message"=>{"mid"=>"mid.1457764197618:41d102a3e1ae206a38", "seq"=>73, "text"=>"Hello, bot!"}}
+ETHON: Libcurl initialized
+ETHON: Libcurl initialized
+[ActiveJob] Enqueued Bobot::CommanderJob (Job ID: 3128058b-c515-488d-9987-a121b91bfaab) to Test(default) with arguments: {"sender"=>{"id"=>"2"}, "recipient"=>{"id"=>"3"}, "timestamp"=>1457764197627, "message"=>{"mid"=>"mid.1457764197618:41d102a3e1ae206a38", "seq"=>73, "text"=>"Hello, bot!"}}

data/spec/dummy/tmp/generator/config/initializers/bobot.rb

@@ -6,11 +6,12 @@ if bobot_config.present?
     raise "Bobot: #{bobot_config_path} required an array key :pages (cf. https://github.com/navidemad/bobot)"
   end
   Bobot.configure do |config|
-    config.app_id        = bobot_config["app_id"],
-    config.app_secret    = bobot_config["app_secret"],
-    config.verify_token  = bobot_config["verify_token"],
-    config.domains       = bobot_config["domains"],
-    config.async         = bobot_config["async"],
+    config.app_id               = bobot_config["app_id"]
+    config.app_secret           = bobot_config["app_secret"]
+    config.verify_token         = bobot_config["verify_token"]
+    config.domains              = bobot_config["domains"]
+    config.async                = bobot_config["async"]
+    config.commander_queue_name = bobot_config["commander_queue_name"]
     bobot_config["pages"].each do |page|
       config.pages << Bobot::Page.new(
         slug:                page["slug"],

data/spec/dummy/tmp/generator/config/locales/bobot.en.yml

@@ -10,17 +10,17 @@ en:
         persistent_menu:
           composer_input_disabled: false
           call_to_actions:
-            - title: "My Account"
-              type: "nested"
+            - type: "nested"
+              title: "My Account"
               call_to_actions:
-                - title: "What is a chatbot?"
-                  type: "postback"
+                - type: "postback"
+                  title: "What is a chatbot?"
                   payload: "WHAT_IS_A_CHATBOT"
-                - title: "History"
-                  type: "postback"
+                - type: "postback"
+                  title: "History"
                   payload: "HISTORY_PAYLOAD"
-                - title: "Contact Info"
-                  type: "postback"
+                - type: "postback"
+                  title: "Contact Info"
                   payload: "CONTACT_INFO_PAYLOAD"
             - type: "web_url"
               title: "Get some help"

data/spec/dummy/tmp/generator/config/locales/bobot.fr.yml

@@ -9,17 +9,17 @@ fr:
         persistent_menu:
           composer_input_disabled: false
           call_to_actions:
-            - title: "Mon compte"
-              type: "nested"
+            - type: "nested"
+              title: "Mon compte"
               call_to_actions:
-                - title: "C'est quoi un chatbot ?"
-                  type: "postback"
+                - type: "postback"
+                  title: "C'est quoi un chatbot ?"
                   payload: "WHAT_IS_A_CHATBOT"
-                - title: "Historique"
-                  type: "postback"
+                - type: "postback"
+                  title: "Historique"
                   payload: "HISTORY_PAYLOAD"
-                - title: "Contact Info"
-                  type: "postback"
+                - type: "postback"
+                  title: "Contact Info"
                   payload: "CONTACT_INFO_PAYLOAD"
             - type: "web_url"
               title: "Obtenir de l'aide"

data/spec/rails_helper.rb

@@ -62,4 +62,7 @@ RSpec.configure do |config|
       c.pages = []
     end
   end
+  config.before :each do
+    Typhoeus::Expectation.clear
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bobot
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.0.5
 platform: ruby
 authors:
 - Navid EMAD
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-28 00:00:00.000000000 Z
+date: 2017-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -44,6 +44,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '6'
+- !ruby/object:Gem::Dependency
+  name: typhoeus
+  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'
 description: Bobot is a Ruby wrapped framework to build easily a Facebook Messenger
   Bot.
 email:
@@ -157,7 +171,6 @@ files:
 - spec/dummy/tmp/generator/config/initializers/bobot.rb
 - spec/dummy/tmp/generator/config/locales/bobot.en.yml
 - spec/dummy/tmp/generator/config/locales/bobot.fr.yml
-- spec/dummy/tmp/generator/config/routes.rb
 - spec/examples.txt
 - spec/helpers/graph_api_helpers.rb
 - spec/jobs/bobot/commander_job_spec.rb
@@ -251,7 +264,6 @@ test_files:
 - spec/dummy/tmp/generator/config/initializers/bobot.rb
 - spec/dummy/tmp/generator/config/locales/bobot.en.yml
 - spec/dummy/tmp/generator/config/locales/bobot.fr.yml
-- spec/dummy/tmp/generator/config/routes.rb
 - spec/examples.txt
 - spec/helpers/graph_api_helpers.rb
 - spec/jobs/bobot/commander_job_spec.rb