board-game-gem 0.3.9 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89306ee68b3eebd59353277a88c8439157031e0d
-  data.tar.gz: fc1411005ad46e6fbd440a837779d88fb3beaf2b
+  metadata.gz: fc068b33bb86956486f67fd7361578490a65ccb8
+  data.tar.gz: 630af575a044c82480b02fe8cfa8e3d0ca9d889d
 SHA512:
-  metadata.gz: a41c69dc211c9529bede5d61f8338005b2460607fcd2dbc40cb2105316ded9739c6b384a38d4d1716b3a868373a44d8c9746aadd94a35a15097292f586b99144
-  data.tar.gz: 0db46eaa50493497dc44e314db7ee388a26a835e6ac22d51fae5b26c09b1d4295a82c6d20640db47cd1dfd5598cfc3c2f449083bfc0d7fb7356948217338da33
+  metadata.gz: dfb84f9b20fe3ec8326402e5374f6cd0861efb887ddc6effe1ce4b3de664a9160216613f1cf266bfc947b223680dccebfe82a0767cf471100c22b9bb47dab609
+  data.tar.gz: 1a3abbffb70a69dcfd56de1792f121657abe45cf2635d7b38a5f5e60ec48145caba4d7fc02180505318e18fb0141b131d0ad7fa1bad27f6615989a149b07c4af

data/lib/bgg_base.rb

@@ -53,5 +53,13 @@ module BoardGameGem
 		def get_datetime(xml, path, key)
 			return DateTime.strptime(get_string(xml, path, key), '%F %T')
 		end
+
+		def key_for_api(api1, api2)
+			@api == 2 ? api2 : api1
+		end
+
+		def api_key_value
+			key_for_api(nil, "value")
+		end
 	end
 end

data/lib/bgg_item.rb

@@ -4,27 +4,40 @@ module BoardGameGem
 		attr_reader :id, :type, :thumbnail, :image, :name, :description, :year_published, :min_players, :max_players,
 			:playing_time, :min_playing_time, :max_playing_time, :statistics
 
-		def initialize(xml)
+		def initialize(xml, api = 2)
+			@api = api
 			if !xml.nil?
-				@id = get_integer(xml, "item", "id")
-				@type = get_string(xml, "item", "type")
+				@id = get_integer(xml, key_for_api("boardgame", "item"), key_for_api("objectid", "id"))
+				if api == 2
+					@type = get_string(xml, "item", "type")
+				else
+					if !get_value(xml, "boardgame", "subtypemismatch").nil?
+						if !get_value(xml, "videogameplatform").nil?
+							@type = "videogame"
+						elsif !get_value(xml, "boardgameexpansion").nil?
+							@type = "boardgameexpansion"
+						end
+					else
+						@type = "boardgame"
+					end
+				end
 				@image = get_string(xml, "image")
 				@thumbnail = get_string(xml, "thumbnail")
-				@name = get_string(xml, "name[type='primary']", "value")
+				@name = get_string(xml, key_for_api("name", "name[type='primary']"), api_key_value)
 				@alternate_names = get_strings(xml, "name[type='alternate']", "value")
 				@description = get_string(xml, "description")
-				@year_published = get_integer(xml, "yearpublished", "value")
-				@min_players = get_integer(xml, "minplayers", "value")
-				@max_players = get_integer(xml, "maxplayers", "value")
-				@playing_time = get_integer(xml, "playingtime", "value")
-				@min_playing_time = get_integer(xml, "minplaytime", "value")
-				@max_playing_time = get_integer(xml, "maxplaytime", "value")
+				@year_published = get_integer(xml, "yearpublished", api_key_value)
+				@min_players = get_integer(xml, "minplayers", api_key_value)
+				@max_players = get_integer(xml, "maxplayers", api_key_value)
+				@playing_time = get_integer(xml, "playingtime", api_key_value)
+				@min_playing_time = get_integer(xml, "minplaytime", api_key_value)
+				@max_playing_time = get_integer(xml, "maxplaytime", api_key_value)
 				@statistics = nil
 				if !xml.at_css("statistics").nil?
 					@statistics = {}
-					@statistics[:user_ratings] = get_integer(xml, "usersrated", "value")
-					@statistics[:average] = get_float(xml, "average", "value")
-					@statistics[:bayes] = get_float(xml, "bayesaverage", "value")
+					@statistics[:user_ratings] = get_integer(xml, "usersrated", api_key_value)
+					@statistics[:average] = get_float(xml, "average", api_key_value)
+					@statistics[:bayes] = get_float(xml, "bayesaverage", api_key_value)
 					@statistics[:ranks] = []
 					xml.css("rank").each do |rank|
 						rank_data = {}
@@ -35,15 +48,15 @@ module BoardGameGem
 						rank_data[:bayes] = rank["bayesaverage"].to_f
 						@statistics[:ranks].push(rank_data)
 					end
-					@statistics[:stddev] = get_float(xml, "stddev", "value")
-					@statistics[:median] = get_float(xml, "median", "value")
-					@statistics[:owned] = get_integer(xml, "owned", "value")
-					@statistics[:trading] = get_integer(xml, "trading", "value")
-					@statistics[:wanting] = get_integer(xml, "wanting", "value")
-					@statistics[:wishing] = get_integer(xml, "wishing", "value")
-					@statistics[:num_comments] = get_integer(xml, "numcomments", "value")
-					@statistics[:num_weights] = get_integer(xml, "numweights", "value")
-					@statistics[:average_weight] = get_integer(xml, "averageweight", "value")
+					@statistics[:stddev] = get_float(xml, "stddev", api_key_value)
+					@statistics[:median] = get_float(xml, "median", api_key_value)
+					@statistics[:owned] = get_integer(xml, "owned", api_key_value)
+					@statistics[:trading] = get_integer(xml, "trading", api_key_value)
+					@statistics[:wanting] = get_integer(xml, "wanting", api_key_value)
+					@statistics[:wishing] = get_integer(xml, "wishing", api_key_value)
+					@statistics[:num_comments] = get_integer(xml, "numcomments", api_key_value)
+					@statistics[:num_weights] = get_integer(xml, "numweights", api_key_value)
+					@statistics[:average_weight] = get_integer(xml, "averageweight", api_key_value)
 				end
 			else
 				@id = 0

data/lib/board-game-gem.rb

@@ -2,25 +2,35 @@ require 'nokogiri'
 require 'open-uri'
 
 module BoardGameGem
-	API_ROOT = "https://www.boardgamegeek.com/xmlapi2"
+	API_1_ROOT = "https://www.boardgamegeek.com/xmlapi"
+	API_2_ROOT = "https://www.boardgamegeek.com/xmlapi2"
 	MAX_ATTEMPTS = 10
 
-	def self.get_item(id, statistics = false, options = {})
+	def self.get_item(id, statistics = false, api = 2, options = {})
 		options[:id] = id
 		options[:stats] = statistics ? 1 : 0
-		item = BGGItem.new(BoardGameGem.request_xml("thing", options))
+		item = BGGItem.new(BoardGameGem.request_xml(api == 2 ? "thing" : "boardgame", options, api), api)
 		item.id == 0 ? nil : item
 	end
 
-	def self.get_items(ids, statistics = false, options = {})
+	def self.get_items(ids, statistics = false, api = 2, 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>")
+		if api == 2
+			path = "thing"
+			element = "item"
+		else
+			path = "boardgame"
+			element = "boardgame"
+		end
+
+		item_xml = BoardGameGem.request_xml(path, options, api)		
+		item_xml.css(element).wrap("<item_data></item_data>")		
 		item_xml.css("item_data").each do |item_data|
-			item_list.push(BGGItem.new(item_data))
+			item_list.push(BGGItem.new(item_data, api))
 		end
+
 		item_list
 	end
 
@@ -57,11 +67,16 @@ module BoardGameGem
 
 	private
 
-	def self.request_xml(method, hash, attempt = 0)
+	def self.request_xml(method, hash, api = 2)
 		params = BoardGameGem.hash_to_uri(hash)
 		value = BoardGameGem.retryable(tries: MAX_ATTEMPTS, on: OpenURI::HTTPError) do
-			#p "#{API_ROOT}/#{method}?#{params}"
-			open("#{API_ROOT}/#{method}?#{params}") do |file|
+			if api == 2
+				api_path = "#{API_2_ROOT}/#{method}?#{params}"
+			else
+				api_path = "#{API_1_ROOT}/#{method}/#{hash[:id]}?stats=#{hash[:stats] ? 1 : 0}"
+			end
+			p api_path
+			open(api_path) do |file|
 				if file.status[0] != "200"
 					sleep 0.05
 					throw OpenURI::HTTPError

data/lib/boardgamegem/version.rb

@@ -1,3 +1,3 @@
 module BoardGameGem
-  VERSION = "0.3.9"
+  VERSION = "0.4.0"
 end

data/test.rb

@@ -1,4 +1,8 @@
 require_relative 'lib/board-game-gem'
-collection =	BoardGameGem.get_collection("AcceptableIce")
+#p BoardGameGem.get_items([15944, 15955, 15956]).to_s
+
+p BoardGameGem.get_items([123260, 123265, 61001], true).map { |x| x.type }
+
+
+p BoardGameGem.get_item(123260, true)
 
-p collection.status_of(68448)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: board-game-gem
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.4.0
 platform: ruby
 authors:
 - Jake Roussel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-18 00:00:00.000000000 Z
+date: 2016-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake