athena 0.0.7 → 0.0.8

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to athena version 0.0.7
+This documentation refers to athena version 0.0.8
 
 
 == DESCRIPTION
@@ -15,7 +15,7 @@ TODO: well, the description... ;-)
 <b></b>
 Documentation::     <http://prometheus.rubyforge.org/athena>
 Source code (old):: <http://prometheus.rubyforge.org/svn/athena>
-Source code:        <http://github.com/blackwinter/athena>
+Source code::       <http://github.com/blackwinter/athena>
 Rubyforge project:: <http://rubyforge.org/projects/prometheus>
 
 

data/bin/athena

@@ -5,7 +5,7 @@
 #                                                                             #
 # athena -- Convert database files to various formats                         #
 #                                                                             #
-# Copyright (C) 2007-2008 University of Cologne,                              #
+# Copyright (C) 2007-2009 University of Cologne,                              #
 #                         Albertus-Magnus-Platz,                              #
 #                         50932 Cologne, Germany                              #
 #                                                                             #
@@ -165,19 +165,19 @@ abort "Config not found for target: #{target}." unless config
 parser = Athena.parser(config, spec)
 
 if Athena.deferred_output?(format)
-  records = parser.parse(options[:input])
+  res = parser.parse(options[:input])
 
-  records.map { |record|
+  res.map { |record|
     record.to(format)
   }.flatten.sort.uniq.each { |line|
     options[:output].puts line
   }
 else
-  records = parser.parse(options[:input]) { |record|
+  res = parser.parse(options[:input]) { |record|
     options[:output].puts record.to(format)
   }
 end
 
 Athena::Util.verbose(:count) do
-  spit records.size
+  spit res.is_a?(Numeric) ? res : res.size
 end

data/lib/athena/formats/ferret.rb

@@ -3,7 +3,7 @@
 #                                                                             #
 # A component of athena, the database file converter.                         #
 #                                                                             #
-# Copyright (C) 2007-2008 University of Cologne,                              #
+# Copyright (C) 2007-2009 University of Cologne,                              #
 #                         Albertus-Magnus-Platz,                              #
 #                         50932 Cologne, Germany                              #
 #                                                                             #
@@ -48,7 +48,7 @@ class Athena::Formats
         when nil
           raise NoRecordElementError, 'no record element specified'
         else
-          raise IllegalRecordElementError, "illegal record element #{@record_element}"
+          raise IllegalRecordElementError, "illegal record element #{@record_element.inspect}"
       end
 
       @config = config

data/lib/athena/formats/sisis.rb

@@ -3,7 +3,7 @@
 #                                                                             #
 # A component of athena, the database file converter.                         #
 #                                                                             #
-# Copyright (C) 2007-2008 University of Cologne,                              #
+# Copyright (C) 2007-2009 University of Cologne,                              #
 #                         Albertus-Magnus-Platz,                              #
 #                         50932 Cologne, Germany                              #
 #                                                                             #
@@ -43,7 +43,7 @@ class Athena::Formats
         when nil
           raise NoRecordElementError, 'no record element specified'
         else
-          raise IllegalRecordElementError, "illegal record element #{@record_element}"
+          raise IllegalRecordElementError, "illegal record element #{@record_element.inspect}"
       end
 
       @config = config
@@ -51,7 +51,7 @@ class Athena::Formats
     end
 
     def parse(source)
-      record = nil
+      record, num = nil, 0
 
       source.each { |line|
         element, value = line.match(/(\d+).*?:\s*(.*)/)[1, 2]
@@ -60,12 +60,15 @@ class Athena::Formats
           when record_element
             record.close if record
             record = Athena::Record.new(parser.block, value)
+            num += 1
           else
             record.update(element, value, config[element])
         end
       }
 
       record.close if record
+
+      num
     end
 
     class NoRecordElementError < StandardError

data/lib/athena/formats/xml.rb

@@ -3,7 +3,7 @@
 #                                                                             #
 # A component of athena, the database file converter.                         #
 #                                                                             #
-# Copyright (C) 2007-2008 University of Cologne,                              #
+# Copyright (C) 2007-2009 University of Cologne,                              #
 #                         Albertus-Magnus-Platz,                              #
 #                         50932 Cologne, Germany                              #
 #                                                                             #
@@ -63,7 +63,7 @@ class Athena::Formats
         when nil
           raise NoRecordElementError, 'no record element specified'
         else
-          raise IllegalRecordElementError, "illegal record element #{record_element}"
+          raise IllegalRecordElementError, "illegal record element #{record_element.inspect}"
       end
 
       element_specs = config.inject({}) { |specs, (element, element_spec)|
@@ -209,7 +209,7 @@ class Athena::Formats
       def start(context, name, attrs)
         super
 
-        self.record = Athena::Record.new(parser.block)
+        self.record = Athena::Record.new(parser.block, nil, true)
       end
 
       def done(context, name)

data/lib/athena/parser.rb

@@ -45,7 +45,7 @@ class Athena::Parser
     self.block = block
 
     res = spec.parse(source)
-    block ? res : Athena::Record.records
+    res.is_a?(Numeric) ? res : Athena::Record.records
   end
 
   private
@@ -62,8 +62,7 @@ class Athena::Parser
           when Hash
             elements = v[:elements] || v[:element].to_a
 
-            raise ArgumentError, "no elements specified for field #{field}" \
-              unless elements.is_a?(Array)
+            raise ArgumentError, "no elements specified for field #{field}" unless elements.is_a?(Array)
           else
             raise ArgumentError, "illegal value for field #{field}"
         end

data/lib/athena/record.rb

@@ -50,12 +50,12 @@ class Athena::Record
 
   attr_reader :struct, :block, :id
 
-  def initialize(block, id = object_id.abs)
+  def initialize(block, id = nil, _add_record = !block)
     @struct = {}
     @block  = block
-    @id     = id
+    @id     = id || object_id.abs
 
-    add_record unless block
+    add_record if _add_record
 
     if block_given?
       begin

data/lib/athena/util.rb

@@ -3,7 +3,7 @@
 #                                                                             #
 # A component of athena, the database file converter.                         #
 #                                                                             #
-# Copyright (C) 2007-2008 University of Cologne,                              #
+# Copyright (C) 2007-2009 University of Cologne,                              #
 #                         Albertus-Magnus-Platz,                              #
 #                         50932 Cologne, Germany                              #
 #                                                                             #
@@ -31,7 +31,7 @@ module Athena::Util
   extend self
 
   def verbose(what, klass = self.class, &block)
-    if $Verbose[what]
+    if $Verbose && $Verbose[what]
       klass.send(:define_method, :spit) { |msg|
         warn "*#{what}: #{msg}"
       }

data/lib/athena/version.rb

@@ -30,7 +30,7 @@ module Athena::Version
 
   MAJOR = 0
   MINOR = 0
-  TINY  = 7
+  TINY  = 8
 
   class << self
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: athena
 version: !ruby/object:Gem::Version 
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors: 
 - Jens Wille
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-20 00:00:00 +02:00
+date: 2009-08-21 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -68,15 +68,15 @@ licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --line-numbers
 - --main
 - README
+- --line-numbers
 - --inline-source
 - --title
 - athena Application documentation
+- --all
 - --charset
 - UTF-8
-- --all
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement