voruby 1.1.1 → 2.0.0

data/Rakefile.rb

@@ -1,288 +1,172 @@
+begin
+  require 'rubygems'
+rescue LoadError
+  nil
+end
+
 require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'
-require 'rake/packagetask'
 require 'rake/gempackagetask'
 
-require 'rubygems'
-
-PKG_VERSION = ENV['version'] || '1.1.1' # VORuby version
+PKG_VERSION = ENV['version'] || '2.0.0' # VORuby version
 
-task :default => [:doc] # By default, create documentation: rake
+task :default => [:doc]
 
-desc 'Run all straightforward tests'
-task :test => ['spacetime:test', 'adql:test', 'resource:test', 'voevent:test',
-               'votable:test', 'simple:test', 'gestalt:test',
-               'registry:test', 'resolver:test'] # rake test
-
-desc 'Create all available documentation'
-task :doc => [:apidoc] # rake doc
-
-desc 'Copy the contents of lib/voruby to a specified directory'
-task :deploy do |t| # rake dest=~/tmp deploy
-  cp_r 'lib/voruby', ENV['dest'] if ENV['dest']
-end
+desc 'Generate documentation'
+task :doc => ['voruby:doc'] # rake doc
 
-Rake::PackageTask.new('voruby') do |pkg| # rake package or rake libonly=true package
-  pkg.version = PKG_VERSION
-  pkg.need_tar_gz = true
-  pkg.package_files.include('lib/voruby/**/*.rb') if ENV['libonly']
-  pkg.package_files.include(
-    Dir.glob("**/*.*").delete_if { |item|  
-      item.include?(".svn")
-    }.push('LICENSE').push('REQUIREMENTS')
-  ) if !ENV['libonly']
+Rake::TestTask.new(:test) do |t| # rake test
+  t.test_files = FileList['test/**/*test*.rb']
+  t.verbose = true
 end
 
-# rake apidoc (if you want diagrams and you have graphviz installed, use rake diagrams=true apidoc, but it will take awhile)
-Rake::RDocTask.new(:apidoc) do |rd|
-  rd.rdoc_dir = "doc/api"
-  rd.title = "VORuby API Documentation"
-  rd.rdoc_files.include(FileList['lib/voruby/**/*.rb'])
-  rd.options << '--diagram' if ENV['diagrams']
-end
-
-namespace 'spacetime' do
-  Rake::TestTask.new(:test) do |t| # rake spacetime:test
-    t.test_files = FileList['test/spacetime/unittest.rb']
-    t.verbose = true
-    t.warning = true 
+namespace 'voruby' do
+  Rake::RDocTask.new(:doc) do |rd| # rake voruby:doc
+    rd.rdoc_dir = "doc/voruby"
+    rd.title = "VORuby API Documentation"
+    rd.rdoc_files.include(FileList['lib/voruby.rb', 'lib/voruby'])
   end
-end
-
-namespace 'adql' do
-  Rake::TestTask.new(:test) do |t| # rake adql:test
-    t.test_files = FileList['test/adql/unittest.rb']
+  
+  Rake::TestTask.new(:test) do |t| # rake voruby:test
+    t.test_files = FileList['test/voruby/**/*test*.rb']
     t.verbose = true
-    t.warning = true
   end
-end
-
-namespace 'resource' do # rake resource:test
-  task :test => ['voresource:test', 'vodataservice:test', 'voregistry:test', 'openskynode:test', 'sia:test', 'conesearch:test']
   
-  namespace 'stsci' do
-    Rake::TestTask.new(:test) do |t| # rake resource:stsci:test
-      t.test_files = FileList['test/resources/unittest_stsci.rb']
-      t.verbose = true
-    end
-  end
-end
-
-namespace 'voresource' do
-  task :test => ['v0_10:test', 'v1_0:test']
+  # namespace 'misc' do
+  #   Rake::TestTask.new(:test) do |t| # rake voruby:misc:test
+  #     t.test_files = FileList['test/voruby/misc/**/*test*.rb']
+  #     t.verbose = true
+  #   end
+  # end
   
-  namespace 'v1_0' do
-    Rake::TestTask.new(:test) do |t| # rake voresource:v1_0:test
-      t.test_files = FileList['test/resources/voresource/unittest_v1_0.rb']
+  namespace 'votable' do
+    Rake::TestTask.new(:test) do |t| # rake voruby:votable:test
+      t.test_files = FileList['test/voruby/votable/**/*test*.rb']
       t.verbose = true
     end
-  end
-  
-  namespace 'v0_10' do
-    Rake::TestTask.new(:test) do |t| # rake voresource:v0_10:test
-      t.test_files = FileList['test/resources/voresource/unittest_v0_10.rb']
-      t.verbose = true
+    
+    namespace '1_1' do
+      Rake::TestTask.new(:test) do |t| # rake voruby:votable:1_1:test
+        t.test_files = FileList['test/voruby/votable/1.1/*test*.rb']
+        t.verbose = true
+      end
     end
-  end
-  
-  # VOResource v0.9 seems to be essentially obsolete and therefore I haven't written
-  # tests for it.
-end
-
-namespace 'vodataservice' do
-  task :test => ['v0_5:test', 'v1_0:test']
-  
-  namespace 'v1_0' do
-    Rake::TestTask.new(:test) do |t| # rake vodataservice:v1_0:test
-      t.test_files = FileList['test/resources/vodataservice/unittest_v1_0.rb']
-      t.verbose = true
+    
+    namespace '1_0' do
+      Rake::TestTask.new(:test) do |t| # rake voruby:votable:1_0:test
+        t.test_files = FileList['test/voruby/votable/1.0/*test*.rb']
+        t.verbose = true
+      end
     end
   end
   
-  namespace 'v0_5' do
-    Rake::TestTask.new(:test) do |t| # rake vodataservice:vo_5:test
-      t.test_files = FileList['test/resources/vodataservice/unittest_v0_5.rb']
+  namespace 'adql' do
+    Rake::TestTask.new(:test) do |t| # rake voruby:adql:test
+      t.test_files = FileList['test/voruby/adql/**/*test*.rb']
       t.verbose = true
     end
-  end
-  
-  # VODataService 0.4 seems to be essentially obsolete and therefore I haven't written
-  # tests for it.
-end
-
-namespace 'voregistry' do
-  task :test => ['v0_3:test', 'v1_0:test']
-  
-  namespace 'v1_0' do
-    Rake::TestTask.new(:test) do |t| # rake voregistry:v1_0:test
-      t.test_files = FileList['test/resources/voregistry/unittest_v1_0.rb']
-      t.verbose = true
+    
+    namespace '1_0' do
+      Rake::TestTask.new(:test) do |t| # rake voruby:adql:1_0:test
+        t.test_files = FileList['test/voruby/adql/1.0/*test*.rb']
+        t.verbose = true
+      end
     end
   end
   
-  namespace 'v0_3' do
-    Rake::TestTask.new(:test) do |t| # rake voregistry:v0_3:test
-      t.test_files = FileList['test/resources/voregistry/unittest_v0_3.rb']
+  namespace 'stc' do
+    Rake::TestTask.new(:test) do |t| # rake voruby:stc:test
+      t.test_files = FileList['test/voruby/stc/**/*test*.rb']
       t.verbose = true
     end
-  end
-  
-  # VORegistry 0.2 seems to be essentially obsolete and therefore I haven't written
-  # tests for it.
-end
-
-namespace 'openskynode' do
-  task :test => ['v0_1:test']
-  
-  namespace 'v0_1' do
-    Rake::TestTask.new(:test) do |t| # rake openskyquery:v0_1:test
-      t.test_files = FileList['test/resources/openskynode/unittest_v0_1.rb']
-      t.verbose = true
+    
+    namespace '1_10' do
+      Rake::TestTask.new(:test) do |t| # rake voruby:stc:1_10:test
+        t.test_files = FileList['test/voruby/stc/1.10/*test*.rb']
+        t.verbose = true
+      end
     end
-  end
-end
-
-namespace 'sia' do
-  task :test => ['v0_7:test', 'v1_0:test']
-  
-  namespace 'v1_0' do
-    Rake::TestTask.new(:test) do |t| # rake sia:v1_0:test
-      t.test_files = FileList['test/resources/sia/unittest_v1_0.rb']
-      t.verbose = true
+    
+    namespace '1_30' do
+      Rake::TestTask.new(:test) do |t| # rake voruby:stc:1_30:test
+        t.test_files = FileList['test/voruby/stc/1.30/*test*.rb']
+        t.verbose = true
+      end
     end
   end
   
-  namespace 'v0_7' do
-    Rake::TestTask.new(:test) do |t| # rake sia:v0_7:test
-      t.test_files = FileList['test/resources/sia/unittest_v0_7.rb']
+  namespace 'resolver' do
+    Rake::TestTask.new(:test) do |t| # rake voruby:resolver:test
+      t.test_files = FileList['test/voruby/resolver/**/*test*.rb']
       t.verbose = true
     end
-  end
-  
-  # SIA 0.6 seems to be essentially obsolete and therefore I haven't written
-  # tests for it.
-end
-
-namespace 'conesearch' do
-  task :test => ['v0_3:test', 'v1_0:test']
-  
-  namespace 'v1_0' do
-     Rake::TestTask.new(:test) do |t| # rake conesearch:v1_0:test
-       t.test_files = FileList['test/resources/conesearch/unittest_v1_0.rb']
-       t.verbose = true
-     end
-   end
-  
-  namespace 'v0_3' do
-    Rake::TestTask.new(:test) do |t| # rake conesearch:v0_3:test
-      t.test_files = FileList['test/resources/conesearch/unittest_v0_3.rb']
-      t.verbose = true
+    
+    namespace 'sesame' do
+      Rake::TestTask.new(:test) do |t| # rake voruby:resolver:sesame:test
+        t.test_files = FileList['test/voruby/resolver/sesame/*test*.rb']
+        t.verbose = true
+      end
     end
   end
   
-  # ConeSearch 0.2 seems to be essentially obsolete and therefore I haven't written
-  # tests for it.
-end
-
-namespace 'votable' do
-  Rake::TestTask.new(:test) do |t| # rake votable:test
-    t.test_files = FileList['test/votables/unittest.rb']
-    t.verbose = true
-  end
-end
-
-namespace 'active_votable' do
-  Rake::TestTask.new(:test) do |t| # rake active_votable:test
-    t.test_files = FileList['test/active_votable/unittest.rb']
-  end
-end
-
-namespace 'voevent' do
-  task :test => ['v1_0:test', 'v1_1:test']
-  
-  namespace 'v1_0' do
-    Rake::TestTask.new(:test) do |t| # rake voevent:v1_0:test
-      t.test_files = FileList['test/voevent/unittest_v1_0.rb']
+  namespace 'wesix' do
+    Rake::TestTask.new(:test) do |t| # rake voruby:wesix:test
+      t.test_files = FileList['test/voruby/wesix/*test*.rb']
       t.verbose = true
     end
   end
   
-  namespace 'v1_1' do
-    Rake::TestTask.new(:test) do |t| # rake voevent:v1_0:test
-      t.test_files = FileList['test/voevent/unittest_v1_1.rb']
+  namespace 'sky_query' do
+    Rake::TestTask.new(:test) do |t| # rake voruby:sky_portal:test
+      t.test_files = FileList['test/voruby/sky_query/*test*.rb']
       t.verbose = true
     end
   end
-end
-
-namespace 'stc' do
-  task :test => ['v1_20:test']
   
-  namespace 'v1_20' do
-    Rake::TestTask.new(:test) do |t| # rake stc:v1_20:test
-      t.test_files = FileList['test/stc/unittest_v1_20.rb']
+  namespace 'active_votable' do
+    Rake::TestTask.new(:test) do |t| # rake voruby:active_votable:test
+      t.test_files = FileList['test/voruby/active_votable/*test*.rb']
       t.verbose = true
     end
   end
-end
-
-namespace 'simple' do
-  Rake::TestTask.new(:test) do |t| # rake simple:test
-    t.test_files = FileList['test/simple/unittest.rb']
-    t.verbose = true
-  end
-end
-
-namespace 'gestalt' do
-  Rake::TestTask.new(:test) do |t| # rake gestalt:test
-    t.test_files = FileList['test/services/gestalt/unittest.rb']
-    t.verbose = true
-    t.warning = true 
-  end
-end
-
-namespace 'registry' do
-  task :test => ['stsci:test']
   
-  namespace 'stsci' do
-    Rake::TestTask.new(:test) do |t| # rake registry:stsci:test
-      t.test_files = FileList['test/services/registry/unittest.rb']
+  namespace 'voevent' do
+    Rake::TestTask.new(:test) do |t| # rake voruby:voevent:test
+      t.test_files = FileList['test/voruby/voevent/**/*test*.rb']
       t.verbose = true
     end
+    
+    namespace '1_1' do
+      Rake::TestTask.new(:test) do |t| # rake voruby:voevent:1_1:test
+        t.test_files = FileList['test/voruby/voevent/1.1/*test*.rb']
+        t.verbose = true
+      end
+    end
   end
-end
-
-namespace 'resolver' do
-  task :test => 'sesame:test'
   
-  namespace 'sesame' do
-    Rake::TestTask.new(:test) do |t| # rake resolver:sesame:test
-      t.test_files = FileList['test/services/resolver/unittest.rb']
+  namespace 'ucd' do
+    Rake::TestTask.new(:test) do |t| # rake voruby:ucd:test
+      t.test_files = FileList['test/voruby/ucd/*test*.rb']
       t.verbose = true
     end
   end
 end
 
-namespace 'plastic' do
-  Rake::TestTask.new(:test) do |t| # rake plastic:test
-    t.test_files = FileList['test/plastic/unittest.rb']
-    t.verbose = true
-  end
-end
-
 dist_dirs = ['lib', 'test']
 spec = Gem::Specification.new do |s|
-  s.required_ruby_version = '>= 1.8.6' # because of changes in REXML
-  
-  s.files = FileList['Rakefile.rb', 'LICENSE', 'REQUIREMENTS']
+  s.files = FileList['Rakefile.rb', 'LICENSE']
   dist_dirs.each do |dir|
     s.files = s.files + Dir.glob( "#{dir}/**/*" ).delete_if { |item| item.include?( "\.svn" ) }
   end
-  s.add_dependency('libxml-ruby', '= 0.3.8.4')
-  s.add_dependency('xml-mapping', '>= 0.8.1')
-  s.add_dependency('activerecord', '>= 1.14')
-  s.add_dependency('activesupport', '>= 1.3')
+  
+  s.add_dependency('libxml-ruby', '>= 0.5.4')
+  s.add_dependency('activerecord', '>= 2.0.2')
+  s.add_dependency('activesupport', '>= 2.0.2')
+  s.add_dependency('builder', '>= 2.1.2')
+  s.add_dependency('net-ping', '>= 1.2.2')
+  s.add_dependency('ruby-units', '>= 1.1.0')
+  s.add_dependency('soap4r', '>= 1.5.8')
   s.requirements << 'libxml from http://xmlsoft.org/'
   
   s.has_rdoc = true
@@ -296,13 +180,12 @@ spec = Gem::Specification.new do |s|
   s.summary = 'Modules for interacting with the astronomical virtual observatory.'
   s.description = <<-EOF
     A set of Ruby modules to help provide access to the Virtual Observatory (VO).
-    Includes support for VOTable, VORegistry, VOEvent, WESIX (an online source
+    Includes support for VOTable, ADQL, Sesame (online name resolution), WESIX (an online source
     extraction service) and more.
   EOF
 end
 
 Rake::GemPackageTask.new(spec) do |pkg| # rake gem
-  pkg.gem_spec = spec
   pkg.need_zip = true
   pkg.need_tar = true
 end

data/lib/misc.rb

@@ -0,0 +1 @@
+require 'misc/misc'

data/lib/misc/misc.rb

@@ -0,0 +1,60 @@
+begin
+  require 'rubygems'
+rescue LoadError; end
+
+class Array
+  def /(dimensions)
+    inject([]) do |ary, x|
+      ary << [] if [*ary.last].nitems % len == 0
+      ary.last << x
+      ary
+    end
+  end
+end
+
+class String
+  # Strip a string on a line-by-line basis.
+  def line_by_line_strip
+    lines = []
+    self.each_line do |l|
+      lines << l.strip
+    end
+    lines.join('')
+  end
+end
+
+class Enumeration
+  attr_reader :value, :choices
+
+  def initialize(choices, value)
+    @choices = choices
+    self.value = value
+  end
+
+  def value=(v)
+    raise ArgumentError, "Expected one of [#{self.choices.collect{ |c| c.to_s }.join(', ')}] but was #{v}" if !self.choices.include?(v)
+    @value = v
+  end
+  
+  def ==(obj)
+    return false if !obj.is_a?(self.class)
+    self.value == obj.value
+  end
+end
+
+require 'ruby-units'
+
+# Additional astronomy-related units for ruby-units
+class Unit
+  UNIT_DEFINITIONS.merge!(
+    '<arcminute>' => [%w{arcminute arcminutes arcmin}, (Math::PI / (180.0 * 60.0)), :angle, %w{<radian>}],
+    '<arcsecond>' => [%w{arcsecond arcseconds arcsec}, (Math::PI / (180.0 * 3600.0)) , :angle, %w{<radian>}],
+    '<hours-of-ra>' => [%w{hra hours-ra hours-of-ra hour-of-ra hour-ra}, ((360 / 24) * (Math::PI/180.0)), :angle, %w{<radian>}],
+    '<minutes-of-ra>' => [%w{mra minutes-ra minutes-of-ra minute-of-ra minute-ra}, (((360 / 24) * Math::PI/(180.0)) / 60.0), :angle, %w{<radian>}],
+    '<seconds-of-ra>' => [%w{sra seconds-ra seconds-of-ra second-of-ra second-ra}, (((360 / 24) * Math::PI/(180.0)) / 3600.0), :angle, %w{<radian>}],
+    '<AU>' => [%w{AU au astronomical-unit astronomical-units}, 149598000000, :length, %w{<meter>}]
+  )
+  
+  UNIT_DEFINITIONS['<light-year>'][0] << 'lyr'
+end
+Unit.setup