URL Composer fixes

thumbor · Oct 24, 2012 · 6dd10b3 · 6dd10b3
1 parent 6ab7c3c
commit 6dd10b3
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 4 deletions.
diff --git a/thumbor/url_composer.py b/thumbor/url_composer.py
@@ -85,6 +85,7 @@ def main(arguments=None):
                             parsed_options.vertical_flip,
                             parsed_options.halign,
                             parsed_options.valign,
+                            parsed_options.trim,
                             crop_left,
                             crop_top,
                             crop_right,
@@ -125,6 +126,7 @@ def main(arguments=None):
         print 'Signed URL:'
 
     print url
+    return url
 
 if __name__ == '__main__':
     main(sys.argv[1:])
diff --git a/vows/crypto_vows.py b/vows/crypto_vows.py
@@ -159,6 +159,7 @@ def should_equal_encrypted_string(self, (topic, expected)):
     'flip_vertical': False,
     'halign': 'center',
     'valign': 'middle',
+    'trim': '',
     'crop_left': 0,
     'crop_top': 0,
     'crop_right': 0,

diff --git a/vows/url_composer_vows.py b/vows/url_composer_vows.py
@@ -22,9 +22,28 @@ def topic(self):
         def should_be_null(self, topic):
             expect(topic).to_be_null()
 
+    class WhenProperArguments(Vows.Context):
+        def topic(self):
+            return main([
+                "-k", "MY-SECURITY-KEY",
+                "-w", "200",
+                "-e", "300",
+                "myserver.com/myimg.jpg"
+            ])
+
+        def should_be_proper_url(self, topic):
+            expect(topic).to_equal('/G_dykuWBGyEil5JnNh9cBke0Ajo=/200x300/myserver.com/myimg.jpg')
+
+    class WhenOldFormat(Vows.Context):
+        def topic(self):
+            return main([
+                "-k", "MY-SECURITY-KEY",
+                "-w", "200",
+                "-e", "300",
+                "--old-format",
+                "myserver.com/myimg.jpg"
+            ])
 
-    #class WhenImagePassed(Vows.Context):
+        def should_be_proper_url(self, topic):
-        #def topic(self):
+            expect(topic).to_equal('/6LSog0KmY0NQg8GK4Tsti0FAR9emvaF4xfyLY3FUmOI0HVcqF8HxibsAjVCbxFfl/myserver.com/myimg.jpg')
-            #return main([
 
-            #])