Merge lp:~robru/libfriends/urlshorten into lp:libfriends

[Robert Bruce Park]

This syncs up lp:libfriends with lp:~robru/friends/urlshorten.

[Ken VanDine (ken-vandine)]

Looks good! Now that Friends.Service has tests, please add a test for urlshorten to tests/vala/test-service.vala.

review: Needs Fixing

[lp:~robru/libfriends/urlshorten]

37. By Robert Bruce Park on 2013-01-08

Merge trunk and add test coverage for urlshorten.

[Robert Bruce Park (robru)]

Ok, so I had to remove some instances of service.do() from the example file, and in the process I discovered that we were missing service.retweet, so I had to add those in order for this to even compile, but it looks good now so please merge ;-)

review: Approve

[Ken VanDine (ken-vandine)]

Thanks!

review: Approve

[Ken VanDine (ken-vandine)]

Thanks!

review: Approve

=== modified file 'examples/example-vala.vala'
--- examples/example-vala.vala	2013-01-07 21:28:53 +0000
+++ examples/example-vala.vala	2013-01-08 22:23:20 +0000
@@ -69,7 +69,7 @@
                         uint acct = int.parse(args[i+1]);
                         string id = args[i+2];
                         stdout.printf("Liked...\n");
-                        service.do("like", acct, id);
+                        service.like(acct, id);
                     } else {
                         PrintUsage ();
                     }
@@ -82,7 +82,7 @@
                         uint acct = int.parse(args[i+1]);
                         string id = args[i+2];
                         stdout.printf("Unliked...\n");
-                        service.do("unlike", acct, id);
+                        service.unlike(acct, id);
                     } else {
                         PrintUsage ();
                     }
@@ -95,7 +95,7 @@
                         uint acct = int.parse(args[i+1]);
                         string id = args[i+2];
                         stdout.printf("Retweet...\n");
-                        service.do("retweet", acct, id);
+                        service.retweet(acct, id);
                     } else {
                         PrintUsage ();
                     }
@@ -126,7 +126,7 @@
                 return;
             }
             for(int i=1; i<args.length; i++) {
-                if (args[i] == "--send-message") 
+                if (args[i] == "--send-message")
                     if (args[i+1] != null && args[i+2] != null) {
                         string message = args[i+1];
                         uint acct = int.parse(args[i+2]);

=== modified file 'gtk/entry.vala'
--- gtk/entry.vala	2013-01-07 15:41:30 +0000
+++ gtk/entry.vala	2013-01-08 22:23:20 +0000
@@ -75,7 +75,7 @@
     /**
      * Widget that displays an entry which posts status updates to
      * your social network accounts using friends-service. The entry
-     * is very simple and does not include any of the frills 
+     * is very simple and does not include any of the frills
      * of {@link FriendsGtk.Entry}.
      *
      * @since 0.1
@@ -122,7 +122,6 @@
          * {@link Friends.Service}
          */
         private Friends.Service service;
-        private Friends.URLShorten urlshorten;
 
         private Gdk.Color fg_color;
         private Gdk.Color error_color;
@@ -147,7 +146,6 @@
         construct
         {
             service = new Friends.Service ();
-            urlshorten = new Friends.URLShorten ();
 
             unowned Gtk.BindingSet binding_set;
             binding_set = Gtk.BindingSet.by_class (typeof (InputTextView).class_ref ());
@@ -253,7 +251,7 @@
             {
                 var buf = get_buffer ();
                 Signal.stop_emission_by_name (buf, "insert-text") ;
-                var shrt = urlshorten.shorten (text);
+                var shrt = service.shorten (text);
                 last_was_shortened = true;
                 buf.insert (ref iter, shrt, -1);
             }

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2012-12-10 20:46:09 +0000
+++ src/Makefile.am	2013-01-08 22:23:20 +0000
@@ -6,7 +6,6 @@
 
 libfriends_la_SOURCES = \
 	service.vala \
-	urlshorten.vala \
 	utils.vala \
 	$(NULL)
 

=== modified file 'src/service.vala'
--- src/service.vala	2013-01-08 22:23:20 +0000
+++ src/service.vala	2013-01-08 22:23:20 +0000
@@ -27,6 +27,7 @@
         public abstract void Do (string action, string account_id, string message_id) throws GLib.IOError;
         public abstract async void Upload (string account_id, string uri, string description, out string result_url) throws GLib.IOError;
         public abstract void ClearIndicators () throws GLib.IOError;
+        public abstract string URLShorten (string url) throws GLib.IOError;
         public abstract string GetFeatures (string protocol) throws GLib.IOError;
         public signal void ConnectionOffline ();
         public signal void ConnectionOnline ();
@@ -225,6 +226,25 @@
         }
 
         /**
+         * Retweet an existing tweet.
+         *
+         * @param account_id The {@link Ag.Account.id} to fetch.
+         * @param message_id The id of the message you want to reshare.
+         * @return ``true`` for success, ``false`` otherwise
+         *
+         * @since 0.1
+         */
+        public bool retweet(uint account_id, string message_id)
+        {
+            try {
+                return do("retweet", account_id.to_string(), message_id);
+            } catch (GLib.Error e) {
+                warning (e.message);
+            }
+            return false;
+        }
+
+        /**
          * Fetch the messages from the user's "home" screen. On
          * Facebook and Twitter this maps to the main feed you see on
          * the front page; public posts by people you follow but not
@@ -370,6 +390,27 @@
         }
 
         /**
+         * Pass any URL to this method and it will shorten it for you.
+         *
+         * @param url The long URL you need shortened.
+         * @return The shortened URL.
+         *
+         * @since 0.1
+         */
+        public string shorten(string url)
+        {
+            try
+            {
+                return service.URLShorten(url);
+            }
+            catch (GLib.IOError e)
+            {
+                warning (e.message);
+                return url;
+            }
+        }
+
+        /**
          * This method returns a list of all the possible actions
          * supported by a given protocol. This can be used to
          * determine what actions can be triggered by the ``do``

=== removed file 'src/urlshorten.vala'
--- src/urlshorten.vala	2013-01-04 23:30:46 +0000
+++ src/urlshorten.vala	1970-01-01 00:00:00 +0000
@@ -1,70 +0,0 @@
-/*
- * Copyright(C) 2012 Canonical Ltd.
- *
- * This library is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License
- * version 3.0 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3.0 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see
- * <http://www.gnu.org/licenses/>.
- *
- * Authored by Ken VaDine <[e-mail]>
- */
-
-[DBus (name = "com.canonical.Friends.URLShorten")]
-private interface URLShortenInterface : Object {
-        public abstract string Shorten (string url) throws GLib.IOError;
-}
-
-[CCode (gir_namespace = "Friends", gir_version = "0.1")]
-namespace Friends
-{
-    public class URLShorten : Object
-    {
-        private const string url_name  = "com.canonical.Friends.URLShorten";
-        private const string url_path  = "/com/canonical/friends/URLShorten";
-
-        private URLShortenInterface url_service;
-
-        construct
-        {
-            try
-            {
-                url_service = Bus.get_proxy_sync(BusType.SESSION,
-                                                  url_name,
-                                                  url_path);
-            }
-            catch (GLib.IOError e)
-            {
-                warning ("Unable to get Friends URLShorten: "+e.message);
-            }
-        }
-
-
-        /**
-         * Pass any URL to this method and it will shorten it for you.
-         *
-         * @param url The long URL you need shortened.
-         *
-         * @since 0.1
-         */
-        public string shorten(string url)
-        {
-            try
-            {
-                return url_service.Shorten(url);
-            }
-            catch (GLib.IOError e)
-            {
-                warning (e.message);
-                return "Failed";
-            }
-        }
-    }
-}

=== modified file 'tests/vala/test-service.vala'
--- tests/vala/test-service.vala	2013-01-08 21:47:44 +0000
+++ tests/vala/test-service.vala	2013-01-08 22:23:20 +0000
@@ -27,7 +27,7 @@
         {
             var dbusmock = new DBusMock ();
             /* Add mock methods to the dbus interface for testing
-             * python-dbusmock docs can be found at 
+             * python-dbusmock docs can be found at
              * http://bazaar.launchpad.net/~pitti/python-dbusmock/trunk/view/head:/README.rst
              */
             dbusmock.add_method ("Refresh", "", "", "");
@@ -38,6 +38,7 @@
             dbusmock.add_method ("Do", "sss", "", "");
             dbusmock.add_method ("Upload", "sss", "s", "ret = 'https://something.com/test.jpg'");
             dbusmock.add_method ("ClearIndicators", "", "", "");
+            dbusmock.add_method ("URLShorten", "s", "s", "ret = 'http://is.gd/short'");
 
             GLib.Test.add_data_func ("/Unit/Friends/Service/Refresh",
                                      ServiceSuite.test_refresh);
@@ -56,7 +57,8 @@
                                      ServiceSuite.test_send_reply);
             GLib.Test.add_data_func ("/Unit/Friends/Service/ClearIndicators",
                                      ServiceSuite.test_clear_indicators);
-
+            GLib.Test.add_data_func ("/Unit/Friends/Service/URLShorten",
+                                     ServiceSuite.test_url_shorten);
         }
 
         internal static void test_refresh ()
@@ -195,5 +197,23 @@
             }
             assert (success == true);
         }
+
+        internal static void test_url_shorten ()
+        {
+            var service = new Friends.Service ();
+            bool success = false;
+            string result = "";
+            try
+            {
+                result = service.shorten ("http://example.com/really/really/long");
+                success = true;
+            }
+            catch (GLib.IOError e)
+            {
+                warning ("Failed to shorten URL - %s", e.message);
+            }
+            assert (success == true);
+            assert (result == "http://is.gd/short");
+        }
     }
 }