Merge pull request #8 from oscarmcm/master

fitoria · fitoria · commit d361ac59cc2a · 2015-08-05T15:47:11.000-06:00
better exceptions, remove unused packages
diff --git a/.coverage b/.coverage
diff --git a/magicembed/__init__.py b/magicembed/__init__.py
@@ -1,2 +1,2 @@
 # -*- coding: utf-8 -*-
-__version__ = '1.0.1'  # pragma: no cover
+__version__ = '1.0.2'  # pragma: no cover
diff --git a/magicembed/providers.py b/magicembed/providers.py
@@ -5,9 +5,9 @@
 
 from urlparse import parse_qs
 
+from django.core.exceptions import ImproperlyConfigured
 from django.conf import settings
 
-
 class Provider(object):
 
     def __init__(self, url, size=(640, 480)):
@@ -65,7 +65,7 @@ def __init__(self, url, size=(640, 480)):
         if key is not None:
             self.api_url = 'http://api.embed.ly/1/oembed?key=%s&url=%s&maxwidth=%s&format=json' % (key, url, size[0])
         else:
-            raise ValueError("If you want to use this please set the Embedly api key")
+            raise ImproperlyConfigured("If you want to use this please set the Embedly api key")
 
     def render_video(self):
         return self._call_api()['html']
@@ -76,8 +76,8 @@ def render_thumbnail(self):
     def _call_api(self):
         try:
             data = json.loads(urllib.urlopen(self.api_url).read())
-        except IOError:
-            raise IOError("Please set the Embedly api key correctly")
+        except ImproperlyConfigured:
+            raise ImproperlyConfigured("Please set the Embedly api key correctly")
         return data
 
 
diff --git a/magicembed/tests/coverage/coverage_status.png b/magicembed/tests/coverage/coverage_status.png
diff --git a/magicembed/tests/coverage/errors.html b/magicembed/tests/coverage/errors.html
@@ -44,7 +44,7 @@
   <body>
 
 <div id="content-header">
-  <h1>Test Coverage Report: error packages and modules</h1><p>Generated: Wed 2015-08-05 13:23 CST</p></div>
+  <h1>Test Coverage Report: error packages and modules</h1><p>Generated: Wed 2015-08-05 15:26 CST</p></div>
 <div id="result-list">
   <p>    <code>django_coverage.utils.module_tools.find_or_load_module</code> had
     problems importing these packages and modules:
diff --git a/magicembed/tests/coverage/excludes.html b/magicembed/tests/coverage/excludes.html
@@ -44,7 +44,7 @@
   <body>
 
 <div id="content-header">
-  <h1>Test Coverage Report: excluded packages and modules</h1><p>Generated: Wed 2015-08-05 13:23 CST</p></div>
+  <h1>Test Coverage Report: excluded packages and modules</h1><p>Generated: Wed 2015-08-05 15:26 CST</p></div>
 <div id="result-list">
   <p>    These packages and modules were excluded from the coverage analysis in
     <code>django.conf.settings.COVERAGE_MODULE_EXCLUDES</code> or they do
diff --git a/magicembed/tests/coverage/index.html b/magicembed/tests/coverage/index.html
@@ -116,7 +116,7 @@
 
 <div id="content-header">
   <h1>Test Coverage Report</h1>
-  <p>Generated: Wed 2015-08-05 13:23 CST</p>
+  <p>Generated: Wed 2015-08-05 15:26 CST</p>
   <p><img src="coverage_status.png"></p>
 </div>
 
@@ -138,10 +138,10 @@ <h1>Test Coverage Report</h1>
     <tfoot>
       <tr>
         <td class="module-name">Total</td>
-        <td>71</td>
-        <td>48</td>
-        <td>9</td>
-        <td>77.4%</td>
+        <td>72</td>
+        <td>47</td>
+        <td>10</td>
+        <td>75.8%</td>
       </tr>
     </tfoot>
     <tbody>
@@ -155,10 +155,10 @@ <h1>Test Coverage Report</h1>
 
 <tr>
   <td class="module-name"><a href="modules/magicembed.providers.html">magicembed.providers</a></td>
-  <td>58</td>
-  <td>48</td>
-  <td>5</td>
-  <td class="normal">90.6%</td>
+  <td>59</td>
+  <td>47</td>
+  <td>6</td>
+  <td class="normal">88.7%</td>
 </tr>
 
 <tr>
diff --git a/magicembed/tests/coverage/modules/magicembed.__init__.html b/magicembed/tests/coverage/modules/magicembed.__init__.html
@@ -129,7 +129,7 @@ <h1>
     1 total statements,
     <span class="normal">100.0% covered</span>
   </h1>
-  <p>Generated: Wed 2015-08-05 13:23 CST</p>
+  <p>Generated: Wed 2015-08-05 15:26 CST</p>
   <p>Source file: /Users/oscarmcm/Code/Django/django-magicembed/magicembed/__init__.py</p>
   <p>
     Stats:
@@ -143,7 +143,7 @@ <h1>
 <div id="source-listing">
   <ol>
     <li class="ignored"><code># -*- coding: utf-8 -*-</code></li>
-<li class="excluded"><code>__version__ = '1.0.0'  # pragma: no cover</code></li>
+<li class="excluded"><code>__version__ = '1.0.2'  # pragma: no cover</code></li>
   </ol>
 </div>
 
diff --git a/magicembed/tests/coverage/modules/magicembed.providers.html b/magicembed/tests/coverage/modules/magicembed.providers.html
@@ -127,17 +127,17 @@
 <div id="content-header">
   <h1>
     <span id="module-name">magicembed.providers</span>:
-    58 total statements,
-    <span class="normal">90.6% covered</span>
+    59 total statements,
+    <span class="normal">88.7% covered</span>
   </h1>
-  <p>Generated: Wed 2015-08-05 13:23 CST</p>
+  <p>Generated: Wed 2015-08-05 15:26 CST</p>
   <p>Source file: /Users/oscarmcm/Code/Django/django-magicembed/magicembed/providers.py</p>
   <p>
     Stats:
-    <span class="executed">48 executed</span>,
-    <span class="missed">5 missed</span>,
-    <span class="excluded">5 excluded</span>,
-    <span class="ignored">33 ignored</span> 
+    <span class="executed">47 executed</span>,
+    <span class="missed">6 missed</span>,
+    <span class="excluded">6 excluded</span>,
+    <span class="ignored">32 ignored</span> 
   </p> 
 </div>
 
@@ -150,9 +150,9 @@ <h1>
 <li class="ignored"><code></code></li>
 <li class="excluded"><code>from urlparse import parse_qs</code></li>
 <li class="ignored"><code></code></li>
+<li class="excluded"><code>from django.core.exceptions import ImproperlyConfigured</code></li>
 <li class="excluded"><code>from django.conf import settings</code></li>
 <li class="ignored"><code></code></li>
-<li class="ignored"><code></code></li>
 <li class="executed"><code>class Provider(object):</code></li>
 <li class="ignored"><code></code></li>
 <li class="executed"><code>    def __init__(self, url, size=(640, 480)):</code></li>
@@ -210,20 +210,20 @@ <h1>
 <li class="executed"><code>        if key is not None:</code></li>
 <li class="executed"><code>            self.api_url = 'http://api.embed.ly/1/oembed?key=%s&amp;url=%s&amp;maxwidth=%s&amp;format=json' % (key, url, size[0])</code></li>
 <li class="ignored"><code>        else:</code></li>
-<li class="missed"><code>            raise ValueError("If you want to use this please set the Embedly api key")</code></li>
+<li class="missed"><code>            raise ImproperlyConfigured("If you want to use this please set the Embedly api key")</code></li>
 <li class="ignored"><code></code></li>
 <li class="executed"><code>    def render_video(self):</code></li>
 <li class="executed"><code>        return self._call_api()['html']</code></li>
 <li class="ignored"><code></code></li>
 <li class="executed"><code>    def render_thumbnail(self):</code></li>
-<li class="executed"><code>        return self._call_api()['thumbnail_url']</code></li>
+<li class="missed"><code>        return self._call_api()['thumbnail_url']</code></li>
 <li class="ignored"><code></code></li>
 <li class="executed"><code>    def _call_api(self):</code></li>
 <li class="executed"><code>        try:</code></li>
 <li class="executed"><code>            data = json.loads(urllib.urlopen(self.api_url).read())</code></li>
-<li class="missed"><code>        except IOError:</code></li>
-<li class="missed"><code>            raise IOError("Please set the Embedly api key correctly")</code></li>
-<li class="executed"><code>        return data</code></li>
+<li class="executed"><code>        except ImproperlyConfigured:</code></li>
+<li class="missed"><code>            raise ImproperlyConfigured("Please set the Embedly api key correctly")</code></li>
+<li class="missed"><code>        return data</code></li>
 <li class="ignored"><code></code></li>
 <li class="ignored"><code></code></li>
 <li class="executed"><code>def get_provider(url, size=None):</code></li>
diff --git a/magicembed/tests/coverage/modules/magicembed.templatetags.magicembed_tags.html b/magicembed/tests/coverage/modules/magicembed.templatetags.magicembed_tags.html
@@ -129,7 +129,7 @@ <h1>
     12 total statements,
     <span class="critical">0.0% covered</span>
   </h1>
-  <p>Generated: Wed 2015-08-05 13:23 CST</p>
+  <p>Generated: Wed 2015-08-05 15:26 CST</p>
   <p>Source file: /Users/oscarmcm/Code/Django/django-magicembed/magicembed/templatetags/magicembed_tags.py</p>
   <p>
     Stats:
diff --git a/requirements.txt b/requirements.txt
@@ -1,3 +1 @@
 django
-six
-django-compat

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`# -- coding: utf-8 --`
`2`		`-__version__ = '1.0.1' # pragma: no cover`
	`2`	`+__version__ = '1.0.2' # pragma: no cover`