From 2f56c1c11aa1158b64dc1829b83b5e516d042666 Mon Sep 17 00:00:00 2001
From: "J. Tanner Netterville" <tannern@gmail.com>
Date: Tue, 13 Nov 2012 17:28:04 -0600
Subject: [PATCH] allow configuring which endpoints to allow

---
 mdx_oembed/__init__.py       |  2 ++
 mdx_oembed/extension.py      | 18 ++++++++++++---
 mdx_oembed/inlinepatterns.py |  6 ++++-
 tests.py                     | 45 +++++++++++++++++++++++++++++++-----
 4 files changed, 61 insertions(+), 10 deletions(-)

diff --git a/mdx_oembed/__init__.py b/mdx_oembed/__init__.py
index 4395f4b..f1cd610 100644
--- a/mdx_oembed/__init__.py
+++ b/mdx_oembed/__init__.py
@@ -3,4 +3,6 @@ from mdx_oembed.extension import OEmbedExtension
 
 
 def makeExtension(configs=None):
+    if isinstance(configs, list):
+        configs = dict(configs)
     return OEmbedExtension(configs=configs)
diff --git a/mdx_oembed/extension.py b/mdx_oembed/extension.py
index 8c7a86d..84e84a6 100644
--- a/mdx_oembed/extension.py
+++ b/mdx_oembed/extension.py
@@ -5,16 +5,28 @@ from mdx_oembed.endpoints import ENDPOINTS
 from mdx_oembed.inlinepatterns import OEmbedLinkPattern, OEMBED_LINK_RE
 
 
+AVAILABLE_ENDPOINTS = ENDPOINTS.keys()
+
+
 class OEmbedExtension(Extension):
 
+    config = {
+        'allowed_endpoints': [
+            AVAILABLE_ENDPOINTS,
+            "A list of oEmbed endpoints to allow. Possible values are "
+            "{}.".format(', '.join(AVAILABLE_ENDPOINTS)),
+        ],
+    }
+
     def extendMarkdown(self, md, md_globals):
         self.oembed_consumer = self.prepare_oembed_consumer()
-        pattern = OEmbedLinkPattern(OEMBED_LINK_RE, md, self.oembed_consumer)
-        md.inlinePatterns.add('oembed_link', pattern, '<image_link')
+        link_pattern = OEmbedLinkPattern(OEMBED_LINK_RE, md,
+                                         self.oembed_consumer)
+        md.inlinePatterns.add('oembed_link', link_pattern, '<image_link')
 
     def prepare_oembed_consumer(self):
         allowed_endpoints = self.getConfig('allowed_endpoints',
-                                           ENDPOINTS.keys())
+                                           AVAILABLE_ENDPOINTS)
         consumer = oembed.OEmbedConsumer()
         [consumer.addEndpoint(v)
          for k,v in ENDPOINTS.items()
diff --git a/mdx_oembed/inlinepatterns.py b/mdx_oembed/inlinepatterns.py
index e76d373..2a9b4fd 100644
--- a/mdx_oembed/inlinepatterns.py
+++ b/mdx_oembed/inlinepatterns.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 import logging
 from markdown.inlinepatterns import Pattern
+import oembed
 
 
 LOG = logging.getLogger(__name__)
@@ -18,6 +19,9 @@ class OEmbedLinkPattern(Pattern):
 
     def handleMatch(self, match):
         url = match.group(3).strip()
-        response = self.consumer.embed(url)
+        try:
+            response = self.consumer.embed(url)
+        except oembed.OEmbedNoEndpoint:
+            return None
         placeholder = self.markdown.htmlStash.store(response['html'])
         return placeholder
diff --git a/tests.py b/tests.py
index 41a8e72..63802ab 100644
--- a/tests.py
+++ b/tests.py
@@ -47,12 +47,7 @@ class OEmbedPatternRegexTestCase(unittest.TestCase):
 
 class OEmbedExtensionTestCase(unittest.TestCase):
     def setUp(self):
-        md_params = {
-            'extensions': [
-                'oembed',
-            ],
-        }
-        self.markdown = markdown.Markdown(**md_params)
+        self.markdown = markdown.Markdown(extensions=['oembed'])
 
 
 class IgnoredTestCase(OEmbedExtensionTestCase):
@@ -112,3 +107,41 @@ class YoutubeTestCase(OEmbedExtensionTestCase):
         output = self.markdown.convert(text)
         self.assertEqual(output, expected)
 
+
+class LimitedOEmbedExtensionTestCase(unittest.TestCase):
+    def setUp(self):
+        self.markdown = markdown.Markdown(
+            extensions=['oembed'],
+            extension_configs={
+                'oembed': {
+                    'allowed_endpoints': ['youtube',],
+                }
+            })
+
+    def test_youtube_link(self):
+        """
+        YouTube video link.
+        """
+        text = '![video](http://www.youtube.com/watch?v=zqnh_YJBvOI)'
+        expected = '<iframe width="459" height="344" src="http://www.youtube.com/embed/zqnh_YJBvOI?fs=1&feature=oembed" frameborder="0" allowfullscreen></iframe>'
+        output = self.markdown.convert(text)
+        self.assertEqual(output, expected)
+
+    def test_youtube_short_link(self):
+        """
+        Short format YouTube video link.
+        """
+        text = '![video](http://youtu.be/zqnh_YJBvOI)'
+        expected = '<iframe width="459" height="344" src="http://www.youtube.com/embed/zqnh_YJBvOI?fs=1&feature=oembed" frameborder="0" allowfullscreen></iframe>'
+        output = self.markdown.convert(text)
+        self.assertEqual(output, expected)
+
+    def test_vimeio_link(self):
+        """
+        Vimeo video link.
+        """
+        text = '![link](http://vimeo.com/52970271)'
+        expected = '<p><img alt="link" src="http://vimeo.com/52970271" /></p>'
+        output = self.markdown.convert(text)
+        self.assertEqual(output, expected)
+