rwikibot 1.0.3 → 1.0.4

data/CHANGELOG

@@ -1,7 +1,12 @@
 RWikiBot ChangeLog
 
 1.0.4
-	- Small code change for config operations
+	- Changed config.yaml to sample-config.yaml
+	- Had rake include the sample-config.yaml file
+	- Fixed broken cookie code to ask for wikicookieprefix, which is usually dbname+tableprefix
+
+1.0.3
+	- Bugfix in config file
 
 1.0.2
 	- Changed initialize to ask for a configuration to use, defaulting to 'default'

data/lib/rwikibot.rb

@@ -26,7 +26,7 @@ class RWikiBot
   # New bots hope for three attributes, but require none. The first is simply the name of the bot for logging purposes. The second is the debug level constant, and third is the logfile.
   #
   # Example: bot = RWikiBot.new("My Neat Bot", Logger::DEBUG, "./rwikibot.log")
-  def initialize (name = "Unnamed Bot", config = 'default', debuglevel = Logger::INFO, log_location = "./rwikibot.log" )
+  def initialize (name = "Unnamed Bot", config = 'default', debuglevel = Logger::DEBUG, log_location = "./rwikibot.log" )
     
     @botname = name
     
@@ -41,11 +41,9 @@ class RWikiBot
     # Load the configuration!! (saved the file based, because I liked it too much.)
     @wikibotlogger.debug "Loading configuration..."
     config_file = YAML.load_file('config.yaml')
-    use_config = config 
-    @wikibotlogger.debug "Config loaded. Using settings: #{use_config}"
     
     #now, the hash that will hold the config options
-    @config = config_file.fetch(use_config)
+    @config = config_file.fetch(config)
     @config['logged_in'] = FALSE
     @config['uri'] = URI.parse(@config.fetch('api_path'))
     
@@ -287,7 +285,7 @@ class RWikiBot
     
     # This will get all pages. Limits vary based on user rights of the Bot. Set to bot.
     @wikibotlogger.debug "ALL PAGES - Preparing request information..."
-    post_me = {'list' => 'allpages', 'apnamespace' => '0', 'aplimit' => '5000'}
+    post_me = {'list' => 'allpages', 'apnamespace' => '0', 'aplimit' => '500'}
     
     #make the request
     @wikibotlogger.debug "ALL PAGES - Asking make_request to get all pages..."
@@ -458,7 +456,7 @@ class RWikiBot
     
       #Send the actual request    
       @wikibotlogger.debug "MAKE REQUEST - Sending request..."
-      resp = @http.post( @config.fetch('uri').path , post_string ,  {'User-agent' => 'RWikiBot/0.1','Cookie' => bake(@config.fetch('cookie'))})
+      resp = @http.post( @config.fetch('uri').path , post_string ,  {'User-agent' => 'RWikiBot/0.1','Cookie' => bake(@config.fetch('cookie')) } )
       @wikibotlogger.info "MAKE REQUEST - Response: "
       @wikibotlogger.info resp.body
       @wikibotlogger.debug "MAKE REQUEST - End Response "
@@ -470,7 +468,7 @@ class RWikiBot
     
       # A small check to make sure we don't need to save cookie data. Because usually, we don't
       if @config.fetch('logged_in') == FALSE
-        @config['cookie'] = resp.header['set-cookie']
+        @config['cookie'] = resp.header['set-cookie'] if @config.fetch('cookie').nil?
         @wikibotlogger.debug "MAKE REQUEST - Received login cookie. Cookie is: #{resp.header['set-cookie']}"
       end
     
@@ -491,14 +489,20 @@ class RWikiBot
   def bake(cookie)
     
     # Make some dough. Let CGI parse set-cookie, since there's multiple set-cookies and this is hard
-    dough = CGI::Cookie::parse(cookie)
+    dough = CGI::Cookie::parse(cookie) 
+    dough.each do |key, value|
+      puts "#{key} => #{value}"
+    end
     
     # Take the dough and get my three elements out
-    # wikidb_wiki_UserID wikidb_wiki_UserName wikidb_wiki_Token
     
-    if cookie != nil
-      return "#{dough.fetch(@config.fetch('wikidbprefix')+'UserID')}; #{dough.fetch(@config.fetch('wikidbprefix')+'UserName')}; #{dough.fetch(@config.fetch('wikidbprefix')+'Token')}"
+    if @config.fetch('logged_in') == TRUE
+      @wikibotlogger.debug "BAKE - Baking a cookie... Smells like wiki."
+      return "#{dough.fetch(@config.fetch('wikicookieprefix')+'UserID')}; #{dough.fetch(@config.fetch('wikicookieprefix')+'UserName')}; #{dough.fetch(@config.fetch('wikicookieprefix')+'Token')}"
+      # return "#{dough.fetch('wikidb_UserID')}; #{dough.fetch('wikidb_UserName')}; #{dough.fetch('wikidb_Token')}"
+     
     else
+      @wikibotlogger.debug "BAKE - No cookies to bake this time."
       return ""
     end
     

data/sample-config.yaml

@@ -0,0 +1,6 @@
+default:
+    username: "RWikiBot"
+    password: "rwikibot"
+    domain: 'en'
+    api_path: "http://localhost:8888/wiki/api.php"
+    wikicookieprefix: 'wikidb_wiki_' #this is the MediaWiki default

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: rwikibot
 version: !ruby/object:Gem::Version 
-  version: 1.0.3
-date: 2007-02-28 00:00:00 -06:00
+  version: 1.0.4
+date: 2007-03-01 00:00:00 -06:00
 summary: A library for creating MediaWiki bots.
 require_paths: 
 - lib
@@ -29,6 +29,7 @@ authors:
 - Eddie Roger
 files: 
 - lib/rwikibot.rb
+- sample-config.yaml
 - README
 - CHANGELOG
 test_files: []
@@ -38,6 +39,7 @@ rdoc_options:
 extra_rdoc_files: 
 - README
 - CHANGELOG
+- sample-config.yaml
 executables: []
 
 extensions: []