rbmediawiki 0.2.6.1 → 0.2.6.2

data/lib/rbmediawiki/category.rb

@@ -13,25 +13,23 @@ class Category
     #returns false if there aren't any, and raises NoPage if page doesn't exist
     def get_members(cmlimit = 500)
         cmcontinue = nil
-        cms = Hash.new
+        cms = Array.new
         loop {
             result = @site.query_list_categorymembers(@title, @title, nil, nil, cmcontinue, cmlimit)
+            if result.key?('error') || !result['query']['categorymembers'].has_key?('cm')
+                raise NoPage.new(), "Page [[#{@title}]] does not exist"
+            end
+            if result['query']['categorymembers']['cm'].is_a? Array
+                cms = cms + result['query']['categorymembers']['cm']
+            else
+                cms.push(result['query']['categorymembers']['cm'])
+            end
             if result.key?('query-continue')
                 cmcontinue = result['query-continue']['categorymembers']['cmcontinue']
-                cms.deep_merge!(result['query'])
             else
-                cms.deep_merge!(result['query'])
                 break
             end
         }
-        if cms['pages']['page'].key?('missing')
-            raise NoPage.new(), "Page [[#{title}]] does not exist"
-        elsif cms.key?('categorymembers')
-            members = Array.new
-            cms['categorymembers']['cm'].each{|el| members.push(Page.new(el['title']))}
-            return members
-        else return false
-        end
-
+        return cms
     end
 end

data/lib/rbmediawiki/page.rb

@@ -217,61 +217,131 @@ class Page
     end
 
 
-     #not working in r1.9
-#    #get interwiki links
-#    #min is the minimum number of elements to return, lllimit is the number of
-#    #elements to request from the API in each iteration. The method will 
-#    #request elements until it has at least min elements.
-#    #returns false if there aren't any, and raises NoPage if page doesn't exist
-#    def get_interwikis(min = nil, lllimit = 500)
-#        llcontinue = nil
-#        iws = Hash.new
-#        count = 0
-#        loop {
-#            result = @site.query_prop_langlinks(@normtitle, lllimit, llcontinue)
-#            iws.deep_merge!(result['query'])
-#            if result.key?('query-continue') && min && count < min
-#                count += lllimit
-#                llcontinue = result['query-continue']['langlinks']['llcontinue']
-#            else
-#                break
-#            end
-#        }
-#        if iws['pages']['page'].key?('missing')
-#            raise NoPage.new(), "Page [[#{title}]] does not exist"
-#        elsif iws['pages']['page'].key?('langlinks')
-#            return iws['pages']['page']['langlinks']['ll']
-#        else return false
-#        end
-#    end
+    #get interwiki links
+    #min is the minimum number of elements to return, lllimit is the number of
+    #elements to request from the API in each iteration. The method will 
+    #request elements until it has at least min elements.
+    #returns false if there aren't any, and raises NoPage if page doesn't exist
+    def get_interwikis(min = nil, lllimit = 500)
+        llcontinue = nil
+        iws = Hash.new
+        count = 0
+        loop {
+            result = @site.query_prop_langlinks(@normtitle, lllimit, llcontinue)
+            if result['query']['pages']['page'].key?('missing')
+                raise NoPage.new(), "Page [[#{title}]] does not exist"
+            end
+            if !result['query'].key?('interwikis')
+                return nil
+            end
+            if result['query']['interwikis']['iw'].is_a? Array
+                iws = iws + result['query']['interwikis']['iw']
+            else
+                iws.push(result['query']['interwikis']['iw'])
+            end
+            if result.key?('query-continue') && min && count < min
+                count += lllimit
+                llcontinue = result['query-continue']['langlinks']['llcontinue']
+            else
+                break
+            end
+        }
+        return iws
+    end
+    
 #    
-#    #gets image links of a page
-#    #min is the minimum number of elements to return, imlimit is the number of
-#    #elements to request from the API in each iteration. The method will 
-#    #request elements until it has at least min elements.
-#    #returns false if there aren't any, and raises NoPage if page doesn't exist
-#    def get_images(min = nil, imlimit = 500)
-#        imcontinue = nil
-#        ims = Hash.new
-#        count = 0
-#        loop {
-#            result = @site.query_prop_images(@normtitle, imlimit, imcontinue)
-#            ims.deep_merge!(result['query'])
-#            if result.key?('query-continue') && min && count < min
-#                count += lllimit
-#                imcontinue = result['query-continue']['images']['imcontinue']
-#            else
-#                break
-#            end
-#        }
-#        if ims['pages']['page'].key?('missing')
-#            raise NoPage.new(), "Page [[#{@title}]] does not exist"
-#        elsif ims['pages']['page'].key?('images')
-#            return ims['pages']['page']['images']['im']
-#        else return false
-#        end
-#    end
-#
+    #gets image links of a page
+    #min is the minimum number of elements to return, imlimit is the number of
+    #elements to request from the API in each iteration. The method will 
+    #request elements until it has at least min elements.
+    #returns false if there aren't any, and raises NoPage if page doesn't exist
+    def get_images(min = nil, imlimit = 500)
+        imcontinue = nil
+        ims = Array.new
+        count = 0
+        loop {
+            result = @site.query_prop_images(@normtitle, imlimit, imcontinue)
+            proc_res = result['query']['pages']['page']
+            if proc_res.key?('missing')
+                raise NoPage.new(), "Page [[#{@title}]] does not exist"
+            end
+            if !proc_res.key?('images')
+                return nil
+            end
+            if proc_res['images']['im'].is_a? Array
+                ims = ims + proc_res['images']['im']
+            else
+                ims.push(proc_res['images']['im'])
+            end
+            if result.key?('query-continue') && min && count < min
+                count += lllimit
+                imcontinue = result['query-continue']['images']['imcontinue']
+            else
+                break
+            end
+        }
+        return ims
+    end
+    #gets categories used in a page
+    #min is the minimum number of elements to return, cllimit is the number of
+    #elements to request from the API in each iteration. The method will 
+    #request elements until it has at least min elements.
+    #clshow can be "hidden" or "!hidden". Default shows both
+    #if sortkey is true will return the sortkey. Default is true
+    def get_categories(min = nil, cllimit = 500, clshow = nil, sortkey = true)
+        clcontinue = nil
+        cls = Array.new
+        count = 0
+
+        if sortkey 
+            clprop = "sortkey"
+        end
+
+        loop {
+            result = @site.query_prop_categories(@normtitle, clprop, clshow, cllimit, clcontinue)
+            if result['query']['pages']['page'].key?('missing')
+                raise NoPage.new(), "Page [[#{@title}]] does not exist"
+            end
+            page = result['query']['pages']['page']
+            if page['categories']['cl'].is_a? Array
+                cls = cls + page['categories']['cl']
+            else
+                cls.push(page['categories']['cl'])
+            end
+
+            if result.key?('query-continue')&& min && count < min
+                count += lllimit
+                clcontinue = result['query-continue']['categories']['clcontinue']
+            else
+                break
+            end
+        }
+        return cls
+    end
+
+    def get_backlinks(bllimit = 500, blnamespace = nil, blredirect = true)
+        blcontinue = nil
+        bls = Array.new
+        loop {
+            result = @site.query_list_backlinks(@normtitle, @normtitle, blcontinue, blnamespace, nil, bllimit, blredirect)
+            if result['query']['pages']['page'].key?('missing')
+                raise NoPage.new(), "Page [[#{@title}]] does not exist"
+            end
+            if result['query']['backlinks']['bl'].is_a? Array
+                bls = bls + result['query']['backlinks']['bl']
+            else
+                bls.push(result['query']['backlinks']['bl'])
+            end
+            if result.key?('query-continue')
+                blcontinue = result['query-continue']['backlinks']['blcontinue']
+            else
+                break
+            end
+        }
+        return bls
+    end
+
+    #not working in r1.9
 #    #gets templates used in a page
 #    #min is the minimum number of elements to return, tllimit is the number of
 #    #elements to request from the API in each iteration. The method will 
@@ -299,38 +369,7 @@ class Page
 #        end
 #    end
 #    
-#    #gets templates used in a page
-#    #min is the minimum number of elements to return, cllimit is the number of
-#    #elements to request from the API in each iteration. The method will 
-#    #request elements until it has at least min elements.
-#    #clshow can be "hidden" or "!hidden". Default shows both
-#    #if sortkey is true will return the sortkey. Default is true
-#    def get_categories(min = nil, cllimit = 500, clshow = nil, sortkey = true)
-#        clcontinue = nil
-#        cls = Hash.new
-#        count = 0
-#
-#        if sortkey 
-#            clprop = "sortkey"
-#        end
-#
-#        loop {
-#            result = @site.query_prop_categories(@normtitle, clprop, clshow, cllimit, clcontinue)
-#            cls.deep_merge!(result['query'])
-#            if result.key?('query-continue')&& min && count < min
-#                count += lllimit
-#                clcontinue = result['query-continue']['categories']['clcontinue']
-#            else
-#                break
-#            end
-#        }
-#        if cls['pages']['page'].key?('missing')
-#            raise NoPage.new(), "Page [[#{@title}]] does not exist"
-#        elsif cls['pages']['page'].key?('categories')
-#            return cls['pages']['page']['categories']['cl']
-#        else return false
-#        end
-#    end
+
 #
 #    #gets external links used in a page
 #    #min is the minimum number of elements to return, ellimit is the number of
@@ -364,25 +403,7 @@ class Page
     #elements to request from the API in each iteration. The method will 
     #request elements until it has at least min elements.
     #returns false if there aren't any, and raises NoPage if page doesn't exist
-    def get_backlinks(min = nil, bllimit = 500, blnamespace = nil, blredirect = true)
-        blcontinue = nil
-        bls = Hash.new
-        count = 0
-        loop {
-            result = @site.query_list_backlinks(@normtitle, @normtitle, blcontinue, blnamespace, nil, bllimit, blredirect)
-            if result['query']['pages']['page'].key?('missing')
-                raise NoPage.new(), "Page [[#{@title}]] does not exist"
-            end
-            bls.merge!(result['query']['backlinks'])
-            if result.key?('query-continue')&& min && count < min
-                count += lllimit
-                blcontinue = result['query-continue']['backlinks']['blcontinue']
-            else
-                break
-            end
-        }
-        return bls['bl']
-    end
+
 
 #    #gets deleted revisions of a page
 #    #min is the minimum number of elements to return, drlimit is the number of

data/lib/rbmediawiki/user.rb

@@ -69,24 +69,27 @@ class User
 
     #get user contributions
     #returns false if there aren't any
-    def get_usercontribs(uclimit = 500, ucstart = nil, ucnamespace = nil)
+    def get_usercontribs(uclimit = 500, ucstart = nil, ucnamespace = nil, ucdir="newer")
         uccontinue = nil
-        ucs = Hash.new
-        puts ucstart
+        ucs = Array.new
         loop {
-            result = @site.query_list_usercontribs(nil, uclimit, ucstart, nil, uccontinue, @username, nil, "newer", ucnamespace)
-            ucs.deep_merge!(result['query'])
+            result = @site.query_list_usercontribs(nil, uclimit, ucstart, nil, uccontinue, @username, nil, ucdir, ucnamespace)
+            if !result['query']['usercontribs'].has_key?('item')
+                raise NoUser
+            end
+            items = result['query']['usercontribs']['item']
+            if items.is_a? Array
+                ucs = ucs + items
+            else
+                ucs.push(items)
+            end
             if result.key?('query-continue')
                 ucstart = result['query-continue']['usercontribs']['ucstart']
             else
                 break
             end
         }
-        if ucs['usercontribs'].key?('item')
-            return ucs['usercontribs']['item']
-        else 
-            return false
-        end
+        return ucs
     end
 
     #rollbacks (reverts) all edits by the user since a given time.
@@ -109,3 +112,7 @@ class User
         }
     end
 end
+
+
+class NoUser < RuntimeError
+end

data/lib/rbmediawiki.rb

@@ -4,7 +4,7 @@ require 'rubygems'
 require 'xmlsimple'
 
 class Rbmediawiki
-    VERSION = '0.2.6.1'
+    VERSION = '0.2.6.2'
     Dir["#{File.dirname(__FILE__)}/rbmediawiki/*.rb"].sort.each { |lib| require lib }
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rbmediawiki
 version: !ruby/object:Gem::Version 
-  version: 0.2.6.1
+  version: 0.2.6.2
 platform: ruby
 authors: 
 - Chabacano
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-24 00:00:00 +02:00
+date: 2009-06-11 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency