reve 0.0.131 → 0.0.132

Sign up to get free protection for your applications and to get access to all the features.
Files changed (7) hide show
  1. data/Rakefile +1 -1
  2. data/VERSION +1 -0
  3. data/lib/reve/classes.rb +3 -5
  4. data/lib/reve.rb +7 -3
  5. data/test/test_reve.rb +16 -3
  6. data/test/xml/sovereignty.xml +20 -26
  7. metadata +5 -133
data/Rakefile CHANGED
@@ -26,7 +26,7 @@ if File.exists?('.git')
26
26
  s.homepage = "http://github.com/lisa/reve"
27
27
  s.platform = Gem::Platform::RUBY
28
28
  s.summary = "Reve is a Ruby library to interface with the Eve Online API"
29
- s.files = FileList["Rakefile","LICENSE", "lib/**/*.rb","reve.rb","tester.rb","init.rb"].to_a
29
+ s.files = FileList["Rakefile","VERSION","LICENSE", "lib/**/*.rb","reve.rb","tester.rb","init.rb"].to_a
30
30
  s.require_path = "lib"
31
31
  s.test_files = FileList["test/test_reve.rb","test/xml/**/*.xml"].to_a
32
32
  s.has_rdoc = true
data/VERSION ADDED
@@ -0,0 +1 @@
1
+ 0.0.132
data/lib/reve/classes.rb CHANGED
@@ -692,7 +692,6 @@ module Reve #:nodoc:
692
692
  @id = elem['stationID'].to_i
693
693
  @name = elem['stationName']
694
694
  @type_id = elem['stationTypeID'].to_i
695
- @system_id = elem['solarSystemID'].to_i
696
695
  @corporation_id = elem['corporationID'].to_i
697
696
  @corporation_name = elem['corporationName']
698
697
  @system_id = elem['solarSystemID'].to_i
@@ -1036,7 +1035,7 @@ module Reve #:nodoc:
1036
1035
  @installed_item_material_level = elem['installedItemMaterialLevel'].to_i
1037
1036
  @installed_item_licensed_production_runs_remaining = elem['installedItemLicensedProductionRunsRemaining'].to_i
1038
1037
  @output_location_id = elem['outputLocationID'].to_i ; @installer_id = elem['installerID'].to_i; @runs = elem['runs'].to_i
1039
- @licensed_production_runs = elem['licensedProductionRuns'].to_i ; @installed_system_id = elem['installedSolarSystemID'].to_i
1038
+ @licensed_production_runs = elem['licensedProductionRuns'].to_i ; @installed_system_id = elem['installedInSolarSystemID'].to_i
1040
1039
  @container_location_id = elem['containerLocationID'].to_i ; @material_multiplier = elem['materialMultiplier'].to_f
1041
1040
  @char_material_multiplier = elem['charMaterialMultiplier'].to_f; @time_multiplier = elem['timeMultiplier'].to_f
1042
1041
  @char_time_multiplier = elem['charTimeMultiplier'].to_f ; @installed_item_type_id = elem['installedItemTypeID'].to_i
@@ -1266,12 +1265,11 @@ module Reve #:nodoc:
1266
1265
  # See Also: Alliance, Reve::API#alliances
1267
1266
  # TODO: Find out what constellationSovereignty is
1268
1267
  class Sovereignty
1269
- attr_reader :system_id, :alliance_id, :constellation_sovereignty, :level, :faction_id, :system_name
1268
+ attr_reader :system_id, :alliance_id, :corporation_id, :factionID, :faction_id, :system_name
1270
1269
  def initialize(elem) #:nodoc:
1271
1270
  @system_id = elem['solarSystemID'].to_i
1272
1271
  @alliance_id = elem['allianceID'] == '0' ? nil : elem['allianceID'].to_i
1273
- @constellation_sovereignty = elem['constellationSovereignty'].to_i
1274
- @level = elem['sovereigntyLevel'].to_i if elem['sovereigntyLevel']
1272
+ @corporation_id = elem['corporationID'] == '0' ? nil : elem['corporationID'].to_i
1275
1273
  @faction_id = elem['factionID'] == '0' ? nil : elem['factionID'].to_i
1276
1274
  @system_name = elem['solarSystemName']
1277
1275
  end
data/lib/reve.rb CHANGED
@@ -111,7 +111,7 @@ module Reve
111
111
 
112
112
 
113
113
  attr_accessor :key, :userid, :charid
114
- attr_accessor :http_user_agent, :save_path
114
+ attr_accessor :http_user_agent, :save_path, :timeout
115
115
  attr_reader :current_time, :cached_until, :last_hash, :reve_version
116
116
 
117
117
  # Create a new API instance.
@@ -129,11 +129,12 @@ module Reve
129
129
  @save_path = nil
130
130
 
131
131
  @max_tries = 3
132
+ @timeout = 20
132
133
 
133
134
  @current_time = nil
134
135
  @cached_until = nil
135
136
  @last_hash = nil
136
- @reve_version = File.read(File.join(File.dirname(__FILE__),'../','VERSION'))
137
+ @reve_version = File.read(File.join(File.dirname(__FILE__),'../','VERSION')).chomp
137
138
  @http_user_agent = "Reve v#{@reve_version}; http://github.com/lisa/reve"
138
139
  end
139
140
  # Save XML to this directory with the format:
@@ -1039,7 +1040,10 @@ module Reve
1039
1040
  begin
1040
1041
  # ||= to prevent making a new Net::HTTP object, the res = nil above should reset this for the next request.
1041
1042
  # the request needs to be here to rescue exceptions from it.
1042
- res ||= Net::HTTP.new(source.host, source.port).start {|http| http.request(req) }
1043
+ http ||= Net::HTTP.new(source.host, source.port)
1044
+ http.open_timeout = 3
1045
+ http.read_timeout = @timeout
1046
+ res = http.start {|http| http.request(req) }
1043
1047
  case res
1044
1048
  when Net::HTTPSuccess, Net::HTTPRedirection
1045
1049
  response = res.body
data/test/test_reve.rb CHANGED
@@ -270,6 +270,7 @@ class TestReve < Test::Unit::TestCase
270
270
  assert_not_nil job.send(att)
271
271
  end
272
272
  end
273
+ assert jobs.last.installed_system_id != 0
273
274
  end
274
275
 
275
276
  def test_corporate_industry_jobs_clean
@@ -580,13 +581,25 @@ class TestReve < Test::Unit::TestCase
580
581
  end
581
582
  assert_not_nil @api.last_hash
582
583
  assert_kind_of Time, @api.cached_until
583
- assert_equal 7, sovereignties.size
584
- sovereignties.each do |sovereignty|
584
+ assert_equal 10, sovereignties.size
585
+ sovereignties[0..4].each do |sovereignty|
585
586
  assert_instance_of Reve::Classes::Sovereignty, sovereignty
586
587
  assert_not_nil sovereignty.system_id
587
- assert_not_nil sovereignty.constellation_sovereignty
588
588
  assert_not_nil sovereignty.system_name
589
+ assert_not_nil sovereignty.faction_id
590
+ assert_nil sovereignty.alliance_id
589
591
  end
592
+ sovereignties[5..8].each do |sovereignty|
593
+ assert_instance_of Reve::Classes::Sovereignty, sovereignty
594
+ assert_not_nil sovereignty.system_id
595
+ assert_not_nil sovereignty.system_name
596
+ assert_not_nil sovereignty.alliance_id
597
+ assert_not_nil sovereignty.corporation_id
598
+ assert_nil sovereignty.faction_id
599
+ end
600
+ assert_nil sovereignties[-1].alliance_id
601
+ assert_nil sovereignties[-1].corporation_id
602
+ assert_nil sovereignties[-1].faction_id
590
603
  end
591
604
 
592
605
  def test_reftypes_clean
data/test/xml/sovereignty.xml CHANGED
@@ -1,29 +1,23 @@
1
- <eveapi version="1">
2
- <currentTime>2007-06-18 22:42:00</currentTime>
1
+ <?xml version='1.0' encoding='UTF-8'?>
2
+ <eveapi version="2">
3
+ <currentTime>2010-09-07 10:47:30</currentTime>
3
4
  <result>
4
- <rowset name="solarSystems">
5
- <row solarSystemID="30000001" allianceID="0"
6
- constellationSovereignty="0" sovereigntyLevel="0"
7
- factionID="500007" solarSystemName="Tanoo" />
8
- <row solarSystemID="30000002" allianceID="0"
9
- constellationSovereignty="0" sovereigntyLevel="0"
10
- factionID="500007" solarSystemName="Lashesih" />
11
- <row solarSystemID="30000003" allianceID="0"
12
- constellationSovereignty="0" sovereigntyLevel="0"
13
- factionID="500007" solarSystemName="Akpivem" />
14
- <row solarSystemID="30000004" allianceID="0"
15
- constellationSovereignty="0" sovereigntyLevel="0"
16
- factionID="500007" solarSystemName="Jark" />
17
- <row solarSystemID="30000005" allianceID="0"
18
- constellationSovereignty="0" sovereigntyLevel="0"
19
- factionID="500007" solarSystemName="Sasta" />
20
- <row solarSystemID="30000006" allianceID="0"
21
- constellationSovereignty="0" sovereigntyLevel="0"
22
- factionID="500007" solarSystemName="Zaid" />
23
- <row solarSystemID="30000007" allianceID="0"
24
- constellationSovereignty="0" sovereigntyLevel="0"
25
- factionID="500007" solarSystemName="Yuzier" />
5
+ <rowset name="solarSystems" key="solarSystemID" columns="solarSystemID,allianceID,factionID,solarSystemName,corporationID">
6
+ <row solarSystemID="30000203" allianceID="0" factionID="500001" solarSystemName="Eruka" corporationID="0" />
7
+ <row solarSystemID="30000204" allianceID="0" factionID="500001" solarSystemName="Ohkunen" corporationID="0" />
8
+ <row solarSystemID="30000205" allianceID="0" factionID="500001" solarSystemName="Obe" corporationID="0" />
9
+ <row solarSystemID="30000206" allianceID="0" factionID="500001" solarSystemName="Wirashoda" corporationID="0" />
10
+ <row solarSystemID="30000207" allianceID="0" factionID="500001" solarSystemName="Osaa" corporationID="0" />
11
+
12
+ <row solarSystemID="30000208" allianceID="212716751" factionID="0" solarSystemName="LZ-6SU" corporationID="1628348921" />
13
+ <row solarSystemID="30000209" allianceID="212716751" factionID="0" solarSystemName="MC6O-F" corporationID="1628348921" />
14
+ <row solarSystemID="30000210" allianceID="212716751" factionID="0" solarSystemName="U54-1L" corporationID="847483660" />
15
+ <row solarSystemID="30000211" allianceID="212716751" factionID="0" solarSystemName="B-588R" corporationID="224161983" />
16
+
17
+ <row solarSystemID="30000230" allianceID="0" factionID="0" solarSystemName="NFM-0V" corporationID="0" />
18
+
26
19
  </rowset>
20
+ <dataTime>2010-09-07 10:00:41</dataTime>
27
21
  </result>
28
- <cachedUntil>2007-06-18 23:42:00</cachedUntil>
29
- </eveapi>
22
+ <cachedUntil>2010-09-07 11:47:30</cachedUntil>
23
+ </eveapi>
metadata CHANGED
@@ -1,13 +1,12 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: reve
3
3
  version: !ruby/object:Gem::Version
4
- hash: 281
5
4
  prerelease: false
6
5
  segments:
7
6
  - 0
8
7
  - 0
9
- - 131
10
- version: 0.0.131
8
+ - 132
9
+ version: 0.0.132
11
10
  platform: ruby
12
11
  authors:
13
12
  - Lisa Seelye
@@ -15,18 +14,16 @@ autorequire:
15
14
  bindir: bin
16
15
  cert_chain: []
17
16
 
18
- date: 2010-08-22 00:00:00 -04:00
17
+ date: 2010-10-03 00:00:00 -04:00
19
18
  default_executable:
20
19
  dependencies:
21
20
  - !ruby/object:Gem::Dependency
22
21
  name: hpricot
23
22
  prerelease: false
24
23
  requirement: &id001 !ruby/object:Gem::Requirement
25
- none: false
26
24
  requirements:
27
25
  - - ">="
28
26
  - !ruby/object:Gem::Version
29
- hash: 7
30
27
  segments:
31
28
  - 0
32
29
  - 6
@@ -44,6 +41,7 @@ extra_rdoc_files:
44
41
  files:
45
42
  - LICENSE
46
43
  - Rakefile
44
+ - VERSION
47
45
  - init.rb
48
46
  - lib/reve.rb
49
47
  - lib/reve/classes.rb
@@ -52,128 +50,6 @@ files:
52
50
  - reve.rb
53
51
  - tester.rb
54
52
  - ChangeLog
55
- - test/test_reve.rb
56
- - test/xml/alliances.xml
57
- - test/xml/assets.xml
58
- - test/xml/badxml.xml
59
- - test/xml/certificate_tree.xml
60
- - test/xml/char_facwarstats.xml
61
- - test/xml/char_medals.xml
62
- - test/xml/character_sheet.xml
63
- - test/xml/characterid.xml
64
- - test/xml/charactername.xml
65
- - test/xml/characters.xml
66
- - test/xml/conqurable_stations.xml
67
- - test/xml/corp_facwarstats.xml
68
- - test/xml/corp_medals.xml
69
- - test/xml/corp_member_medals.xml
70
- - test/xml/corp_membersecurity.xml
71
- - test/xml/corporate_assets_list.xml
72
- - test/xml/corporate_market_orders.xml
73
- - test/xml/corporate_wallet_balance.xml
74
- - test/xml/corporate_wallet_journal.xml
75
- - test/xml/corporate_wallet_transactions.xml
76
- - test/xml/corporation_sheet.xml
77
- - test/xml/errors/error_100.xml
78
- - test/xml/errors/error_101.xml
79
- - test/xml/errors/error_102.xml
80
- - test/xml/errors/error_103.xml
81
- - test/xml/errors/error_104.xml
82
- - test/xml/errors/error_105.xml
83
- - test/xml/errors/error_106.xml
84
- - test/xml/errors/error_107.xml
85
- - test/xml/errors/error_108.xml
86
- - test/xml/errors/error_109.xml
87
- - test/xml/errors/error_110.xml
88
- - test/xml/errors/error_111.xml
89
- - test/xml/errors/error_112.xml
90
- - test/xml/errors/error_113.xml
91
- - test/xml/errors/error_114.xml
92
- - test/xml/errors/error_115.xml
93
- - test/xml/errors/error_116.xml
94
- - test/xml/errors/error_117.xml
95
- - test/xml/errors/error_118.xml
96
- - test/xml/errors/error_119.xml
97
- - test/xml/errors/error_120.xml
98
- - test/xml/errors/error_121.xml
99
- - test/xml/errors/error_122.xml
100
- - test/xml/errors/error_123.xml
101
- - test/xml/errors/error_124.xml
102
- - test/xml/errors/error_125.xml
103
- - test/xml/errors/error_200.xml
104
- - test/xml/errors/error_201.xml
105
- - test/xml/errors/error_202.xml
106
- - test/xml/errors/error_203.xml
107
- - test/xml/errors/error_204.xml
108
- - test/xml/errors/error_205.xml
109
- - test/xml/errors/error_206.xml
110
- - test/xml/errors/error_207.xml
111
- - test/xml/errors/error_208.xml
112
- - test/xml/errors/error_209.xml
113
- - test/xml/errors/error_210.xml
114
- - test/xml/errors/error_211.xml
115
- - test/xml/errors/error_212.xml
116
- - test/xml/errors/error_213.xml
117
- - test/xml/errors/error_214.xml
118
- - test/xml/errors/error_500.xml
119
- - test/xml/errors/error_501.xml
120
- - test/xml/errors/error_502.xml
121
- - test/xml/errors/error_503.xml
122
- - test/xml/errors/error_504.xml
123
- - test/xml/errors/error_505.xml
124
- - test/xml/errors/error_506.xml
125
- - test/xml/errors/error_507.xml
126
- - test/xml/errors/error_508.xml
127
- - test/xml/errors/error_509.xml
128
- - test/xml/errors/error_510.xml
129
- - test/xml/errors/error_511.xml
130
- - test/xml/errors/error_512.xml
131
- - test/xml/errors/error_513.xml
132
- - test/xml/errors/error_514.xml
133
- - test/xml/errors/error_515.xml
134
- - test/xml/errors/error_516.xml
135
- - test/xml/errors/error_517.xml
136
- - test/xml/errors/error_518.xml
137
- - test/xml/errors/error_519.xml
138
- - test/xml/errors/error_520.xml
139
- - test/xml/errors/error_521.xml
140
- - test/xml/errors/error_522.xml
141
- - test/xml/errors/error_523.xml
142
- - test/xml/errors/error_524.xml
143
- - test/xml/errors/error_525.xml
144
- - test/xml/errors/error_900.xml
145
- - test/xml/errors/error_901.xml
146
- - test/xml/errors/error_902.xml
147
- - test/xml/errors/error_903.xml
148
- - test/xml/errors/error_999.xml
149
- - test/xml/errors.xml
150
- - test/xml/eve_facwarstats.xml
151
- - test/xml/eve_facwartopstats.xml
152
- - test/xml/industryjobs.xml
153
- - test/xml/kills.xml
154
- - test/xml/mail_messages.xml
155
- - test/xml/mailing_lists.xml
156
- - test/xml/map_facwarsystems.xml
157
- - test/xml/mapjumps.xml
158
- - test/xml/mapkills.xml
159
- - test/xml/market_transactions.xml
160
- - test/xml/marketorders.xml
161
- - test/xml/member_tracking.xml
162
- - test/xml/nonmember_corpsheet.xml
163
- - test/xml/notifications.xml
164
- - test/xml/reftypes.xml
165
- - test/xml/research.xml
166
- - test/xml/server_status.xml
167
- - test/xml/skill_in_training-amarr-titan.xml
168
- - test/xml/skill_in_training-none.xml
169
- - test/xml/skill_queue-paused.xml
170
- - test/xml/skill_queue.xml
171
- - test/xml/skilltree.xml
172
- - test/xml/sovereignty.xml
173
- - test/xml/starbase_fuel.xml
174
- - test/xml/starbases.xml
175
- - test/xml/wallet_balance.xml
176
- - test/xml/wallet_journal.xml
177
53
  has_rdoc: true
178
54
  homepage: http://github.com/lisa/reve
179
55
  licenses: []
@@ -184,27 +60,23 @@ rdoc_options:
184
60
  require_paths:
185
61
  - lib
186
62
  required_ruby_version: !ruby/object:Gem::Requirement
187
- none: false
188
63
  requirements:
189
64
  - - ">="
190
65
  - !ruby/object:Gem::Version
191
- hash: 3
192
66
  segments:
193
67
  - 0
194
68
  version: "0"
195
69
  required_rubygems_version: !ruby/object:Gem::Requirement
196
- none: false
197
70
  requirements:
198
71
  - - ">="
199
72
  - !ruby/object:Gem::Version
200
- hash: 3
201
73
  segments:
202
74
  - 0
203
75
  version: "0"
204
76
  requirements: []
205
77
 
206
78
  rubyforge_project: reve
207
- rubygems_version: 1.3.7
79
+ rubygems_version: 1.3.6
208
80
  signing_key:
209
81
  specification_version: 3
210
82
  summary: Reve is a Ruby library to interface with the Eve Online API