sunflower 0.4.2 → 0.4.3

data/README

@@ -1,4 +1,4 @@
-Version: 0.4.2 alpha
+Version: 0.4.3 alpha
 
 >>> English:
 

data/lib/sunflower/commontasks.rb

@@ -125,8 +125,8 @@ class Page
 			name, anchor, _end = $1, $2, $3
 			
 			begin
-				name=CGI.unescape(name)
-				anchor=CGI.unescape((anchor||'').gsub(/\.([0-9A-F]{2})/,'%\1'))
+				name = name.gsub(/((?:%[0-9a-fA-F]{2})+)/){ [$1.delete('%')].pack('H*') }
+				anchor = (anchor||'').gsub(/\.([0-9A-F]{2})/, '%\1').gsub(/((?:%[0-9a-fA-F]{2})+)/){ [$1.delete('%')].pack('H*') }
 				a='[['+name+anchor+(_end||'')
 				a=a.gsub '_', ' '
 			rescue
@@ -261,6 +261,6 @@ class Page
 	def change_category from, to
 		from=from.sub(/\A\s*([cC]ategory|[kK]ategoria):/, '').strip
 		to=to.sub(/\A\s*([cC]ategory|[kK]ategoria):/, '').strip
-		self.text = self.text.gsub(/\[\[ *(?:[cC]ategory|[kK]ategoria) *: *#{Regexp.escape from} *(\|[^\]]+ *|)\]\]/){'[[Kategoria:'+to+$1.rstrip+']]'}
+		self.text = self.text.gsub(/\[\[ *(?:[cC]ategory|[kK]ategoria) *: *#{Regexp.escape from} *(\|[^\]]*|)\]\]/){'[[Kategoria:'+to+($1=='| ' ? $1 : $1.rstrip)+']]'}
 	end
 end

data/lib/sunflower/core.rb

@@ -19,7 +19,7 @@ class SunflowerError < StandardError; end
 #
 # You can use multiple Sunflowers at once, to work on multiple wikis.
 class Sunflower
-	VERSION = '0.4.2'
+	VERSION = '0.4.3'
 	
 	INVALID_CHARS = %w(# < > [ ] | { })
 	INVALID_CHARS_REGEX = Regexp.union *INVALID_CHARS
@@ -31,8 +31,13 @@ class Sunflower
 
 	# Options for this Sunflower.
 	attr_accessor :summary, :always_do_code_cleanup
+	attr_accessor :cookie, :headers, :wikiURL
 	
-	attr_accessor :cookie, :headers, :wikiURL, :warnings, :log
+	def is_bot?; @is_bot; end
+	
+	attr_writer :warnings, :log
+	def warnings?; @warnings; end
+	def log?; @log; end
 	
 	# Initialize a new Sunflower working on a wiki with given URL, for ex. "pl.wikipedia.org".
 	def initialize url=nil
@@ -141,11 +146,7 @@ class Sunflower
 	end
 	
 	def log t
-		File.open('log.txt','a'){|f| f.puts t}
-	end
-	
-	def is_bot?
-		@is_bot
+		File.open('log.txt','a'){|f| f.puts t} if @log
 	end
 end
 
@@ -168,7 +169,10 @@ class Page
 	attr_reader :sunflower
 	alias :belongs_to :sunflower
 	
+	# this is only for RDoc. wrapped in "if false" to avoid warnings when running with ruby -w
+	if false
 	attr_reader :pageid, :ns, :title, :touched, :lastrevid, :counter, :length, :starttimestamp, :edittoken, :protection #prop=info
+	end
 	
 	# calling any of these accessors will fetch the data.
 	[:pageid, :ns, :title, :touched, :lastrevid, :counter, :length, :starttimestamp, :edittoken, :protection].each do |meth|
@@ -253,20 +257,19 @@ class Page
 			if !summary or summary==''
 				summary = @summaryAppend.uniq.join(', ')
 			else
-				summary =  summary.sub(/,\s*\Z/, '') + ', ' + @summaryAppend.uniq.join(', ')
+				summary = summary.sub(/,\s*\Z/, '') + ', ' + @summaryAppend.uniq.join(', ')
 			end
 		end
 		
 		if @orig_text==@text && title==@title
 			@sunflower.log('Page '+title+' not saved - no changes.')
-			return
+			return nil
 		end
 		
 		
-		
 		self.code_cleanup if @sunflower.always_do_code_cleanup && self.respond_to?('code_cleanup')
 		
-		r=@sunflower.API("action=edit&bot=1&title=#{CGI.escape(title)}&text=#{CGI.escape(@text)}&summary=#{CGI.escape(summary)}&token=#{CGI.escape(@edittoken)}")# if @sunflower.isBot?
+		return @sunflower.API("action=edit&bot=1&title=#{CGI.escape(title)}&text=#{CGI.escape(@text)}&summary=#{CGI.escape(summary)}&token=#{CGI.escape(@edittoken)}")
 	end
 	alias :put :save
 	

data/scripts/fix-bold-in-headers.rb

@@ -8,7 +8,7 @@ url = 'http://toolserver.org/~sk/cgi-bin/checkwiki/checkwiki.cgi?project=plwiki&
 print "Reading articles list... "
 # EDIT FILENAME BELOW
 str=Net::HTTP.get(URI.parse(url))
-list=str[(str.index('<pre>')+5)...(str.index('</pre>'))].strip.split(/\r?\n/).uniq
+list=str[(str.index('<pre>')+5)...(str.index('</pre>'))].strip.gsub('&#039;', "'").split(/\r?\n/).uniq
 print "done (#{list.length} to do)!\n\n"
 
 # EDIT SUMMARY BELOW

data/scripts/fix-double-pipes.rb

@@ -8,7 +8,7 @@ url = 'http://toolserver.org/~sk/cgi-bin/checkwiki/checkwiki.cgi?project=plwiki&
 print "Reading articles list... "
 # EDIT FILENAME BELOW
 str=Net::HTTP.get(URI.parse(url))
-list=str[(str.index('<pre>')+5)...(str.index('</pre>'))].strip.split(/\r?\n/).uniq
+list=str[(str.index('<pre>')+5)...(str.index('</pre>'))].strip.gsub('&#039;', "'").split(/\r?\n/).uniq
 print "done (#{list.length} to do)!\n\n"
 
 # EDIT SUMMARY BELOW

data/scripts/fix-langs.rb

@@ -1,5 +1,5 @@
-require 'sunflower-commontasks.rb'
-require 'sunflower-listmaker.rb'
+# coding: utf-8
+require 'sunflower'
 
 # EDIT WIKI URL BELOW
 s=Sunflower.new('pl.wikipedia.org')

data/scripts/fix-some-entities.rb

@@ -8,7 +8,7 @@ url = 'http://toolserver.org/~sk/cgi-bin/checkwiki/checkwiki.cgi?project=plwiki&
 print "Reading articles list... "
 # EDIT FILENAME BELOW
 str=Net::HTTP.get(URI.parse(url))
-list=str[(str.index('<pre>')+5)...(str.index('</pre>'))].strip.split(/\r?\n/).uniq
+list=str[(str.index('<pre>')+5)...(str.index('</pre>'))].strip.gsub('&#039;', "'").split(/\r?\n/).uniq
 print "done (#{list.length} to do)!\n\n"
 
 # EDIT SUMMARY BELOW

data/scripts/fix-unicode-control-chars.rb

@@ -8,7 +8,7 @@ url = 'http://toolserver.org/~sk/cgi-bin/checkwiki/checkwiki.cgi?project=plwiki&
 print "Reading articles list... "
 # EDIT FILENAME BELOW
 str=Net::HTTP.get(URI.parse(url))
-list=str[(str.index('<pre>')+5)...(str.index('</pre>'))].strip.split(/\r?\n/).uniq
+list=str[(str.index('<pre>')+5)...(str.index('</pre>'))].strip.gsub('&#039;', "'").split(/\r?\n/).uniq
 print "done (#{list.length} to do)!\n\n"
 
 # EDIT SUMMARY BELOW

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sunflower
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-03 00:00:00.000000000 Z
+date: 2012-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &8801052 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8801052
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &8800728 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +37,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8800728
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Sunflower is a lightweight library to provide access to MediaWiki API
   from Ruby.
 email: matma.rex@gmail.com
@@ -85,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Sunflower is a lightweight library to provide access to MediaWiki API from