still working on it

9 files changed, 20 insertions, 29 deletions

diff --git a/Pb_Api/ImPattern/Params.py b/Pb_Api/ImPattern/Params.py
index 9c86f7b..c308ed1 100644
--- a/Pb_Api/ImPattern/Params.py
+++ b/Pb_Api/ImPattern/Params.py
@@ -1,7 +1,8 @@
 #!/usr/bin/python2.7
 from Pb_Api.Params import Pb_Api_Params 
+from Pb_Api.Param import Pb_Api_Param
 from Pb_Api.Param.Username import Pb_Api_Param_Username
-from Pb_Api.Param.String import Pb_Api_Param_String
+from Pb_Api.Param.Image_Url import Pb_Api_Param_Image_Url
 from Pb_Api.Param.MultiSelect import Pb_Api_Param_MultiSelect
 
 pattern_url_options = [
@@ -13,6 +14,5 @@ class ImPattern_Params(Pb_Api_Params):
         self.params = [
            Pb_Api_Param_Username(name="username", required=1), 
            Pb_Api_Param_Image_Url(name="image_url", required=1),
-           Pb_Api_Param_MultiSelect(name="pattern_url", required=1, options=pattern_url_options
-           ),
+#           Pb_Api_Param_MultiSelect(name="pattern_url", required=1, options=pattern_url_options)
         ]
diff --git a/Pb_Api/ImPattern/__init__.py b/Pb_Api/ImPattern/__init__.py
index f05cee9..1c25913 100755
--- a/Pb_Api/ImPattern/__init__.py
+++ b/Pb_Api/ImPattern/__init__.py
@@ -1,19 +1,11 @@
 #!/usr/bin/python2.7
-import urllib
-import urllib2
-import simplejson as json
-import random
-import sys
-from lib.utils import post_request, Pb_Api
+from Pb_Api import Pb_Api
+from Pb_Api.ImPattern.Params import ImPattern_Params
 
 IMPATTERN_URL = "http://asdf.us/im/api/impattern"
 
-#ok what about here?
-
-class ImPattern(Pb_Api):
+class Pb_Api_ImPattern(Pb_Api):
     def __init__(self):
         self.url = IMPATTERN_URL
     def params(self):
         return ImPattern_Params() 
-
-
diff --git a/Pb_Api/Param/Image_Url.py b/Pb_Api/Param/Image_Url.py
index d199e11..59e7cbc 100644
--- a/Pb_Api/Param/Image_Url.py
+++ b/Pb_Api/Param/Image_Url.py
@@ -2,6 +2,6 @@ from config import TEST_URL
 from Pb_Api.Param.String import Pb_Api_Param_String
 
 class Pb_Api_Param_Image_Url(Pb_Api_Param_String): 
-    def __init__(self, options):
+    def __init__(self, *args, **kwargs):
       super(Pb_Api_Param_Image_Url, self).__init__(*args, **kwargs) 
       self.value(TEST_URL, autogenerated=1) 
diff --git a/Pb_Api/Param/MultiSelect.py b/Pb_Api/Param/MultiSelect.py
index c482dfd..da42802 100644
--- a/Pb_Api/Param/MultiSelect.py
+++ b/Pb_Api/Param/MultiSelect.py
@@ -1,14 +1,14 @@
 from Pb_Api.Param import Pb_Api_Param 
 
 class Pb_Api_Param_MultiSelect(Pb_Api_Param):
-    def __init__(self, options):
+    def __init__(self, *args, **kwargs):
       super(Pb_Api_Param_MultiSelect, self).__init__(*args, **kwargs) 
     def options(self):
-      return self.options
+      return self._options
     def value(self, *args):
       if len(args) > 1:
         valid = False
-        for i in self.options:
+        for i in self.options():
           if args[0] == i['value']: valid = True
         if not valid : raise ValueError 
         super(Pb_Api_Param_MultiSelect, self).value(args[0])
diff --git a/Pb_Api/Param/String.py b/Pb_Api/Param/String.py
index f7d873c..a1161a8 100644
--- a/Pb_Api/Param/String.py
+++ b/Pb_Api/Param/String.py
@@ -1,3 +1,4 @@
+from Pb_Api.Param import Pb_Api_Param
 class Pb_Api_Param_String(Pb_Api_Param): 
     def __init__(self, *args, **kwargs):
       super(Pb_Api_Param_String, self).__init__(*args, **kwargs)  
diff --git a/Pb_Api/Param/Username.py b/Pb_Api/Param/Username.py
index 80b445c..18d7041 100644
--- a/Pb_Api/Param/Username.py
+++ b/Pb_Api/Param/Username.py
@@ -2,6 +2,6 @@ from config import USERNAME
 from Pb_Api.Param.String import Pb_Api_Param_String
 
 class Pb_Api_Param_Username(Pb_Api_Param_String):
-    def __init__(self, options):
+    def __init__(self, *args, **kwargs):
       super(Pb_Api_Param_Username, self).__init__(*args, **kwargs) 
       self.value(USERNAME, autogenerated=1) 
diff --git a/Pb_Api/Param/__init__.py b/Pb_Api/Param/__init__.py
index af13a2a..edbfd53 100644
--- a/Pb_Api/Param/__init__.py
+++ b/Pb_Api/Param/__init__.py
@@ -1,8 +1,10 @@
 class Pb_Api_Param(object):
+    def __init__(self, *args, **kwargs):
+      self.value(args, kwargs)
     def name(self):
-      return self.name
+      return self._name
     def required(self):
-      return self.required
+      return self._required
 
     def manually_set(self, *args):
       if len(args) >= 1:
diff --git a/Pb_Api/__init__.py b/Pb_Api/__init__.py
index 14bf18e..ced9983 100644
--- a/Pb_Api/__init__.py
+++ b/Pb_Api/__init__.py
@@ -3,6 +3,7 @@ import urllib2
 import sys
 import random
 import simplejson as json
+import urllib2
 
 class Pb_Api:
     def __init__(self):
diff --git a/test2.py b/test2.py
index 4754b1c..7562b21 100644
--- a/test2.py
+++ b/test2.py
@@ -1,13 +1,8 @@
 #!/usr/bin/python2.7 
 from Pb_Api.ImPattern import Pb_Api_ImPattern
+import pprint
 
 p = Pb_Api_ImPattern()
 params = p.params()
-params.param("image_url").value("http://hello")
-pprint.pprint(params.as_hash()) 
-# for now
-#and then to call it, just below? yes are the params set, or do I pass them in?
-
-#p.call(params) #something like this?
-#and inside .call() you need to use .as_hash() to pass to post request. ok good
-#alright I'll test this on my own time. sort of a lot. Thanks again no problems
+#params.param("image_url").value("http://hello")
+#pprint.pprint(params.as_hash())