board-game-gem 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d992e082ecbc6ba804153d4a436d77ce1ba97b4c
-  data.tar.gz: 2a7bc098550f61b8bd306931cc4dd960eb1a3573
+  metadata.gz: 885a33bd0b10621b111609e0c6fac82a1b2f70e3
+  data.tar.gz: 03e2c7b96ce5ed3e80c4d09e77f9e1088787067f
 SHA512:
-  metadata.gz: 1af19a3020690d2c10d2a755f0a41bd72814aa36b74f0c4c4e287f97b69a3835a061bcaeab985b3d2104cf9c566b6f6c8ab0e16442ab8ae1a0039b47a83c2ba9
-  data.tar.gz: 7981c3e9766e03183e5d7e490cc39c76c13234f0705c1557472925bc776cb563615d92294ae86697d3255b0b8ddab2c1cbe88ec7e7d797e7a89624cc7d0f5c40
+  metadata.gz: fad520ae5d8380c4941f6c604580d2d694dfdd9fb5cb2ab48ce3ee260a4e6ea4c5e07fead824ce629e406b790063bdeb7a39ac65dfa9507307dbc393cf33446e
+  data.tar.gz: b9cf6c632da9ed9e56db5b5ed49e76e47c7fc1ab1a0756f928111d4652047c35ee3110ec5d8853af80fcd1ae47c41aafbc7a02a299a0bdef101f8338f11037cd

data/lib/bgg_item.rb

@@ -5,7 +5,6 @@ module BoardGameGem
 			:playing_time, :min_playing_time, :max_playing_time, :statistics
 
 		def initialize(xml)
-			p xml.nil? ? "yes" : "no"
 			if !xml.nil?
 				@id = get_integer(xml, "item", "id")
 				@type = get_string(xml, "item", "type")

data/lib/boardgamegem.rb

@@ -60,34 +60,42 @@ module BoardGameGem
 
 	def BoardGameGem.request_xml(method, hash, attempt = 0)
 		params = BoardGameGem.hash_to_uri(hash)
-		if attempt < MAX_ATTEMPTS
-			begin
-				open("#{API_ROOT}/#{method}?#{params}") do |file|
-					if file.status[0] != "200"
-						sleep 0.05
-						BoardGameGem.request_xml(method, hash, attempt + 1)
-					else
-						Nokogiri::XML(file.read)
-					end
+		value = BoardGameGem.retryable(tries: MAX_ATTEMPTS, on: OpenURI::HTTPError) do
+			open("#{API_ROOT}/#{method}?#{params}") do |file|
+				if file.status[0] != "200"
+					sleep 0.05
+					throw OpenURI::HTTPError
+				else
+					value = Nokogiri::XML(file.read)
 				end
-			rescue
-				sleep 0.05
-				BoardGameGem.request_xml(method, hash, attempt + 1)
 			end
-		else
-			return nil
 		end
+		value
 	end
 
 	def BoardGameGem.hash_to_uri(hash)
 		return hash.to_a.map { |x| "#{x[0]}=#{x[1]}" }.join("&")
 	end
+
+	def BoardGameGem.retryable(options = {}, &block)
+	  opts = { :tries => 1, :on => Exception }.merge(options)
+
+	  retry_exception, retries = opts[:on], opts[:tries]
+
+	  begin
+	    return yield
+	  rescue retry_exception
+	    retry if (retries -= 1) > 0
+	  end
+
+	  yield
+	end
 end
 
-require 'bgg_base'
-require 'bgg_item'
-require 'bgg_family'
-require 'bgg_user'
-require 'bgg_collection'
-require 'bgg_collection_item'
-require 'bgg_search_result'
+require_relative 'bgg_base'
+require_relative 'bgg_item'
+require_relative 'bgg_family'
+require_relative 'bgg_user'
+require_relative 'bgg_collection'
+require_relative 'bgg_collection_item'
+require_relative 'bgg_search_result'

data/lib/boardgamegem/version.rb

@@ -1,3 +1,3 @@
 module BoardGameGem
-  VERSION = "0.2.8"
+  VERSION = "0.2.9"
 end

data/test.rb

@@ -1,3 +1,3 @@
 require_relative 'lib/boardgamegem'
 
-p	BoardGameGem.get_user("AcceptableIce")
+p	BoardGameGem.get_item(13122)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: board-game-gem
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - Jake Roussel