Added first feature to list photos

Author: carlosb1

app/data.py

@@ -25,7 +25,7 @@ def get_or_404(cls, id):
 
     def update(self, commit=True, **kwargs):
         for attr, value in kwargs.iteritems():
-            setattr(self, attr, value)
+	    setattr(self, attr, value)
         return commit and self.save() or self
 
     def save(self, commit=True):

app/mod_photos/controllers.py

@@ -13,13 +13,15 @@
 
 mod_photos = Blueprint('photos',__name__,url_prefix='/photos/v1.0')
 
+
+responses = FactoryResponse()
+
 def allowed_file(filename):
 	return '.' in filename and filename.rsplit('.',1)[1] in ALLOWED_EXTENSIONS
 
 
 @mod_photos.route('/photos',methods=['POST'])
-def photos():
-	responses = FactoryResponse()
+def photos_post():
 	app.logger.debug("Applying post photo...")
 
         data = None
@@ -45,3 +47,11 @@ def photos():
 		resp = responses.new201(data)
         return resp
 
+@mod_photos.route('/photos',methods=['GET'])
+def photos_get():
+	app.logger.debug("Applying get photos...")
+	photos = Photo.query.all()
+	resp = jsonify({'data':
+		[photo.serialize() for photo in photos]})
+	return resp
+

app/mod_photos/models.py

@@ -10,15 +10,18 @@ class Photo(Base,CRUDMixin):
     __tablename__='photo'
     uuid = db.Column(db.String(128), nullable=False)
     filepath = db.Column(db.String(500), nullable=False)
-    
+   
+
     def __init__(self,uuid,filepath):
 	self.uuid = uuid
 	self.filepath = filepath
 
     def get_id(self):
 	return self.id
 
+    def serialize(self):
+	return {'uuid':self.uuid}
     def __repr__(self):
-	return '<photo uuid=%r filepath=%r>' % (self.name,self.uuid,self.filepath)
+	return '<photo uuid=%r filepath=%r>' % (self.uuid,self.filepath)
 
 

app/mod_photos/tests.py

@@ -1,12 +1,12 @@
-from flask import url_for
+from flask import url_for, jsonify, json
 from flask.ext.login import current_user
 
 from app.test_base import BaseTestCase
 from app import app
 
 from .models import Photo
 from factory_responses import FactoryResponse
-
+from app.data import db
 
 
 class TestModelPhoto(BaseTestCase):
@@ -16,13 +16,13 @@ def test_new_photo(self):
         self.assertTrue(photo.filepath,'/test/photo.png')
 class TestFactoryResponses(BaseTestCase):
 	responses = None
-
 	@classmethod
 	def setUpClass(cls):
 		cls.responses = FactoryResponse()
 	@classmethod
 	def tearDownClass(cls):
 		cls.responses = None
+
 	def test_200_correct(self):
 		#TODO add respnse
 		resp=self.responses.new200()
@@ -40,7 +40,6 @@ def test_202_correct(self):
 
 class TestPhotosViews(BaseTestCase):
     def test_post_photo_correct(self):
-	
         with self.app.open_resource("test_resources/photo.jpg") as fp:
             with self.client:
                 response = self.client.post("/photos/v1.0/photos",data={'file':fp});
@@ -49,7 +48,8 @@ def test_post_photo_correct(self):
 		self.app.logger.debug(response.json)
 		#TODO add assert for correct response
 		self.assertTrue(response.status_code == 201)
-    def post_photo_not_allowed_file(self):
+
+    def test_post_photo_not_allowed_file(self):
         with self.app.open_resource("test_resources/photo.txt") as fp:
              with self.client:
                 response = self.client.post("/photos/v1.0/photos",data={'file':fp});
@@ -58,3 +58,14 @@ def post_photo_not_allowed_file(self):
 		#TODO add assert for correct response
 		self.assertTrue(response.status_code == 202)
 
+    def test_get_photo_correct(self):
+	#fake information
+	data={"uuid":"1","filepath":"test1.jpg"}
+	Photo.create(**data)	
+        
+	#fake data to test get resource
+	with self.app.open_resource("test_resources/photo.jpg") as fp:
+            with self.client:
+		response = self.client.get("/photos/v1.0/photos")
+		app.logger.debug(response.json['data'][0]['uuid'])
+

app/test_base.py

@@ -3,13 +3,17 @@
 from app.data import db
 
 class BaseTestCase(TestCase):
+    #FIXME DEAD CODE??
     def create_app(self):
         app.config.from_object('config')
 	return app
     def setUp(self):
-	app.config['TESTING']=True
 	app.config['WTF_CSRF_ENABLED']=False
-        db.create_all()
+	app.config['SQLALCHEMY_DATABASE_URI']='sqlite:///:memory:'
+	app.config['TESTING']=True
+	#set up memory database
+	db.app = app
+	db.create_all()
     def tearDown(self):
         #db.session_remove()
         db.drop_all()

requirements.txt

@@ -1,4 +1,6 @@
-APScheduler>=3.0.4
+APScheduler==3.1.0
+BeautifulSoup==3.2.1
+CherryPy==3.2.2
 Flask==0.10.1
 Flask-APScheduler==1.2.1
 Flask-Bootstrap==3.3.5.7
@@ -7,22 +9,104 @@ Flask-SQLAlchemy==2.1
 Flask-Testing==0.4.2
 Flask-WTF==0.12
 Jinja2==2.8
+Mako==0.9.1
+Markdown==2.4
 MarkupSafe==0.23
+PAM==0.4.2
+Pillow==2.3.0
+Pygments==1.6
+Routes==2.0
 SQLAlchemy==1.0.9
+Theano==0.8.1
+Twisted-Core==13.2.0
+Twisted-Names==13.2.0
+Twisted-Web==13.2.0
 WTForms==2.0.2
 Werkzeug==0.10.4
 amqp==1.4.7
 anyjson==0.3.3
+## FIXME: could not find svn URL in dependency_links for this package:
+apsw==3.8.2-r1
+apt-xapian-index==0.45
+apturl==0.4.1ubuntu4
 argparse==1.2.1
 billiard==3.3.0.21
 celery==3.1.19
+chardet==2.0.1
+colorama==0.2.5
+command-not-found==0.3
+configglue==1.1.2
+configobj==4.7.2
+coverage==4.0.3
+cssselect==0.9.1
+cssutils==0.9.10
+dbgp==1.1
+debtagshw==0.1
+defer==1.0.6
+dirspec==13.10
+dnspython==1.11.1
 dominate==2.1.16
+dryscrape==1.0
+duplicity==0.6.23
+fake-factory==0.5.7
+feedparser==5.1.3
+funcsigs==1.0.0
 futures==3.0.3
+gunicorn==19.3.0
+gyp==0.1
+html5lib==0.999
+httplib2==0.8
+ipaddress==1.0.16
 itsdangerous==0.24
 kombu==3.0.29
+lockfile==0.8
+lxml==3.3.3
+matplotlib==1.3.1
+mechanize==0.2.5
+mixer==5.5.7
+nemo-emblems==0.0.1
+netifaces==0.8
+networkx==1.8.1
+nose==1.3.1
+numpy==1.11.0
+oauthlib==0.6.1
+oneconf==0.3.7.14.04.1
+ordereddict==1.1
+paramiko==1.10.1
+pexpect==3.1
+piston-mini-client==0.7.5
+protobuf==2.5.0
+pyOpenSSL==0.13
+pycrypto==2.6.1
+pycups==1.9.66
+pycurl==7.19.3
+pygobject==3.12.0
+pyinotify==0.9.4
+pyparsing==2.0.1
+pyserial==2.6
+pysmbc==1.0.14.1
+python-apt==0.9.3.5ubuntu2
 python-dateutil==2.4.2
+python-debian==0.1.21-nmu2ubuntu2
 pytz==2015.7
+pyxdg==0.25
+redis==2.10.5
+reportlab==3.0
+repoze.lru==0.6
+requests==2.2.1
+scipy==0.17.0
+sessioninstaller==0.0.0
 six==1.10.0
+system-service==0.1.6
 tzlocal==1.2
+uTidylib==0.2
+urllib3==1.7.1
+vboxapi==1.0
+vim-debug==1.5.4
+virtualenv==1.11.4
 visitor==0.1.2
+webkit-server==1.0
+wicd==1.7.2.4
 wsgiref==0.1.2
+xvfbwrapper==0.2.8
+zope.interface==4.0.5