sunflower 0.5.4 → 0.5.5

data/README

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

data/lib/sunflower/core.rb

@@ -3,6 +3,29 @@ require 'rest-client'
 require 'json'
 require 'cgi'
 
+class Hash
+	# Recursively, destructively merges two hashes that might contain further hashes and arrays.
+	# Hashes are merged using #merge!; arrays are merged using #concat.
+	# 
+	# Named like this to prevent monkey-patching conflicts; is a monkey-patch because it is convenient.
+	# Should be considered private to Sunflower and might disappear at any time.
+	# Used in Sunflower#API_continued.
+	# 
+	# From http://stackoverflow.com/a/2277713 , slightly modified.
+	def sunflower_recursive_merge!(other)
+		other.keys.each do |k|
+			if self[k].is_a?(Array) && other[k].is_a?(Array)
+				self[k].concat(other[k])
+			elsif self[k].is_a?(Hash) && other[k].is_a?(Hash)
+				self[k].recursive_merge!(other[k])
+			else
+				self[k] = other[k]
+			end
+		end
+		self
+	end
+end
+
 # Main class. To start working, you have to create new Sunflower:
 #   s = Sunflower.new('en.wikipedia.org')
 # And then log in:
@@ -17,7 +40,7 @@ require 'cgi'
 #
 # You can use multiple Sunflowers at once, to work on multiple wikis.
 class Sunflower
-	VERSION = '0.5.4'
+	VERSION = '0.5.5'
 	
 	INVALID_CHARS = %w(# < > [ ] | { })
 	INVALID_CHARS_REGEX = Regexp.union *INVALID_CHARS
@@ -108,6 +131,9 @@ class Sunflower
 		return type_map[type].sub 'XX', lang
 	end
 	
+	# Used by #initialize to cache siteinfo data.
+	@@siteinfo = {}
+	
 	# 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.
 	# 
@@ -141,7 +167,8 @@ class Sunflower
 		@cookies = {}
 		
 		siprop = 'general|namespaces|namespacealiases|specialpagealiases|magicwords|interwikimap|dbrepllag|statistics|usergroups|extensions|fileextensions|rightsinfo|languages|skins|extensiontags|functionhooks|showhooks|variables'
-		@siteinfo = self.API(action: 'query', meta: 'siteinfo', siprop: siprop)['query']
+		@@siteinfo[@api_endpoint] ||= self.API(action: 'query', meta: 'siteinfo', siprop: siprop)['query']
+		@siteinfo = @@siteinfo[@api_endpoint]
 		
 		_build_ns_map
 	end
@@ -193,8 +220,9 @@ class Sunflower
 	# Assumes action=query. 
 	# 
 	# By default returns an array of all API responses. Attempts to merge the responses
-	# into a response that would have been returned if the limit was infinite. merge_on is
-	# the key of response['query'] to merge consecutive responses on.
+	# into a response that would have been returned if the limit was infinite
+	# (merges the response hashes recursively using Hash#sunflower_recursive_merge!).
+	# merge_on is the key of response["query-continue"] that contains the continuation data.
 	# 
 	# If limit given, will perform no more than this many API calls before returning.
 	# If limit is 1, behaves exactly like #API.
@@ -221,15 +249,18 @@ class Sunflower
 		
 		# merge
 		merged = out[0]
-		meth = (merged['query'][merge_on].is_a?(Hash) ? :merge! : :concat)
-		
 		out.drop(1).each do |cur|
-			merged['query'][merge_on].send meth, cur['query'][merge_on]
+			merged.recursive_merge! cur
 		end
 		
 		return merged
 	end
 	
+	# Returns a Sunflower::Page with the given title belonging to this Sunflower.
+	def page title
+		Sunflower::Page.new title, self
+	end
+	
 	# Log in using given info.
 	def login user='', password=''
 		if user=='' || password==''

metadata

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