develop update to config to get closer to testing, what a pain

Author: lame

app/__init__.py

@@ -16,15 +16,19 @@
 except:
   raise EnvironmentError('Environmental variable "BROADCAST_ENV" not found or unrecognized value')
 
-app.config.from_object('config.' + ENV)
+basedir = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
+print(basedir)
+app.config.from_pyfile(basedir + '/config.py')
+
 parser = ConfigParser()
 api = Api(app)
 db = SQLAlchemy(app)
 migrate = Migrate(app, db)
 tc = TwilioRestClient(
     app.config.get('TWILIO_ACCOUNT_SID'),
-    app.config.get('TWILIO_ACCOUNT_AUTH')
+    app.config.get('TWILIO_ACCOUNT_AUTH'),
 )
 
-# FIXME
-from app.mod_sms import views, models, controllers, routes
+# Routes
+from app.mod_sms import routes
+from app.mod_bot import routes

app/mod_bot/__init__.py

@@ -1,35 +1,22 @@
 import os
 
-
-class Base(object):
-
-    # Flask Config
-    BASEDIR = os.path.abspath(os.path.dirname(__file__))
-    CSRF_ENABLED = True
-    DEBUG = False
-
-    # SQLAlchemy Config
-    DATABASE_QUERY_TIMEOUT = 0.5
-    SQLALCHEMY_MIGRATE_REPO = os.path.join(BASEDIR, 'db_repository')
-    SQLALCHEMY_RECORD_QUERIES = True
-    SQLALCHEMY_TRACK_MODIFICATIONS = False
-    SQLALCHEMY_DATABASE_URI = os.environ['DATABASE_URL']
-
-    # TWILIO Config
-    try:
-        TWILIO_ACCOUNT_SID=os.environ['TWILIO_ACCOUNT_SID']
-        TWILIO_ACCOUNT_AUTH=os.environ['TWILIO_ACCOUNT_AUTH']
-    except KeyError:
-        raise('Missing Twilio environ variables')
-
-
-class STAGING(Base):
-    ENV = 'STAGING'
-    DEBUG = True
-    SECRET_KEY = 'Replace_With_SecretKey'
-    DATABASE_QUERY_TIMEOUT = 1.0
-
-
-class PRODUCTION(Base):
-    ENV = 'PRODUCTION'
-    SECRET_KEY = os.environ.get('SECRET_KEY', '')
+# Flask Config
+BASEDIR = os.path.abspath(os.path.dirname(__file__))
+CSRF_ENABLED = os.environ.get('CSRF_ENABLED', True)
+DEBUG = os.environ.get('DEBUG', False)
+ENV = os.environ.get('ENV')
+SECRET_KEY = os.environ.get('SECRET_KEY', '')
+
+# SQLAlchemy Config
+DATABASE_QUERY_TIMEOUT = 0.5
+SQLALCHEMY_MIGRATE_REPO = os.path.join(BASEDIR, 'db_repository')
+SQLALCHEMY_RECORD_QUERIES = True
+SQLALCHEMY_TRACK_MODIFICATIONS = False
+SQLALCHEMY_DATABASE_URI = os.environ['DATABASE_URL']
+
+# TWILIO Config
+try:
+    TWILIO_ACCOUNT_SID=os.environ['TWILIO_ACCOUNT_SID']
+    TWILIO_ACCOUNT_AUTH=os.environ['TWILIO_ACCOUNT_AUTH']
+except KeyError:
+    raise('Missing Twilio environ variables')

app/mod_bot/routes.py

@@ -1,6 +1,49 @@
+import unittest
 from nose.tools import assert_true
+# from app import app
 
 
-class TestUselessTests:
+class TestUselessTests(unittest.TestCase):
+    def setup(self):
+        pass
+        # app.config['TESTING'] = True
+        # app.config['WTF_CSRF_ENABLED'] = False
+        # app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///' + os.path.join(basedir, 'test.db')
+
+        # db.create_all()
+
+    def tearDown(self):
+        pass
+        # db.session.remove()
+        # db.drop_all()
+
     def test_nothing(self):
         assert_true(True)
+
+    # def test_sms(self):
+    #   self.test_app = app.test_client()
+    #   params = dict(
+    #     ToCountry='US',
+    #     ToState='FL',
+    #     SmsMessageSid='SM01d24ae1a8dede74326bca2ab0986601',
+    #     NumMedia=0,
+    #     ToCity='MIAMI',
+    #     FromZip=None,
+    #     SmsSid='SM01d24ae1a8dede74326bca2ab0986601',
+    #     FromState='CA',
+    #     SmsStatus='received',
+    #     FromCity='',
+    #     Body='testtest',
+    #     FromCountry='US',
+    #     To='+17868378095',
+    #     ToZip=33130,
+    #     NumSegments=1,
+    #     MessageSid='SM01d24ae1a8dede74326bca2ab0986601',
+    #     AccountSid='ACd54f610007bb0fbf352df81d4fdff7dd',
+    #     From='+16269882527',
+    #     ApiVersion='2010-04-01'
+
+    #   )
+
+    #   response = self.test_app.post('/inbound', params=params)
+    #   self.assertEquals(response.status, "200 OK")