Merge pull request #1 from leonardoo/dev

Update to django 1.7 and test

Author: leonardoo

.gitignore

@@ -4,6 +4,7 @@
 *.pyc
 django_dropbox.egg-info/
 dist/
+env/
 venv/
 bin/
 lib/

.travis.yml

@@ -0,0 +1,21 @@
+language: python
+python: 2.7
+env:
+  matrix:
+  - TOX_ENV=py27-django14
+  - TOX_ENV=py27-django15
+  - TOX_ENV=py27-django16
+  - TOX_ENV=py27-django17
+  - TOX_ENV=py34-django15
+  - TOX_ENV=py34-django16
+  - TOX_ENV=py34-django17
+  - TOX_ENV=coverage
+  global:
+  - secure: ZdqsHM92b1pPklUT6S4j7mbnIQINOE5+QKOFoXqgq/N4lDHX8XvHywWDfn6iigr0R9Nj9F5RmzPB/EyaSbPb/RM14y1BlHPL4Jqwu83+JAyS6QxZqt1cAgrnG++rpJCnTT6tZTsiXgyWo6RCxMTQFAXQsvye6br0w5rLxP7Ymyg=
+  - secure: XLLNIUgl5VsSy1w6i34z0Vo2NHRQcX9e8TS4Mg4Iq1fDT9WjLGG8tN2Nu4CFzrOK6PjCBFMTHgt88UJiQ45dxAzIFl+ApysqB+E2Z42r3HggiDn2iHfu8S/csSxgcFoI5qjyqeW3tDEOZfxtMZ18hqAPVFBlZ7QwmSSl7TeHb8k=
+  - secure: ULa2n0dqO1/Vf8QpBXVz47XQ963LXEvD59/TmoxXffusMV47aASSv4j+kXU2+RwvzTDWO5k1afd5esebwGUiv78l/x5Ta4QiDpX6uxxPTQk/CGHEuUTMru7d/CYf3xPAB5Vu/mexaPHmPAT4sO3I9Sef6LIsFSNsXp/LkmbT3NQ=
+  - secure: gXWm2BJJ7FoGMc09uzPUMpEeFCJMQE3awvJ9nnx6n1I4D7GZPyE7Ukm+o4o8DsjO/nBQzAqkMNJi4J2E4H0FvHnLHif8ktE0JATf3jYAHhOZO4NaY5aikSliMvH2a+JkfNZsUbUbq8zzcZMpyNX2O4N0cIZc9tplQznHD8RMrJU=
+install:
+- pip install tox
+script:
+- tox -e $TOX_ENV

README.md

@@ -1,5 +1,5 @@
 # django-dropbox
-> Version 0.0.1
+> Version 0.0.5
 
 # What
 
@@ -28,6 +28,8 @@ additionally you must need to set the next settings:
     DROPBOX_ACCESS_TOKEN = 'xxx'
     DROPBOX_ACCESS_TOKEN_SECRET = 'xxx'
 
+    ACCESS_TYPE = 'app_folder'
+
 if you don't have `DROPBOX_CONSUMER_KEY` or `DROPBOX_CONSUMER_SECRET` 
 you will need to create an Dropbox app at [Dropbox for Developers](https://www.dropbox.com/developers)
 then set `DROPBOX_CONSUMER_KEY` and `DROPBOX_CONSUMER_SECRET` settings in `settings.py`,
@@ -36,3 +38,22 @@ after that run:
     $ python manage.py get_dropbox_token
 
 And follow up on screen instructions, finally set the `DROPBOX_ACCESS_TOKEN` and `DROPBOX_ACCESS_TOKEN_SECRET` in `settings.py`
+
+
+# Config in app
+
+for use in your app project in the models, you have to add
+
+from django_dropbox.storage import DropboxStorage
+
+STORAGE = DropboxStorage()
+
+and in the fields like
+
+file_1 = models.FileField(upload_to="pathtoupload",storage=STORAGE)
+
+or
+
+logo = models.ImageField(upload_to='pathtoupload', storage=STORAGE)
+
+

django_dropbox/__init__.py

@@ -1,6 +1,15 @@
-VERSION = (0, 0, 4)
+"""
+Django accounts management made easy.
 
-def get_version():
-   return '%s.%s.%s' % VERSION
+"""
+default_app_config = 'django_dropbox.apps.DjangoDropboxConfig'
+
+VERSION = (0, 0, 5)
 
-version = get_version()
+__version__ = '.'.join((str(each) for each in VERSION[:4]))
+
+def get_version():
+    """
+    Returns string with digit parts only as version.
+    """
+    return '.'.join((str(each) for each in VERSION[:3]))

django_dropbox/apps.py

@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class DjangoDropboxConfig(AppConfig):
+    name = 'django_dropbox'
+    verbose_name = 'Django Dropbox'

django_dropbox/compat.py

@@ -0,0 +1,21 @@
+
+from io import BytesIO, StringIO
+
+from django.utils import six
+from django.utils.six.moves.urllib import parse as urlparse
+
+try:
+    from django.utils.deconstruct import deconstructible
+except ImportError: # Django 1.7+ migrations
+    deconstructible = lambda klass, *args, **kwargs: klass
+
+
+def getFile(content=None):
+    if not content:
+        return BytesIO()
+
+    if six.PY3:
+        stream_class = StringIO if isinstance(content, six.text_type) else BytesIO
+    else:
+        stream_class = BytesIO
+    return stream_class(content)

django_dropbox/management/commands/get_dropbox_token.py

@@ -1,3 +1,4 @@
+from __future__ import print_function
 from django.core.management.base import NoArgsCommand
 from dropbox import rest, session
 from django_dropbox.settings import CONSUMER_KEY, CONSUMER_SECRET, ACCESS_TYPE
@@ -9,12 +10,12 @@ def handle_noargs(self, *args, **options):
         request_token = sess.obtain_request_token()
 
         url = sess.build_authorize_url(request_token)
-        print "Url:", url
-        print "Please visit this website and press the 'Allow' button, then hit 'Enter' here."
+        print("Url:", url)
+        print("Please visit this website and press the 'Allow' button, then hit 'Enter' here.")
         raw_input()
 
         # This will fail if the user didn't visit the above URL and hit 'Allow'
         access_token = sess.obtain_access_token(request_token)
 
-        print "DROPBOX_ACCESS_TOKEN = '%s'" % access_token.key
-        print "DROPBOX_ACCESS_TOKEN_SECRET = '%s'" % access_token.secret
+        print("DROPBOX_ACCESS_TOKEN = '%s'" % access_token.key)
+        print("DROPBOX_ACCESS_TOKEN_SECRET = '%s'" % access_token.secret)

django_dropbox_project/__init__.py renamed to django_dropbox/runtests/__init__.py

@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+import django_dropbox.storage
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='TestDropbox',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('file_test', models.FileField(storage=django_dropbox.storage.DropboxStorage(location=b'/test/djangodropbox'), null=True, upload_to=b'.')),
+            ],
+            options={
+            },
+            bases=(models.Model,),
+        ),
+    ]