all apis added

3 files changed, 176 insertions, 10 deletions

diff --git a/lib/imgrid_params_defaults.py b/lib/imgrid_params_defaults.py
index cc84546..57c1f95 100644
--- a/lib/imgrid_params_defaults.py
+++ b/lib/imgrid_params_defaults.py
@@ -4,7 +4,7 @@ from config import USERNAME, TEST_URL
 from lib.utils import Pb_Api_Params
 
 
-class ImGradientParams_FromDefaults(Pb_Api_Params):
+class ImGridParams_FromDefaults(Pb_Api_Params):
     def __init__(self):
         self.weighted_width = [
             { "value" : 400, "weight" : 1 }, 
@@ -33,7 +33,7 @@ class ImGradientParams_FromDefaults(Pb_Api_Params):
             {"value":random.randint(1,200),  "weight": 1},
         ]
         self.weighted_opacity = [
-            {"value":1.0,  "weight": 2},
+            {"value":1,  "weight": 2},
             {"value":0.5,  "weight": 1},
             {"value":float(random.randint(0,10)/10.0),  "weight": 1},
         ]
@@ -71,20 +71,20 @@ class ImGradientParams_FromDefaults(Pb_Api_Params):
             {"value": random.randint(-180,180),   "weight": 1},
         ]
         self.weighted_zoom = [
-            {"value": "",  "weight": 3},
-            {"value": random.randint(1,12),   "weight": 1},
-            {"value": random.randint(-1,-12),   "weight": 1},
+            {"value": 0,  "weight": 3},
+            {"value": float(random.randint(1,12)/2.0),   "weight": 1},
+            {"value": float(random.randint(-12,-1)/2.0),   "weight": 1},
         ]
         self.weighted_trim = [
             {"value":"",  "weight": 1},
             {"value":"true",   "weight": 1},
         ]
         self.weighted_transition = [
-            { "value" : "background", weight: 1 },
-            { "value" : "dither", weight: 1 },
-            { "value" : "random", weight: 1 },
-            { "value" : "tile", weight: 1 },
-            { "value" : "edge", weight: 1 },
+            { "value" : "background", "weight": 1 },
+            { "value" : "dither", "weight": 1 },
+            { "value" : "random", "weight": 1 },
+            { "value" : "tile", "weight": 1 },
+            { "value" : "edge", "weight": 1 },
         ]
         self.weighted_format = [
             {"value":"png",  "weight": 5},
diff --git a/lib/impattern_params_defaults.py b/lib/impattern_params_defaults.py
new file mode 100644
index 0000000..60a1d81
--- /dev/null
+++ b/lib/impattern_params_defaults.py
@@ -0,0 +1,165 @@
+#!/usr/bin/python2.7
+import random
+from config import USERNAME, TEST_URL
+from lib.utils import Pb_Api_Params
+PATTERN_URL_BASE =  "http://asdf.us/impattern/patterns"
+class ImBreakParams_FromDefaults(Pb_Api_Params):
+#            "pattern_url",
+#            "pattern_data",
+#            "username",
+#            "image_url",
+    def __init__(self):
+        self.weighted_pattern_url = [
+#{{{pattern urls
+            { "value":"1.png", "weight":1 },
+            { "value":"10.png", "weight":1 },
+            { "value":"11.png", "weight":1 },
+            { "value":"12.png", "weight":1 },
+            { "value":"13.png", "weight":1 },
+            { "value":"14.png", "weight":1 },
+            { "value":"15.png", "weight":1 },
+            { "value":"16.png", "weight":1 },
+            { "value":"17.png", "weight":1 },
+            { "value":"18.png", "weight":1 },
+            { "value":"19.png", "weight":1 },
+            { "value":"2.png", "weight":1 },
+            { "value":"20.png", "weight":1 },
+            { "value":"21.png", "weight":1 },
+            { "value":"22.png", "weight":1 },
+            { "value":"23.png", "weight":1 },
+            { "value":"24.png", "weight":1 },
+            { "value":"25.png", "weight":1 },
+            { "value":"26.png", "weight":1 },
+            { "value":"27.png", "weight":1 },
+            { "value":"28.png", "weight":1 },
+            { "value":"29.png", "weight":1 },
+            { "value":"3.png", "weight":1 },
+            { "value":"30.png", "weight":1 },
+            { "value":"31.png", "weight":1 },
+            { "value":"32.png", "weight":1 },
+            { "value":"33.png", "weight":1 },
+            { "value":"34.png", "weight":1 },
+            { "value":"35.png", "weight":1 },
+            { "value":"36.png", "weight":1 },
+            { "value":"37.png", "weight":1 },
+            { "value":"38.png", "weight":1 },
+            { "value":"39.png", "weight":1 },
+            { "value":"4.png", "weight":1 },
+            { "value":"40.png", "weight":1 },
+            { "value":"41.png", "weight":1 },
+            { "value":"42.png", "weight":1 },
+            { "value":"43.png", "weight":1 },
+            { "value":"44.png", "weight":1 },
+            { "value":"45.png", "weight":1 },
+            { "value":"46.png", "weight":1 },
+            { "value":"47.png", "weight":1 },
+            { "value":"48.png", "weight":1 },
+            { "value":"49.png", "weight":1 },
+            { "value":"5.png", "weight":1 },
+            { "value":"50.png", "weight":1 },
+            { "value":"51.png", "weight":1 },
+            { "value":"52.png", "weight":1 },
+            { "value":"53.png", "weight":1 },
+            { "value":"54.png", "weight":1 },
+            { "value":"55.png", "weight":1 },
+            { "value":"56.png", "weight":1 },
+            { "value":"57.png", "weight":1 },
+            { "value":"58.png", "weight":1 },
+            { "value":"59.png", "weight":1 },
+            { "value":"6.png", "weight":1 },
+            { "value":"60.png", "weight":1 },
+            { "value":"61.png", "weight":1 },
+            { "value":"62.png", "weight":1 },
+            { "value":"63.png", "weight":1 },
+            { "value":"64.png", "weight":1 },
+            { "value":"65.png", "weight":1 },
+            { "value":"66.png", "weight":1 },
+            { "value":"67.png", "weight":1 },
+            { "value":"68.png", "weight":1 },
+            { "value":"69.png", "weight":1 },
+            { "value":"7.png", "weight":1 },
+            { "value":"70.png", "weight":1 },
+            { "value":"71.png", "weight":1 },
+            { "value":"72.png", "weight":1 },
+            { "value":"73.png", "weight":1 },
+            { "value":"74.png", "weight":1 },
+            { "value":"75.png", "weight":1 },
+            { "value":"76.png", "weight":1 },
+            { "value":"77.png", "weight":1 },
+            { "value":"78.png", "weight":1 },
+            { "value":"79.png", "weight":1 },
+            { "value":"8.png", "weight":1 },
+            { "value":"80.png", "weight":1 },
+            { "value":"81.png", "weight":1 },
+            { "value":"82.png", "weight":1 },
+            { "value":"83.png", "weight":1 },
+            { "value":"84.png", "weight":1 },
+            { "value":"85.png", "weight":1 },
+            { "value":"86.png", "weight":1 },
+            { "value":"87.png", "weight":1 },
+            { "value":"88.png", "weight":1 },
+            { "value":"89.png", "weight":1 },
+            { "value":"9.png", "weight":1 },
+            { "value":"90.png", "weight":1 },
+            { "value":"91.png", "weight":1 },
+            { "value":"92.png", "weight":1 },
+            { "value":"93.png", "weight":1 },
+            { "value":"94.png", "weight":1 },
+            { "value":"95.png", "weight":1 },
+            { "value":"96.png", "weight":1 },
+            { "value":"a0.png", "weight":1 },
+            { "value":"a1.png", "weight":1 },
+            { "value":"a10.png", "weight":1 },
+            { "value":"a11.png", "weight":1 },
+            { "value":"a12.png", "weight":1 },
+            { "value":"a13.png", "weight":1 },
+            { "value":"a14.png", "weight":1 },
+            { "value":"a15.png", "weight":1 },
+            { "value":"a16.png", "weight":1 },
+            { "value":"a17.png", "weight":1 },
+            { "value":"a18.png", "weight":1 },
+            { "value":"a19.png", "weight":1 },
+            { "value":"a2.png", "weight":1 },
+            { "value":"a20.png", "weight":1 },
+            { "value":"a21.png", "weight":1 },
+            { "value":"a22.png", "weight":1 },
+            { "value":"a23.png", "weight":1 },
+            { "value":"a24.png", "weight":1 },
+            { "value":"a25.png", "weight":1 },
+            { "value":"a26.png", "weight":1 },
+            { "value":"a27.png", "weight":1 },
+            { "value":"a28.png", "weight":1 },
+            { "value":"a29.png", "weight":1 },
+            { "value":"a3.png", "weight":1 },
+            { "value":"a30.png", "weight":1 },
+            { "value":"a31.png", "weight":1 },
+            { "value":"a32.png", "weight":1 },
+            { "value":"a33.png", "weight":1 },
+            { "value":"a34.png", "weight":1 },
+            { "value":"a35.png", "weight":1 },
+            { "value":"a36.png", "weight":1 },
+            { "value":"a37.png", "weight":1 },
+            { "value":"a38.png", "weight":1 },
+            { "value":"a39.png", "weight":1 },
+            { "value":"a4.png", "weight":1 },
+            { "value":"a40.png", "weight":1 },
+            { "value":"a41.png", "weight":1 },
+            { "value":"a5.png", "weight":1 },
+            { "value":"a6.png", "weight":1 },
+            { "value":"a7.png", "weight":1 },
+            { "value":"a8.png", "weight":1 },
+            { "value":"a9.png", "weight":1 },
+#}}}
+        ]
+    def from_random(self, url=TEST_URL):
+        return {
+            "image_url" : url,
+            "username" : USERNAME, 
+            "pattern_url" : "{}/{}".format(PATTERN_URL_BASE, self._weighted_choice( self.weighted_pattern_url )),
+        }
+    def from_default(self, url=TEST_URL):
+        return {
+            "image_url" : url,
+            "username" : USERNAME, 
+            "pattern_url" : "{}/{}".format(PATTERN_URL_BASE, self._default_choice( self.weighted_pattern_url )),
+        }
diff --git a/lib/utils.py b/lib/utils.py
index 0ad9aa3..78a7b1f 100644
--- a/lib/utils.py
+++ b/lib/utils.py
@@ -4,6 +4,7 @@ import sys
 import random
 def post_request(url, params):
     params = urllib.urlencode(params)
+    sys.stderr.write(params)
     headers = {
         "Content-type": "application/x-www-form-urlencoded",
         "User-Agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/40.0.2214.94 Safari/537.36",