Adding sendLocation, its tests and minor fixes

leandrotoledo · leandrotoledo · commit 86c1f684196d · 2015-07-08T09:37:25.000-03:00
diff --git a/telegram/__init__.py b/telegram/__init__.py
@@ -17,7 +17,7 @@
 from sticker import Sticker
 from video import Video
 # from contact import Contact
-# from location import Location
+from location import Location
 # from inputfile import InputFile
 # from userprofilephotos import UserProfilePhotos
 # from replykeyboardmarkup import ReplyKeyboardMarkup
diff --git a/telegram/bot.py b/telegram/bot.py
@@ -313,9 +313,47 @@ def sendVideo(self,
 
         return Message.newFromJsonDict(data)
 
-    def sendLocation(self):
+    def sendLocation(self,
+                     chat_id,
+                     latitude,
+                     longitude,
+                     reply_to_message_id=None,
+                     reply_markup=None):
+        """Use this method to send point on the map.
+
+        Args:
+          chat_id:
+            Unique identifier for the message recipient — User or GroupChat id.
+          latitude:
+            Latitude of location.
+          longitude:
+            Longitude of location.
+          reply_to_message_id:
+            If the message is a reply, ID of the original message. [Optional]
+          reply_markup:
+            Additional interface options. A JSON-serialized object for a
+            custom reply keyboard, instructions to hide keyboard or to force a
+            reply from the user. [Optional]
+        Returns:
+          A telegram.Message instance representing the message posted.
+        """
+
         url = '%s/sendLocation' % (self.base_url)
 
+        data = {'chat_id': chat_id,
+                'latitude': latitude,
+                'longitude': longitude}
+
+        if reply_to_message_id:
+            data['reply_to_message_id'] = reply_to_message_id
+        if reply_markup:
+            data['reply_markup'] = reply_markup
+
+        json_data = self._requestUrl(url, 'POST', data=data)
+        data = self._parseAndCheckTelegram(json_data.content)
+
+        return Message.newFromJsonDict(data)
+
     def sendChatAction(self):
         url = '%s/sendChatAction' % (self.base_url)
 
diff --git a/telegram/location.py b/telegram/location.py
@@ -0,0 +1,17 @@
+#!/usr/bin/env python
+
+
+class Location(object):
+    def __init__(self, **kwargs):
+        param_defaults = {
+            'longitude': None,
+            'latitude': None,
+        }
+
+        for (param, default) in param_defaults.iteritems():
+            setattr(self, param, kwargs.get(param, default))
+
+    @staticmethod
+    def newFromJsonDict(data):
+        return Location(longitude=data.get('longitude', None),
+                     latitude=data.get('latitude', None))
diff --git a/telegram/message.py b/telegram/message.py
@@ -29,6 +29,10 @@ def __init__(self, **kwargs):
 
         for (param, default) in param_defaults.iteritems():
             setattr(self, param, kwargs.get(param, default))
+    
+    @property
+    def chat_id(self):
+        return self.chat.id
 
     @staticmethod
     def newFromJsonDict(data):
@@ -91,6 +95,12 @@ def newFromJsonDict(data):
         else:
             video = None
 
+        if 'location' in data:
+            from telegram import Location
+            location = Location.newFromJsonDict(data['location'])
+        else:
+            location = None
+
         if 'new_chat_participant' in data:
             from telegram import User
             new_chat_participant = User.newFromJsonDict(
@@ -121,7 +131,7 @@ def newFromJsonDict(data):
                        sticker=sticker,
                        video=video,
                        contact=data.get('contact', None),
-                       location=data.get('location', None),
+                       location=location,
                        new_chat_participant=new_chat_participant,
                        left_chat_participant=left_chat_participant,
                        new_chat_title=data.get('new_chat_title', None),
diff --git a/telegram/user.py b/telegram/user.py
@@ -13,10 +13,6 @@ def __init__(self, **kwargs):
         for (param, default) in param_defaults.iteritems():
             setattr(self, param, kwargs.get(param, default))
 
-    @property
-    def chat_id(self):
-        return self.id
-
     @staticmethod
     def newFromJsonDict(data):
         return User(id=data.get('id', None),
diff --git a/tests/test_bot.py b/tests/test_bot.py
@@ -97,5 +97,14 @@ def testResendVideo(self):
         '''Test the telegram.Bot sendVideo method'''
         print 'Testing sendVideo - Resend'
         message = self._bot.sendVideo(video=str('BAADAQADIgEAAvjAuQABOuTB937fPTgC'),
-                                        chat_id=12173560)
+                                      chat_id=12173560)
         self.assertEqual(4, message.video.duration)
+
+    def testSendLocation(self):
+        '''Test the telegram.Bot sendLocation method'''
+        print 'Testing sendLocation'
+        message = self._bot.sendLocation(latitude=-23.558873,
+                                         longitude=-46.659732,
+                                         chat_id=12173560)
+        self.assertEqual(-23.558873, message.location.latitude)
+        self.assertEqual(-46.659732, message.location.longitude)
