voruby 1.1 → 1.1.1

data/REQUIREMENTS

@@ -1,6 +1,6 @@
-* ruby >= 1.8.4
+* ruby >= 1.8.6
 * libxml (http://xmlsoft.org/)
 * libxml-ruby installed via gem (i.e. "gem install libxml-ruby")
 * xml-mapping installed via gem (i.e. "gem install xml-mapping")
-* activerecord installed via gem (i.e. "gem install activerecord")
-* activesupport installed via gem (i.e. "gem install activesupport")
+* activerecord installed via gem (i.e. "gem install activerecord") for ActiveVotable
+* activesupport installed via gem (i.e. "gem install activesupport") for ActiveVotable

data/Rakefile.rb

@@ -6,7 +6,7 @@ require 'rake/gempackagetask'
 
 require 'rubygems'
 
-PKG_VERSION = ENV['version'] || '1.1' # VORuby version
+PKG_VERSION = ENV['version'] || '1.1.1' # VORuby version
 
 task :default => [:doc] # By default, create documentation: rake
 
@@ -217,6 +217,8 @@ namespace 'voevent' do
 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']
@@ -271,11 +273,13 @@ 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']
   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')
+  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')

data/lib/voruby/active_votable/active_votable.rb

@@ -68,7 +68,7 @@ module VORuby
     # This allows all the power of a full database manager + ActiveRecord
     # to be used in searching and manipulating the VOTable.  It assumes
     # that the VOTable has one resource with one table and that the table
-    # is encoded as text and binary.
+    # is encoded as text and not binary.
     #
     #   ActiveVotable.establish_connection(
     #    :adapter => 'postgresql'
@@ -93,6 +93,7 @@ module VORuby
       @@arow = []
       @@ordered_columns = []
       @@items_per_page = 20
+      @@added_col = false
   
       DATATYPE_CONVERSIONS = {
         'boolean' => :boolean,
@@ -112,16 +113,24 @@ module VORuby
       @@actions = {
         :on_start_element => {
           'FIELD' => Proc.new { |name, attrs|
-            field_name = ActiveVotable.columnize(attrs['name'] || attrs['ID'] || "unknown_column_#{rand(1000000)}")
+            vot_col_name = attrs['name'] || attrs['ID'] || "unknown_column_#{rand(1000000)}"
+            field_name = ActiveVotable.columnize(vot_col_name)
             field_name = 'record_id' if field_name == 'id'
             field_type = ActiveVotable.column_type(attrs['datatype'] || 'char', attrs['arraysize'])
-            @@ordered_columns << {:name => field_name, :type => field_type}
+            @@ordered_columns << {
+              :id => attrs['ID'],
+              :vot_col_name => vot_col_name, :name => field_name,
+              :datatype => attrs['datatype'], :type => field_type,
+              :ucd => attrs['ucd'],
+              :arraysize => attrs['arraysize']
+            }
         
             ActiveRecord::Schema.define do
               add_column(ActiveVotable.table_name(), field_name, field_type)
             end
           },
           'TD' => Proc.new{ |name, attrs|
+            @@added_col = false
             @@end_of_cell = false
           },
           'TABLEDATA' => Proc.new{ |name, attrs|
@@ -150,6 +159,7 @@ module VORuby
           },
           'TD' => Proc.new { |name|
             @@end_of_cell = true
+            @@arow << nil if !@@added_col # This is necessary because a blank tag doesn't trigger an on_characters callback.
           },
           'TABLEDATA' => Proc.new { |name|
             connection().commit_db_transaction()
@@ -157,6 +167,7 @@ module VORuby
         },
         :on_characters => Proc.new { |chars|
           @@arow << chars if !@@end_of_cell
+          @@added_col = true
         },
         :on_cdata_block => Proc.new{ |cdata|
           @@arow << cdata if !@@end_of_cell # not sure if this is safe
@@ -179,7 +190,9 @@ module VORuby
           ActiveVotable.src = src
           ActiveVotable.parser = VOTableExtractor.new(src, @@actions)
     
-          set_table_name(tbl_name || "votable_#{Time.now.to_i}_#{rand(1000000)}")
+          tname = tbl_name || "votable_#{Time.now.to_i}_#{rand(1000000)}"
+          ActiveVotable.table_name = tname
+          set_table_name(tname)
     
           create_basic_schema()
           parse()
@@ -187,6 +200,24 @@ module VORuby
           return self
         end
       end
+      
+      # Instantiate a VOTable that already exists inside
+      # the database.  If the optional block is provided
+      # ActiveVotable.drop() will be called automatically.
+      # [_tbl_name:]
+      #   The name of the database table the VOTable lives in.
+      def self.from_db_table(tbl_name, metadata=[], &block)
+        ActiveVotable.table_name = tbl_name
+        set_table_name(tbl_name)
+        @@ordered_columns = metadata
+        
+        if block
+          block.call(self)
+          drop()
+        else
+          return self
+        end
+      end
   
       # Set the file name of the source VOTable.
       def self.src=(src)
@@ -208,6 +239,17 @@ module VORuby
       def self.parser
         @@parser
       end
+      
+      # Set the name of the database table to use to store the VOTable.
+      # Typically you'll never use this directly but rather use build().
+      def self.table_name=(tbl_name)
+        @@table_name = tbl_name
+      end
+      
+      # Get the name of the database table the VOTable is stored in.
+      def self.table_name
+        @@table_name
+      end
   
       # Set the number of records per page for use in paging results.
       def self.items_per_page=(num)
@@ -240,7 +282,11 @@ module VORuby
       # Erase the table out of the database.
       def self.drop
         ActiveRecord::Schema.define do
-          drop_table ActiveVotable::table_name
+          begin
+            drop_table ActiveVotable::table_name
+          rescue ActiveRecord::StatementInvalid
+            # If a table has already gone bye-bye, well, that's life.
+          end
         end
       end
   
@@ -271,7 +317,7 @@ module VORuby
         case type
         when :integer then value.to_i
         when :float then value.to_f
-        when :string then value
+        when :string then value.to_s
         when :boolean
           (value != 'false' and value != '0') ? true: false
         else value
@@ -311,6 +357,11 @@ module VORuby
       def self.page(page=1)
         find(:all, :order => 'id', :page => page)
       end
+      
+      # Find the total number of pages.
+      def self.number_of_pages
+        (count() / items_per_page().to_f).ceil()
+      end
   
       # Iterate through each page in the VOTable.  The
       # block receives the page number and the list of
@@ -329,6 +380,10 @@ module VORuby
           block.call(record)
         end
       end
+      
+      def self.metadata
+        @@ordered_columns
+      end
 
     end
   end

data/lib/voruby/adql/adql.rb

@@ -809,22 +809,22 @@ module VORuby
     # Same as a TableType with an additional archive name.
     class ArchiveTable < FromTable
       attr_accessor :archive, :name, :alias_name
-    
+      
       def initialize(archive, name, alias_name=nil)
         self.archive = archive
         self.name = name
         self.alias_name = alias_name
       end
-    
+      
       def to_s
       "{archive=#{self.archive},name=#{self.name},alias=#{self.alias_name}}"
       end
-    
+      
       def self.from_xml(node)
-        archive = node.attributes['Archive'] or raise "No ArchiveTable attribute 'Archive'"
-        #name = CGI::escapeHTML(node.attributes['Name']) or raise "No ArchiveTable attribute 'Name'"
-        name = node.attributes['Name'] or raise "No ArchiveTable attribute 'Name'"
-        alias_name = node.attributes['Alias']
+        archive = node.attributes['Archive'] or '' #or raise "No ArchiveTable attribute 'Archive'"
+        name = CGI::escapeHTML(node.attributes['Name']) or raise "No ArchiveTable attribute 'Name'"
+        #name = node.attributes['Name'] or raise "No ArchiveTable attribute 'Name'"
+        alias_name = node.attributes['Alias'] or ''
       
         at = ArchiveTable.new(archive, name, alias_name)
       end
@@ -997,6 +997,13 @@ module VORuby
           return self
         end
       end
+      
+      # This method counts the number of times that a condition appears.
+      def count_condition(attributes, times)
+        times = self.cond1.count_condition(attributes, times)
+        times = self.cond2.count_condition(attributes, times)
+        return times
+      end
     end
   
     # Represents expressions like A Or B.
@@ -1097,6 +1104,13 @@ module VORuby
           return self
         end
       end
+      
+      # This method counts the number of times that a condition appears.
+      def count_condition(attributes, times)
+        times = self.cond1.count_condition(attributes, times)
+        times = self.cond2.count_condition(attributes, times)
+        return times
+      end
     end
 	
   	# A cross match expression.
@@ -1265,6 +1279,13 @@ module VORuby
         end
         return 1
       end
+      
+      # This method counts the number of times that a condition appears.
+      def count_condition(attributes, times)
+        return times += 1 if self.arg.table == attributes['table'] and
+            self.arg.name == attributes['name']
+        return times
+      end
     end
 	
   	# The Not Like expression of a query.
@@ -1493,6 +1514,13 @@ module VORuby
         end
         return 1
       end
+      
+      # This method counts the number of times that a condition appears.
+      def count_condition(attributes, times)
+        return times += 1 if self.arg1.table == attributes['table'] and
+            self.arg1.name == attributes['name']
+        return times
+      end
     end
   
     # Represents the Between expression of a query.
@@ -1617,6 +1645,13 @@ module VORuby
         end
         return 1
       end
+      
+      # This method counts the number of times that a condition appears.
+      def count_condition(attributes, times)
+        return times += 1 if self.arg1.table == attributes['table'] and
+            self.arg1.name == attributes['name']
+        return times
+      end
     end
 	
   	# Represents expressions like Not A.
@@ -1709,15 +1744,20 @@ module VORuby
     
       def self.from_xml(node)
         unit = node.attributes['unit'] || 'deg'
-      
-        center = REXML::XPath.first(node, 'reg:Center', {'reg' => 'http://www.ivoa.net/xml/STC/STCregion/v1.10'}).text
+        
+        # Find the prefix for STCregion.
+        region_prefix = node.namespaces.index('http://www.ivoa.net/xml/STC/STCregion/v1.10')
+        
+        center_tag = region_prefix ? "#{region_prefix}:Center" : 'Center'
+        center = REXML::XPath.first(node, center_tag).text
         ra_s, dec_s = center.split(/\s+/)
         ra = RealType.new(ra_s.to_f)
         dec = RealType.new(dec_s.to_f)
-      
-        radius_s = REXML::XPath.first(node, 'reg:Radius', {'reg' => 'http://www.ivoa.net/xml/STC/STCregion/v1.10'}).text
+        
+        radius_tag = region_prefix ? "#{region_prefix}:Radius" : 'Radius'
+        radius_s = REXML::XPath.first(node, radius_tag).text
         radius = RealType.new(radius_s.to_f)
-      
+        
         return Circle.new(ra, dec, radius)
       end
     
@@ -1936,6 +1976,12 @@ module VORuby
         end
         return 1
       end
+      
+      # This method counts the number of times that a condition appears.
+      def count_condition(attributes, times)
+        #TODO
+        return 1
+      end
     end
 	
   	# Represents expressions like Not A.
@@ -2082,6 +2128,12 @@ module VORuby
           self.condition = condition
         end
       end
+      
+      # This method counts the number of times that a condition appears.
+      def count_condition(attributes)
+        times = 0
+        return self.condition.count_condition(attributes, times)
+      end
     end
 	
   	# Represents the From part of the query.

data/lib/voruby/adql/ext.rb

@@ -3,9 +3,8 @@ class REXML::Element
     if !ns
       return self.attributes[attr_name]
     else
-      ns_index = self.namespaces.index(ns)
-      if ns_index
-        ns_prefix = self.prefixes[ns_index]
+      ns_prefix = self.namespaces.index(ns)
+      if ns_prefix
         return self.attributes["#{ns_prefix}:#{attr_name}"]
       else
         return nil

data/lib/voruby/adql/loader.rb

@@ -1,4 +1,5 @@
 require 'rexml/element'
+require 'cgi'
 
 require 'voruby/loader'
 require 'voruby/votables/misc'

data/lib/voruby/resources/voresource/voresource_v0_10.rb

@@ -64,6 +64,7 @@ module VORuby
           text_node :value, '', :optional => false
           
           def value=(short_name)
+            short_name.strip!
             raise RuntimeError, "ShortName '#{short_name}' must have <= 16 characters" if short_name.size > 16
             
             @value = short_name
@@ -84,8 +85,12 @@ module VORuby
            def value=(uri)
              # Strictly, this should be ivo only, but I notice that sometimes http is used.
              #raise RuntimeError, "IdentifierURI '#{uri}' in wrong format" if !uri.strip.match('^(ivo|http):')
-
-             @value = URI.parse(uri.strip)
+             
+             begin
+               @value = URI.parse(uri.strip)
+             rescue URI::InvalidURIError
+               return nil
+              end
            end
         end
         

data/lib/voruby/services/gestalt/footprint.rb

@@ -27,8 +27,8 @@ module VORuby
           params['in2'] = radius
           params['in3'] = multiple_tables
     
-          map_names = @driver.makeCircleMap(params.to_soap_map)['makeCircleMapReturn']
-    
+          map_names = driver.makeCircleMap(params.to_soap_map)['makeCircleMapReturn']
+          
           map_names = [map_names] if !map_names.is_a?(Array)
           return map_names
         end

data/lib/voruby/services/gestalt/wesix.rb

@@ -7,7 +7,7 @@ module VORuby
       class WesixException < RuntimeError; end
       class NoVotableException < WesixException
         def initialize
-          super('VOTABLE missing from SOAP response. ' +
+          super('VOTable missing from SOAP response. ' +
                 'Often this is caused by an overly large catalog. ' +
                 'Try increasing your detection threshold.')
         end

data/lib/voruby/services/resolver/resolver.rb

@@ -16,7 +16,7 @@ module VORuby
           @driver.wiredump_dev = $stderr if debug
         end
         
-        def self.from_wsdl(wsdl='http://vizier.cfa.harvard.edu:8080/axis/services/Sesame?wsdl', debug=false)
+        def self.from_wsdl(wsdl='http://cdsws.u-strasbg.fr/axis/services/Sesame?wsdl', debug=false)
           return Sesame.new(SOAP::WSDLDriverFactory.new(wsdl).create_rpc_driver, debug)
         end