mediawiki-butt 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16daad9c28f5960f5820657cf6ec6b646976b0c0
-  data.tar.gz: f0a165472aad7b3864507a351581abeb40be25a5
+  metadata.gz: 7f401612e4a15f409ee096a93af7db54d7b1a622
+  data.tar.gz: 95f0582b2eb5c83c84ed37c911e2b17ae3f1684a
 SHA512:
-  metadata.gz: 1d944b95cea6f5b6319db90607a117288ec244def26000ce018b2d14301cc3c11b9c1ed49d36628d39cb8e2e300cbbd47d8437770be12affb7a5526716eeebaf
-  data.tar.gz: 0a82a742586f999f7dcbf1055fbbda20ff6c3b22f183cd249c045b0f960be0d36741b273b09d35736ff60700326573ef5d7ae7f2177fc1700f76fd7d2bb1d329
+  metadata.gz: 74a04d30b93a548662119f85118ba0b6261e7b8ed4bab1d57db7e8b0303cdee2e19d4b23548c9a5d499a4e16dde1554e37855b68a542ff5e70028f27063d1251
+  data.tar.gz: 4eaaa0362c1620c9e62c928f8d7916c204514b4b6ef745b12555cfdd6a20f1eda21f4a603cbbabb6b3618fe77a19958fc483cd82ed86b2d3235e2ec017986404

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 ## Version 1
+### Version 1.1.0
+* Support for the continuation API (Issue #9 and PR #47)
+
 ### Version 1.0.0
 * Important: MediaWiki::Butt now depends on Ruby 2.3. If you aren't using that yet, use it. It's worth it.
 * MediaWiki::Butt.new now takes two parameters, `url`, and an options hash. See the documentation for initialize for more details.

data/lib/mediawiki/butt.rb

@@ -22,6 +22,7 @@ module MediaWiki
     include MediaWiki::Watch
 
     attr_accessor :query_limit_default
+    attr_accessor :use_continuation
 
     # Creates a new instance of MediaWiki::Butt.
     # @param url [String] The FULL wiki URL. api.php can be omitted, but it will make harsh assumptions about
@@ -32,6 +33,7 @@ module MediaWiki
     #   the various query methods. In other words, if you pass a limit parameter to the valid query methods, it will
     #   use that, otherwise, it will use this. Defaults to 500. It can be set to 'max' to use MW's default max for
     #   each API.
+    # @option opts [Boolean] :use_continuation Whether to use the continuation API on queries.
     def initialize(url, opts = {})
       @url = url =~ /api.php$/ ? url : "#{url}/api.php"
       @query_limit_default = opts[:query_limit_default] || 500
@@ -39,6 +41,7 @@ module MediaWiki
       @uri = URI.parse(@url)
       @logged_in = false
       @custom_agent = opts[:custom_agent]
+      @use_continuation = opts[:use_continuation]
     end
 
     # Performs a generic HTTP POST request and provides the response. This method generally should not be used by the
@@ -62,6 +65,39 @@ module MediaWiki
       autoparse ? JSON.parse(res.body) : res
     end
 
+    # Performs a Mediawiki API query and provides the response, dealing with continuation as necessary.
+    # @param params [Hash] A hash containing MediaWiki API parameters.
+    # @param base_return [Any] The return value to start with. Defaults to an empty array.
+    # @yield [base_return, query] Provides the value provided to the base_return parameter, and the value in the
+    #   'query' key in the API response. See the API documentation for more information on this. If the base_return
+    #   value is modified in the block, its modifications will persist across each continuation loop.
+    # @return [Any] The base_return value as modified by the yielded block.
+    def query(params, base_return = [])
+      params[:action] = 'query'
+      params[:continue] = ''
+
+      loop do
+        result = post(params)
+        yield(base_return, result['query']) if result.key?('query')
+        break unless @use_continuation || result.key?('continue')
+        continue = result['continue']
+        continue.each do |key, val|
+          params[key.to_sym] = val
+        end
+      end
+
+      base_return
+    end
+
+    # Helper method for query methods that return an array built from the query objects.
+    # @param params [Hash] A hash containing MediaWiki API parameters.
+    # @param
+    def query_ary(params, base_response_key, property_key)
+      query(params) do |return_val, query|
+        query[base_response_key].each { |obj| return_val << obj[property_key] }
+      end
+    end
+
     # Gets whether the currently logged in user is a bot.
     # @param username [String] The username to check. Optional. Defaults to
     #   the currently logged in user if nil.

data/lib/mediawiki/query/lists/all.rb

@@ -10,17 +10,11 @@ module MediaWiki
         # @return [Array<String>] An array of all categories.
         def get_all_categories(limit = @query_limit_default)
           params = {
-            action: 'query',
             list: 'allcategories',
             aclimit: get_limited(limit)
           }
 
-          response = post(params)
-
-          ret = []
-          response['query']['allcategories'].each { |c| ret << c['*'] }
-
-          ret
+          query_ary(params, 'allcategories', '*')
         end
 
         # Gets all the images on the wiki.
@@ -30,17 +24,11 @@ module MediaWiki
         # @return [Array<String>] An array of all images.
         def get_all_images(limit = @query_limit_default)
           params = {
-            action: 'query',
             list: 'allimages',
             ailimit: get_limited(limit)
           }
 
-          response = post(params)
-
-          ret = []
-          response['query']['allimages'].each { |i| ret << i['name'] }
-
-          ret
+          query_ary(params, 'allimages', 'name')
         end
 
         # Gets all pages within a namespace integer.
@@ -51,18 +39,12 @@ module MediaWiki
         # @return [Array<String>] An array of all page titles.
         def get_all_pages_in_namespace(namespace, limit = @query_limit_default)
           params = {
-            action: 'query',
             list: 'allpages',
             apnamespace: namespace,
             aplimit: get_limited(limit)
           }
 
-          response = post(params)
-
-          ret = []
-          response['query']['allpages'].each { |p| ret << p['title'] }
-
-          ret
+          query_ary(params, 'allpages', 'title')
         end
 
         # Gets all users, or all users in a group.
@@ -73,18 +55,14 @@ module MediaWiki
         # @return [Hash<String, Fixnum>] A hash of all users, names are keys, IDs are values.
         def get_all_users(group = nil, limit = @query_limit_default)
           params = {
-            action: 'query',
             list: 'allusers',
             aulimit: get_limited(limit)
           }
           params[:augroup] = group unless group.nil?
 
-          response = post(params)
-
-          ret = {}
-          response['query']['allusers'].each { |u| ret[u['name']] = u['userid'] }
-
-          ret
+          query(params, {}) do |return_val, query|
+            query['allusers'].each { |u| return_val[u['name']] = u['userid']}
+          end
         end
 
         # Gets all block IDs on the wiki. It seems like this only gets non-IP blocks, but the MediaWiki docs are a
@@ -95,18 +73,12 @@ module MediaWiki
         # @return [Array<Fixnum>] All block IDs as strings.
         def get_all_blocks(limit = @query_limit_default)
           params = {
-            action: 'query',
             list: 'blocks',
             bklimit: get_limited(limit),
             bkprop: 'id'
           }
 
-          response = post(params)
-
-          ret = []
-          response['query']['blocks'].each { |b| ret.push(b['id']) }
-
-          ret
+          query_ary(params, 'blocks', 'id')
         end
 
         # Gets all page titles that transclude a given page.
@@ -117,18 +89,12 @@ module MediaWiki
         # @return [Array<String>] All transcluder page titles.
         def get_all_transcluders(page, limit = @query_limit_default)
           params = {
-            action: 'query',
             list: 'embeddedin',
             eititle: page,
             eilimit: get_limited(limit)
           }
 
-          response = post(params)
-
-          ret = []
-          response['query']['embeddedin'].each { |e| ret << e['title'] }
-
-          ret
+          query_ary(params, 'embeddedin', 'title')
         end
 
         # Gets an array of all deleted or archived files on the wiki.
@@ -138,17 +104,11 @@ module MediaWiki
         # @return [Array<String>] All deleted file names. These are not titles, so they do not include "File:".
         def get_all_deleted_files(limit = @query_limit_default)
           params = {
-            action: 'query',
             list: 'filearchive',
             falimit: get_limited(limit)
           }
 
-          response = post(params)
-
-          ret = []
-          response['query']['filearchive'].each { |f| ret.push(f['name']) }
-
-          ret
+          query_ary(params, 'filearchive', 'name')
         end
 
         # Gets a list of all protected pages, by protection level if provided.
@@ -159,18 +119,12 @@ module MediaWiki
         # @return [Array<String>] All protected page titles.
         def get_all_protected_titles(protection_level = nil, limit = @query_limit_default)
           params = {
-            action: 'query',
             list: 'protectedtitles',
             ptlimit: get_limited(limit)
           }
           params[:ptlevel] = protection_level unless protection_level.nil?
 
-          response = post(params)
-
-          ret = []
-          response['query']['protectedtitles'].each { |t| ret << t['title'] }
-
-          ret
+          query_ary(params, 'protectedtitles', 'title')
         end
       end
     end

data/lib/mediawiki/query/lists/backlinks.rb

@@ -11,17 +11,12 @@ module MediaWiki
         # @return [Array<String>] All backlinks until the limit
         def what_links_here(title, limit = @query_limit_default)
           params = {
-            action: 'query',
             list: 'backlinks',
             bltitle: title,
             bllimit: get_limited(limit)
           }
 
-          ret = []
-          response = post(params)
-          response['query']['backlinks'].each { |bl| ret << bl['title'] }
-
-          ret
+          query_ary(params, 'backlinks', 'title')
         end
 
         # Gets interwiki backlinks by the prefix and title.
@@ -33,18 +28,13 @@ module MediaWiki
         # @return [Array<String>] All interwiki backlinking page titles.
         def get_interwiki_backlinks(prefix = nil, title = nil, limit = @query_limit_default)
           params = {
-            action: 'query',
             list: 'iwbacklinks',
             iwbllimit: get_limited(limit)
           }
           params[:iwblprefix] = prefix unless prefix.nil?
           params[:iwbltitle] = title unless title.nil?
 
-          ret = []
-          response = post(params)
-          response['query']['iwbacklinks'].each { |bl| ret << bl['title'] }
-
-          ret
+          query_ary(params, 'iwbacklinks', 'title')
         end
 
         # Gets language backlinks by the language and title.
@@ -56,18 +46,13 @@ module MediaWiki
         def get_language_backlinks(language = nil, title = nil, limit = @query_limit_default)
           language.downcase! if language.match(/[^A-Z]*/)[0].empty?
           params = {
-            action: 'query',
             list: 'langbacklinks',
             lbltitle: get_limited(limit)
           }
           params[:lbllang] = language unless language.nil?
           params[:lbltitle] = title unless title.nil?
 
-          ret = []
-          response = post(params)
-          response['query']['langbacklinks'].each { |bl| ret << bl['title'] }
-
-          ret
+          query_ary(params, 'langbacklinks', 'title')
         end
 
         # Gets image backlinks, or the pages that use a given image.
@@ -80,20 +65,14 @@ module MediaWiki
         # @return [Array<String>] All page titles that fit the requirements.
         def get_image_backlinks(title, list_redirects = nil, thru_redir = false, limit = @query_limit_default)
           params = {
-            action: 'query',
             list: 'imageusage',
             iutitle: title,
             iulimit: get_limited(limit)
           }
-
           params[:iufilterredir] = list_redirects.nil? ? 'all' : list_redirects
           params[:iuredirect] = '1' if thru_redir
 
-          response = post(params)
-          ret = []
-          response['query']['imageusage'].each { |bl| ret << bl['title'] }
-
-          ret
+          query_ary(params, 'imageusage', 'title')
         end
 
         # Gets all external link page titles.
@@ -106,27 +85,14 @@ module MediaWiki
         #   hash, url and title.
         def get_url_backlinks(url = nil, limit = @query_limit_default)
           params = {
-            action: 'query',
             list: 'exturlusage',
             eulimit: get_limited(limit)
           }
-          params[:euquery] = url unless url.nil?
+          params[:euquery] = url if url
 
-          response = post(params)
-          ret = []
-          response['query']['exturlusage'].each do |bl|
-            if url.nil?
-              hash = {
-                url: bl['url'],
-                title: bl['title']
-              }
-              ret << hash
-            else
-              ret << bl['title']
-            end
+          query(params) do |return_val, query|
+           query['exturlusage'].each { |bl| return_val << url ? bl['title'] : { url: bl['url'], title: bl['title'] } }
           end
-
-          ret
         end
       end
     end

data/lib/mediawiki/query/lists/categories.rb

@@ -13,7 +13,6 @@ module MediaWiki
         # @return [Array<String>] All category members until the limit
         def get_category_members(category, limit = @query_limit_default, type = 'page')
           params = {
-            action: 'query',
             list: 'categorymembers',
             cmprop: 'title',
             cmlimit: get_limited(limit),
@@ -21,11 +20,8 @@ module MediaWiki
           }
 
           params[:cmtitle] = category =~ /[Cc]ategory:/ ? category : "Category:#{category}"
-          ret = []
-          response = post(params)
-          response['query']['categorymembers'].each { |cm| ret << cm['title'] }
 
-          ret
+          query_ary(params, 'categorymembers', 'title')
         end
 
         # Gets the subcategories of a given category.

data/lib/mediawiki/query/lists/miscellaneous.rb

@@ -4,23 +4,23 @@ module MediaWiki
       module Miscellaneous
         # Returns an array of random pages titles.
         # @param limit [Fixnum] The number of articles to get. Defaults to 1. Cannot be greater than 10 for normal
-        #   users, or 20 for bots. This method does *not* use the query_limit_default attribute.
+        #   users, or 20 for bots. This method does *not* use the query_limit_default attribute. This method does not
+        #   use continuation.
         # @param namespace [Fixnum] The namespace ID. Defaults to 0 (the main namespace).
         # @see https://www.mediawiki.org/wiki/API:Random MediaWiki Random API Docs
         # @since 0.2.0
         # @return [Array<String>] All members
         def get_random_pages(limit = 1, namespace = 0)
           params = {
-            action: 'query',
             list: 'random',
             rnlimit: get_limited(limit, 10, 20),
             rnnamespace: validate_namespace(namespace)
           }
 
-          ret = []
-          responce = post(params)
-          responce['query']['random'].each { |a| ret << a['title'] }
-
+          continue = @use_continuation
+          @use_continuation = false
+          ret = query_ary(params, 'random', 'title')
+          @use_continuation = continue
           ret
         end
 
@@ -31,14 +31,11 @@ module MediaWiki
         # @return [Array<String>] All tag names.
         def get_tags(limit = @query_limit_default)
           params = {
-            action: 'query',
             list: 'tags',
             limit: get_limited(limit)
           }
-          response = post(params)
-          ret = []
-          response['query']['tags'].each { |tag| ret << tag['name'] }
-          ret
+
+          query_ary(params, 'tags', 'name')
         end
       end
     end

data/lib/mediawiki/query/lists/querypage.rb

@@ -89,11 +89,7 @@ module MediaWiki
         # @return [Nil] If the user does not have the necessary rights.
         def get_unwatchedpages_page(limit = @query_limit_default)
           rights = get_userrights
-          if rights != false && rights.include?('unwatchedpages')
-            get_querypage('Unwatchedpages', limit)
-          else
-            return nil
-          end
+          rights && rights.include?('unwatchedpages') ? get_querypage('Unwatchedpages', limit) : nil
         end
 
         # @since 0.10.0
@@ -182,18 +178,14 @@ module MediaWiki
         # @return [Array<String>] All of the page titles in the querypage.
         def get_querypage(page, limit = @query_limit_default)
           params = {
-            action: 'query',
             list: 'querypage',
             qppage: page,
             qplimit: get_limited(limit)
           }
-          response = post(params)
-          ret = []
-          response['query']['querypage']['results'].each do |result|
-            ret << result['title']
-          end
 
-          ret
+          query(params) do |return_val, query|
+            query['querypage']['results'].each { |result| return_val << result['title'] }
+          end
         end
       end
     end

data/lib/mediawiki/query/lists/search.rb

@@ -28,18 +28,12 @@ module MediaWiki
         # @return [Array<String>] The page titles that matched the search.
         def get_search_results(search_value, namespace = 0)
           params = {
-            action: 'query',
             list: 'search',
             srsearch: search_value,
             srnamespace: validate_namespace(namespace)
           }
 
-          response = post(params)
-
-          ret = []
-          response['query']['search'].each { |search| ret << search['title'] }
-
-          ret
+          query_ary(params, 'search', 'title')
         end
 
         # Searches the wiki by a prefix.
@@ -51,19 +45,12 @@ module MediaWiki
         # @return [Array<String>] All of the page titles that match the search.
         def get_prefix_search(prefix, limit = 100)
           params = {
-            action: 'query',
             list: 'prefixsearch',
             pssearch: prefix,
             pslimit: get_limited(limit, 100, 200)
           }
 
-          response = post(params)
-          ret = []
-          response['query']['prefixsearch'].each do |result|
-            ret << result['title']
-          end
-
-          ret
+          query_ary(params, 'prefixsearch', 'title')
         end
       end
     end

data/lib/mediawiki/query/lists/users.rb

@@ -3,7 +3,7 @@ module MediaWiki
     module Lists
       module Users
         # Gets user information. This method should rarely be used by
-        # normal users, unless they want a huge amount of user data at once.
+        # normal users, unless they want a huge amount of usnot g data at once.
         # @param prop [String] The usprop parameter.
         # @param username [String] The username to get info for. Optional. Defaults to the currently logged in user
         # if omitted.
@@ -144,26 +144,22 @@ module MediaWiki
         # the size change relative to the previous edit.
         def get_user_contributions(user, limit = @query_limit_default)
           params = {
-            action: 'query',
             list: 'usercontribs',
             ucuser: user,
             uclimit: get_limited(limit),
             ucprop: 'ids|title|comment|size|sizediff|flags|patrolled'
           }
 
-          response = post(params)
-
-          ret = {}
-          response['query']['usercontribs'].each do |item|
-            ret[item['revid']] = {
-              title: item['title'],
-              summary: item['comment'],
-              total_size: item['size'],
-              diff_size: item['sizediff']
-            }
+          query(params, {}) do |return_val, query|
+            query['usercontribs'].each do |item|
+              return_val[item['revid']] = {
+                title: item['title'],
+                summary: item['comment'],
+                total_size: item['size'],
+                diff_size: item['sizediff']
+              }
+            end
           end
-
-          ret
         end
 
         # Gets the user's full watchlist. If no user is provided, it will use the currently logged in user, according
@@ -175,19 +171,13 @@ module MediaWiki
         # @return [Array<String>] All the watchlist page titles.
         def get_full_watchlist(user = nil, limit = @query_limit_default)
           params = {
-            action: 'query',
             list: 'watchlist',
             wlprop: 'title',
             wllimit: get_limited(limit)
           }
-          params[:wluser] = user unless user.nil?
+          params[:wluser] = user if user
 
-          response = post(params)
-
-          ret = []
-          response['query']['watchlist'].each { |t| ret << t['title'] }
-
-          ret
+          query_ary(params, 'watchlist', 'title')
         end
       end
     end

data/lib/mediawiki/query/properties/contributors.rb

@@ -12,10 +12,12 @@ module MediaWiki
         # @see #get_logged_in_contributors
         # @since 0.8.0
         # @return [Fixnum] The number of contributors to that page.
+        # @return [Nil] If the page does not exist.
         def get_total_contributors(title, limit = @query_limit_default)
           anon_users = get_anonymous_contributors_count(title, limit)
           users = get_logged_in_contributors(title, limit)
 
+          return if users.nil?
           users.size + anon_users
         end
 
@@ -23,21 +25,14 @@ module MediaWiki
         # @param (see #get_total_contributors)
         # @see #get_contributors_response
         # @since 0.8.0
-        # @return [Array] All usernames for the contributors.
+        # @return [Array<String>] All usernames for the contributors.
         def get_logged_in_contributors(title, limit = @query_limit_default)
-          response = get_contributors_response(title, limit)
-          pageid = nil
-          response['query']['pages'].each { |r, _| pageid = r }
-          ret = []
-          if response['query']['pages'][pageid]['missing'] == ''
-            return nil
-          else
-            response['query']['pages'][pageid]['contributors'].each do |c|
-              ret.push(c['name'])
-            end
+          get_contributors_response(title, limit) do |return_val, query|
+            pageid = nil
+            query['pages'].each { |r, _| pageid = r }
+            return if query['pages'][pageid].key?('missing')
+            query['pages'][pageid]['contributors'].each { |c| return_val << c['name'] }
           end
-
-          ret
         end
 
         private
@@ -46,16 +41,15 @@ module MediaWiki
         # @param (see #get_total_contributors)
         # @see https://www.mediawiki.org/wiki/API:Contributors MediaWiki Contributors Property API Docs
         # @since 0.8.0
-        # @return [Hash] See {MediaWiki::Butt#post}
+        # @return [Hash] See {MediaWiki::Butt#query}
         def get_contributors_response(title, limit = @query_limit_default)
           params = {
-            action: 'query',
             prop: 'contributors',
             titles: title,
             pclimit: get_limited(limit)
           }
 
-          post(params)
+          query(params) { |return_val, query| yield(return_val, query) }
         end
 
         # Gets the total number of anonymous contributors for the given page.
@@ -65,12 +59,16 @@ module MediaWiki
         # @return [Fixnum] The number of anonymous contributors for the page.
         # @return [Nil] If title is not a valid page.
         def get_anonymous_contributors_count(title, limit = @query_limit_default)
-          response = get_contributors_response(title, limit)
-          pageid = nil
-          response['query']['pages'].each { |r, _| pageid = r }
-          return nil if response['query']['pages'][pageid]['missing'] == ''
+          ret = 0
 
-          response['query']['pages'][pageid]['anoncontriburors'].to_i
+          get_contributors_response(title, limit) do |_, query|
+            pageid = nil
+            query['pages'].each { |r, __| pageid = r }
+            return if query['pages'][pageid].key?('missing')
+            ret += query['pages'][pageid]['anoncontributors'].to_i
+          end
+
+          ret
         end
       end
     end

data/lib/mediawiki/query/properties/files.rb

@@ -10,24 +10,19 @@ module MediaWiki
         # @see https://www.mediawiki.org/wiki/API:Duplicatefiles MediaWiki Duplicate Files API Docs
         # @since 0.8.0
         # @return [Array<String>] Array of all the duplicated file names.
-        # @return [Nil] If there aren't any duplicated files.
         def get_duplicated_files_of(title, limit = @query_limit_default)
           params = {
-            action: 'query',
             prop: 'duplicatefiles',
             titles: title,
             dflimit: get_limited(limit)
           }
 
-          response = post(params)
-          ret = []
-          response['query']['pages'].each do |_, c|
-            return nil if c['duplicatefiles'].nil?
-            c['duplicatefiles'].each do |f|
-              ret << f['name']
+          query(params) do |return_val, query|
+            query['pages'].each do |_, c|
+              next unless c['duplicatefies']
+              c['duplicatefiles'].each { |f| return_val << f['name'] }
             end
           end
-          ret
         end
 
         # Gets all duplicated files on the wiki.
@@ -37,18 +32,12 @@ module MediaWiki
         # @return [Array<String>] All duplicate file titles on the wiki.
         def get_all_duplicated_files(limit = @query_limit_default)
           params = {
-            action: 'query',
             generator: 'allimages',
-            prop: 'duplicatefiles',
+            prop: 'duplicatedfiles',
             dflimit: get_limited(limit)
           }
 
-          response = post(params)
-          ret = []
-          response['query']['pages'].each do |_, c|
-            ret << c['title']
-          end
-          ret
+          query_ary(params, 'pages', 'title')
         end
 
         # Gets the size of an image in bytes.

data/lib/mediawiki/query/properties/pages.rb

@@ -12,18 +12,20 @@ module MediaWiki
         # @return [Nil] If the title does not exist.
         def get_categories_in_page(title)
           params = {
-            action: 'query',
             prop: 'categories',
             titles: title
           }
 
-          response = post(params)
-          pageid = nil
-          ret = []
-          response['query']['pages'].each { |r, _| pageid = r }
-          return if response['query']['pages'][pageid]['missing'] == ''
+          query(params) do |return_val, query|
+            pageid = nil
+            query['pages'].each do |r, _|
+              pageid = r
+              break
+            end
 
-          response['query']['pages'][pageid].fetch('categories', []).map { |c| c['title'] }
+            return if query['pages'][pageid].key?('missing')
+            query['pages'][pageid].fetch('categories', []).each { |c| return_val << c['title'] }
+          end
         end
 
         # Gets the wiki text for the given page. Returns nil if it for some reason cannot get the text, for example,
@@ -85,16 +87,12 @@ module MediaWiki
             ellimit: get_limited(limit)
           }
 
-          response = post(params)
-          ret = []
-          response['query']['pages'].each do |revid, _|
-            return if revid == '-1'
-            response['query']['pages'][revid]['extlinks'].each do |l|
-              ret << l['*']
+          query(params) do |return_val, query|
+            query['pages'].each do |revid, _|
+              return if revid == '-1'
+              query['pages'][revid]['extlinks'].each { |l| return_val << l['*'] }
             end
           end
-
-          ret
         end
 
         # Gets whether the current user watches the page.
@@ -273,22 +271,17 @@ module MediaWiki
         # @return [Nil] If the page does not exist.
         def get_images_in_page(title, limit = @query_limit_default)
           params = {
-            action: 'query',
             prop: 'images',
             titles: title,
             imlimit: get_limited(limit)
           }
 
-          response = post(params)
-          ret = []
-          response['query']['pages'].each do |revid, _|
-            return if revid == '-1'
-            response['query']['pages'][revid]['images'].each do |img|
-              ret << img['title']
+          query(params) do |return_val, query|
+            query['pages'].each do |revid, _|
+              return if revid == '-1'
+              query['pages'][revid]['images'].each { |img| return_val << img['title'] }
             end
           end
-
-          ret
         end
 
         # Gets all of the templates in the given page.
@@ -299,48 +292,40 @@ module MediaWiki
         # @return [Nil] If the page does not exist.
         def get_templates_in_page(title, limit = @query_limit_default)
           params = {
-            action: 'query',
             prop: 'templates',
             titles: title,
             tllimit: get_limited(limit)
           }
 
-          response = post(params)
-          ret = []
-          response['query']['pages'].each do |revid, _|
-            return if revid == '-1'
-            response['query']['pages'][revid]['templates'].each do |tmp|
-              ret << tmp['title']
+          query(params) do |return_val, query|
+            query['pages'].each do |revid, _|
+              return if revid == '-1'
+              query['pages'][revid]['templates'].each { |template| return_val << template['title'] }
             end
           end
-
-          ret
         end
 
         # Gets all of the interwiki links on the given page.
         # @param (see #get_external_links)
         # @see https://www.mediawiki.org/wiki/API:Iwlinks MediaWiki Interwiki Links API Docs
         # @since 0.8.0
-        # @return [Array<String>] All interwiki link titles.
+        # @return [Array<Hash<Symbol, String>>] All interwiki links. Each hash has a :prefix and :title
         # @return [Nil] If the page does not exist.
         def get_interwiki_links_in_page(title, limit = @query_limit_default)
           params = {
-            action: 'query',
             prop: 'iwlinks',
             titles: title,
             tllimit: get_limited(limit)
           }
 
-          response = post(params)
-          ret = []
-          response['query']['pages'].each do |revid, _|
-            return if revid == '-1'
-            response['query']['pages'][revid]['iwlinks'].each do |l|
-              ret << l['*']
+          query(params) do |return_val, query|
+            query['pages'].each do |revid, _|
+              return if revid == '-1'
+              query['pages'][revid].fetch('iwlinks', []).each do |l|
+                return_val << { prefix: l['prefix'], title: l['*'] }
+              end
             end
           end
-
-          ret
         end
 
         # Gets a hash of data for the page in every language that it is available in. This includes url, language
@@ -352,28 +337,25 @@ module MediaWiki
         # @return [Nil] If the page does not exist.
         def get_other_langs_of_page(title, limit = @query_limit_default)
           params = {
-            action: 'query',
             prop: 'langlinks',
             titles: title,
             lllimit: get_limited(limit),
             llprop: 'url|langname|autonym'
           }
 
-          response = post(params)
-          ret = {}
-          response['query']['pages'].each do |revid, _|
-            return if revid == '-1'
-            response['query']['pages'][revid]['langlinks'].each do |l|
-              ret[l['lang'].to_sym] = {
-                url: l['url'],
-                langname: l['langname'],
-                autonym: l['autonym'],
-                title: l['*']
-              }
+          query(params) do |return_val, query|
+            query['pages'].each do |revid, _|
+              return if revid == '-1'
+              query['pages'][revid]['langlinks'].each do |l|
+                return_val[l['lang'].to_sym] = {
+                  url: l['url'],
+                  langname: l['langname'],
+                  autonym: l['autonym'],
+                  title: l['*']
+                }
+              end
             end
           end
-
-          ret
         end
 
         # Gets every single link in a page.
@@ -384,22 +366,17 @@ module MediaWiki
         # @return [Nil] If the page does not exist.
         def get_all_links_in_page(title, limit = @query_limit_default)
           params = {
-            action: 'query',
             prop: 'links',
             titles: title,
             pllimit: get_limited(limit)
           }
 
-          response = post(params)
-          ret = []
-          response['query']['pages'].each do |revid, _|
-            return if revid == '-1'
-            response['query']['pages'][revid]['links'].each do |l|
-              ret << l['title']
+          query(params) do |return_val, query|
+            query['pages'].each do |revid, _|
+              return if revid == '-1'
+              query['pages'][revid]['links'].each { |l| return_val << l['title'] }
             end
           end
-
-          ret
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mediawiki-butt
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Eli Foster
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-30 00:00:00.000000000 Z
+date: 2016-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient