BoardGameGem 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55c33b7b69af9dedf6c2cd7e81d6f732fd7f75c6
-  data.tar.gz: c3e9715859d0a8c6ba0bfeae4c4d1665afca779f
+  metadata.gz: 3eb488f2147d01f50bf5e289daaed8ed6a18f666
+  data.tar.gz: 97a5509a6aa1925f6331b74c55a86625b973052f
 SHA512:
-  metadata.gz: b073d6d5fa3d7c30787cbceab8ffa13b8d6fd1265cabb132653fcc0a5b935d2edfa7a7063a1a3ec5ce2e21013d0a685152e19ca0e37ff66f2acdf963d3e08a0c
-  data.tar.gz: d66d884434f2b9caeac8ac98b32b647149a28547389316c93f06c9cfabf77451c8dd78452ae449b0b1814cc26088a6894721093fa86bd857ed8b1279ca10a710
+  metadata.gz: 6f6e04d0e68ec8d73eccef07dd189171bd893cb4dbac86ab605bf59ae2655154157451af204104744cb1a2e274df0baeb0f0d2f092ec9ca6f0b720e96cb608f5
+  data.tar.gz: 4de4f0e259a083c987b0f1cddba03aad5c01fae9f96fefd4d7308feca33cf3d5e9f013fa71f9dd78ca43af80fb3fb9e23f8e91138a1781e896976d1936e66b78

data/lib/bgg_base.rb

@@ -1,17 +1,9 @@
 module BoardGameGem
 	class BGGBase
-		def initialize(xml)
-			@xml = xml
-		end
-
-		def to_s
-			return instance_variables.map{|ivar| "#{ivar} => #{instance_variable_get ivar}" }
-		end
-
 		protected
 
-		def get_value(path, key = nil)
-			item = @xml.at_css(path)
+		def get_value(xml, path, key = nil)
+			item = xml.at_css(path)
 			if item.nil?
 				return nil
 			end
@@ -22,9 +14,9 @@ module BoardGameGem
 			end
 		end
 
-		def get_values(path, key = nil)
+		def get_values(xml, path, key = nil)
 			results = []
-			@xml.css(path).each do |item|
+			xml.css(path).each do |item|
 				if key.nil?
 					results.push(item.content)
 				else
@@ -34,32 +26,32 @@ module BoardGameGem
 			return results
 		end
 
-		def get_boolean(path, key = nil)
-			return get_integer(path, key) == 1 rescue nil
+		def get_boolean(xml, path, key = nil)
+			return get_integer(xml, path, key) == 1 rescue nil
 		end
 
-		def get_integer(path, key = nil)
-			return get_value(path, key).to_i rescue nil
+		def get_integer(xml, path, key = nil)
+			return get_value(xml, path, key).to_i rescue nil
 		end
 
-		def get_integers(path, key = nil)
-			return get_values(path, key).map {|x| x.to_i } rescue nil
+		def get_integers(xml, path, key = nil)
+			return get_values(xml, path, key).map {|x| x.to_i } rescue nil
 		end
 
-		def get_string(path, key = nil)
-			return get_value(path, key).to_s rescue nil
+		def get_string(xml, path, key = nil)
+			return get_value(xml, path, key).to_s rescue nil
 		end
 
-		def get_strings(path, key = nil)
-			return get_values(path, key).map {|x| x.to_s } rescue nil
+		def get_strings(xml, path, key = nil)
+			return get_values(xml, path, key).map {|x| x.to_s } rescue nil
 		end
 
-		def get_float(path, key = nil)
-			return get_value(path, key).to_f rescue nil
+		def get_float(xml, path, key = nil)
+			return get_value(xml, path, key).to_f rescue nil
 		end
 
-		def get_datetime(path, key)
-			return DateTime.strptime(get_string(path, key), '%F %T')
+		def get_datetime(xml, path, key)
+			return DateTime.strptime(get_string(xml, path, key), '%F %T')
 		end
 	end
 end

data/lib/bgg_collection.rb

@@ -4,10 +4,9 @@ module BoardGameGem
 		attr_reader :count, :items
 
 		def initialize(xml)
-			super
-			@count = get_integer("items", "totalitems")
+			@count = get_integer(xml, "items", "totalitems")
 			@items = []
-			@xml.css("item").each do |item|
+			xml.css("item").each do |item|
 				@items.push(BGGCollectionItem.new(item))
 			end
 		end

data/lib/bgg_collection_item.rb

@@ -4,26 +4,25 @@ module BoardGameGem
 		attr_reader :id, :type, :name, :year_published, :image, :thumbnail, :num_players, :status, :num_plays
 
 		def initialize(xml)
-			super
 			@id = xml["objectid"].to_i
 			@type = xml["subtype"]
-			@name = get_string("name")
-			@year_published = get_string("yearpublished")
-			@image = get_string("image")
-			@thumbnail = get_string("thumbnail")
-			@num_players = get_string("numplayers")
+			@name = get_string(xml, "name")
+			@year_published = get_string(xml, "yearpublished")
+			@image = get_string(xml, "image")
+			@thumbnail = get_string(xml, "thumbnail")
+			@num_players = get_string(xml, "numplayers")
 			@status = {
-				:own => get_boolean("status", "own"),
-				:prev_owned => get_boolean("status", "prevowned"),
-				:for_trade => get_boolean("status", "fortrade"),
-				:want => get_boolean("status", "want"),
-				:want_to_play => get_boolean("status", "wanttoplay"),
-				:want_to_buy => get_boolean("status", "wanttobuy"),
-				:wishlist => get_boolean("status", "wishlist"),
-				:preordered => get_boolean("status", "preordered"),
-				:last_modified => get_datetime("status", "lastmodified")
+				:own => get_boolean(xml, "status", "own"),
+				:prev_owned => get_boolean(xml, "status", "prevowned"),
+				:for_trade => get_boolean(xml, "status", "fortrade"),
+				:want => get_boolean(xml, "status", "want"),
+				:want_to_play => get_boolean(xml, "status", "wanttoplay"),
+				:want_to_buy => get_boolean(xml, "status", "wanttobuy"),
+				:wishlist => get_boolean(xml, "status", "wishlist"),
+				:preordered => get_boolean(xml, "status", "preordered"),
+				:last_modified => get_datetime(xml, "status", "lastmodified")
 			}
-			@num_plays = get_integer("numplays")
+			@num_plays = get_integer(xml, "numplays")
 		end
 
 		def to_item(statistics = false)

data/lib/bgg_family.rb

@@ -4,13 +4,12 @@ module BoardGameGem
 		attr_reader :id, :thumbnail, :image, :name, :alternate_names, :description
 
 		def initialize(xml)
-			super
-			@id = get_integer("item", "id")
-			@thumbnail = get_string("thumbnail")
-			@image = get_string("image")
-			@name = get_string("name[type='primary']", "value")
-			@alternate_names = get_strings("name[type='alternate']", "value")
-			@description = get_string("description")
+			@id = get_integer(xml, "item", "id")
+			@thumbnail = get_string(xml, "thumbnail")
+			@image = get_string(xml, "image")
+			@name = get_string(xml, "name[type='primary']", "value")
+			@alternate_names = get_strings(xml, "name[type='alternate']", "value")
+			@description = get_string(xml, "description")
 		end
 	end
 end

data/lib/bgg_item.rb

@@ -5,27 +5,26 @@ module BoardGameGem
 			:playing_time, :min_playing_time, :max_playing_time, :statistics
 
 		def initialize(xml)
-			super
-			@id = get_integer("item", "id")
-			@type = get_string("item", "type")
-			@thumbnail = get_string("thumbnail")
-			@name = get_string("name[type='primary']", "value")
-			@alternate_names = get_strings("name[type='alternate']", "value")
-			@description = get_string("description")
-			@year_published = get_integer("yearpublished", "value")
-			@min_players = get_integer("minplayers", "value")
-			@max_players = get_integer("maxplayers", "value")
-			@playing_time = get_integer("playingtime", "value")
-			@min_playing_time = get_integer("minplaytime", "value")
-			@max_playing_time = get_integer("maxplaytime", "value")
+			@id = get_integer(xml, "item", "id")
+			@type = get_string(xml, "item", "type")
+			@thumbnail = get_string(xml, "thumbnail")
+			@name = get_string(xml, "name[type='primary']", "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")
 			@statistics = nil
-			if !@xml.at_css("statistics").nil?
+			if !xml.at_css("statistics").nil?
 				@statistics = {}
-				@statistics[:user_ratings] = get_integer("usersrated", "value")
-				@statistics[:average] = get_float("average", "value")
-				@statistics[:bayes] = get_float("bayesaverage", "value")
+				@statistics[:user_ratings] = get_integer(xml, "usersrated", "value")
+				@statistics[:average] = get_float(xml, "average", "value")
+				@statistics[:bayes] = get_float(xml, "bayesaverage", "value")
 				@statistics[:ranks] = []
-				@xml.css("rank").each do |rank|
+				xml.css("rank").each do |rank|
 					rank_data = {}
 					rank_data[:type] = rank["type"]
 					rank_data[:name] = rank["name"]
@@ -33,15 +32,15 @@ module BoardGameGem
 					rank_data[:bayes] = rank["bayesaverage"].to_f
 					@statistics[:ranks].push(rank_data)
 				end
-				@statistics[:stddev] = get_float("stddev", "value")
-				@statistics[:median] = get_float("median", "value")
-				@statistics[:owned] = get_integer("owned", "value")
-				@statistics[:trading] = get_integer("trading", "value")
-				@statistics[:wanting] = get_integer("wanting", "value")
-				@statistics[:wishing] = get_integer("wishing", "value")
-				@statistics[:num_comments] = get_integer("numcomments", "value")
-				@statistics[:num_weights] = get_integer("numweights", "value")
-				@statistics[:average_weight] = get_integer("averageweight", "value")
+				@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")
 			end
 			
 		end

data/lib/bgg_search_result.rb

@@ -4,11 +4,10 @@ module BoardGameGem
 		attr_reader :id, :type, :name, :year_published
 		
 		def initialize(xml)
-			super
 			@id = xml["id"].to_i
 			@type = xml["type"]
-			@name = get_string("name", "value")
-			@year_published = get_string("yearpublished", "value")
+			@name = get_string(xml, "name", "value")
+			@year_published = get_string(xml, "yearpublished", "value")
 		end
 
 		def to_item(statistics = false)

data/lib/bgg_user.rb

@@ -4,14 +4,13 @@ module BoardGameGem
 		attr_reader :id, :name, :avatar, :year_registered, :last_login, :state, :trade_rating
 
 		def initialize(xml)
-			super
-			@id = get_integer("user", "id")
-			@name = get_string("user", "name")
-			@avatar = get_string("avatarlink", "value")
-			@year_registered = get_integer("yearregistered", "value")
-			@last_login = get_string("lastlogin", "value")
-			@state = get_string("stateorprovince", "value")
-			@trade_rating = get_integer("traderating", "value")
+			@id = get_integer(xml, "user", "id")
+			@name = get_string(xml, "user", "name")
+			@avatar = get_string(xml, "avatarlink", "value")
+			@year_registered = get_integer(xml, "yearregistered", "value")
+			@last_login = get_string(xml, "lastlogin", "value")
+			@state = get_string(xml, "stateorprovince", "value")
+			@trade_rating = get_integer(xml, "traderating", "value")
 		end
 
 		def get_collection

data/lib/boardgamegem/version.rb

@@ -1,3 +1,3 @@
 module BoardGameGem
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: BoardGameGem
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Jake Roussel