Added much more robust replacement mechanism using Django templates.

git-svn-id: https://django-oembed.googlecode.com/svn/trunk@8 4c08321d-174e-0410-8f1d-477679e35061

Author: floguy

oembed/core.py

@@ -13,6 +13,7 @@
 from django.utils.safestring import mark_safe
 #from django.utils.html import conditional_escape
 from oembed.models import ProviderRule, StoredOEmbed
+from django.template.loader import render_to_string
 
 conditional_escape = lambda x: x
 
@@ -21,12 +22,6 @@
 MAX_HEIGHT = getattr(settings, "OEMBED_MAX_HEIGHT", 240)
 FORMAT = getattr(settings, "OEMBED_FORMAT", "json")
 
-HTML_MAPPING = {
-    'photo': 'url',
-    'video': 'html',
-    'rich': 'html',
-}
-
 def fetch(url, user_agent="django-oembed"):
         request = urllib2.Request(url)
         request.add_header('User-Agent', user_agent)
@@ -111,12 +106,10 @@ def replace(text, max_width=MAX_WIDTH, max_height=MAX_HEIGHT):
             urls.add(part)
             indices_rules.append(i)
             parts.append(part)
-            print part
             index += 1
             if to_append:
                 parts.append(to_append)
                 index += 1
-    print urls
     for stored_embed in StoredOEmbed.objects.filter(match__in=urls, max_width=max_width, max_height = max_height):
         stored[stored_embed.match] = stored_embed
     for i, id_to_replace in enumerate(indices):
@@ -130,10 +123,7 @@ def replace(text, max_width=MAX_WIDTH, max_height=MAX_HEIGHT):
                     rule.endpoint, part, max_width, max_height, FORMAT
                 )
                 resp = simplejson.loads(fetch(url))
-                replacement = None
-                for key in HTML_MAPPING.iterkeys():
-                    if resp['type'] == key:
-                        replacement = resp[HTML_MAPPING[key]]
+                replacement = render_to_string('oembed/%s.html' % resp['type'], {'response': resp})
                 if replacement:
                     stored_embed = StoredOEmbed.objects.create(
                         match = part,

oembed/templates/oembed/photo.html

@@ -0,0 +1 @@
+{% autoescape off %}<img src="{{ response.url }}" alt="{{ response.title }}"></img>{% endautoescape %}

oembed/templates/oembed/rich.html

@@ -0,0 +1 @@
+{% autoescape off %}{{ response.html }}{% endautoescape %}

oembed/templates/oembed/video.html

@@ -0,0 +1 @@
+{% autoescape off %}{{ response.html }}{% endautoescape %}