continuing to phase out api class

4 files changed, 45 insertions, 51 deletions

diff --git a/example.py b/example.py
index fa97a75..0bafc8b 100755
--- a/example.py
+++ b/example.py
@@ -3,7 +3,7 @@ from ricky.pbgradient import PbGradient
 from ricky.pbbreaker import PbBreaker
 from ricky.pbgrid import PbGrid
 from ricky.pbpattern import PbPattern
-
+import ricky.utils as utils
 
 api = PbGradient()
 params = api.params_init()
@@ -11,7 +11,7 @@ params.randomize()
 print params
 #print params
 #print params.execute()
-data = api.data_from_url(
+data = utils.data_from_url(
     "http://i.asdf.us/im/8f/PbGradientblue4-DarkGreen_1448917630.png"
 )
 params.from_dict(data['params'])
diff --git a/ricky/params.py b/ricky/params.py
index b12902a..5ba90c0 100644
--- a/ricky/params.py
+++ b/ricky/params.py
@@ -3,7 +3,8 @@ import pprint
 import simplejson as json
 import sys
 import os
-from ricky.config import PROBABILITIES_DIR
+from ricky.config import PROBABILITIES_DIR, OFFLINE
+import ricky.utils as utils
 
 
 class Params(object):
@@ -74,7 +75,21 @@ class Params(object):
 
     def execute(self):
         """calls the associated api"""
-        return self.api.call(self)
+        if OFFLINE:
+            sys.path.append("./photoblaster")
+            from photoblaster.modules import Pb as _Pb
+            from photoblaster.config import LOCAL as PBLOCAL
+            for pbcls in _Pb.__subclasses__():
+                if pbcls.__name__ == self.__class__.__name__:
+                    params_dict = self.as_dict()
+                    instance = pbcls(**params_dict)
+                    instance.create()
+                    if not PBLOCAL:
+                        instance.file_s3move()
+                    return instance.file_dict()
+        return json.loads(
+            utils.http_request(self._url, params=self.as_dict())
+        )
 
     def as_dict(self):
         """displays the params names and values in dictionary form
diff --git a/ricky/pb.py b/ricky/pb.py
index 10d9504..fe0cb0f 100644
--- a/ricky/pb.py
+++ b/ricky/pb.py
@@ -1,49 +1,3 @@
-import os
-import sys
-import simplejson as json
-from ricky.config import OFFLINE, PB_DATA_URL
-import ricky.utils as utils
-
-
 class Pb(object):
     def __init__(self):
-        self.url = ""
-        self._offline = OFFLINE
-
-    def call(self, params):
-        if self._offline:
-            sys.path.append("./photoblaster")
-            from photoblaster.modules import Pb as _Pb
-            from photoblaster.config import LOCAL as PBLOCAL
-            for pbcls in _Pb.__subclasses__():
-                if pbcls.__name__ == self.__class__.__name__:
-                    params_dict = params.as_dict()
-                    instance = pbcls(**params_dict)
-                    instance.create()
-                    if not PBLOCAL:
-                        instance.file_s3move()
-                    return instance.file_dict()
-        return json.loads(
-            utils.http_request(params._url, params=params.as_dict())
-        )
-
-    def data_from_url(self, url):
-        """
-        retrieves image params from db using the url
-        """
-        newfile = os.path.split(url)[-1]
-        if self._offline:
-            sys.path.append("./photoblaster")
-            from photoblaster.db.models.imcmd import ImCmd
-            result = ImCmd.search(newfile=newfile).first()
-            try:
-                return {
-                    "module": result.tag.split(":")[0],
-                    "params": json.loads(result.dataobj)
-                }
-            except AttributeError:
-                sys.stderr.write("No usable data found in db\n")
-                return None
-        else:
-            print utils.http_request("%s?newfile=%s" % (PB_DATA_URL, newfile))
-            raise NotImplementedError("Not yet implemented\n")
+        pass
diff --git a/ricky/utils.py b/ricky/utils.py
index e887fa0..04e2074 100644
--- a/ricky/utils.py
+++ b/ricky/utils.py
@@ -1,6 +1,31 @@
+import os
 import sys
 import urllib
 import urllib2
+import simplejson as json
+from ricky.config import OFFLINE, PB_DATA_URL
+
+
+def data_from_url(url):
+    """
+    retrieves image params from db using the url
+    """
+    newfile = os.path.split(url)[-1]
+    if OFFLINE:
+        sys.path.append("./photoblaster")
+        from photoblaster.db.models.imcmd import ImCmd
+        result = ImCmd.search(newfile=newfile).first()
+        try:
+            return {
+                "module": result.tag.split(":")[0],
+                "params": json.loads(result.dataobj)
+            }
+        except AttributeError:
+            sys.stderr.write("No usable data found in db\n")
+            return None
+    else:
+        print http_request("%s?newfile=%s" % (PB_DATA_URL, newfile))
+        raise NotImplementedError("Not yet implemented\n")
 
 
 def http_request(url, params={}):