board-game-gem 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 176f0892877f5d69ed9f39d40b45f7629f4f894b
-  data.tar.gz: 319eb3f37f20f0c2e1edd1f72120a181459b2229
+  metadata.gz: 2c3e0fa45e3189984d4d424a96ce0456fff79e6d
+  data.tar.gz: ad86d9f0acb69d0868e0832faf22825ac2285bd8
 SHA512:
-  metadata.gz: 7706f8ca646f2219609fe99721d64d2dafd09bade34d7e4135512b7528912be95d0ff3bba8ad6be4972b9a12aeb3e20e5a3b4c04a1ea75335b1d7227342bdcd7
-  data.tar.gz: 99826cab898a1ab99c90e3dcbdfb5709f66ec6d0f07af0af51bdfaf81b05052069d6373bec7aded21dcad2bd4100b95b2ea3d5f63f8f77e521403aad9d3f5700
+  metadata.gz: 7186b16e34ab46758272f8f52f3e4ddc0a05ad8b8d12ae34b4b5c0d86e30f73887644802142edd1f175b9aa9d7eb657a2c546e02da4050fbf01796e9e94d2fff
+  data.tar.gz: 0dd412ee4a6e553d0b245ac51c6a4891113d6e93c579cd20aaa7c5736f40b5cf6f134ef94000cc34d76d7c14347e4d9d4dac636630c733c1472792966981cb9d

data/lib/board-game-gem.rb

@@ -2,42 +2,54 @@ require 'nokogiri'
 require 'open-uri'
 
 module BoardGameGem
-	API_ROOT = "http://www.boardgamegeek.com/xmlapi2"
+	API_ROOT = "https://www.boardgamegeek.com/xmlapi2"
 	MAX_ATTEMPTS = 10
 
-	def BoardGameGem.get_item(id, statistics = false, options = {})
+	def self.get_item(id, statistics = false, options = {})
 		options[:id] = id
 		options[:stats] = statistics ? 1 : 0
 		item = BGGItem.new(BoardGameGem.request_xml("thing", options))
-		return item.id == 0 ? nil : item
+		item.id == 0 ? nil : item
 	end
 
-	def BoardGameGem.get_family(id, options = {})
+	def self.get_items(ids, statistics = false, options = {})
+		options[:id] = ids.join(",")
+		options[:stats] = statistics ? 1 : 0
+		item_xml = BoardGameGem.request_xml("thing", options)
+		item_list = []
+		item_xml.css("item").wrap("<item_data></item_data>")
+		item_xml.css("item_data").each do |item_data|
+			item_list.push(BGGItem.new(item_data))
+		end
+		item_list
+	end
+
+	def self.get_family(id, options = {})
 		options[:id] = id
 		family = BGGFamily.new(BoardGameGem.request_xml("family", options))
-		return family.id == 0 ? nil : family
+		family.id == 0 ? nil : family
 	end
 
-	def BoardGameGem.get_user(username, options = {})
+	def self.get_user(username, options = {})
 		options[:name] = username
 		user = BGGUser.new(BoardGameGem.request_xml("user", options))
-		return user.id == 0 ? nil : user
+		user.id == 0 ? nil : user
 	end
 
-	def BoardGameGem.get_collection(username, options = {})
+	def self.get_collection(username, options = {})
 		options[:username] = username
 		collection_xml = BoardGameGem.request_xml("collection", options)
 		if collection_xml.css("error").length > 0
-			return nil
+			nil
 		else
-			return BGGCollection.new(collection_xml)
+			BGGCollection.new(collection_xml)
 		end
 	end
 
-	def BoardGameGem.search(query, options = {})
+	def self.search(query, options = {})
 		options[:query] = query
 		xml = BoardGameGem.request_xml("search", options)
-		return {
+		{
 			:total => xml.at_css("items")["total"].to_i,
 			:items => xml.css("item").map { |x| BGGSearchResult.new(x) }
 		}
@@ -45,31 +57,44 @@ module BoardGameGem
 
 	private
 
-	def BoardGameGem.request_xml(method, hash, attempt = 0)
+	def self.request_xml(method, hash, attempt = 0)
 		params = BoardGameGem.hash_to_uri(hash)
-		open("#{API_ROOT}/#{method}?#{params}") do |file|
-			if file.status == 202
-				if attempt < MAX_ATTEMPTS
+		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
-					BoardGameGem.request_xml(method, hash, attempt + 1)
+					throw OpenURI::HTTPError
 				else
-					return nil
+					value = Nokogiri::XML(file.read)
 				end
-			else
-				Nokogiri::XML(file.read)
 			end
-		end
+		end 
+		value
 	end
 
-	def BoardGameGem.hash_to_uri(hash)
+	def self.hash_to_uri(hash)
 		return hash.to_a.map { |x| "#{x[0]}=#{x[1]}" }.join("&")
 	end
+
+	def self.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.3.6"
+  VERSION = "0.3.7"
 end

data/test.rb

@@ -1,2 +1,2 @@
-require_relative 'lib/boardgamegem'
+require_relative 'lib/board-game-gem'
 p	BoardGameGem.get_items([1,2,3,4,5])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: board-game-gem
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Jake Roussel
@@ -76,7 +76,6 @@ files:
 - lib/bgg_search_result.rb
 - lib/bgg_user.rb
 - lib/board-game-gem.rb
-- lib/boardgamegem.rb
 - lib/boardgamegem/version.rb
 - test.rb
 homepage: http://www.github.com/acceptableice/boardgamegem

data/lib/boardgamegem.rb

@@ -1,100 +0,0 @@
-require 'nokogiri'
-require 'open-uri'
-
-module BoardGameGem
-	API_ROOT = "https://www.boardgamegeek.com/xmlapi2"
-	MAX_ATTEMPTS = 10
-
-	def self.get_item(id, statistics = false, options = {})
-		options[:id] = id
-		options[:stats] = statistics ? 1 : 0
-		item = BGGItem.new(BoardGameGem.request_xml("thing", options))
-		item.id == 0 ? nil : item
-	end
-
-	def self.fetch_items(ids, statistics = false, options = {})
-		options[:id] = ids.join(",")
-		options[:stats] = statistics ? 1 : 0
-		item_xml = BoardGameGem.request_xml("thing", options)
-		item_list = []
-		item_xml.css("item").wrap("<item_data></item_data>")
-		item_xml.css("item_data").each do |item_data|
-			item_list.push(BGGItem.new(item_data))
-		end
-		item_list
-	end
-
-	def self.get_family(id, options = {})
-		options[:id] = id
-		family = BGGFamily.new(BoardGameGem.request_xml("family", options))
-		family.id == 0 ? nil : family
-	end
-
-	def self.get_user(username, options = {})
-		options[:name] = username
-		user = BGGUser.new(BoardGameGem.request_xml("user", options))
-		user.id == 0 ? nil : user
-	end
-
-	def self.get_collection(username, options = {})
-		options[:username] = username
-		collection_xml = BoardGameGem.request_xml("collection", options)
-		if collection_xml.css("error").length > 0
-			nil
-		else
-			BGGCollection.new(collection_xml)
-		end
-	end
-
-	def self.search(query, options = {})
-		options[:query] = query
-		xml = BoardGameGem.request_xml("search", options)
-		{
-			:total => xml.at_css("items")["total"].to_i,
-			:items => xml.css("item").map { |x| BGGSearchResult.new(x) }
-		}
-	end
-
-	private
-
-	def self.request_xml(method, hash, attempt = 0)
-		params = BoardGameGem.hash_to_uri(hash)
-		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
-			end
-		end 
-		value
-	end
-
-	def self.hash_to_uri(hash)
-		return hash.to_a.map { |x| "#{x[0]}=#{x[1]}" }.join("&")
-	end
-
-	def self.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_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'