sinbotra 0.1.6 → 0.2.0

data/lib/sinbotra/messenger/platform.rb

@@ -0,0 +1,72 @@
+module Sinbotra::Messenger
+  class Platform
+    attr_reader :recipient_id
+    attr_reader :client
+
+    def self.get_started(postback_id)
+      client = MessengerClient::Client.new(ENV.fetch("FACEBOOK_PAGE_TOKEN"))
+      client.get_started(postback_id)
+    end
+
+    def initialize(recipient_id)
+      @recipient_id = recipient_id
+      @client = MessengerClient::Client.new(ENV.fetch("FACEBOOK_PAGE_TOKEN"))
+    end
+
+    def say(text)
+      client.text(
+        recipient_id: recipient_id,
+        text: text
+      )
+    end
+    alias_method :text, :say
+
+    def quick_replies(text, replies)
+      client.qr(
+        recipient_id: recipient_id,
+        text:         text,
+        replies:      replies
+      )
+    end
+
+    def typing(seconds=0, &blk)
+      client.typing(recipient_id: recipient_id, seconds: seconds, &blk)
+    end
+
+    def qr(text, postback=nil)
+      MessengerClient::QuickReply.new(text, postback)
+    end
+
+    def payload_button(text, payload)
+      MessengerClient::PayloadButton.new(text, payload)
+    end
+
+    def url_button(text, url)
+      MessengerClient::URLButton.new(text, url)
+    end
+
+    def generic_template(title, subtitle, image, link, buttons)
+    end
+
+    def text_with_buttons(text, buttons)
+      client.button_template(
+        recipient_id: recipient_id,
+        text:         text,
+        buttons:      buttons
+      )
+    end
+
+    def video(url)
+      client.video(recipient_id: recipient_id, url: url)
+    end
+
+    def image(url)
+      client.image(recipient_id: recipient_id, url: url)
+    end
+
+    def location
+      client.location(recipient_id: recipient_id)
+    end
+  end
+end
+

data/lib/sinbotra/messenger/user_presenter.rb

@@ -0,0 +1,46 @@
+module Sinbotra::Messenger
+  class UserPresenter
+    attr_reader :current_user
+
+    def initialize(sender)
+      @current_user = Sinbotra::Bot::UserRepo.find_or_create(sender.id)
+    end
+
+    def id; current_user.id; end
+
+    def conversation
+      @current_user.conversation
+    end
+
+    def in_conversation?
+      !current_conversation.nil?
+    end
+
+    def start_conversation(convo_id)
+      update_conversation(convo_id, 0)
+    end
+
+    def next_step!
+      convo = current_user.conversation
+      id, step = convo.id, convo.step + 1
+      update_conversation(id, step)
+    end
+
+    def update_conversation(convo_id, step)
+      Sinbotra::Bot::UserRepo.update_conversation(
+        user:     current_user,
+        convo_id: convo_id,
+        step:     step
+      )
+    end
+
+    def end_conversation!
+      current_user.end_conversation
+      Sinbotra::Bot::UserRepo.update(current_user)
+    end
+
+    def current_conversation
+      current_user.conversation
+    end
+  end
+end

data/lib/sinbotra/server.rb

@@ -2,25 +2,22 @@ require "sinbotra"
 require "sinatra"
 require "json"
 
+require "sinbotra/messenger/middleware/facebook_signature"
+require "sinbotra/messenger/middleware/parse_message"
+
 module Sinbotra
+
   class Server < Sinatra::Base
+    use Sinbotra::Messenger::Middleware::FacebookSignature
+    use Sinbotra::Messenger::Middleware::ParseMessage
+
     configure do
-      raise ArgumentError, "You need to set a FACEBOOK_PAGE_TOKEN environmental variable to run the server!" unless ENV["FACEBOOK_PAGE_TOKEN"]
-      raise ArgumentError, "You need to set a FACEBOOK_APP_SECRET environmental variable to run the server!" unless ENV["FACEBOOK_APP_SECRET"]
       raise ArgumentError, "You need to set a FACEBOOK_CHALLENGE environmental variable to run the server!"  unless ENV["FACEBOOK_CHALLENGE"]
+      set :facebook_handler, Sinbotra::MessageHandler.new(:facebook)
+      Sinbotra::Bot::UserRepo.connect
     end
 
     helpers do
-      def verify_facebook_signature!(payload_body)
-        digest = OpenSSL::HMAC.hexdigest(
-          OpenSSL::Digest.new("sha1"),
-          ENV["FACEBOOK_APP_SECRET"],
-          payload_body
-        )
-        signature = "sha1=" + digest
-        return halt 403, "Signatures didn't match!" unless Rack::Utils.secure_compare(signature, request.env["HTTP_X_HUB_SIGNATURE"])
-      end
-
       def match_facebook_challenge(params)
         matching = params["hub.mode"] == "subscribe" &&
                    params["hub.verify_token"] == ENV.fetch("FACEBOOK_CHALLENGE")
@@ -37,16 +34,15 @@ module Sinbotra
     end
 
     post "/facebook/webhook" do
-      payload = request.body.read
-      verify_facebook_signature!(payload)
       begin
-        msg = JSON.load(payload)
-        Sinbotra::Bot.handle(:facebook, msg)
+        msgs    = request.env["facebook.messages"]
+        settings.facebook_handler.receive_messages(msgs)
+        status 200
         "OK"
       rescue Exception => e
         STDERR.puts e.message
         STDERR.puts e.backtrace
-        status 500
+        status 200
         "ERROR"
       end
     end

data/lib/sinbotra/version.rb

@@ -1,3 +1,3 @@
 module Sinbotra
-  VERSION = "0.1.6"
+  VERSION = "0.2.0"
 end

data/sinbotra.gemspec

@@ -34,6 +34,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "messenger_client"
   spec.add_dependency "sucker_punch"
   spec.add_dependency "typhoeus"
+  spec.add_dependency "redis"
 
   spec.add_development_dependency "puma"
   spec.add_development_dependency "bundler", "~> 1.13"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sinbotra
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.0
 platform: ruby
 authors:
 - Aaron Cruz
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-24 00:00:00.000000000 Z
+date: 2017-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: redis
+  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'
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
@@ -153,21 +167,25 @@ files:
 - bin/console
 - bin/setup
 - config.example.ru
-- examples/pushup_bot.rb
-- examples/simple_conversations.rb
+- examples/.keep
 - lib/sinbotra.rb
 - lib/sinbotra/bot.rb
 - lib/sinbotra/bot/conversation.rb
-- lib/sinbotra/bot/conversation_repo.rb
-- lib/sinbotra/bot/default_message_history.rb
+- lib/sinbotra/bot/redis_store.rb
 - lib/sinbotra/bot/user.rb
 - lib/sinbotra/bot/user_repo.rb
+- lib/sinbotra/bot/user_store.rb
 - lib/sinbotra/config.rb
+- lib/sinbotra/message_handler.rb
+- lib/sinbotra/message_store.rb
 - lib/sinbotra/messenger.rb
 - lib/sinbotra/messenger/bot.rb
-- lib/sinbotra/messenger/handler.rb
 - lib/sinbotra/messenger/message.rb
-- lib/sinbotra/messenger/user.rb
+- lib/sinbotra/messenger/message_presenter.rb
+- lib/sinbotra/messenger/middleware/facebook_signature.rb
+- lib/sinbotra/messenger/middleware/parse_message.rb
+- lib/sinbotra/messenger/platform.rb
+- lib/sinbotra/messenger/user_presenter.rb
 - lib/sinbotra/server.rb
 - lib/sinbotra/version.rb
 - sinbotra.gemspec
@@ -191,7 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: A bot framework.

data/examples/pushup_bot.rb

@@ -1,47 +0,0 @@
-class PushupBot
-  include Sinbotra::Messenger::Handler
-
-  enable_get_started!
-
-  get_started do
-    start_conversation(:onboarding)
-  end
-
-  hear(/hi|hello|yo/i) do |bot, _msg|
-    bot.say "Hello there!"
-    bot.start_conversation(:onboarding, msg)
-  end
-
-  hear do |bot, msg|
-    intent = get_intent(msg.text)
-    if conversations.include?(intent)
-      bot.start_conversation(intent, msg)
-    else
-      bot.say next_dont_understand_phrase
-    end
-  end
-
-  conversation :onboarding do |convo|
-    convo.step :ask_name do |_msg|
-      convo.say "Hi there!"
-      convo.say "What's your name?"
-      convo.next_step!
-    end
-
-    convo.step :ask_height do |msg|
-      convo.store!(:name, msg.text)
-      convo.say "Great #{convo.recall[:name]}. How tall are you?"
-      convo.next_step!
-    end
-
-    convo.step :done do |msg|
-      convo.store!(:height, msg.text)
-      convo.say "Thank you for the info"
-      typing 1
-      convo.say "See you around!"
-      convo.done!
-    end
-  end
-end
-
-Sinbotra::Bot.add_handler(:facebook, PushupBot)

data/examples/simple_conversations.rb

@@ -1,38 +0,0 @@
-class SimpleConversation
-  include Sinbotra::Conversation
-
-  hear /hi|hello/ do |_|
-    start_conversation(:onboarding)
-  end
-
-  hear do |msg|
-    intent = get_intent(msg.text)
-    if conversations.include?(intent)
-      start_conversation(intent)
-    else
-      say next_dont_understand_phrase
-    end
-  end
-
-  conversation :onboarding do
-    step :ask_name do |convo|
-      say "Hi there!"
-      say "What's your name?"
-      convo.next_step!
-    end
-
-    step :ask_height do |convo|
-      convo.store(:name, convo.last_message.text)
-      say "Great. How tall are you?"
-      convo.next_step!
-    end
-
-    step :done do |convo|
-      convo.store(:height, convo.last_message.text)
-      say "Thank you for the info"
-      typing 1
-      say "See you around!"
-      convo.done!
-    end
-  end
-end

data/lib/sinbotra/bot/conversation_repo.rb

@@ -1,17 +0,0 @@
-class Sinbotra::Bot
-  class ConversationRepo
-    class << self
-      def connect
-        @conversations ||= {}
-      end
-
-      def find(id)
-        @conversations[id]
-      end
-
-      def create(id, convo)
-        @conversations[id] = convo
-      end
-    end
-  end
-end

data/lib/sinbotra/bot/default_message_history.rb

@@ -1,15 +0,0 @@
-class Sinbotra::Bot
-  class DefaultMessageHistory
-    attr_reader :store
-
-    def initialize(store=[])
-      @store = store
-    end
-
-    def add_message(msg)
-      @store << msg
-    end
-
-    def all() @store end
-  end
-end

data/lib/sinbotra/messenger/handler.rb

@@ -1,126 +0,0 @@
-module Sinbotra::Messenger
-  module Handler
-    def self.included(base)
-      ensure_repos_connected
-      base.extend ClassMethods
-    end
-
-    def self.ensure_repos_connected
-      Sinbotra::Bot::ConversationRepo.connect
-      Sinbotra::Bot::UserRepo.connect
-    end
-
-    module ClassMethods
-      GET_STARTED_ID = "GET_STARTED"
-
-      def handle_message(msg)
-        user = Sinbotra::Messenger::User.load(msg)
-        bot  = Sinbotra::Messenger::Bot.new(user)
-        # Next step in conversation
-        # or match the `#hear`
-        # or get default fallback
-        if user.in_conversation?
-          convo = user.current_conversation
-          convo.perform_current_step(bot)
-        elsif intent = match_intent(bot)
-          intent.callback.(bot) unless intent.nil?
-        else
-          intent = default_intent
-          intent.callback.(bot) unless intent.nil?
-        end
-      end
-
-      def handle_action(action_name, opts={})
-        a = @actions[action_name]
-        if a.nil?
-          raise ArgumentError, "No action found with the key #{action_name}"
-        end
-        a.(opts)
-      end
-
-      def enable_get_started!
-        @client = MessengerClient::Client.new(ENV.fetch("FACEBOOK_PAGE_TOKEN"))
-        @client.get_started(GET_STARTED_ID)
-      end
-
-      def get_started(&blk)
-        postback(GET_STARTED_ID, &blk)
-      end
-
-      def conversation(id, &blk)
-        c = Sinbotra::Bot::Conversation.new(id)
-        Sinbotra::Bot::ConversationRepo.create(id, c)
-        yield c
-      end
-
-      Listener = Struct.new(:matcher, :callback) do
-        def default?; false end
-      end
-      DefaultListener = Struct.new(:callback) do
-        def default?; true end
-      end
-      Postback = Struct.new(:matcher, :callback)
-
-      def postback(matcher, &blk)
-        # TODO: THis feels kinda wrong
-        @postbacks ||= []
-        @postbacks << Postback.new(matcher, blk)
-      end
-
-      def hear(matcher=nil, &blk)
-        # TODO: THis feels kinda wrong
-        @listeners ||= []
-        if matcher.nil?
-          return @listeners << DefaultListener.new(blk)
-        end
-        @listeners << Listener.new(matcher, blk)
-      end
-
-      def action(name, &blk)
-        @actions ||= {}
-        @actions[name] = blk
-      end
-
-      def get_intent(text)
-        puts "NOOP get_intent"
-        nil
-      end
-
-      def yes?(str)
-        str =~ yes_matcher
-      end
-
-      def typing(delay=1)
-        puts "NOOP show typing for #{delay} seconds"
-      end
-
-      def next_dont_understand_phrase
-        puts "NOOP next_dont_understand_phrase"
-      end
-
-      private
-
-      def yes_matcher
-        /^(yes|yeah|ya|ok)/i
-      end
-
-      def default_intent
-        @listeners.find(&:default?)
-      end
-
-      def match_intent(bot)
-        msg = bot.current_message
-        # look for postback
-        postback = msg.postback
-        if !postback.nil?
-          found_pb = @postbacks.find { |pb| postback.match(pb.matcher) }
-          return found_pb unless found_pb.nil?
-        end
-        # if you couldn't find a postback, look for text
-        txt = msg.text
-        @listeners.find { |l| !l.default? && txt.match(l.matcher) }
-      end
-    end
-  end
-end
-