sunflower 0.5.6 → 0.5.7

data/README

@@ -1,4 +1,4 @@
-Version: 0.5.6 alpha
+Version: 0.5.7 alpha
 
 >>> English:
 

data/lib/sunflower/commontasks.rb

@@ -110,4 +110,14 @@ class Sunflower::Page
 			"[[#{self.sunflower.ns_local_for 'Category'}:#{to}#{rest}"
 		}
 	end
+	
+	# Remove the category from page wikitext.
+	# 
+	# Input can be either with the Category: prefix (or localised version) or without.
+	def remove_category cat
+		cat_regex = self.sunflower.ns_regex_for 'Category'
+		cat = self.sunflower.cleanup_title(cat).sub(/^#{cat_regex}:/, '')
+		
+		self.text.gsub!(/\[\[ *#{cat_regex} *: *#{Regexp.escape cat} *(\|[^\]]*)?\]\](\r?\n)?/, '')
+	end
 end

data/lib/sunflower/core.rb

@@ -40,7 +40,7 @@ end
 #
 # You can use multiple Sunflowers at once, to work on multiple wikis.
 class Sunflower
-	VERSION = '0.5.6'
+	VERSION = '0.5.7'
 	
 	INVALID_CHARS = %w(# < > [ ] | { })
 	INVALID_CHARS_REGEX = Regexp.union *INVALID_CHARS
@@ -154,8 +154,18 @@ class Sunflower
 			end
 		end
 		
-		@wikiURL = (url.include?('.') ? url : Sunflower.resolve_wikimedia_id(url))
-		@api_endpoint = opts[:api_endpoint] || 'http://'+@wikiURL+'/w/api.php'
+		# find out the base URL for this wiki and its API endpoint
+		# we joyfully assume that all URLs contain at least a single dot, which is incorrect, but oh well
+		if url.include?('.')
+			# a regular external wiki; use the RSD discovery mechanism to find out the endpoint
+			@wikiURL = url
+			# let's not pull in a HTML parsing library, this regex will do
+			@api_endpoint = opts[:api_endpoint] || RestClient.get(@wikiURL).to_str[/<link rel="EditURI" type="application\/rsd\+xml" href="([^"]+)\?action=rsd"/, 1]
+		else
+			# probably a Wikimedia wiki shorthand
+			@wikiURL = Sunflower.resolve_wikimedia_id(url)
+			@api_endpoint = opts[:api_endpoint] || 'http://'+@wikiURL+'/w/api.php'
+		end
 		
 		@warnings = true
 		@log = false
@@ -317,7 +327,7 @@ class Sunflower
 		
 		# 4. check bot rights
 		r=self.API('action=query&list=allusers&aulimit=1&augroup=bot&aufrom='+(CGI.escape user))
-		unless r['query']['allusers'][0]['name']==user
+		unless r['query']['allusers'][0] && r['query']['allusers'][0]['name']==user
 			warn 'Sunflower - this user does not have bot rights!' if @warnings
 			@is_bot=false
 		else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sunflower
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.5.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-23 00:00:00.000000000 Z
+date: 2013-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json