scoreoid 1.1.0 → 1.1.1

data/CHANGES.md

@@ -1,6 +1,11 @@
 Scoreoid Ruby Change Log
 ========================
 
+2012-11-25 *v1.1.1*
+-------------------
+
+- Fix a issue that occured when parsing API responses where the root node is an array.
+
 2012-11-25 *v1.1.0*
 -------------------
 

data/lib/scoreoid/api.rb

@@ -35,14 +35,25 @@ module Scoreoid
 			# @param [Hash] params Parameters to include in the API request.
 			#
 			# @raise [Scoreoid::APIError] if the Scoreoid API returns an error response.
+			# @raise [MultiJson::DecodeError] if the Scoreoid API response can't be parsed
+			#    (report a bug if this happens!)
 			#
 			# @return [Hash] The Scoreoid API response parsed into a Hash.
 			#
 			# @see .query
 			def query_and_parse(api_method, params={})
+				# We're gonna parse JSON, so ask for JSON
 				params = params.merge(response: 'json')
 
+				# Query Scoreoid
 				api_response = self.query(api_method, params)
+
+				# Fix for API responses that return arrays (they can't be parsed by MultiJson)
+				if api_response =~ /\A\[/ and api_response =~ /\]\Z/
+					api_response.sub!(/\A\[/, '') # Remove leading bracket
+					api_response.sub!(/\]\Z/, '') # Remove trailing bracket
+				end
+
 				parsed_result = MultiJson.load(api_response)
 
 				raise APIError, parsed_result['error'] if parsed_result.key? 'error'

data/lib/scoreoid/version.rb

@@ -1,4 +1,4 @@
 module Scoreoid
 	# The currently loaded Scoreoid Ruby version.
-	VERSION = '1.1.0'
+	VERSION = '1.1.1'
 end

data/spec/api_spec.rb

@@ -66,5 +66,14 @@ describe Scoreoid::API do
 				Scoreoid::API.query_and_parse('getScores')
 			end.to raise_error(Scoreoid::APIError, 'The API key is broken or the game is not active')
 		end
+
+		it 'should not raise an error if the the response is an array' do
+			example_response = %q([{"Player": {"username": "pwner"}}])
+			Scoreoid::API.stub(:query).and_return(example_response)
+
+			expect do
+				Scoreoid::API.query_and_parse('getPlayer', username: 'someuser')
+			end.to_not raise_error
+		end
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scoreoid
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors: