Prefix PumpObject.add_link and .add_links with _

relates to #61

CHANGELOG.md

@@ -1,5 +1,6 @@
 0.6
 ===
+- PumpObject.add_link and .add_links renamed to ._add_link and ._add_links
 - Recipients can now be set for Comment, Person objects
 - Recipient properties (.to, .cc, .bto, .bcc) has been moved from Activity to Activity.obj
 - Feeds (inbox, followers, etc) can now be sliced by object or object_id.

pypump/models/__init__.py

@@ -117,40 +117,40 @@ def __str__(self):
     def _striptags(self, html):
         return re.sub(r'<[^>]+>', '', html)
 
-    def add_link(self, name, link):
+    def _add_link(self, name, link):
         """ Adds a link to the model """
 
         self.links[name] = link
         return True
 
-    def add_links(self, links, key="href", proxy_key="proxyURL", endpoints=None):
+    def _add_links(self, links, key="href", proxy_key="proxyURL", endpoints=None):
         """ Parses and adds block of links """
         if endpoints is None:
             endpoints = ["likes", "replies", "shares", "self", "followers",
                          "following", "lists", "favorites", "members"]
 
         if links.get("links"):
             for endpoint in links['links']:
-                self.add_link(endpoint, links['links'][endpoint]["href"])
+                self._add_link(endpoint, links['links'][endpoint]["href"])
 
         for endpoint in endpoints:
             if links.get(endpoint, None) is None:
                 continue
 
             if "pump_io" in links[endpoint]:
-                self.add_link(endpoint, links[endpoint]["pump_io"][proxy_key])
+                self._add_link(endpoint, links[endpoint]["pump_io"][proxy_key])
             elif "url" in links[endpoint]:
-                self.add_link(endpoint, links[endpoint]["url"])
+                self._add_link(endpoint, links[endpoint]["url"])
             else:
-                self.add_link(endpoint, links[endpoint][key])
+                self._add_link(endpoint, links[endpoint][key])
 
         return self.links
 
     def unserialize(self, data):
         Mapper(pypump=self._pump).parse_map(self, mapping=PumpObject._mapping,
                                             ignore_attr=PumpObject._ignore_attr,
                                             data=data)
-        self.add_links(data)
+        self._add_links(data)
         return self
 
 class Mapper(object):

pypump/models/activity.py

@@ -66,7 +66,7 @@ def unserialize(self, data):
                 data["object"][key] = data[key]
 
         Mapper(pypump=self._pump).parse_map(self, data=data)
-        self.add_links(data)
+        self._add_links(data)
 
         return self
 

pypump/models/collection.py

@@ -83,7 +83,7 @@ def __repr__(self):
 
     def unserialize(self, data):
         Mapper(pypump=self._pump).parse_map(self, data=data)
-        self.add_links(data)
+        self._add_links(data)
         return self
 
 

pypump/models/comment.py

@@ -80,6 +80,6 @@ def serialize(self):
     def unserialize(self, data):
         """ from JSON -> Comment """
         Mapper(pypump=self._pump).parse_map(self, data=data)
-        self.add_links(data)
+        self._add_links(data)
         return self
 

pypump/models/feed.py

@@ -267,7 +267,7 @@ def _request(self, url, offset=None, since=None, before=None):
 
     def unserialize(self, data={}):
         Mapper(pypump=self._pump).parse_map(self, data=data)
-        self.add_links(data)
+        self._add_links(data)
         self.url = data.get('pump_io', {}).get('proxyURL') or self.url
         return self
 

pypump/models/image.py

@@ -145,6 +145,6 @@ def get_fileurl(data):
                 width=thumbnail.get("width")
             ))
         Mapper(pypump=self._pump).parse_map(self, data=data)
-        self.add_links(data)
+        self._add_links(data)
 
         return self

pypump/models/note.py

@@ -80,5 +80,5 @@ def __unicode__(self):
     def unserialize(self, data):
         """ Goes from JSON -> Note object """
         Mapper(pypump=self._pump).parse_map(self, data=data)
-        self.add_links(data)
+        self._add_links(data)
         return self

pypump/models/person.py

@@ -112,7 +112,7 @@ def __init__(self, webfinger=None, summary=None, username=None,
             self.image = image #TODO set proper image object
             self.location = location #TODO set proper Place object
 
-            self.add_link('self', "{0}://{1}/api/user/{2}/profile".format(
+            self._add_link('self', "{0}://{1}/api/user/{2}/profile".format(
                 self._pump.protocol, self.server, self.username)
             )
             try:
@@ -164,6 +164,6 @@ def unserialize(self, data):
         """ Goes from JSON -> Person object """
 
         Mapper(pypump=self._pump).parse_map(self, data=data)
-        self.add_links(data)
+        self._add_links(data)
 
         return self