athena 0.1.2 → 0.1.3

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to athena version 0.1.2
+This documentation refers to athena version 0.1.3
 
 
 == DESCRIPTION

data/lib/athena/formats/xml.rb

@@ -3,7 +3,7 @@
 #                                                                             #
 # A component of athena, the database file converter.                         #
 #                                                                             #
-# Copyright (C) 2007-2009 University of Cologne,                              #
+# Copyright (C) 2007-2010 University of Cologne,                              #
 #                         Albertus-Magnus-Platz,                              #
 #                         50932 Cologne, Germany                              #
 #                                                                             #
@@ -137,7 +137,7 @@ module Athena::Formats
 
     def setup_specs(config)
       case @record_element = config.delete(:__record_element)
-        when String
+        when String, Array
           # fine!
         when nil
           raise NoRecordElementError, 'no record element specified'
@@ -145,6 +145,15 @@ module Athena::Formats
           raise IllegalRecordElementError, "illegal record element #{@record_element.inspect}"
       end
 
+      case @skip_hierarchy = config.delete(:__skip_hierarchy)
+        when Integer
+          # fine!
+        when nil
+          @skip_hierarchy = 0
+        else
+          raise ConfigError, "illegal value #{@skip_hierarchy.inspect} for skip hierarchy"
+      end
+
       config.inject({}) { |specs, (element, element_spec)|
         element_spec.each { |field, c|
           element.split('/').reverse.inject({}) { |hash, part|
@@ -164,11 +173,16 @@ module Athena::Formats
       record_spec.specs!(specs)
 
       root_spec   = BaseSpec.new
-      root_spec.specs!(record_element => record_spec)
+      [*record_element].each { |re| root_spec.specs!(re => record_spec) }
 
       spec        = BaseSpec.new
       spec.default!(root_spec)
 
+      @skip_hierarchy.times {
+        prev_spec, spec = spec, BaseSpec.new
+        spec.default!(prev_spec)
+      }
+
       verbose(:spec, BaseSpec) do
         spec.inspect_spec
       end
@@ -344,10 +358,12 @@ module Athena::Formats
 
     end
 
-    class NoRecordElementError < StandardError
+    ConfigError = Athena::Parser::ConfigError
+
+    class NoRecordElementError < ConfigError
     end
 
-    class IllegalRecordElementError < StandardError
+    class IllegalRecordElementError < ConfigError
     end
 
   end

data/lib/athena/parser.rb

@@ -3,7 +3,7 @@
 #                                                                             #
 # A component of athena, the database file converter.                         #
 #                                                                             #
-# Copyright (C) 2007-2009 University of Cologne,                              #
+# Copyright (C) 2007-2010 University of Cologne,                              #
 #                         Albertus-Magnus-Platz,                              #
 #                         50932 Cologne, Germany                              #
 #                                                                             #
@@ -83,4 +83,7 @@ class Athena::Parser
     }
   end
 
+  class ConfigError < StandardError
+  end
+
 end

data/lib/athena/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: athena
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Jens Wille
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-03 00:00:00 +01:00
+date: 2010-02-05 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -53,40 +53,40 @@ extra_rdoc_files:
 - ChangeLog
 - README
 files: 
-- lib/athena.rb
-- lib/athena/formats/sisis.rb
-- lib/athena/formats/dbm.rb
+- lib/athena/util.rb
+- lib/athena/record.rb
 - lib/athena/formats/xml.rb
 - lib/athena/formats/lingo.rb
 - lib/athena/formats/ferret.rb
-- lib/athena/formats.rb
+- lib/athena/formats/dbm.rb
+- lib/athena/formats/sisis.rb
 - lib/athena/version.rb
-- lib/athena/util.rb
-- lib/athena/record.rb
 - lib/athena/parser.rb
+- lib/athena/formats.rb
+- lib/athena.rb
 - bin/athena
+- README
+- ChangeLog
 - Rakefile
 - COPYING
-- ChangeLog
-- README
-- example/sisis-ex.txt
 - example/config.yaml
 - example/example.xml
+- example/sisis-ex.txt
 has_rdoc: true
 homepage: http://prometheus.rubyforge.org/athena
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --title
-- athena Application documentation
-- --main
-- README
 - --line-numbers
 - --inline-source
-- --all
+- --main
+- README
 - --charset
 - UTF-8
+- --title
+- athena Application documentation
+- --all
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement