Adds freshen tests

Author: Bob Corsaro

embedly/client.py

@@ -17,12 +17,12 @@
 class Embedly(object):
     """
     Client
-    
+
     """
-    def __init__(self, user_agent=USER_AGENT, domain='api.embed.ly', key=None):
+    def __init__(self, user_agent=USER_AGENT, domain=None, key=None):
         """
         Initialize the Embedly client 
-        
+
         :param user_agent: User Agent passed to Embedly
         :type user_agent: str
         :param domain: Domain you want the client to use '(api|pro).embed.ly'
@@ -33,13 +33,19 @@ def __init__(self, user_agent=USER_AGENT, domain='api.embed.ly', key=None):
         :returns: None
         :raises: ValueError
         """
+        if not domain:
+            if key:
+                domain = 'pro.embed.ly'
+            else:
+                domain = 'api.embed.ly'
+
         if not domain_re.match(domain):
             raise ValueError(
                 'Invalid Domain: %s. api.embed.ly or pro.embed.ly' % domain)
-        
+
         if domain == 'pro.embed.ly' and key is None:
             raise ValueError('domain: pro.embed.ly requires a key.')
-        
+
         self.user_agent = user_agent
         self.domain = domain
         self.key = key
@@ -71,7 +77,8 @@ def _get(self, version, method, url_or_urls, **kwargs):
         if resp['status'] == '200':
             data = json.loads(content)
         else:
-            data = {'error' : True,
+            data = {'type' : 'error',
+                    'error' : True,
                     'error_code' : int(resp['status'])}
 
         print data
@@ -98,4 +105,4 @@ def objectify(self, url_or_urls, **kwargs):
         """
         oembed
         """
-        return self._get(2, 'objectify', url_or_urls, **kwargs)
+        return self._get(2, 'objectify', url_or_urls, **kwargs)

features/oembed.feature

@@ -0,0 +1,79 @@
+Feature: OEmbed
+
+    As an embedly user
+    I want to call the the embedly api
+    Because I want and oembed for a specific url
+
+    Scenario Outline: Get the provider_url
+        Given an embedly endpoint
+        When oembed is called with the <url> URL
+        Then the provider_url should be <provider_url>
+
+        Examples:
+            | url                                                          | provider_url            |
+            | http://www.scribd.com/doc/13994900/Easter                    | http://www.scribd.com/  |
+            | http://www.scribd.com/doc/28452730/Easter-Cards              | http://www.scribd.com/  |
+            | http://www.youtube.com/watch?v=Zk7dDekYej0                   | http://www.youtube.com/ |
+            | http://tweetphoto.com/14784358                               | http://plixi.com        |
+
+
+    Scenario Outline: Get the provider_url with force flag
+        Given an embedly endpoint
+        When oembed is called with the <url> URL and force flag
+        Then the provider_url should be <provider_url>
+
+        Examples:
+            | url                                                          | provider_url            |
+            | http://www.youtube.com/watch?v=Zk7dDekYej0                   | http://www.youtube.com/ |
+
+
+    Scenario Outline: Get multiple provider_urls
+        Given an embedly endpoint
+        When oembed is called with the <urls> URLs
+        Then provider_url should be <provider_urls>
+
+        Examples:
+            | urls                                                                                      | provider_urls                                 |
+            | http://www.scribd.com/doc/13994900/Easter,http://www.scribd.com/doc/28452730/Easter-Cards | http://www.scribd.com/,http://www.scribd.com/ |
+            | http://www.youtube.com/watch?v=Zk7dDekYej0,http://plixi.com/p/16044847                    | http://www.youtube.com/,http://plixi.com      |
+
+
+    Scenario Outline: Get the provider_url with pro
+        Given an embedly endpoint with key
+        When oembed is called with the <url> URL
+        Then the provider_url should be <provider_url>
+
+        Examples:
+            | url                                                                              | provider_url               |
+            | http://blog.embed.ly/bob                                                         | http://posterous.com       |
+            | http://blog.doki-pen.org/cassandra-rules                                         | http://posterous.com       |
+            | http://www.guardian.co.uk/media/2011/jan/21/andy-coulson-phone-hacking-statement | http://www.guardian.co.uk/ |
+
+
+    Scenario Outline: Attempt to get 404 URL
+        Given an embedly endpoint
+        When oembed is called with the <url> URL
+        Then type should be error
+        And error_code should be 404
+        And type should be error
+
+        Examples:
+            | url                                                              |
+            | http://www.youtube.com/this/is/a/bad/url                         |
+            | http://blog.embed.ly/lsbsdlfldsf/asdfkljlas/klajsdlfkasdf        |
+            | http://tweetphoto.com/alsdfldsf/asdfkljlas/klajsdlfkasdf         |
+        
+
+    Scenario Outline: Attempt multi get 404 URLs
+        Given an embedly endpoint
+        When oembed is called with the <urls> URLs
+        Then error_code should be <errcode>
+        And type should be <types>
+
+        Examples:
+            | urls                                                                             | errcode  | types       |
+            | http://www.youtube.com/this/is/a/bad/url,http://blog.embed.ly/alsd/slsdlf/asdlfj | 404,404  | error,error |
+            | http://blog.embed.ly/lsbsdlfldsf/asdf/kl,http://tweetphoto.com/asdf/asdf/asdfl   | 404,404  | error,error |
+            | http://blog.embed.ly/lsbsdlfldsf/asdf/kl,http://tweetphoto.com/14784358          | 404,None | error,photo |
+            | http://tweetphoto.com/14784358,http://www.scribd.com/asdf/asdf/asdfasdf          | None,404 | photo,error |
+        

features/steps.py

@@ -0,0 +1,44 @@
+from os import environ
+
+from freshen import *
+
+from embedly.client import Embedly
+
+@Given("an embedly endpoint( [^\s]+)?( with key)?$")
+def init_api(domain, key_enabled):
+  opts = {}
+
+  if domain:
+     opts['domain'] = domain
+
+  if key_enabled:
+    if not environ.get('EMBEDLY_KEY'):
+        raise RuntimeError('Please set env variable $EMBEDLY_KEY')
+    opts['key'] = environ["EMBEDLY_KEY"]
+
+  scc.api = Embedly(**opts)
+
+@When("(\w+) is called with the (.*) URLs?( and ([^\s]+) flag)?$")
+def call_urls(method, urls, _, flag):
+  urls = urls.split(',')
+  opts = {}
+  if len(urls) == 1:
+    opts['url_or_urls'] = urls[0]
+  else:
+    opts['url_or_urls'] = urls
+
+  if flag:
+      opts[flag] = 'true'
+
+  scc.result = getattr(scc.api, method)(**opts)
+
+@Then("(the )?([^\s]+) should be ([^\s]+)")
+def check_value(_, key, value):
+  if type(scc.result) == list:
+    r = []
+    for o in scc.result:
+      r.append(str(o.get(key)))
+    assert_equal(','.join(r), value)
+
+  else:
+    assert_equal(str(scc.result.get(key)), value)