reve 0.0.86 → 0.0.91

data/lib/reve/classes.rb

@@ -531,7 +531,7 @@ module Reve #:nodoc:
       attr_reader :system_id, :ship_kills, :faction_kills, :pod_kills
       def initialize(elem) #:nodoc:        
         @system_id     = elem['solarSystemID'].to_i
-        @ship_kills    = elem['shipJills'].to_i
+        @ship_kills    = elem['shipKills'].to_i
         @faction_kills = elem['factionKills'].to_i
         @pod_kills     = elem['podKills'].to_i
       end            

data/lib/reve.rb

@@ -308,7 +308,7 @@ module Reve
     # Does big brother tracking from
     # http://api.eve-online.com/corp/MemberTracking.xml.aspx
     # Expects:
-    # * charid ( Integer | String ) - Look at players in this Character's Corporation
+    # * characterid ( Integer | String ) - Look at players in this Character's Corporation
     # See also: Reve::Classes::MemberTracking
     def member_tracking(opts = {:characterid => nil})
       args = postfields(opts)
@@ -320,7 +320,7 @@ module Reve
     # Gets one's own personal WalletBalance from
     # http://api.eve-online.com/char/AccountBalance.xml.aspx
     # Expects:
-    # * charid ( Integer | String ) - Look at this player's WalletBalance
+    # * characterid ( Integer | String ) - Look at this player's WalletBalance
     # See also: Reve::Classes::WalletBalance and corporate_wallet_balance
     def personal_wallet_balance(opts = { :characterid => nil })
       args = postfields(opts)
@@ -332,7 +332,7 @@ module Reve
     # Gets one's corporate WalletBalance from 
     # http://api.eve-online.com/corp/AccountBalance.xml.aspx
     # Expects:
-    # * charid ( Integer | String ) - Look at WalletBalance objects from this Character's Corporation
+    # * characterid ( Integer | String ) - Look at WalletBalance objects from this Character's Corporation
     # See also:  Reve::Classes::WalletBalance and personal_wallet_balance
     def corporate_wallet_balance(opts = { :characterd => nil })
       args = postfields(opts)
@@ -359,7 +359,7 @@ module Reve
     # http://api.eve-online.com/corp/WalletTransactions.xml.aspx
     # Expects:
     # * account_key ( Integer | String ) - Account key (1000-1006) to look at.
-    # * charid ( Integer | String ) - Look at WalletTransaction objects from this Character's Corporation
+    # * characterid ( Integer | String ) - Look at WalletTransaction objects from this Character's Corporation
     # * before_trans_id ( Integer | String ) - Gets a list of WalletTransaction objects from before this Transaction ID.
     # See also: Reve::Classes::WalletTransaction and
     # personal_wallet_transactions
@@ -374,7 +374,7 @@ module Reve
     # http://api.eve-online.com/corp/WalletJournal.xml.aspx
     # Expects:
     # * account_key ( Integer | String ) - Account key (1000-1006) to look at.
-    # * charid ( Integer | String ) - Look at WalletJournal objects from this Character's Corporation
+    # * characterid ( Integer | String ) - Look at WalletJournal objects from this Character's Corporation
     # * before_ref_id ( Integer | String ) - Gets a list of  WalletTransaction objects from before this RefID.
     # See also: Reve::Classes::WalletJournal and personal_wallet_journal
     def corporate_wallet_journal(opts = {:accountkey => nil, :characterid => nil, :beforerefid => nil})
@@ -387,7 +387,7 @@ module Reve
     # Gets one's own personal WalletJournal list from
     # http://api.eve-online.com/char/WalletJournal.xml.aspx
     # Expects:
-    # * charid ( Integer | String ) - Look at this player's WalletJournal list
+    # * characterid ( Integer | String ) - Look at this player's WalletJournal list
     # * before_ref_id ( Integer | String ) - Gets a list of WalletJournal objects from before this RefID.
     # See also: Reve::Classes::WalletJournal and corporate_wallet_journal
     def personal_wallet_journal(opts = { :characterid => nil, :beforerefid => nil} )
@@ -446,7 +446,7 @@ module Reve
     # Gets the SkillInTraining from
     # http://api.eve-online.com/char/SkillInTraining.xml.aspx
     # Expects:
-    # * charid ( Integer | String ) - Get the SkillInTraining for this Character
+    # * characterid ( Integer | String ) - Get the SkillInTraining for this Character
     # See also: Reve::Classes::SkillInTraining
     def skill_in_training(opts = {:characterid => nil})
       args = postfields(opts)
@@ -462,10 +462,10 @@ module Reve
       Reve::Classes::SkillInTraining.new(h)
     end
     
-    # Returns a list of Reve::Classes::Starbase for charid's Corporation.
+    # Returns a list of Reve::Classes::Starbase for characterid's Corporation.
     # http://api.eve-online.com/corp/StarbaseList.xml.aspx
     # Expects:
-    # * charid ( Integer | String ) - Get the Starbase list for this character's Corporation
+    # * characterid ( Integer | String ) - Get the Starbase list for this character's Corporation
     # See also Reve::Classes::Starbase
     def starbases(opts = { :characterid => nil})
       args = postfields(opts)
@@ -477,7 +477,7 @@ module Reve
     # Returns the fuel status for the Starbase whose item id is starbase_id
     # http://api.eve-online.com/corp/StarbaseDetail.xml.aspx
     # Expects:
-    # * charid ( Integer | String ) - Get the Starbase associated wih this character's Corporation
+    # * characterid ( Integer | String ) - Get the Starbase associated wih this character's Corporation
     # * starbase_id ( Integer ) - Get the fuel for this Starbase. This is the Starbase's itemid.
     # See also Reve::Classes::StarbaseFuel
     def starbase_fuel(opts = { :characterid => nil, :starbaseid => nil })
@@ -641,9 +641,9 @@ module Reve
     # TODO: Consider moving this whole thing into process_query to avoid 
     # calling this in every method!
     def postfields(opts = {})
-      ret = { "userID" => @userid, "apiKey" => @key }.merge(opts)
+      ret = { "userid" => @userid, "apikey" => @key, "characterid" => @charid }.merge(opts.stringify_keys)
       ret.inject({}) do |n, (k,v)|
-        n[k] = v.to_s if v
+        n[k.downcase] = v.to_s if v
         n
       end
     end
@@ -656,10 +656,11 @@ module Reve
     # nil will be returned
     # TODO: Consider moving this whole thing into process_query before the URI parsing
     def compute_hash(args = {})
-      return nil unless args.include?(:just_hash)
-      args.delete(:just_hash)
-      url = args[:url].kind_of?(URI) ? args[:url].path : args[:url]
-      args.delete(:url)
+      args.stringify_keys!
+      return nil unless args.include?('just_hash')
+      args.delete('just_hash')
+      url = args['url'].kind_of?(URI) ? args['url'].path : args['url']
+      args.delete('url')
       spl = url.split '/'
       ret = (spl[-2] + '/' + spl[-1]) + ':'
       args.delete_if { |k,v| (v || "").to_s.length == 0 } # Delete keys if the value is nil

data/test/test_reve.rb

@@ -51,6 +51,11 @@ class TestReve < Test::Unit::TestCase
     assert_instance_of String, h
     assert_equal "xml/alliances.xml", h    
   end
+  
+  def test_charid_default_works_when_characterid_is_nil
+    # this line of code is wrong on so many levels.
+    assert_equal("CharID", Reve::API.new('uid','key','CharID').send(:postfields,{})['characterid'])
+  end
 
   def test_makes_a_complex_hash
     Reve::API.corporate_wallet_trans_url = XML_BASE + 'market_transactions.xml'
@@ -58,7 +63,7 @@ class TestReve < Test::Unit::TestCase
     @api.key = 'aaa'
     h = @api.corporate_wallet_transactions :accountkey => '1001', :characterid => 123, :beforerefid => 456, :just_hash => true
     assert_instance_of String, h
-    assert_equal 'xml/market_transactions.xml:accountkey:1001:apiKey:aaa:beforerefid:456:characterid:123:userID:999',h
+    assert_equal 'xml/market_transactions.xml:accountkey:1001:apikey:aaa:beforerefid:456:characterid:123:userid:999',h
   end
 
   def test_bad_xml

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: reve
 version: !ruby/object:Gem::Version 
-  version: 0.0.86
-date: 2008-03-11 00:00:00 +00:00
+  version: 0.0.91
+date: 2008-06-06 00:00:00 -04:00
 summary: Reve is a Ruby library to interface with the Eve Online API
 require_paths: 
 - lib