games_radar 0.1.0 → 0.1.1

data/lib/games_radar/game.rb

@@ -35,8 +35,8 @@ module GamesRadar
       }.merge(options)
 
       request "/games", options do |xml|
-        total_rows = xml.at("total_rows").inner_text.to_i
-        items = xml.search("game").collect {|node| new(node) }
+        total_rows = xml.at("total_rows").text.to_i
+        items = xml.search("game").collect {|node| initialize_with_node node }
 
         GamesRadar::Result.new(
           :items     => items,
@@ -50,16 +50,21 @@ module GamesRadar
     def self.initialize_with_node(xml) # :nodoc:
       raise GamesRadar::GameNotFoundError unless xml.at("id")
 
-      new(
-        :id => xml.at("id").inner_text,
+      # First set up mandatory attributes
+      options = {
+        :id => xml.at("id").text,
         :name => {
-          :us => xml.at("name > us").inner_text,
-          :uk => xml.at("name > uk").inner_text
+          :us => xml.at("name > us").text,
+          :uk => xml.at("name > uk").text
         },
-        :platform => GamesRadar::Platform.new(xml.at("platform > id").inner_text),
-        :genre => GamesRadar::Genre.new(xml.at("genre > id").inner_text),
-        :description => Nokogiri(xml.at("description").inner_text).inner_text
-      )
+        :platform => GamesRadar::Platform.new(xml.at("platform > id").text)
+      }
+
+      # Then set up optional attributes
+      options[:genre] = GamesRadar::Genre.new(xml.at("genre > id").text) if xml.at("genre > id")
+      options[:description] = Nokogiri(xml.at("description").text).text if xml.at("description")
+
+      new(options)
     end
 
     # Return a game with the specified id.

data/lib/games_radar/request.rb

@@ -24,6 +24,14 @@ module GamesRadar
       :filter => :game_name
     }
 
+    class << self
+      # Hold the latest response.
+      attr_accessor :response
+
+      # Hold the latest uri.
+      attr_accessor :uri
+    end
+
     # Make a API request processing the provided parameters and
     # merging the API key in every request.
     #
@@ -33,8 +41,9 @@ module GamesRadar
     #     # do whatever you want with the response XML
     #   end
     def request(path, params = {}, &block)
-      uri = uri_for(path, params.dup)
-      xml = Nokogiri::XML(open(uri).read)
+      GamesRadar::Request.uri = uri_for(path, params.dup)
+      GamesRadar::Request.response = open(GamesRadar::Request.uri)
+      xml = Nokogiri::XML(GamesRadar::Request.response.read)
 
       handle_exceptions! xml
 
@@ -43,7 +52,7 @@ module GamesRadar
 
     # Raise exception when XML contains known error codes
     def handle_exceptions!(xml) # :nodoc:
-      case xml.search("error > code").inner_text.to_i
+      case xml.search("error > code").text.to_i
       when 10001 then raise GamesRadar::InvalidApiKeyError
       end
     end

data/lib/games_radar/version.rb

@@ -2,7 +2,7 @@ module GamesRadar
   module Version
     MAJOR = 0
     MINOR = 1
-    PATCH = 0
+    PATCH = 1
     STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
   end
 end

data/test/request_test.rb

@@ -29,4 +29,10 @@ class GamesRadar::GenreTest < Test::Unit::TestCase
     @request.prepare_params!(options)
     assert_equal "sport+games", options[:genre]
   end
+
+  def test_response_object
+    register_uri "/game/20060713144458560042?api_key=SxKuVse22qqUcZXq", "game.xml"
+    @request.request("/game/20060713144458560042") do |xml|
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: games_radar
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Nando Vieira
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-16 00:00:00 -02:00
+date: 2010-02-17 00:00:00 -02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency