athena 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c029a5754a067e303b4c673f9904c91531fe1504
-  data.tar.gz: acc964603b8637cb8b1700225d50881a0d6e1b52
+  metadata.gz: d32f444096ae3b9f0ecdd6c038ee9a1ab0c1e8ed
+  data.tar.gz: 2ada4ab199db9a4c877a0a332542d8f74897cb9f
 SHA512:
-  metadata.gz: c25e93d4cca0744459fa0650036eea7ce7ba4e20d14b1774234cb241ff0ac7d1c96a3cd1e34dfcbc18dbd2d4dcb16ce7450e28c1c12fdb282a3d7962c6297460
-  data.tar.gz: a5f9d1e45d874eaab1b1e0a952b9cc9ae8e648e63bb064aa2fcbb821aa763bc31b8b86c0463d47197ac4e310a615d75351389bd8a7a95a8171c3b9b315986177
+  metadata.gz: 62845c8060a4e0df098029dbadb66606ae6fde1e721e821fb07126ceb43f4934eaa2ca18fcec3b0649ef44b4df0de450bbb289f72ae5ec7d005bcbc3b8aa1f88
+  data.tar.gz: 54cdbebac8a5b227f3433cdb3055a63ab8a22a28edf66c8a837225b086ac05dade548edf9c83cab5166dfec2e22b029fba270fbf3224b4215ab6c31757d347ba

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to athena version 0.2.4
+This documentation refers to athena version 0.2.5
 
 
 == DESCRIPTION
@@ -23,9 +23,9 @@ placed in <tt>$LOAD_PATH</tt>. See Athena::Formats on how to define custom forma
 == LINKS
 
 <b></b>
-Documentation::     http://prometheus.rubyforge.org/athena
-Source code::       http://github.com/blackwinter/athena
-RubyForge project:: http://rubyforge.org/projects/prometheus
+Documentation:: http://blackwinter.github.com/athena
+Source code::   http://github.com/blackwinter/athena
+RubyGem::       http://rubygems.org/gems/athena
 
 
 == AUTHORS

data/Rakefile

@@ -4,17 +4,14 @@ begin
   require 'hen'
 
   Hen.lay! {{
-    :rubyforge => {
-      :project => %q{prometheus},
-      :package => %q{athena}
-    },
-
     :gem => {
+      :name         => %q{athena},
       :version      => Athena::VERSION,
       :summary      => %q{Convert database files to various formats.},
       :author       => %q{Jens Wille},
       :email        => %q{jens.wille@gmail.com},
-      :dependencies => %w[builder highline xmlstreamin] << ['ruby-nuggets', '>= 0.9.1']
+      :homepage     => :blackwinter,
+      :dependencies => %w[builder highline xmlstreamin] << ['ruby-nuggets', '>= 0.9.2']
     }
   }}
 rescue LoadError => err

data/example/config.yaml

@@ -79,3 +79,19 @@
   :attr3:     [attr3ID, Val]
   :attr4:     [attr4ID, Val]
 :dump-pg:
+:midos-ex:
+  :__record_element: "000"
+  :language:
+    :elements: ["015"]
+    :separator: " / "
+  :title:
+    :elements:
+      - "331"
+      - "335"
+    :string: "%s: %s"
+    :empty: ">>n/a<<"
+  :date:
+    :elements:
+      - "424"
+      - "425"
+    :separator: ", "

data/example/midos-ex.dbm

@@ -0,0 +1,53 @@
+000:3
+001:000000003
+002:02.05.2001
+003:27.08.2002
+015:ger | lat
+036:m
+125:Blattmaß 38 x 30 cm; Hinterklebt ; Klebereste | Blattmaß 30 x 31,5 cm; Fragment: unterer Textteil fehlt teilweise
+331:Denckwürdiges Geheimnuß
+335:Teutsche Erklärung des Kupfferstücks
+370:Dum tua privato fessus das lumina somno | Einer/ oder gar drey müssen für das Volck sterben
+424:1620
+425:[ca. 1620]
+433:1 Bl.
+434:1 Ill.; Radierung 19,5 x 27,5 cm(nach einem Kupferstich von Gaspar Dooms)
+435:Satzspiegel 38 x 30 cm
+509:Verfasser ermittelt aus Nachweis
+511:Erscheinungsjahr ermittelt aus Inhalt und Nachweis
+720:Politisches Flugblatt | Prokaiserliches Flugblatt
+&&&
+
+000:4
+001:000000004
+002:03.05.2001
+003:29.08.2002
+015:ger
+036:m
+331:Machometische Zanck= und Haderkatzen
+370:UNser Planet Ist Machomet, Saturnisch Thier Sind wir allhier
+424:1621
+425:1621
+433:1 Bl.
+434:1 Ill.; Kupferstich 14 x 24 cm
+435:Satzspiegel 30,5 x 24,5 cm
+720:Politische Flugblatt | Antiunionistisches Flugblatt
+721:Dreissigjähriger Krieg | Böhmisch-Pfälzischer Krieg
+&&&
+
+000:5
+001:000000005
+002:03.05.2001
+003:29.08.2002
+015:ger
+036:m
+331:Alles hatt Sein Zeydt | -- Hää?
+424:1621
+425:[1621]
+433:1 Bl.
+434:1 Ill.; 16 x 27,5 cm
+435:Satspiegel 16 x 27,5 cm
+511:Erscheinungsjahr ermittelt aus Bildinhalt und Nachweis
+527:Andere Ausgabe: Einbl. V,8 b-8; Deutsche illustrierte Flugblätter des 16. und 17. Jahrhunderts
+&&&
+

data/lib/athena.rb

@@ -106,5 +106,5 @@ module Athena
 
 end
 
-require 'nuggets/util/pluggable'
-Util::Pluggable.load_plugins_for(Athena)
+require 'nuggets/pluggable'
+Nuggets::Pluggable.load_plugins_for(Athena)

data/lib/athena/cli.rb

@@ -28,12 +28,12 @@
 ###############################################################################
 #++
 
-require 'nuggets/util/cli'
+require 'nuggets/cli'
 require 'athena'
 
 module Athena
 
-  class CLI < ::Util::CLI
+  class CLI < ::Nuggets::CLI
 
     class << self
 
@@ -57,12 +57,12 @@ module Athena
       abort "No output format specified and none could be inferred." unless format
       abort "Invalid output format: #{format}. Use `-l' to get a list of available formats." unless Athena.valid_output_format?(format)
 
-      target_config = if t = options[:target]
-        config[target = t.to_sym]
+      if t = options[:target]
+        target_config = config[target = t.to_sym]
       else
         [options[:target_fallback] || 'generic', ".#{spec}", ":#{format}"].inject([]) { |s, t|
           s << (s.last ? s.last + t : t)
-        }.reverse.find { |t| config[target = t.to_sym] }
+        }.reverse.find { |t| target_config = config[target = t.to_sym] }
       end or abort "Config not found for target: #{target}."
 
       input = options[:input]

data/lib/athena/formats.rb

@@ -207,8 +207,6 @@ module Athena
         registered.compact
       end
 
-      protected
-
       # call-seq:
       #   Athena::Formats.format_name(name) -> aString
       #

data/lib/athena/formats/dbm.rb

@@ -28,21 +28,58 @@
 ###############################################################################
 #++
 
-require 'iconv'
 require 'athena'
+require 'nuggets/midos'
 
 module Athena::Formats
 
   class DBM < Base
 
-    VALUE_SEPARATOR  = '|'
-    RECORD_SEPARATOR = '&&&'
+    RECORD_SEPARATOR = Nuggets::Midos::Parser::DEFAULT_RS
+    FIELD_SEPARATOR  = Nuggets::Midos::Parser::DEFAULT_FS
+    VALUE_SEPARATOR  = Nuggets::Midos::Parser::DEFAULT_VS
+
+    TO_LATIN1 = begin
+      require 'iconv'
+    rescue LoadError
+      Object.new.tap { |x|
+        if ENV['ATHENA_DBM_NOCONV']
+          def x.iconv(s); s; end
+        else
+          def x.iconv(s); s.encode('iso-8859-1', 'utf-8'); end
+        end
+      }
+    else
+      iconv = Iconv.new('latin1//TRANSLIT//IGNORE', 'utf-8')
+      def iconv.iconv(s); s; end if ENV['ATHENA_DBM_NOCONV']
+      iconv
+    end
+
+    attr_reader :dbm_parser
+
+    def parse(input, &block)
+      num = 0
+
+      dbm_parser.parse(input) { |id, doc|
+        Athena::Record.new(id, block) { |record|
+          config.each { |element, field_config|
+            Array(doc[element]).each { |value|
+              record.update(element, value, field_config)
+            }
+          }
+        }
 
-    ICONV_TO_LATIN1 = Iconv.new('latin1//TRANSLIT//IGNORE', 'utf-8')
-    def ICONV_TO_LATIN1.iconv(s); s; end if ENV['ATHENA_DBM_NOCONV']
+        num += 1
+      }
+
+      num
+    end
 
     def convert(record)
-      dbm = ["ID:#{record.id}"]
+      rs, fs, vs, crlf_re, iconv =
+        RECORD_SEPARATOR, FIELD_SEPARATOR, VALUE_SEPARATOR, CRLF_RE, TO_LATIN1
+
+      dbm = ["ID#{fs}#{record.id}"]
 
       record.struct.each { |field, struct|
         struct_values = struct[:values]
@@ -53,22 +90,30 @@ module Athena::Formats
 
           struct_values[element].each { |value|
             if value
-              value = value.strip.gsub(CRLF_RE, ' ')
+              value = value.strip.gsub(crlf_re, ' ')
               values << value unless value.empty?
             end
           }
 
-          values.empty? ? struct[:empty] : values.join(VALUE_SEPARATOR)
+          values.empty? ? struct[:empty] : values.join(vs)
         }
 
-        dbm << "#{field.to_s.upcase}:#{ICONV_TO_LATIN1.iconv(struct[:string] % strings)}"
+        dbm << "#{field.to_s.upcase}#{fs}#{iconv.iconv(struct[:string] % strings)}"
       }
 
-      dbm << RECORD_SEPARATOR << CRLF
+      dbm << rs << CRLF
 
       dbm.join(CRLF)
     end
 
+    private
+
+    def init_in(*)
+      @__record_element_ok__ = [String, nil]
+      super
+      @dbm_parser = Nuggets::Midos::Parser.new(:key => record_element)
+    end
+
   end
 
   Midos = DBM

data/lib/athena/formats/lingo.rb

@@ -28,7 +28,6 @@
 ###############################################################################
 #++
 
-require 'iconv'
 require 'enumerator'
 require 'athena'
 

data/lib/athena/formats/sql.rb

@@ -67,7 +67,7 @@ module Athena::Formats
     def init_in(*)
       @__record_element_ok__ = [String, nil]
       super
-      @sql_parser = Util::MySQL::Parser.new
+      @sql_parser = Nuggets::MySQL::Parser.new
     end
 
   end

data/lib/athena/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: athena
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Jens Wille
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-12 00:00:00.000000000 Z
+date: 2013-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.9.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.9.2
 description: Convert database files to various formats.
 email: jens.wille@gmail.com
 executables:
@@ -97,8 +97,9 @@ files:
 - example/dump-my.sql
 - example/dump-pg.sql
 - example/example.xml
+- example/midos-ex.dbm
 - example/sisis-ex.txt
-homepage: http://prometheus.rubyforge.org/athena
+homepage: http://github.com/blackwinter/athena
 licenses: []
 metadata: {}
 post_install_message: 
@@ -108,7 +109,7 @@ rdoc_options:
 - --line-numbers
 - --all
 - --title
-- athena Application documentation (v0.2.4)
+- athena Application documentation (v0.2.5)
 - --main
 - README
 require_paths:
@@ -124,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: prometheus
+rubyforge_project: 
 rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4