sunflower 0.5.3 → 0.5.4

data/README

@@ -1,4 +1,4 @@
-Version: 0.5.3 alpha
+Version: 0.5.4 alpha
 
 >>> English:
 

data/lib/sunflower/core.rb

@@ -17,7 +17,7 @@ require 'cgi'
 #
 # You can use multiple Sunflowers at once, to work on multiple wikis.
 class Sunflower
-	VERSION = '0.5.3'
+	VERSION = '0.5.4'
 	
 	INVALID_CHARS = %w(# < > [ ] | { })
 	INVALID_CHARS_REGEX = Regexp.union *INVALID_CHARS
@@ -44,7 +44,7 @@ class Sunflower
 	# Whether to run #code_cleanup when calling #save.
 	attr_accessor :always_do_code_cleanup
 	# The URL this Sunflower works on, as provided as argument to #initialize.
-	attr_reader :wikiURL
+	attr_reader :wikiURL, :api_endpoint
 	# Siteinfo, as returned by API call.
 	attr_accessor :siteinfo
 	
@@ -108,8 +108,16 @@ class Sunflower
 		return type_map[type].sub 'XX', lang
 	end
 	
-	# Initialize a new Sunflower working on a wiki with given URL, for ex. "pl.wikipedia.org". url can also be a shorthand identifier such as "b:pl" - see Sunflower.resolve_wikimedia_id for details.
-	def initialize url=nil
+	# Initialize a new Sunflower working on a wiki with given URL, for ex. "pl.wikipedia.org".
+	# url can also be a shorthand identifier such as "b:pl" - see Sunflower.resolve_wikimedia_id for details.
+	# 
+	# There is currently one option available:
+	# * api_endpoint: full URL to your api.php, if different than http://<url>/w/api.php (standard for WMF wikis)
+	def initialize url=nil, opts={}
+		if url.is_a? Hash
+			url, opts = nil, url
+		end
+		
 		if !url
 			userdata = Sunflower.read_userdata()
 			
@@ -121,6 +129,7 @@ class Sunflower
 		end
 		
 		@wikiURL = (url.include?('.') ? url : Sunflower.resolve_wikimedia_id(url))
+		@api_endpoint = opts[:api_endpoint] || 'http://'+@wikiURL+'/w/api.php'
 		
 		@warnings = true
 		@log = false
@@ -172,7 +181,7 @@ class Sunflower
 		end
 		
 		resp = RestClient.post(
-			'http://'+@wikiURL+'/w/api.php',
+			@api_endpoint,
 			request,
 			{:user_agent => "Sunflower #{VERSION} alpha", :cookies => @cookies}
 		)
@@ -239,33 +248,29 @@ class Sunflower
 		
 		# 1. get the login token
 		response = RestClient.post(
-			'http://'+@wikiURL+'/w/api.php?'+"action=login&lgname=#{CGI.escape user}&lgpassword=#{CGI.escape password}"+'&format=json', 
-			nil,
+			@api_endpoint, 
+			"action=login&lgname=#{CGI.escape user}&lgpassword=#{CGI.escape password}&format=json",
 			{:user_agent => "Sunflower #{VERSION} alpha"}
 		)
 		
 		@cookies = response.cookies
-		json = JSON.parse response.to_str
-		token, prefix = json['login']['token'], json['login']['cookieprefix']
+		raise Sunflower::Error, 'unable to log in (no cookies received)!' if !@cookies or @cookies.empty?
 		
+		json = JSON.parse response.to_str
+		token, prefix = (json['login']['lgtoken']||json['login']['token']), json['login']['cookieprefix']
 		
 		# 2. actually log in
 		response = RestClient.post(
-			'http://'+@wikiURL+'/w/api.php?'+"action=login&lgname=#{CGI.escape user}&lgpassword=#{CGI.escape password}&lgtoken=#{token}"+'&format=json',
-			nil,
+			@api_endpoint,
+			"action=login&lgname=#{CGI.escape user}&lgpassword=#{CGI.escape password}&lgtoken=#{token}&format=json",
 			{:user_agent => "Sunflower #{VERSION} alpha", :cookies => @cookies}
 		)
 		
 		json = JSON.parse response.to_str
 		
-		@cookies = @cookies.merge(response.cookies).merge({
-			"#{prefix}UserName" => json['login']['lgusername'].to_s,
-			"#{prefix}UserID" => json['login']['lguserid'].to_s,
-			"#{prefix}Token" => json['login']['lgtoken'].to_s
-		})
-		
+		@cookies = @cookies.merge(response.cookies)
 		
-		raise Sunflower::Error, 'unable to log in (no cookies received)!' if !@cookies
+		raise Sunflower::Error, 'unable to log in (no cookies received)!' if !@cookies or @cookies.empty?
 		
 		
 		# 3. confirm you did log in by checking the watchlist.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sunflower
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-28 00:00:00.000000000 Z
+date: 2012-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json