rbmediawiki 0.1 → 0.2

data/lib/api.rb

@@ -1,3 +1,4 @@
+#coding: utf-8
 require 'yaml'
 require 'net/http'
 require 'rubygems'
@@ -41,13 +42,14 @@ class Api
     #for using then when making requests. If the user is already logged iy
     #does nothing
 
-    def login()
+    def login(password = nil)
         if @config['logged']
             return true
         end
-
-        puts "Introduce password for #{@config['user']} at #{@config['base_url']}"
-        password = gets.chomp
+        if (!password)
+            puts "Introduce password for #{@config['user']} at #{@config['base_url']}"
+            password = gets.chomp
+        end
 
         post_me = add_post('lgname',@config['user'])
         post_me = add_post('lgpassword',password, post_me)
@@ -890,7 +892,10 @@ class Api
         response = Net::HTTP.new(uri.host, uri.port).start { |http| 
             http.request(request)
         }
-        return_result = XmlSimple.xml_in(response.body, { 'ForceArray' => false })	
+        resputf8 = '<?xml version="1.0" encoding="UTF-8" ?>'+response.body[21..-1]
+
+        return_result = XmlSimple.xml_in(resputf8, { 'ForceArray' => false })	
+        return return_result
     end
 
     def add_post(key, value, post_me = nil)

data/lib/category.rb

@@ -1,5 +1,3 @@
-require 'deep_merge'
-
 require 'api'
 require 'page'
 

data/lib/misc_generator.rb

@@ -1,5 +1,5 @@
+#coding: utf-8
 require 'page'
-require 'generator'
 
 class Misc_generator
     def initialize(site)
@@ -17,40 +17,36 @@ class Misc_generator
     # * diffto: Revision ID to diff each revision to.  Use "prev", "next" and "cur" for the previous, next and current revision respectively.
 
 
-    def history( titles, rvlimit = 1, rvprop = "ids|timestamp|flags|comment|user|size|content", rvstartid = nil, rvendid = nil, rvdir = "older", rvuser = nil, diffto = "prev")
-        g = Generator.new { |g|
-            pages = Hash.new
-            finish = false
-            while !finish
-                result = @site.query_prop_revisions(titles, rvprop, rvlimit, rvstartid, rvendid, nil, nil, rvdir, rvuser, nil, nil, nil, nil, nil, nil, diffto )
-                result['query']['pages']['page']['revisions'].each {|rv|
-                    g.yield rv
-                }
-                if result.key?('query-continue') 
-                    rvstartid = result['query-continue']['revisions']['rvstartid']
-                else
-                    finish = true
-                end
+    def history( titles, rvlimit = 50, rvprop = "ids|timestamp|flags|comment|user|size|content", rvstartid = nil, rvendid = nil, rvdir = "older", rvuser = nil, diffto = "prev")
+        pages = Hash.new
+        finish = false
+        while !finish
+            result = @site.query_prop_revisions(titles, rvprop, rvlimit, rvstartid, rvendid, nil, nil, rvdir, rvuser, nil, nil, nil, nil, nil, nil, diffto )
+            result['query']['pages']['page']['revisions']['rev'].each {|rv|
+                puts rv
+                yield rv
+            }
+            if result.key?('query-continue') 
+                rvstartid = result['query-continue']['revisions']['rvstartid']
+            else
+                finish = true
             end
-         }
+        end
     end
     
-    def history_diff( titles, rvlimit = 50, rvprop = "ids|timestamp|flags|comment|user|size|content", rvstartid = nil, rvendid = nil, rvdir = "older", rvuser= nil)
-        g = Generator.new { |g|
-            pages = Hash.new
-            finish = false
-            while !finish
-                result = @site.query_prop_revisions(titles, rvprop, rvlimit, rvstartid, rvendid, nil, nil, rvdir, rvuser)
-                puts result['query']['pages']['page']['revisions']
-                result['query']['pages']['page']['revisions'].each {|rv|
-                    g.yield rv
-                }
-                if result.key?('query-continue') 
-                    rvstartid = result['query-continue']['revisions']['rvstartid']
-                else
-                    finish = true
-                end
+    def history_diff( titles, rvlimit = 30, rvprop = "timestamp|comment|user|size", rvstartid = nil, rvendid = nil, rvdir = "older", rvuser= nil, diffto = "prev")
+        pages = Hash.new
+        finish = false
+        while !finish
+            result = @site.query_prop_revisions("japonés", rvprop, rvlimit, rvstartid, rvendid, nil, nil, rvdir, rvuser, nil, nil, nil, nil, nil, nil, "prev")
+            result['query']['pages']['page']['revisions'].each {|rv|
+                yield rv
+            }
+            if result.key?('query-continue') 
+                rvstartid = result['query-continue']['revisions']['rvstartid']
+            else
+                finish = true
             end
-         }
+        end
     end
 end 

data/lib/page.rb

@@ -1,6 +1,5 @@
 #TODO: rollback
 #TODO: patrol
-require 'deep_merge'
 
 require 'api'
 
@@ -24,14 +23,24 @@ class Page
         end
     end
 
+    #returns false if it is not a redirect, the redirected title if it is
+    def redirect?()
+        txt = this.get
+        if (txt =~ /#REDIRECT\s+\[\[(.*)\]\]/)
+            return $1
+        else
+            return false
+        end
+    end
+
     #puts the text of a page.
     # * text: the new content of the page
     # * summary: editting summary
     # * minor: is a minor edit? default->true
     # * bot: is a bot flagged edit?
-    def put(text, summary = nil, minor = true, bot = true)
+    def put(text, summary = nil, minor = true, bot = true, password = nil)
         #require login
-        @site.login
+        @site.login(password)
         result = @site.query_prop_info(@normtitle, nil, 'edit') 
         token = result['query']['pages']['page']['edittoken']
         result = @site.edit(@normtitle, nil, text, token, summary, minor, nil, bot)
@@ -40,6 +49,7 @@ class Page
         else
             return true
         end
+        puts "content put"
     end
 
     #appends texto to a page
@@ -209,240 +219,241 @@ class Page
     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)
-            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
-    
-    #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 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 
-    #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_templates(min = nil, tllimit = 500)
-        tlcontinue = nil
-        tls = Hash.new
-        count = 0
-        loop {
-            result = @site.query_prop_templates(@normtitle, nil, tllimit, tlcontinue)
-            tls.deep_merge!(result['query'])
-            if result.key?('query-continue')&& min && count < min
-                count += lllimit
-                tlcontinue = result['query-continue']['templates']['tlcontinue']
-            else
-                break
-            end
-        }
-        if tls['pages']['page'].key?('missing')
-            raise NoPage.new(), "Page [[#{@title}]] does not exist"
-        elsif tls['pages']['page'].key?('templates')
-            return tls['pages']['page']['templates']['tl']
-        else return false
-        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
-    #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_external_links(min = nil, ellimit = 500)
-        eloffset = nil
-        els = Hash.new
-        count = 0
-        loop {
-            result = @site.query_prop_extlinks(@normtitle, ellimit, eloffset)
-            els.deep_merge!(result['query'])
-            if result.key?('query-continue')&& min && count < min
-                count += lllimit
-                eloffset = result['query-continue']['extlinks']['elcontinue']
-            else
-                break
-            end
-        }
-        if els['pages']['page'].key?('missing')
-            raise NoPage.new(), "Page [[#{@title}]] does not exist"
-        elsif els['pages']['page'].key?('extlinks')
-            return els['pages']['page']['extlinks']['el']
-        else return false
-        end
-    end
-    
-    #gets backlinks (what links here) used in a page
-    #min is the minimum number of elements to return, bllimit 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_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)
-            bls.deep_merge!(result['query'])
-            if result.key?('query-continue')&& min && count < min
-                count += lllimit
-                blcontinue = result['query-continue']['backlinks']['blcontinue']
-            else
-                break
-            end
-        }
-        if bls['pages']['page'].key?('missing')
-            raise NoPage.new(), "Page [[#{@title}]] does not exist"
-        elsif bls['backlinks'].key?('bl')
-            return bls['backlinks']['bl']
-        else return false
-        end
-    end
-
-    #gets deleted revisions of a page
-    #min is the minimum number of elements to return, drlimit 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
-    def get_deletedrevs(min = nil, drlimit = 500)
-        @site.login
-        drcontinue = nil
-        drs = Hash.new
-        count = 0
-        loop {
-            result = @site.query_list_deletedrevs(@normtitle, nil, nil, nil, nil, nil, nil, drcontinue, nil, nil, nil, nil, drlimit)
-            drs.deep_merge!(result['query'])
-            if result.key?('query-continue')&& min && count < min
-                count += lllimit
-                drcontinue = result['query-continue']['deletedrevs']['drstart']
-            else
-                break
-            end
-        }
-        if drs['deletedrevs'].key?('page')
-            return drs['deletedrevs']['page']['revisions']['rev']
-        else return false
-        end
-    end
-
-    #gets pages in which this page is embedded (or transcluded). Returns a list
-    #of Page elements
-    #min is the minimum number of elements to return, eilimit 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_embeddedin(min = nil, eilimit = 500)
-        eicontinue = nil
-        eis = Hash.new
-        count = 0
-        loop {
-            result = @site.query_list_embeddedin(@normtitle, @normtitle, eicontinue, nil, nil, eilimit)
-            eis.deep_merge!(result['query'])
-            if result.key?('query-continue')&& min && count < min
-                count += lllimit
-                eicontinue = result['query-continue']['embeddedin']['eicontinue']
-            else
-                break
-            end
-        }
-        if eis['pages']['page'].key?('missing')
-            raise NoPage.new(), "Page [[#{@title}]] does not exist"
-        elsif eis['embeddedin'].key?('ei')
-            members = Array.new
-            eis['embeddedin']['ei'].each{|el| members.push(Page.new(el['title']))}
-            return members
-        else return false
-        end
-    end
-
-    #returns the size of the page content in bytes
-    #Raises NoPage if the page doesn't exist
-    def get_size
-        result = @site.query_prop_info(@normtitle)
-        if result['query']['pages']['page'].key?('missing')
-            raise NoPage.new(), "Page [[#{@normtitle}]] does not exist"
-        else
-            return result['query']['pages']['page']['length']
-        end
-    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
+#    
+#    #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 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 
+#    #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_templates(min = nil, tllimit = 500)
+#        tlcontinue = nil
+#        tls = Hash.new
+#        count = 0
+#        loop {
+#            result = @site.query_prop_templates(@normtitle, nil, tllimit, tlcontinue)
+#            tls.deep_merge!(result['query'])
+#            if result.key?('query-continue')&& min && count < min
+#                count += lllimit
+#                tlcontinue = result['query-continue']['templates']['tlcontinue']
+#            else
+#                break
+#            end
+#        }
+#        if tls['pages']['page'].key?('missing')
+#            raise NoPage.new(), "Page [[#{@title}]] does not exist"
+#        elsif tls['pages']['page'].key?('templates')
+#            return tls['pages']['page']['templates']['tl']
+#        else return false
+#        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
+#    #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_external_links(min = nil, ellimit = 500)
+#        eloffset = nil
+#        els = Hash.new
+#        count = 0
+#        loop {
+#            result = @site.query_prop_extlinks(@normtitle, ellimit, eloffset)
+#            els.deep_merge!(result['query'])
+#            if result.key?('query-continue')&& min && count < min
+#                count += lllimit
+#                eloffset = result['query-continue']['extlinks']['elcontinue']
+#            else
+#                break
+#            end
+#        }
+#        if els['pages']['page'].key?('missing')
+#            raise NoPage.new(), "Page [[#{@title}]] does not exist"
+#        elsif els['pages']['page'].key?('extlinks')
+#            return els['pages']['page']['extlinks']['el']
+#        else return false
+#        end
+#    end
+#    
+#    #gets backlinks (what links here) used in a page
+#    #min is the minimum number of elements to return, bllimit 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_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)
+#            bls.deep_merge!(result['query'])
+#            if result.key?('query-continue')&& min && count < min
+#                count += lllimit
+#                blcontinue = result['query-continue']['backlinks']['blcontinue']
+#            else
+#                break
+#            end
+#        }
+#        if bls['pages']['page'].key?('missing')
+#            raise NoPage.new(), "Page [[#{@title}]] does not exist"
+#        elsif bls['backlinks'].key?('bl')
+#            return bls['backlinks']['bl']
+#        else return false
+#        end
+#    end
+#
+#    #gets deleted revisions of a page
+#    #min is the minimum number of elements to return, drlimit 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
+#    def get_deletedrevs(min = nil, drlimit = 500)
+#        @site.login
+#        drcontinue = nil
+#        drs = Hash.new
+#        count = 0
+#        loop {
+#            result = @site.query_list_deletedrevs(@normtitle, nil, nil, nil, nil, nil, nil, drcontinue, nil, nil, nil, nil, drlimit)
+#            drs.deep_merge!(result['query'])
+#            if result.key?('query-continue')&& min && count < min
+#                count += lllimit
+#                drcontinue = result['query-continue']['deletedrevs']['drstart']
+#            else
+#                break
+#            end
+#        }
+#        if drs['deletedrevs'].key?('page')
+#            return drs['deletedrevs']['page']['revisions']['rev']
+#        else return false
+#        end
+#    end
+#
+#    #gets pages in which this page is embedded (or transcluded). Returns a list
+#    #of Page elements
+#    #min is the minimum number of elements to return, eilimit 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_embeddedin(min = nil, eilimit = 500)
+#        eicontinue = nil
+#        eis = Hash.new
+#        count = 0
+#        loop {
+#            result = @site.query_list_embeddedin(@normtitle, @normtitle, eicontinue, nil, nil, eilimit)
+#            eis.deep_merge!(result['query'])
+#            if result.key?('query-continue')&& min && count < min
+#                count += lllimit
+#                eicontinue = result['query-continue']['embeddedin']['eicontinue']
+#            else
+#                break
+#            end
+#        }
+#        if eis['pages']['page'].key?('missing')
+#            raise NoPage.new(), "Page [[#{@title}]] does not exist"
+#        elsif eis['embeddedin'].key?('ei')
+#            members = Array.new
+#            eis['embeddedin']['ei'].each{|el| members.push(Page.new(el['title']))}
+#            return members
+#        else return false
+#        end
+#    end
+#
+#    #returns the size of the page content in bytes
+#    #Raises NoPage if the page doesn't exist
+#    def get_size
+#        result = @site.query_prop_info(@normtitle)
+#        if result['query']['pages']['page'].key?('missing')
+#            raise NoPage.new(), "Page [[#{@normtitle}]] does not exist"
+#        else
+#            return result['query']['pages']['page']['length']
+#        end
+#    end
 
 end
 

data/lib/page_generator.rb

@@ -1,5 +1,4 @@
 require 'page'
-require 'generator'
 
 class Page_generator
     def initialize(site)
@@ -31,102 +30,93 @@ class Page_generator
     #   * One value: withlanglinks, withoutlanglinks, all
     #   * Default: all
     def all_pages(from = "!", limit = "500", prefix = nil, namespace = nil, filterredir = nil, minsize = nil, maxsize = nil, prtype = nil, prlevel = nil, prfiltercascade = nil, filterlanglinks = nil)
-        g = Generator.new { |g|
-            pages = Hash.new
-            count = 0
-            finish = false
-            while !finish
-                result = @site.query_list_allpages(nil, from, prefix, namespace, filterredir, minsize, maxsize, prtype, prlevel, prfiltercascade, limit, nil, filterlanglinks)
-                result['query']['allpages']['p'].each {|page|
-                    g.yield Page.new(page['title'], @site)
-                }
-                if result.key?('query-continue') 
-                    from = result['query-continue']['allpages']['apfrom']
-                else
-                    finish = true
-                end
+        pages = Hash.new
+        count = 0
+        finish = false
+        while !finish
+            result = @site.query_list_allpages(nil, from, prefix, namespace, filterredir, minsize, maxsize, prtype, prlevel, prfiltercascade, limit, nil, filterlanglinks)
+            result['query']['allpages']['p'].each {|page|
+                yield Page.new(page['title'], @site)
+            }
+            if result.key?('query-continue') 
+                from = result['query-continue']['allpages']['apfrom']
+            else
+                finish = true
             end
-         }
+        end
     end
 
     def linksearch(euquery, eulimit = 500, eunamespace = 0)
-        g = Generator.new { |g|
-            pages = Hash.new
-            count = 0
-            finish = false
-            euoffset = nil
-            while !finish
-                result = @site.query_list_exturlusage(nil, nil, euoffset, nil, euquery, eunamespace, eulimit)
-                result['query']['exturlusage']['eu'].each {|page|
-                    g.yield Page.new(page['title'], @site)
-                }
-                if result.key?('query-continue') 
-                    euoffset = result['query-continue']['exturlusage']['euoffset']
-                else
-                    finish = true
-                end
+        pages = Hash.new
+        count = 0
+        finish = false
+        euoffset = nil
+        while !finish
+            result = @site.query_list_exturlusage(nil, nil, euoffset, nil, euquery, eunamespace, eulimit)
+            result['query']['exturlusage']['eu'].each {|page|
+                yield Page.new(page['title'], @site)
+            }
+            if result.key?('query-continue') 
+                euoffset = result['query-continue']['exturlusage']['euoffset']
+            else
+                finish = true
             end
-         }
+        end
     end
     def templateusage(eititle, eilimit = 500, einamespace = nil)
-        g = Generator.new { |g|
-            pages = Hash.new
-            finish = false
-            eioffset = nil
-            while !finish
-                result = @site.query_list_embeddedin(nil, eititle, eioffset, einamespace, nil, eilimit)
-                result['query']['embeddedin']['ei'].each {|page|
-                    g.yield Page.new(page['title'], @site)
-                }
-                if result.key?('query-continue') 
-                    euoffset = result['query-continue']['embeddedin']['eioffset']
-                else
-                    finish = true
-                end
+        pages = Hash.new
+        finish = false
+        eioffset = nil
+        while !finish
+            result = @site.query_list_embeddedin(nil, eititle, eioffset, einamespace, nil, eilimit)
+            result['query']['embeddedin']['ei'].each {|page|
+                g.yield Page.new(page['title'], @site)
+            }
+            if result.key?('query-continue') 
+                eioffset = result['query-continue']['embeddedin']['eicontinue']
+            else
+                finish = true
             end
-         }
+        end
     end
     def alllinks(alprefix, allimit = 500, alnamespace = nil)
-        g = Generator.new { |g|
-            pages = Hash.new
-            finish = false
-            aloffset = nil
-            while !finish
-                result = @site.query_list_alllinks(nil, aloffset, nil, alprefix, nil, nil, nil, alnamespace, allimit, nil, nil, true)
-                result['query']['alllinks']['l'].each {|page|
-                    g.yield Page.new(page['title'], @site)
-                }
-                if result.key?('query-continue') 
-                    euoffset = result['query-continue']['alllinks']['alcontinue']
-                else
-                    finish = true
-                end
+        pages = Hash.new
+        finish = false
+        aloffset = nil
+        while !finish
+            result = @site.query_list_alllinks(nil, aloffset, nil, alprefix, nil, nil, nil, alnamespace, allimit, nil, nil, true)
+            result['query']['alllinks']['l'].each {|page|
+                yield Page.new(page['title'], @site)
+            }
+            if result.key?('query-continue') 
+                euoffset = result['query-continue']['alllinks']['alcontinue']
+            else
+                finish = true
             end
-         }
+        end
     end
     def backlinks(bltitle, bllimit = 500, blnamespace = nil, blfilterredir = nil)
-        g = Generator.new { |g|
-            pages = Hash.new
-            finish = false
-            bloffset = nil
-            while !finish
-                result = @site.query_list_backlinks(nil, bltitle, bloffset, blnamespace, blfilterredir, bllimit, true )
-                result['query']['backlinks']['bl'].each {|page|
-                    if page.key?('redirect')
-                        page['redirlinks']['bl'].each {|page2|
-                            g.yield Page.new(page2['title'], @site)
-                        }
-                    else
-                        g.yield Page.new(page['title'], @site)
-                    end
-                }
-                if result.key?('query-continue') 
-                    euoffset = result['query-continue']['backlinks']['blcontinue']
+        pages = Hash.new
+        finish = false
+        bloffset = nil
+        while !finish
+            result = @site.query_list_backlinks(nil, bltitle, bloffset, blnamespace, blfilterredir, bllimit, true )
+            result['query']['backlinks']['bl'].each {|page|
+                if page.key?('redirect')
+                    page['redirlinks']['bl'].each {|page2|
+                        yield Page.new(page2['title'], @site)
+                    }
                 else
-                    finish = true
+                    yield Page.new(page['title'], @site)
                 end
+            }
+            if result.key?('query-continue') 
+                euoffset = result['query-continue']['backlinks']['blcontinue']
+            else
+                finish = true
             end
-         }
+        end
+     
     end
 
     #TODO

data/lib/rbmediawiki.rb

@@ -4,3 +4,4 @@ require 'category'
 require 'user'
 require 'page_generator'
 require 'misc_generator'
+require 'fiber'

data/lib/user.rb

@@ -1,5 +1,4 @@
-require 'deep_merge'
-
+#coding: utf-8
 require 'api'
 require 'page'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rbmediawiki
 version: !ruby/object:Gem::Version 
-  version: "0.1"
+  version: "0.2"
 platform: ruby
 authors: 
 - chabacano
@@ -43,6 +43,8 @@ files:
 - util/querydesc
 has_rdoc: true
 homepage: http://en.wikipedia.org/User:chabacano/rbmediawiki
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
@@ -62,10 +64,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.1.1
+rubyforge_project: rbmediawiki
+rubygems_version: 1.3.3
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Rbmediawiki is a framework for building bots for Mediawiki using its api.
 test_files: []