bobot 4.4.1 → 4.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d390e6b0114f6f9c5711d4cf4a1de653b31dc65b7bd5205c7be5ef3069da2648
-  data.tar.gz: 6b6cd9ffc4ebef23a2d738a5bbfff534fd5652609410ea89f2da704d6e5d396d
+  metadata.gz: d093e3ccb5910f8a8427770a9dd8c62cd23a3e1bca8edcf04e46060d057bb048
+  data.tar.gz: 37b0b720425ce522449ddcd7563d05a37f82da50efcaa780abe48bba4f22db21
 SHA512:
-  metadata.gz: 22bb577ef33b1f30d213f1323102f48d83ac6e33e9cdadb7af0c056eb944f6fbe817dd5b522c490f300a25b4b794345ef8a4a088f3f95ce3b13f87cca563098c
-  data.tar.gz: 16d0f211b6e24d48b3252d6e45f5ac6c108e6fbbd9c1f89397bd7edd9361e2a85f77a3db99349133300a6323c003d08a7a713a8b3180ec9d135badc0d9afdd87
+  metadata.gz: 4e7b089446483cde8685cab259ebff4e8868f6685bc72563f1957dc36f7e75de0e8396496265f821af52ecb8ddfe6b47c5933d3b940b45c4297f98ddfddcfaf2
+  data.tar.gz: ad4f5447c8c509f82195fa05a2fde2bcee17ad8e1b891b39eab6e5e3186ffc5ec037374986f98b973e853101ac24f79513e9f9fc5a5abb332e34ba23909052f0

data/README.md

@@ -82,8 +82,6 @@ gem 'bobot'
     - `page.update_facebook_setup!`
 
     Or one by one in a Rails console:
-    - `page.subscribe_to_facebook_page!`
-    - `page.unsubscribe_to_facebook_page!`
     - `page.unset_greeting_text!`
     - `page.set_greeting_text!`
     - `page.unset_whitelist_domains!`

data/lib/bobot.rb

@@ -3,7 +3,6 @@ require 'bobot/exceptions'
 require 'bobot/error_parser'
 require 'bobot/graph_facebook'
 require 'bobot/configuration'
-require 'bobot/subscription'
 require 'bobot/profile'
 require 'bobot/user'
 require 'bobot/buttons'

data/lib/bobot/commander.rb

@@ -34,6 +34,8 @@ module Bobot
 
       def receive(payload)
         event = Bobot::Event.parse(payload)
+        return if event.page.present?
+
         hooks.fetch(Bobot::Event::EVENTS.invert[event.class].to_sym)
         event.mark_as_seen
         Bobot::CommanderJob.send(
@@ -46,6 +48,8 @@ module Bobot
 
       def trigger(payload)
         event = Bobot::Event.parse(payload)
+        return if event.page.present?
+
         hook = hooks.fetch(Bobot::Event::EVENTS.invert[event.class].to_sym)
         hook.call(event)
       rescue KeyError

data/lib/bobot/page.rb

@@ -256,20 +256,6 @@ module Bobot
       rescue => e
         Rails.logger.error(e.message)
       end
-      begin
-        puts "- unsubscribe_to_facebook_page! [....]"
-        unsubscribe_to_facebook_page!
-        puts "- unsubscribe_to_facebook_page! [DONE]"
-      rescue => e
-        Rails.logger.error(e.message)
-      end
-      begin
-        puts "- subscribe_to_facebook_page! [....]"
-        subscribe_to_facebook_page!
-        puts "- subscribe_to_facebook_page! [DONE]"
-      rescue => e
-        Rails.logger.error(e.message)
-      end
     end
 
     def get_facebook_setup
@@ -301,13 +287,6 @@ module Bobot
       rescue => e
         Rails.logger.error(e.message)
       end
-      begin
-        puts "- subscribed_facebook_pages [....]"
-        puts subscribed_facebook_pages.inspect
-        puts "- subscribed_facebook_pages [DONE]"
-      rescue => e
-        Rails.logger.error(e.message)
-      end
     end
 
     ## == Set bot description (only displayed on first time). ==
@@ -479,42 +458,5 @@ module Bobot
         query: { access_token: page_access_token, fields: %w[persistent_menu] },
       )
     end
-
-    ## == Subcribe your bot to your page ==
-    def subscribe_to_facebook_page!(subscription_fields: [])
-      raise Bobot::FieldFormat.new("page_id is required") unless page_id.present?
-      raise Bobot::FieldFormat.new("access_token is required") unless page_access_token.present?
-      raise Bobot::FieldFormat.new("subscription_fields is required") if subscription_fields.nil?
-      raise Bobot::FieldFormat.new("subscription_fields has to be an array") unless subscription_fields.is_a?(Array)
-      Bobot::Subscription.set(
-        query: {
-          page_id: page_id,
-          access_token: page_access_token,
-          subscription_fields: subscription_fields,
-        },
-      )
-    end
-
-    ## == Unsubcribe your bot from your page ==
-    def unsubscribe_to_facebook_page!
-      raise Bobot::FieldFormat.new("page_id is required") unless page_id.present?
-      raise Bobot::FieldFormat.new("access_token is required") unless page_access_token.present?
-      Bobot::Subscription.unset(
-        query: {
-          page_id: page_id,
-          access_token: page_access_token,
-        },
-      )
-    end
-
-    ## == Subcribed pages for your bot ==
-    def subscribed_facebook_pages
-      raise Bobot::FieldFormat.new("access_token is required") unless page_access_token.present?
-      Bobot::Subscription.get(
-        query: {
-          access_token: page_access_token,
-        },
-      )
-    end
   end
 end

data/lib/bobot/version.rb

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

data/lib/generators/bobot/templates/config/initializers/bobot.rb

@@ -1,48 +1,38 @@
-bobot_config_path = Rails.root.join("config", "secrets.yml")
-bobot_config = YAML.safe_load(ERB.new(File.read(bobot_config_path)).result, [], [], true)[Rails.env]["bobot"]
-
+bobot_config = Rails.application.config_for(:bobot).with_indifferent_access
 if bobot_config.present?
-  unless bobot_config.key?("pages")
-    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.skip_code            = bobot_config["skip_code"]
-    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.app_id               = bobot_config[:app_id]
+    config.app_secret           = bobot_config[:app_secret]
+    config.verify_token         = bobot_config[:verify_token]
+    config.skip_code            = bobot_config[:skip_code]
+    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|
+      next if page[:slug].nil? || page[:page_id].nil? || page[:page_access_token].nil? || page[:get_started_payload].nil?
       config.pages << Bobot::Page.new(
-        slug:                page["slug"],
-        language:            page["language"],
-        page_id:             page["page_id"],
-        page_access_token:   page["page_access_token"],
-        get_started_payload: page["get_started_payload"],
+        slug:                page[:slug],
+        language:            page[:language],
+        page_id:             page[:page_id],
+        page_access_token:   page[:page_access_token],
+        get_started_payload: page[:get_started_payload],
       )
     end
   end
-else
-  warn "#{bobot_config_path} not configured yet in #{Rails.env} environment."
-end
-
-unless Rails.env.production?
-  bot_files = Dir[Rails.root.join("app", "bobot", "**", "*.rb")]
-  bot_reloader = ActiveSupport::FileUpdateChecker.new(bot_files) do
+  unless Rails.env.production?
+    bot_files = Dir[Rails.root.join("app", "bobot", "**", "*.rb")]
+    bot_reloader = ActiveSupport::FileUpdateChecker.new(bot_files) do
+      bot_files.each { |file| require_dependency file }
+    end
+    ActiveSupport::Reloader.to_prepare do
+      bot_reloader.execute_if_updated
+    end
     bot_files.each { |file| require_dependency file }
   end
-
-  ActiveSupport::Reloader.to_prepare do
-    bot_reloader.execute_if_updated
-  end
-
-  bot_files.each { |file| require_dependency file }
-end
-
-if defined?(Rails::Server)
-  Rails.application.config.after_initialize do
-    Rails.application.config.paths.add File.join("app", "bobot"), glob: File.join("**", "*.rb")
-    Rails.application.config.autoload_paths += Dir[Rails.root.join("app", "bobot", "*")]
+  if defined?(Rails::Server)
+    Rails.application.config.after_initialize do
+      Rails.application.config.paths.add File.join("app", "bobot"), glob: File.join("**", "*.rb")
+      Rails.application.config.autoload_paths += Dir[Rails.root.join("app", "bobot", "*")]
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bobot
 version: !ruby/object:Gem::Version
-  version: 4.4.1
+  version: 4.5.0
 platform: ruby
 authors:
 - Navid EMAD
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-15 00:00:00.000000000 Z
+date: 2018-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -99,7 +99,6 @@ files:
 - lib/bobot/graph_facebook.rb
 - lib/bobot/page.rb
 - lib/bobot/profile.rb
-- lib/bobot/subscription.rb
 - lib/bobot/user.rb
 - lib/bobot/version.rb
 - lib/generators/bobot/install_generator.rb
@@ -125,7 +124,6 @@ files:
 - spec/bobot/install_generator_spec.rb
 - spec/bobot/page_spec.rb
 - spec/bobot/profile_spec.rb
-- spec/bobot/subscription_spec.rb
 - spec/bobot/user_spec.rb
 - spec/controllers/bobot/application_controller_spec.rb
 - spec/controllers/bobot/webhook_controller_spec.rb
@@ -241,7 +239,6 @@ test_files:
 - spec/bobot/install_generator_spec.rb
 - spec/bobot/bobot_spec.rb
 - spec/bobot/page_spec.rb
-- spec/bobot/subscription_spec.rb
 - spec/bobot/event_spec.rb
 - spec/bobot/profile_spec.rb
 - spec/bobot/user_spec.rb

data/lib/bobot/subscription.rb

@@ -1,20 +0,0 @@
-module Bobot
-  module Subscription
-    include Bobot::GraphFacebook
-
-    def get(query:)
-      graph_get "/me/subscribed_apps", query: query
-    end
-    module_function :get
-  
-    def set(query:)
-      graph_post "/#{query.fetch(:page_id)}/subscribed_apps", query: query
-    end
-    module_function :set
-
-    def unset(query:)
-      graph_delete "/#{query.fetch(:page_id)}/subscribed_apps", query: query
-    end
-    module_function :unset
-  end
-end

data/spec/bobot/subscription_spec.rb

@@ -1,140 +0,0 @@
-require 'rails_helper'
-require 'helpers/graph_api_helpers'
-
-RSpec.describe Bobot::Subscription do
-  let(:access_token) { 'access token' }
-  let(:page_id) { 'page-id' }
-
-  let(:subscription_url) do
-    File.join(
-      described_class::GRAPH_FB_URL,
-      "/#{page_id}",
-      '/subscribed_apps?include_headers=false',
-    )
-  end
-
-  before do
-    Bobot.config.pages << Bobot::Page.new(
-      page_access_token: access_token,
-      page_id:           page_id,
-    )
-  end
-
-  describe '.set' do
-    context 'with a successful response' do
-      before do
-        stub_request(:post, subscription_url)
-          .with(query: { access_token: access_token})
-          .to_return(
-            body: ActiveSupport::JSON.encode(
-              success: true,
-            ),
-            status: :ok,
-            headers: default_graph_api_response_headers
-          )
-      end
-
-      it 'returns hash' do
-        expect(
-          subject.set(
-            query: {
-              page_id: page_id,
-              access_token: access_token,
-            }
-          )
-        ).to include('success' => true)
-      end
-    end
-
-    context 'with an unsuccessful response' do
-      let(:error_message) { 'Invalid OAuth access token.' }
-
-      before do
-        stub_request(:post, subscription_url)
-          .with(query: { access_token: access_token })
-          .to_return(
-            body: {
-              'error' => {
-                'message' => error_message,
-                'type' => 'OAuthException',
-                'code' => 190,
-                'fbtrace_id' => 'Hlssg2aiVlN'
-              }
-            }.to_json,
-            status: :ok,
-            headers: default_graph_api_response_headers
-          )
-      end
-
-      it 'raises an error' do
-        expect do
-          subject.set(
-            query: {
-              page_id: page_id,
-              access_token: access_token,
-            }
-          )
-        end.to raise_error(Bobot::AccessTokenError)
-      end
-    end
-  end
-
-  describe '.unset' do
-    context 'with a successful response' do
-      before do
-        stub_request(:delete, subscription_url)
-          .with(query: { access_token: access_token })
-          .to_return(
-            body: ActiveSupport::JSON.encode(
-              success: true,
-            ),
-            status: :ok,
-            headers: default_graph_api_response_headers
-          )
-      end
-
-      it 'returns hash' do
-        expect(
-          subject.unset(
-            query: {
-              page_id: page_id,
-              access_token: access_token,
-            }
-          )
-        ).to include('success' => true)
-      end
-    end
-
-    context 'with an unsuccessful response' do
-      let(:error_message) { 'Invalid OAuth access token.' }
-
-      before do
-        stub_request(:delete, subscription_url)
-          .with(query: { access_token: access_token })
-          .to_return(
-            body: {
-              'error' => {
-                'message' => error_message,
-                'type' => 'OAuthException',
-                'code' => 190,
-                'fbtrace_id' => 'Hlssg2aiVlN'
-              }
-            }.to_json,
-            status: :ok,
-            headers: default_graph_api_response_headers
-          )
-      end
-
-      it 'raises an error' do
-        expect do
-          subject.unset(
-            query: {
-              page_id: page_id,
-              access_token: access_token,
-            }
-          )
-        end.to raise_error(Bobot::AccessTokenError)
-      end
-    end
-  end
-end