athena 0.2.1 → 0.2.2

data/lib/athena/record.rb

@@ -54,9 +54,7 @@ module Athena
     attr_reader :struct, :block, :id
 
     def initialize(id = nil, block = nil, add = !block)
-      @id     = id || object_id.map_positive
-      @block  = block
-      @struct = {}
+      @id, @block, @struct = id || object_id.map_positive, block, {}
 
       add_record if add
 

data/lib/athena/version.rb

@@ -4,7 +4,7 @@ module Athena
 
     MAJOR = 0
     MINOR = 2
-    TINY  = 1
+    TINY  = 2
 
     class << self
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: athena
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Jens Wille
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-27 00:00:00 Z
+date: 2012-04-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: builder
@@ -53,12 +53,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 61
         segments: 
         - 0
-        - 7
-        - 4
-        version: 0.7.4
+        - 8
+        - 1
+        version: 0.8.1
   type: :runtime
   version_requirements: *id003
 description: Convert database files to various formats.
@@ -72,41 +72,41 @@ extra_rdoc_files:
 - COPYING
 - ChangeLog
 files: 
-- lib/athena/record.rb
-- lib/athena/cli.rb
-- lib/athena/formats/xml.rb
+- lib/athena/version.rb
+- lib/athena/formats.rb
 - lib/athena/formats/lingo.rb
-- lib/athena/formats/ferret.rb
 - lib/athena/formats/dbm.rb
 - lib/athena/formats/sql.rb
+- lib/athena/formats/xml.rb
 - lib/athena/formats/sisis.rb
-- lib/athena/version.rb
-- lib/athena/parser.rb
-- lib/athena/formats.rb
+- lib/athena/formats/ferret.rb
+- lib/athena/cli.rb
+- lib/athena/record.rb
 - lib/athena.rb
 - bin/athena
-- README
 - ChangeLog
-- Rakefile
 - COPYING
+- README
+- Rakefile
 - example/dump-my.sql
-- example/config.yaml
+- example/sisis-ex.txt
 - example/dump-pg.sql
+- example/config.yaml
 - example/example.xml
-- example/sisis-ex.txt
+- example/athena_plugin.rb
 homepage: http://prometheus.rubyforge.org/athena
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --all
-- --main
-- README
 - --charset
 - UTF-8
 - --title
-- athena Application documentation (v0.2.1)
+- athena Application documentation (v0.2.2)
+- --main
+- README
 - --line-numbers
+- --all
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -130,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: prometheus
-rubygems_version: 1.8.6
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Convert database files to various formats.

data/lib/athena/parser.rb

@@ -1,90 +0,0 @@
-#--
-###############################################################################
-#                                                                             #
-# A component of athena, the database file converter.                         #
-#                                                                             #
-# Copyright (C) 2007-2011 University of Cologne,                              #
-#                         Albertus-Magnus-Platz,                              #
-#                         50923 Cologne, Germany                              #
-#                                                                             #
-# Authors:                                                                    #
-#     Jens Wille <jens.wille@uni-koeln.de>                                    #
-#                                                                             #
-# athena is free software; you can redistribute it and/or modify it under the #
-# terms of the GNU Affero General Public License as published by the Free     #
-# Software Foundation; either version 3 of the License, or (at your option)   #
-# any later version.                                                          #
-#                                                                             #
-# athena is distributed in the hope that it will be useful, but WITHOUT ANY   #
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS   #
-# FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for     #
-# more details.                                                               #
-#                                                                             #
-# You should have received a copy of the GNU Affero General Public License    #
-# along with athena. If not, see <http://www.gnu.org/licenses/>.              #
-#                                                                             #
-###############################################################################
-#++
-
-require 'athena'
-
-module Athena
-
-  class Parser
-
-    DEFAULT_SEPARATOR = ', '
-    DEFAULT_EMPTY     = '<<EMPTY>>'
-
-    attr_reader :config, :spec
-
-    def initialize(config, spec)
-      @config = build_config(config)
-      @spec   = Formats[:in, spec].new(self)
-    end
-
-    def parse(source, &block)
-      res = spec.parse(source, &block)
-      res.is_a?(Numeric) ? res : Record.records
-    end
-
-    private
-
-    def build_config(config)
-      hash = {}
-
-      config.each { |field, value|
-        if field.to_s =~ /\A__/
-          hash[field] = value
-        else
-          case value
-            when String, Array
-              elements, value = [*value], {}
-            when Hash
-              elements = value[:elements] || value[:element].to_a
-
-              raise ArgumentError, "no elements specified for field #{field}" unless elements.is_a?(Array)
-            else
-              raise ArgumentError, "illegal value for field #{field}"
-          end
-
-          separator = value[:separator] || DEFAULT_SEPARATOR
-
-          elements.each { |element|
-            (hash[element] ||= {})[field] = {
-              :string   => value[:string] || ['%s'] * elements.size * separator,
-              :empty    => value[:empty]  || DEFAULT_EMPTY,
-              :elements => elements
-            }
-          }
-        end
-      }
-
-      hash
-    end
-
-    class ConfigError < StandardError
-    end
-
-  end
-
-end