add ucare cli utility, minor improvements to lib

Author: dmitry-mukhin

pyuploadcare/__init__.py

@@ -15,14 +15,17 @@
 
 from .file import File, LazyFile
 
-uuid_regex = re.compile(r'[a-z0-9]{8}-[a-z0-9]{4}-[a-z0-9]{4}-[a-z0-9]{4}-[a-z0-9]{12}')
+uuid_regex = re.compile(r'[a-z0-9]{8}-(?:[a-z0-9]{4}-){3}[a-z0-9]{12}')
+
 
 class UploadCareException(Exception):
-    def __init__(self, message, response=None):
+    def __init__(self, response, data):
+        message = 'Response status is %i. Data: %s' % (response.status, data)
         super(UploadCareException, self).__init__(message)
         self.response = response
+        self.data = data
+
 
-    
 class UploadCare(object):
     def __init__(self, pub_key, secret, timeout=5, api_base="http://api.uploadcare.com/"):
         self.pub_key = pub_key
@@ -47,23 +50,22 @@ def file(self, file_serialized):
 
         if file_serialized.startswith('http'):
             f._cached_url = file_serialized
-        
+
         return f
 
     def file_from_url(self, url):
         data = self.make_request('POST', '/files/download/', {'source_url': url})
         return LazyFile(data['id'], self)
 
-
-    def make_request(self, verb, uri, data=None):    
+    def make_request(self, verb, uri, data=None):
         parts = [''] + filter(None, self.path.split('/') + uri.split('/')) + ['']
         uri = '/'.join(parts)
 
         content = ''
-    
+
         if data:
             content = json.dumps(data)
-        
+
         content_type = 'application/json'
         content_md5 = hashlib.md5(content).hexdigest()
         date = email.utils.formatdate(usegmt=True)
@@ -77,7 +79,7 @@ def make_request(self, verb, uri, data=None):
         sign = hmac.new(str(self.secret),
                         sign_string,
                         hashlib.sha1).hexdigest()
-        
+
         headers = {
             'Authentication': 'UploadCare %s:%s' % (self.pub_key, sign),
             'Date': date,
@@ -87,8 +89,6 @@ def make_request(self, verb, uri, data=None):
         con = httplib.HTTPConnection(self.host, self.port, timeout=self.timeout)
         con.request(verb, uri, content, headers)
 
-#        assert False
-
         logger.debug('sent: %s %s %s' % (verb, uri, content))
 
         response = con.getresponse()
@@ -102,9 +102,4 @@ def make_request(self, verb, uri, data=None):
         if response.status == 204: # No Content
             return
 
-        raise UploadCareException('Response status is %i. Data: %s' % (response.status, data),
-                response=response)
-
-
-
-
+        raise UploadCareException(response, data)

pyuploadcare/dj/forms.py

@@ -1,5 +1,4 @@
-from django.forms import Field, TextInput, Media
-from django.conf import settings
+from django.forms import Field, TextInput
 from django.utils.safestring import mark_safe
 from django.utils.translation import ugettext as _, get_language
 
@@ -12,8 +11,9 @@
 
 AVAIL_ASSET_LANG = ('en', 'ru', 'pl')
 
+
 def get_asset_lang():
-    '''returns a localized asset url '''
+    """returns a localized asset url"""
     lang = get_language()
     if lang.startswith('en'):
         lang = lang[:2]
@@ -33,16 +33,15 @@ class FileWidget(TextInput):
 
     class Media:
         js = (get_asset_lang(),)
-    
 
     def __init__(self, attrs=None):
         default_attrs = {'role': 'uploadcare-line-uploader',
                          'data-public-key': UploadCare().pub_key,
                          'data-override-style': 'float: left;'}
-        
-        if attrs:
+
+        if attrs is not None:
             default_attrs.update(attrs)
-            
+
         super(FileWidget, self).__init__(default_attrs)
 
     def render(self, name, value, attrs):
@@ -52,17 +51,17 @@ def render(self, name, value, attrs):
             if isinstance(value, basestring):
                 value = UploadCare().file(value)
 
-            if value.url():
-                fname = '<a href="%s">%s</a>' % (value.url(), value.filename())
+            if value.url:
+                fname = '<a href="%s">%s</a>' % (value.url, value.filename)
             else:
-                fname = '%s (%s)' % (value.filename(), _('unavail.'))
+                fname = '%s (%s)' % (value.filename, _('unavail.'))
 
             description = '<p>%s: %s</p>' % (_('File'), fname)
 
             html = mark_safe(html + description)
 
         return html
-    
+
 
 class FileField(Field):
     widget = FileWidget

pyuploadcare/dj/models.py

@@ -10,23 +10,19 @@ class FileField(models.Field):
 
     description = "UploadCare file id/URI with cached data"
 
-    def __init__(self, *args, **kwargs):
-        super(FileField, self).__init__(*args, **kwargs)
-
-
     def get_internal_type(self):
         return "TextField"
 
     def to_python(self, value):
         if not value:
             return None
-            
+
         if isinstance(value, basestring):
-            return UploadCare().file(value)        
+            return UploadCare().file(value)
 
         if isinstance(value, File):
             return value
-        
+
         raise ValidationError('Invalid value for a field')
 
     def get_prep_value(self, value):

pyuploadcare/dj/tests.py

@@ -1,11 +1,9 @@
-import datetime
-
 from django.test import TestCase
-from django.conf import settings
 from django import forms
 
 from pyuploadcare.dj import forms as uc_forms
 
+
 class TestFormFields(TestCase):
     def test_form_field(self):
 

pyuploadcare/file.py

@@ -1,12 +1,12 @@
 import time
-import urllib
 import logging
 
 logger = logging.getLogger("pyuploadcare")
 
 
 RESIZER_BASE = 'http://services.uploadcare.com/resizer/%(file_id)s/%(cmd_line)s/'
 
+
 class LazyFile(object):
     def __init__(self, id, ucare):
         self.id = id
@@ -47,15 +47,15 @@ def __getattr__(self, name):
         return super(File, self).__getattr__(name)
 
     def keep(self, wait=False):
-        self._info = self.ucare.make_request('POST', self.api_uri(), {'keep': 1})
+        self._info = self.ucare.make_request('POST', self.api_uri, {'keep': 1})
 
         if wait:
             while not self.info['on_s3']:
                 self.update_info()
                 time.sleep(0.1)
 
     def delete(self):
-        self.ucare.make_request('DELETE', self.api_uri())
+        self.ucare.make_request('DELETE', self.api_uri)
 
     @property
     def info(self):
@@ -65,36 +65,40 @@ def info(self):
         return self._info
 
     def update_info(self):
-        self._info = self.ucare.make_request('GET', self.api_uri())
+        self._info = self.ucare.make_request('GET', self.api_uri)
 
+    @property
     def api_uri(self):
         return '/files/%s/' % self.file_id
 
     def serialize(self):
-        """Returns a string suitable to be stored somethere. It's either an URL (to save a request) or just file-id"""
+        """Returns a string suitable to be stored somewhere.
+        It's either an URL (to save a request) or just file-id"""
 
-        if self._info and self.url():
-            return self.url()
+        if self._info and self.url:
+            return self.url
 
         return self.file_id
 
+    @property
     def url(self):
         if self._cached_url:
             return self._cached_url
 
         return self.info['original_file_url']
 
+    @property
     def filename(self):
-        if not self.url():
+        if not self.url:
             return ''
 
-        return self.url().split('/')[-1]
+        return self.url.split('/')[-1]
 
     def resized(self, width=None, height=None, crop=False):
         dimensions = str(width or '')
 
         if height:
-            dimensions += 'x%i' % height 
+            dimensions += 'x%i' % height
 
         chunks = [dimensions]
 
@@ -107,8 +111,5 @@ def resized(self, width=None, height=None, crop=False):
 
     def string_resized(self, cmd_line):
         cmd_line = cmd_line.replace('_', '/')
-        
-        return RESIZER_BASE % {'file_id': self.file_id, 'cmd_line': cmd_line}
-
-
 
+        return RESIZER_BASE % {'file_id': self.file_id, 'cmd_line': cmd_line}

test_project/gallery/models.py

@@ -2,7 +2,10 @@
 
 from pyuploadcare.dj import FileField
 
-# Create your models here.
+
 class Photo(models.Model):
     title = models.CharField(max_length=255)
     photo = FileField()
+
+    def __unicode__(self):
+        return self.title

test_project/gallery/tests.py

@@ -150,9 +150,7 @@
 
 
 UPLOADCARE = {
-    #'pub_key': '3aaee4d571b832736d722396bf541154f14aaa1f50e0199e374ba8edea84efb6',
-    #'secret': 'eea670103077e50b0d22ddc8da92165a04ba20c43274506bdad27b7966199ac2',
     #'api_base': "http://0.0.0.0:8000/api/",
-    'pub_key': 'd07d12ae31b52d365ed3570dd651201f737d673c130c15185d53057e3b903e06',
-    'secret': '6c8986d5861262e3cf231d315555980381891117e8357ac60cc20418fd6bf15b'
+    'pub_key': '--your key here--',
+    'secret': '--your secret here--'
 }

test_project/gallery/views.py

@@ -1,17 +1,8 @@
-from django.conf.urls.defaults import patterns, include, url
+from django.conf.urls import patterns, include, url
 
-# Uncomment the next two lines to enable the admin:
 from django.contrib import admin
 admin.autodiscover()
 
 urlpatterns = patterns('',
-    # Examples:
-    # url(r'^$', 'test_project.views.home', name='home'),
-    # url(r'^test_project/', include('test_project.foo.urls')),
-
-    # Uncomment the admin/doc line below to enable admin documentation:
-    # url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
-
-    # Uncomment the next line to enable the admin:
     url(r'^admin/', include(admin.site.urls)),
 )