voruby 1.1 → 1.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (29) hide show
  1. data/REQUIREMENTS +3 -3
  2. data/Rakefile.rb +6 -2
  3. data/lib/voruby/active_votable/active_votable.rb +61 -6
  4. data/lib/voruby/adql/adql.rb +64 -12
  5. data/lib/voruby/adql/ext.rb +2 -3
  6. data/lib/voruby/adql/loader.rb +1 -0
  7. data/lib/voruby/resources/voresource/voresource_v0_10.rb +7 -2
  8. data/lib/voruby/services/gestalt/footprint.rb +2 -2
  9. data/lib/voruby/services/gestalt/wesix.rb +1 -1
  10. data/lib/voruby/services/resolver/resolver.rb +1 -1
  11. data/lib/voruby/services/schema/schema.rb +644 -0
  12. data/lib/voruby/simple/sap.rb +2 -2
  13. data/lib/voruby/votables/chandra.rb +194 -231
  14. data/lib/voruby/votables/galex.rb +229 -242
  15. data/lib/voruby/votables/int.rb +193 -230
  16. data/lib/voruby/votables/nsa.rb +299 -282
  17. data/lib/voruby/votables/rexml_votable.rb +1 -1
  18. data/lib/voruby/votables/sdss.rb +194 -231
  19. data/lib/voruby/votables/transforms.rb +3 -3
  20. data/lib/voruby/votables/votable.rb +338 -281
  21. data/test/active_votable/unittest.rb +18 -4
  22. data/test/plastic/test.rb +1 -1
  23. data/test/resources/voresource/unittest_v1_0.rb +2 -2
  24. data/test/stc/unittest_v1_20.rb +2 -2
  25. metadata +52 -54
  26. data/lib/voruby/votables/cnoc.rb +0 -393
  27. data/lib/voruby/votables/hst.rb +0 -391
  28. data/lib/voruby/votables/nsar3.rb +0 -410
  29. data/lib/voruby/votables/xmm.rb +0 -394
data/test/active_votable/unittest.rb CHANGED
@@ -7,21 +7,35 @@ ActiveVotable.establish_connection(YAML::load(File.open('test/active_votable/dat
7
7
 
8
8
  class ActiveVotableTest < Test::Unit::TestCase
9
9
  def setup
10
- @vot = ActiveVotable.build('test/active_votable/test.vot')
11
- @vot.items_per_page = 5
10
+ @vot1 = ActiveVotable.build('test/active_votable/test.vot')
11
+ @vot1.items_per_page = 5
12
+
13
+ # This should basically be a no-op, and therefore tests should be uneffected.
14
+ @vot2 = ActiveVotable.from_db_table(@vot1.table_name, @vot1.metadata)
15
+ @vot2.items_per_page = 5
12
16
  end
13
17
 
14
18
  def test_page
15
- record = @vot.page(2).first
19
+ assert_equal(1605, @vot1.number_of_pages)
20
+ record = @vot1.page(2).first
21
+ assert_equal(record[:object], 'F4p11')
22
+ assert_equal(record[:survey], 'NOAO Deep Lens')
23
+ assert_equal(record[:instrument], 'NOAO.CTIO.4M')
24
+ assert_equal(record[:ra], 163.669)
25
+ assert_equal(record[:dec], -4.33333)
16
26
 
27
+ record = @vot2.page(2).first
17
28
  assert_equal(record[:object], 'F4p11')
18
29
  assert_equal(record[:survey], 'NOAO Deep Lens')
19
30
  assert_equal(record[:instrument], 'NOAO.CTIO.4M')
20
31
  assert_equal(record[:ra], 163.669)
21
32
  assert_equal(record[:dec], -4.33333)
33
+
34
+ assert_equal(@vot1.metadata, @vot2.metadata)
22
35
  end
23
36
 
24
37
  def teardown
25
- @vot.drop()
38
+ @vot1.drop()
39
+ assert_nothing_raised { @vot2.drop() }
26
40
  end
27
41
  end
data/test/plastic/test.rb CHANGED
@@ -32,7 +32,7 @@ begin
32
32
  votable_capable = @app.get_message_registered_ids(Messages::VOTABLE_LOAD_FROM_URL)
33
33
  @app.request_to_subset_asynch(Messages::VOTABLE_LOAD_FROM_URL,
34
34
  ['http://archive.noao.edu/nvo/sim/voquery.php?POS=23.000,2.000&SIZE=7.0000'],
35
- votable_capable)
35
+ votable_capable).inspect
36
36
 
37
37
  # Bring the server to the forefront and wait for incoming messages.
38
38
  # To shutdown the server at this point do a Ctrl-C.
data/test/resources/voresource/unittest_v1_0.rb CHANGED
@@ -11,8 +11,8 @@ class ResourceTest < Test::Unit::TestCase
11
11
  end
12
12
 
13
13
  def test_resource_attributes
14
- assert_equal('2006-08-14T08:00:00Z', @res.created.to_s)
15
- assert_equal('2006-08-14T13:26:00Z', @res.updated.to_s)
14
+ assert_match('2006-08-14T08:00:00', @res.created.to_s)
15
+ assert_match('2006-08-14T13:26:00', @res.updated.to_s)
16
16
  assert_equal('active', @res.status)
17
17
  end
18
18
 
data/test/stc/unittest_v1_20.rb CHANGED
@@ -183,9 +183,9 @@ class STCTest < Test::Unit::TestCase
183
183
  assert_equal('B1950-OPTICAL-ET', coord_area1.coord_system_id)
184
184
  assert_equal('RA6-18hDec20-70deg', coord_area1.coord_area_id)
185
185
  assert_equal('ET', coord_area1.time_intervals[0].start_time.timescale.value)
186
- assert_equal('1968-05-23T00:00:00Z', coord_area1.time_intervals[0].start_time.absolute_time.value.to_s)
186
+ assert_match('1968-05-23T00:00:00', coord_area1.time_intervals[0].start_time.absolute_time.value.to_s)
187
187
  assert_equal('ET', coord_area1.time_intervals[0].end_time.timescale.value)
188
- assert_equal('1971-02-17T00:00:00Z', coord_area1.time_intervals[0].end_time.absolute_time.value.to_s)
188
+ assert_match('1971-02-17T00:00:00', coord_area1.time_intervals[0].end_time.absolute_time.value.to_s)
189
189
  assert_equal(true, coord_area1.spatial_interval.value.region.is_a?(Polygon))
190
190
  assert_equal('deg', coord_area1.spatial_interval.value.region.value.unit.value)
191
191
  assert_equal([270, 70], coord_area1.spatial_interval.value.region.value.vertices[3].position.value)
metadata CHANGED
@@ -1,10 +1,10 @@
1
1
  --- !ruby/object:Gem::Specification
2
- rubygems_version: 0.9.0
2
+ rubygems_version: 0.9.3
3
3
  specification_version: 1
4
4
  name: voruby
5
5
  version: !ruby/object:Gem::Version
6
- version: "1.1"
7
- date: 2006-12-04 00:00:00 -07:00
6
+ version: 1.1.1
7
+ date: 2007-09-08 00:00:00 -07:00
8
8
  summary: Modules for interacting with the astronomical virtual observatory.
9
9
  require_paths:
10
10
  - lib
@@ -18,9 +18,9 @@ bindir: bin
18
18
  has_rdoc: true
19
19
  required_ruby_version: !ruby/object:Gem::Version::Requirement
20
20
  requirements:
21
- - - ">"
21
+ - - ">="
22
22
  - !ruby/object:Gem::Version
23
- version: 0.0.0
23
+ version: 1.8.6
24
24
  version:
25
25
  platform: ruby
26
26
  signing_key:
@@ -34,55 +34,45 @@ files:
34
34
  - REQUIREMENTS
35
35
  - lib/voruby
36
36
  - lib/voruby/active_votable
37
- - lib/voruby/adql
38
- - lib/voruby/ext.rb
39
- - lib/voruby/loader.rb
40
- - lib/voruby/misc
41
- - lib/voruby/plastic
42
- - lib/voruby/resources
43
- - lib/voruby/services
44
- - lib/voruby/sesame
45
- - lib/voruby/simple
46
- - lib/voruby/spacetime
47
- - lib/voruby/stc
48
- - lib/voruby/util.rb
49
- - lib/voruby/voevent
50
- - lib/voruby/votables
51
37
  - lib/voruby/active_votable/active_votable.rb
52
38
  - lib/voruby/active_votable/loader.rb
39
+ - lib/voruby/adql
53
40
  - lib/voruby/adql/adql.rb
54
41
  - lib/voruby/adql/ext.rb
55
42
  - lib/voruby/adql/loader.rb
56
43
  - lib/voruby/adql/operations.rb
57
44
  - lib/voruby/adql/parser.rb
58
45
  - lib/voruby/adql/transforms.rb
46
+ - lib/voruby/ext.rb
47
+ - lib/voruby/loader.rb
48
+ - lib/voruby/misc
59
49
  - lib/voruby/misc/propertyfile.rb
50
+ - lib/voruby/plastic
60
51
  - lib/voruby/plastic/applications.rb
61
52
  - lib/voruby/plastic/constants.rb
62
53
  - lib/voruby/plastic/loader.rb
63
54
  - lib/voruby/plastic/plastic.rb
55
+ - lib/voruby/resources
64
56
  - lib/voruby/resources/conesearch
65
- - lib/voruby/resources/loader.rb
66
- - lib/voruby/resources/nodes.rb
67
- - lib/voruby/resources/openskynode
68
- - lib/voruby/resources/sia
69
- - lib/voruby/resources/stsci.rb
70
- - lib/voruby/resources/vodataservice
71
- - lib/voruby/resources/voregistry
72
- - lib/voruby/resources/voresource
73
57
  - lib/voruby/resources/conesearch/conesearch.rb
74
58
  - lib/voruby/resources/conesearch/conesearch_v0_2.rb
75
59
  - lib/voruby/resources/conesearch/conesearch_v0_3.rb
76
60
  - lib/voruby/resources/conesearch/conesearch_v1_0.rb
77
61
  - lib/voruby/resources/conesearch/loader.rb
62
+ - lib/voruby/resources/loader.rb
63
+ - lib/voruby/resources/nodes.rb
64
+ - lib/voruby/resources/openskynode
78
65
  - lib/voruby/resources/openskynode/loader.rb
79
66
  - lib/voruby/resources/openskynode/openskynode.rb
80
67
  - lib/voruby/resources/openskynode/openskynode_v0_1.rb
68
+ - lib/voruby/resources/sia
81
69
  - lib/voruby/resources/sia/loader.rb
82
70
  - lib/voruby/resources/sia/sia.rb
83
71
  - lib/voruby/resources/sia/sia_v0_6.rb
84
72
  - lib/voruby/resources/sia/sia_v0_7.rb
85
73
  - lib/voruby/resources/sia/sia_v1_0.rb
74
+ - lib/voruby/resources/stsci.rb
75
+ - lib/voruby/resources/vodataservice
86
76
  - lib/voruby/resources/vodataservice/coverage_v0_2.rb
87
77
  - lib/voruby/resources/vodataservice/coverage_v0_3.rb
88
78
  - lib/voruby/resources/vodataservice/loader.rb
@@ -90,45 +80,55 @@ files:
90
80
  - lib/voruby/resources/vodataservice/vodataservice_v0_4.rb
91
81
  - lib/voruby/resources/vodataservice/vodataservice_v0_5.rb
92
82
  - lib/voruby/resources/vodataservice/vodataservice_v1_0.rb
83
+ - lib/voruby/resources/voregistry
93
84
  - lib/voruby/resources/voregistry/loader.rb
94
85
  - lib/voruby/resources/voregistry/voregistry.rb
95
86
  - lib/voruby/resources/voregistry/voregistry_v0_2.rb
96
87
  - lib/voruby/resources/voregistry/voregistry_v0_3.rb
97
88
  - lib/voruby/resources/voregistry/voregistry_v1_0.rb
89
+ - lib/voruby/resources/voresource
98
90
  - lib/voruby/resources/voresource/loader.rb
99
91
  - lib/voruby/resources/voresource/voresource.rb
100
92
  - lib/voruby/resources/voresource/voresource_v0_10.rb
101
93
  - lib/voruby/resources/voresource/voresource_v0_9.rb
102
94
  - lib/voruby/resources/voresource/voresource_v1_0.rb
95
+ - lib/voruby/services
103
96
  - lib/voruby/services/ext.rb
104
97
  - lib/voruby/services/gestalt
105
- - lib/voruby/services/loader.rb
106
- - lib/voruby/services/registry
107
- - lib/voruby/services/resolver
108
98
  - lib/voruby/services/gestalt/footprint.rb
109
99
  - lib/voruby/services/gestalt/wcs_fixer.rb
110
100
  - lib/voruby/services/gestalt/wesix.rb
101
+ - lib/voruby/services/loader.rb
102
+ - lib/voruby/services/registry
111
103
  - lib/voruby/services/registry/registry.rb
104
+ - lib/voruby/services/resolver
112
105
  - lib/voruby/services/resolver/resolver.rb
106
+ - lib/voruby/services/schema
107
+ - lib/voruby/services/schema/schema.rb
108
+ - lib/voruby/sesame
113
109
  - lib/voruby/sesame/loader.rb
114
110
  - lib/voruby/sesame/sesame_v1_0.rb
111
+ - lib/voruby/simple
115
112
  - lib/voruby/simple/loader.rb
116
113
  - lib/voruby/simple/parameters.rb
117
114
  - lib/voruby/simple/sap.rb
115
+ - lib/voruby/spacetime
118
116
  - lib/voruby/spacetime/loader.rb
119
117
  - lib/voruby/spacetime/spacetime.rb
118
+ - lib/voruby/stc
120
119
  - lib/voruby/stc/coords_v1_20.rb
121
120
  - lib/voruby/stc/loader.rb
122
121
  - lib/voruby/stc/region_v1_20.rb
123
122
  - lib/voruby/stc/stc_v1_20.rb
123
+ - lib/voruby/util.rb
124
+ - lib/voruby/voevent
124
125
  - lib/voruby/voevent/loader.rb
125
126
  - lib/voruby/voevent/voevent_v1_0.rb
126
127
  - lib/voruby/voevent/voevent_v1_1.rb
128
+ - lib/voruby/votables
127
129
  - lib/voruby/votables/chandra.rb
128
- - lib/voruby/votables/cnoc.rb
129
130
  - lib/voruby/votables/data.rb
130
131
  - lib/voruby/votables/galex.rb
131
- - lib/voruby/votables/hst.rb
132
132
  - lib/voruby/votables/int.rb
133
133
  - lib/voruby/votables/libxml_parser.rb
134
134
  - lib/voruby/votables/libxml_votable.rb
@@ -136,7 +136,6 @@ files:
136
136
  - lib/voruby/votables/meta.rb
137
137
  - lib/voruby/votables/misc.rb
138
138
  - lib/voruby/votables/nsa.rb
139
- - lib/voruby/votables/nsar3.rb
140
139
  - lib/voruby/votables/rexml_parser.rb
141
140
  - lib/voruby/votables/rexml_votable.rb
142
141
  - lib/voruby/votables/sdss.rb
@@ -144,20 +143,11 @@ files:
144
143
  - lib/voruby/votables/tree.rb
145
144
  - lib/voruby/votables/types.rb
146
145
  - lib/voruby/votables/votable.rb
147
- - lib/voruby/votables/xmm.rb
148
146
  - test/active_votable
149
- - test/adql
150
- - test/plastic
151
- - test/resources
152
- - test/services
153
- - test/simple
154
- - test/spacetime
155
- - test/stc
156
- - test/voevent
157
- - test/votables
158
147
  - test/active_votable/database.yml
159
148
  - test/active_votable/test.vot
160
149
  - test/active_votable/unittest.rb
150
+ - test/adql
161
151
  - test/adql/test1.adql
162
152
  - test/adql/test2.adql
163
153
  - test/adql/test3.adql
@@ -166,27 +156,27 @@ files:
166
156
  - test/adql/test6.adql
167
157
  - test/adql/test7.adql
168
158
  - test/adql/unittest.rb
159
+ - test/plastic
169
160
  - test/plastic/test.rb
170
161
  - test/plastic/test.vot
171
162
  - test/plastic/unittest.rb
163
+ - test/resources
172
164
  - test/resources/conesearch
173
- - test/resources/openskynode
174
- - test/resources/sia
175
- - test/resources/stsci.xml
176
- - test/resources/unittest_stsci.rb
177
- - test/resources/vodataservice
178
- - test/resources/voregistry
179
- - test/resources/voresource
180
165
  - test/resources/conesearch/conesearch_v0_3.xml
181
166
  - test/resources/conesearch/conesearch_v1_0.xml
182
167
  - test/resources/conesearch/unittest_v0_3.rb
183
168
  - test/resources/conesearch/unittest_v1_0.rb
169
+ - test/resources/openskynode
184
170
  - test/resources/openskynode/open_sky_node_v0_1.xml
185
171
  - test/resources/openskynode/unittest_v0_1.rb
172
+ - test/resources/sia
186
173
  - test/resources/sia/simple_image_access_v0_7.xml
187
174
  - test/resources/sia/simple_image_access_v1_0.xml
188
175
  - test/resources/sia/unittest_v0_7.rb
189
176
  - test/resources/sia/unittest_v1_0.rb
177
+ - test/resources/stsci.xml
178
+ - test/resources/unittest_stsci.rb
179
+ - test/resources/vodataservice
190
180
  - test/resources/vodataservice/catalog_service_resource_v1_0.xml
191
181
  - test/resources/vodataservice/data_collection_resource_v0_5.xml
192
182
  - test/resources/vodataservice/data_collection_resource_v1_0.xml
@@ -196,12 +186,14 @@ files:
196
186
  - test/resources/vodataservice/tabular_sky_service_resource_v0_10.xml
197
187
  - test/resources/vodataservice/unittest_v0_5.rb
198
188
  - test/resources/vodataservice/unittest_v1_0.rb
189
+ - test/resources/voregistry
199
190
  - test/resources/voregistry/authority_resource_v0_3.xml
200
191
  - test/resources/voregistry/authority_resource_v1_0.xml
201
192
  - test/resources/voregistry/registry_service_v0_3.xml
202
193
  - test/resources/voregistry/registry_service_v1_0.xml
203
194
  - test/resources/voregistry/unittest_v0_3.rb
204
195
  - test/resources/voregistry/unittest_v1_0.rb
196
+ - test/resources/voresource
205
197
  - test/resources/voresource/organisation_resource_v1_0.xml
206
198
  - test/resources/voresource/resource_organisation_v0_10.xml
207
199
  - test/resources/voresource/resource_service_v0_10.xml
@@ -211,23 +203,29 @@ files:
211
203
  - test/resources/voresource/unittest_v0_10.rb
212
204
  - test/resources/voresource/unittest_v0_9.rb
213
205
  - test/resources/voresource/unittest_v1_0.rb
206
+ - test/services
214
207
  - test/services/gestalt
215
- - test/services/registry
216
- - test/services/resolver
217
208
  - test/services/gestalt/unittest.rb
209
+ - test/services/registry
218
210
  - test/services/registry/unittest.rb
211
+ - test/services/resolver
219
212
  - test/services/resolver/unittest.rb
213
+ - test/simple
220
214
  - test/simple/unittest.rb
215
+ - test/spacetime
221
216
  - test/spacetime/unittest.rb
217
+ - test/stc
222
218
  - test/stc/catalog_entry_location_v1_20.xml
223
219
  - test/stc/obs_data_location_v1_20.xml
224
220
  - test/stc/search_location_v1_20.xml
225
221
  - test/stc/stc_resource_profile_v1_20.xml
226
222
  - test/stc/unittest_v1_20.rb
223
+ - test/voevent
227
224
  - test/voevent/unittest_v1_0.rb
228
225
  - test/voevent/unittest_v1_1.rb
229
226
  - test/voevent/voevent_v1_0.xml
230
227
  - test/voevent/voevent_v1_1.xml
228
+ - test/votables
231
229
  - test/votables/test.vot
232
230
  - test/votables/unittest.rb
233
231
  test_files: []
@@ -248,9 +246,9 @@ dependencies:
248
246
  version_requirement:
249
247
  version_requirements: !ruby/object:Gem::Version::Requirement
250
248
  requirements:
251
- - - ">="
249
+ - - "="
252
250
  - !ruby/object:Gem::Version
253
- version: 0.3.8
251
+ version: 0.3.8.4
254
252
  version:
255
253
  - !ruby/object:Gem::Dependency
256
254
  name: xml-mapping