Merge pull request #12 from hyzhak/feature/deploy-to-heroku

Feature/deploy to heroku

Author: hyzhak

.gitignore

@@ -90,3 +90,5 @@ ENV/
 
 # IDEA
 .idea
+
+docker-compose.dev.yml

.travis.yml

@@ -11,7 +11,8 @@ services:
 
 env:
   DOCKER_COMPOSE_VERSION: 1.8.0
-  MONGODB_URL: 127.0.0.1
+  MONGODB_URI: 127.0.0.1
+  MONGODB_DB_NAME: test
 
 before_install:
   - pip install -r requirements.txt

Procfile

@@ -0,0 +1 @@
+web: ./scripts/start.sh

app.json

@@ -1,16 +1,9 @@
 {
   "name": "echo-bot",
   "description": "Very simple example of using bot-story framework",
-  "scripts": {
-  },
-  "env": {
-  },
-  "formation": {
-  },
-  "addons": [
-
-  ],
-  "buildpacks": [
-
-  ]
+  "scripts": {},
+  "env": {},
+  "formation": {},
+  "addons": [],
+  "buildpacks": []
 }

docker-compose.yml

@@ -4,7 +4,9 @@ services:
     image: mongo
   bot:
     build: .
-    command: python ./echo/main.py
+    command: ./scripts/start.sh
+    environment:
+      - PORT=8080
     ports:
       - "80:8080"
     volumes:

echo/gunicorn_runner.py

@@ -0,0 +1,3 @@
+from .main import main
+
+app = main(forever=False)

echo/main.py

@@ -1,5 +1,4 @@
 import asyncio
-import botstory
 from botstory import chat, story
 from botstory.integrations import aiohttp, fb, mongodb
 from botstory.middlewares import any, text
@@ -23,46 +22,55 @@ async def echo(message):
 @story.on(receive=any.Any())
 def else_story():
     @story.part()
-    async def something_else():
-        await chat.say('Hm I don''t know what is it')
+    async def something_else(message):
+        await chat.say('Hm I don''t know what is it', message['user'])
 
 
 # setup modules
 
-async def init(fake_http_session=None):
+async def init(auto_start=True, fake_http_session=None):
     story.use(fb.FBInterface(
-        token=os.environ.get('FB_ACCESS_TOKEN', None),
-        webhook=os.environ.get('WEBHOOK_URL_SECRET_PART', '/webhook'),
+        page_access_token=os.environ.get('FB_ACCESS_TOKEN', None),
+        webhook_url='/webhook{}'.format(os.environ.get('FB_WEBHOOK_URL_SECRET_PART', '')),
+        webhook_token=os.environ.get('FB_WEBHOOK_TOKEN', None),
     ))
-    story.use(aiohttp.AioHttpInterface(
+    http = story.use(aiohttp.AioHttpInterface(
         port=os.environ.get('API_PORT', 8080),
-    )).session = fake_http_session
+        auto_start=auto_start,
+    ))
     story.use(mongodb.MongodbInterface(
-        uri=os.environ.get('MONGODB_URL', 'mongo'),
-        db_name='tests',
+        uri=os.environ.get('MONGODB_URI', 'mongo'),
+        db_name=os.environ.get('MONGODB_DB_NAME', 'echobot'),
     ))
 
     await story.start()
-    logger.info('start!')
+
+    logger.info('started!')
+
+    # for test purpose
+    http.session = fake_http_session
+
+    return http.app
 
 
 async def stop():
-    await botstory.story.stop()
+    await story.stop()
+    # TODO: should be something like
+    # story.clear()
+    story.middlewares = []
 
 
 # launch app
-
-def main():
-    # init logging
+def main(forever=True):
     logging.basicConfig(level=logging.DEBUG)
 
     loop = asyncio.get_event_loop()
-    loop.run_until_complete(init())
-
-    story.forever(loop)
+    app = loop.run_until_complete(init(auto_start=forever))
+    if forever:
+        story.forever(loop)
 
-    # TODO: 1) we should support gunicorn
+    return app
 
 
 if __name__ == '__main__':
-    main()
+    main(forever=True)

echo/main_test.py

@@ -1,20 +1,21 @@
 from botstory.integrations import aiohttp, fb
 from botstory.integrations.tests.fake_server import fake_fb
+import os
 import pytest
 
 from . import main
 
 
 @pytest.mark.asyncio
 async def test_text_echo(event_loop):
-    try:
-        async with fake_fb.Server(event_loop) as server:
-            async with server.session() as server_session:
+    async with fake_fb.Server(event_loop) as server:
+        async with server.session() as server_session:
+            try:
                 await main.init(fake_http_session=server_session)
 
                 # send message from user
                 http = aiohttp.AioHttpInterface()
-                await http.post('http://localhost:8080/webhook', json={
+                await http.post_raw('http://0.0.0.0:{}/webhook'.format(os.environ.get('API_PORT', 8080)), json={
                     "object": "page",
                     "entry": [{
                         "id": "PAGE_ID",
@@ -50,5 +51,60 @@ async def test_text_echo(event_loop):
                     },
                     'recipient': {'id': 'USER_ID'},
                 }
-    finally:
-        await main.stop()
+            finally:
+                await main.stop()
+
+
+@pytest.mark.asyncio
+async def test_should_ignore_like(event_loop):
+    async with fake_fb.Server(event_loop) as server:
+        async with server.session() as server_session:
+            try:
+                await main.init(fake_http_session=server_session)
+
+                http = aiohttp.AioHttpInterface()
+                await http.post_raw('http://0.0.0.0:{}/webhook'.format(os.environ.get('API_PORT', 8080)), json={
+                    "entry": [
+                        {
+                            "id": "329188380752158",
+                            "messaging": [
+                                {
+                                    "message": {
+                                        "attachments": [
+                                            {
+                                                "payload": {
+                                                    "sticker_id": 369239263222822,
+                                                    "url": "https://scontent.xx.fbcdn.net/t39.1997-6/851557_369239266556155_759568595_n.png?_nc_ad=z-m"
+                                                },
+                                                "type": "image"
+                                            }
+                                        ],
+                                        "mid": "mid.1477264110799:ac44f49883",
+                                        "seq": 50,
+                                        "sticker_id": 369239263222822
+                                    },
+                                    "recipient": {
+                                        "id": "329188380752158"
+                                    },
+                                    "sender": {
+                                        "id": "1034692249977067"
+                                    },
+                                    "timestamp": 1477264110799
+                                }
+                            ],
+                            "time": 1477264110878
+                        }
+                    ],
+                    "object": "page"
+                })
+
+                # receive message from bot
+                assert len(server.history) == 1
+                assert await server.history[0]['request'].json() == {
+                    'message': {
+                        'text': 'Hm I don''t know what is it'
+                    },
+                    'recipient': {'id': '1034692249977067'},
+                }
+            finally:
+                await main.stop()

requirements.txt

@@ -1,4 +1,5 @@
-botstory==0.0.14
+botstory==0.0.24
+gunicorn==19.6.0
 pytest==3.0.3
 pytest-aiohttp==0.1.2
 pytest-asyncio==0.5.0

runtime.txt

@@ -0,0 +1 @@
+python-3.5.2

scripts/start.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+gunicorn echo.gunicorn_runner:app --bind 0.0.0.0:${PORT} --log-file - --reload --worker-class aiohttp.worker.GunicornWebWorker