athena 0.2.3 → 0.2.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c029a5754a067e303b4c673f9904c91531fe1504
+  data.tar.gz: acc964603b8637cb8b1700225d50881a0d6e1b52
+SHA512:
+  metadata.gz: c25e93d4cca0744459fa0650036eea7ce7ba4e20d14b1774234cb241ff0ac7d1c96a3cd1e34dfcbc18dbd2d4dcb16ce7450e28c1c12fdb282a3d7962c6297460
+  data.tar.gz: a5f9d1e45d874eaab1b1e0a952b9cc9ae8e648e63bb064aa2fcbb821aa763bc31b8b86c0463d47197ac4e310a615d75351389bd8a7a95a8171c3b9b315986177

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to athena version 0.2.3
+This documentation refers to athena version 0.2.4
 
 
 == DESCRIPTION
@@ -30,14 +30,16 @@ RubyForge project:: http://rubyforge.org/projects/prometheus
 
 == AUTHORS
 
-* Jens Wille <mailto:jens.wille@uni-koeln.de>
+* Jens Wille <mailto:jens.wille@gmail.com>
 
 
 == LICENSE AND COPYRIGHT
 
-Copyright (C) 2007-2011 University of Cologne,
+Copyright (C) 2007-2012 University of Cologne,
 Albertus-Magnus-Platz, 50923 Cologne, Germany
 
+Copyright (C) 2013 Jens Wille
+
 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)

data/Rakefile

@@ -13,8 +13,8 @@ begin
       :version      => Athena::VERSION,
       :summary      => %q{Convert database files to various formats.},
       :author       => %q{Jens Wille},
-      :email        => %q{jens.wille@uni-koeln.de},
-      :dependencies => %w[builder xmlstreamin] << ['ruby-nuggets', '>= 0.8.1']
+      :email        => %q{jens.wille@gmail.com},
+      :dependencies => %w[builder highline xmlstreamin] << ['ruby-nuggets', '>= 0.9.1']
     }
   }}
 rescue LoadError => err

data/bin/athena

@@ -5,12 +5,14 @@
 #                                                                             #
 # athena -- Convert database files to various formats                         #
 #                                                                             #
-# Copyright (C) 2007-2011 University of Cologne,                              #
+# Copyright (C) 2007-2012 University of Cologne,                              #
 #                         Albertus-Magnus-Platz,                              #
 #                         50923 Cologne, Germany                              #
 #                                                                             #
+# Copyright (C) 2013 Jens Wille                                               #
+#                                                                             #
 # Authors:                                                                    #
-#     Jens Wille <jens.wille@uni-koeln.de>                                    #
+#     Jens Wille <jens.wille@gmail.com>                                       #
 #                                                                             #
 # 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     #

data/lib/athena.rb

@@ -3,12 +3,14 @@
 #                                                                             #
 # athena -- Convert database files to various formats                         #
 #                                                                             #
-# Copyright (C) 2007-2011 University of Cologne,                              #
+# Copyright (C) 2007-2012 University of Cologne,                              #
 #                         Albertus-Magnus-Platz,                              #
 #                         50923 Cologne, Germany                              #
 #                                                                             #
+# Copyright (C) 2013 Jens Wille                                               #
+#                                                                             #
 # Authors:                                                                    #
-#     Jens Wille <jens.wille@uni-koeln.de>                                    #
+#     Jens Wille <jens.wille@gmail.com>                                       #
 #                                                                             #
 # 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     #

data/lib/athena/cli.rb

@@ -3,12 +3,14 @@
 #                                                                             #
 # A component of athena, the database file converter.                         #
 #                                                                             #
-# Copyright (C) 2007-2011 University of Cologne,                              #
+# Copyright (C) 2007-2012 University of Cologne,                              #
 #                         Albertus-Magnus-Platz,                              #
 #                         50923 Cologne, Germany                              #
 #                                                                             #
+# Copyright (C) 2013 Jens Wille                                               #
+#                                                                             #
 # Authors:                                                                    #
-#     Jens Wille <jens.wille@uni-koeln.de>                                    #
+#     Jens Wille <jens.wille@gmail.com>                                       #
 #                                                                             #
 # 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     #

data/lib/athena/formats.rb

@@ -3,12 +3,14 @@
 #                                                                             #
 # A component of athena, the database file converter.                         #
 #                                                                             #
-# Copyright (C) 2007-2011 University of Cologne,                              #
+# Copyright (C) 2007-2012 University of Cologne,                              #
 #                         Albertus-Magnus-Platz,                              #
 #                         50923 Cologne, Germany                              #
 #                                                                             #
+# Copyright (C) 2013 Jens Wille                                               #
+#                                                                             #
 # Authors:                                                                    #
-#     Jens Wille <jens.wille@uni-koeln.de>                                    #
+#     Jens Wille <jens.wille@gmail.com>                                       #
 #                                                                             #
 # 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     #

data/lib/athena/formats/dbm.rb

@@ -3,12 +3,14 @@
 #                                                                             #
 # A component of athena, the database file converter.                         #
 #                                                                             #
-# Copyright (C) 2007-2011 University of Cologne,                              #
+# Copyright (C) 2007-2012 University of Cologne,                              #
 #                         Albertus-Magnus-Platz,                              #
 #                         50923 Cologne, Germany                              #
 #                                                                             #
+# Copyright (C) 2013 Jens Wille                                               #
+#                                                                             #
 # Authors:                                                                    #
-#     Jens Wille <jens.wille@uni-koeln.de>                                    #
+#     Jens Wille <jens.wille@gmail.com>                                       #
 #                                                                             #
 # 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     #

data/lib/athena/formats/ferret.rb

@@ -3,12 +3,14 @@
 #                                                                             #
 # A component of athena, the database file converter.                         #
 #                                                                             #
-# Copyright (C) 2007-2011 University of Cologne,                              #
+# Copyright (C) 2007-2012 University of Cologne,                              #
 #                         Albertus-Magnus-Platz,                              #
 #                         50923 Cologne, Germany                              #
 #                                                                             #
+# Copyright (C) 2013 Jens Wille                                               #
+#                                                                             #
 # Authors:                                                                    #
-#     Jens Wille <jens.wille@uni-koeln.de>                                    #
+#     Jens Wille <jens.wille@gmail.com>                                       #
 #                                                                             #
 # 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     #

data/lib/athena/formats/lingo.rb

@@ -3,12 +3,14 @@
 #                                                                             #
 # A component of athena, the database file converter.                         #
 #                                                                             #
-# Copyright (C) 2007-2011 University of Cologne,                              #
+# Copyright (C) 2007-2012 University of Cologne,                              #
 #                         Albertus-Magnus-Platz,                              #
 #                         50923 Cologne, Germany                              #
 #                                                                             #
+# Copyright (C) 2013 Jens Wille                                               #
+#                                                                             #
 # Authors:                                                                    #
-#     Jens Wille <jens.wille@uni-koeln.de>                                    #
+#     Jens Wille <jens.wille@gmail.com>                                       #
 #                                                                             #
 # 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     #

data/lib/athena/formats/sisis.rb

@@ -3,12 +3,14 @@
 #                                                                             #
 # A component of athena, the database file converter.                         #
 #                                                                             #
-# Copyright (C) 2007-2011 University of Cologne,                              #
+# Copyright (C) 2007-2012 University of Cologne,                              #
 #                         Albertus-Magnus-Platz,                              #
 #                         50923 Cologne, Germany                              #
 #                                                                             #
+# Copyright (C) 2013 Jens Wille                                               #
+#                                                                             #
 # Authors:                                                                    #
-#     Jens Wille <jens.wille@uni-koeln.de>                                    #
+#     Jens Wille <jens.wille@gmail.com>                                       #
 #                                                                             #
 # 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     #

data/lib/athena/formats/sql.rb

@@ -3,12 +3,14 @@
 #                                                                             #
 # A component of athena, the database file converter.                         #
 #                                                                             #
-# Copyright (C) 2007-2011 University of Cologne,                              #
+# Copyright (C) 2007-2012 University of Cologne,                              #
 #                         Albertus-Magnus-Platz,                              #
 #                         50923 Cologne, Germany                              #
 #                                                                             #
+# Copyright (C) 2013 Jens Wille                                               #
+#                                                                             #
 # Authors:                                                                    #
-#     Jens Wille <jens.wille@uni-koeln.de>                                    #
+#     Jens Wille <jens.wille@gmail.com>                                       #
 #                                                                             #
 # 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     #
@@ -26,7 +28,6 @@
 ###############################################################################
 #++
 
-require 'strscan'
 require 'athena'
 
 module Athena::Formats
@@ -36,35 +37,25 @@ module Athena::Formats
     attr_reader :sql_parser
 
     def parse(input, &block)
-      columns, table, num = Hash.new { |h, k| h[k] = [] }, nil, 0
-
-      input.each { |line|
-        case line = line.chomp
-          when /\ACREATE\s+TABLE\s+`(.+?)`/i
-            table = $1
-          when /\A\s+`(.+?)`/i
-            columns[table] << $1 if table
-          when /\A\).*;\z/
-            table = nil
-          when /\AINSERT\s+INTO\s+`(.+?)`\s+VALUES\s*(.*);\z/i
-            _columns = columns[$1]
-            next if _columns.empty?
+      num = 0
 
-            sql_parser.parse($2) { |row|
-              Athena::Record.new(nil, block) { |record|
-                row.each_with_index { |value, index|
-                  column = _columns[index] or next
+      sql_parser.parse(input) { |event, *args|
+        if event == :insert
+          _, _, columns, values = args
 
-                  if column == record_element
-                    record.instance_variable_set(:@id, value)
-                  end
-
-                  record.update(column, value.to_s, config[column])
-                }
-              }
+          Athena::Record.new(nil, block) { |record|
+            values.each_with_index { |value, index|
+              if column = columns[index]
+                if column == record_element
+                  record.instance_variable_set(:@id, value)
+                end
 
-              num += 1
+                record.update(column, value.to_s, config[column])
+              end
             }
+          }
+
+          num += 1
         end
       }
 
@@ -76,104 +67,7 @@ module Athena::Formats
     def init_in(*)
       @__record_element_ok__ = [String, nil]
       super
-      @sql_parser = SQLParser.new
-    end
-
-    class SQLParser
-
-      AST = Struct.new(:value)
-
-      def self.parse(input)
-        new.parse(input)
-      end
-
-      def parse(input)
-        @input = StringScanner.new(input)
-
-        rows, block_given = [], block_given?
-
-        while result = parse_row
-          row = result.value
-          block_given ? yield(row) : rows << row
-          break unless @input.scan(/,\s*/)
-        end
-
-        @input.scan(/;/)  # optional
-
-        error('Unexpected data') unless @input.eos?
-
-        rows unless block_given
-      end
-
-      def parse_row
-        return unless @input.scan(/\(/)
-
-        row = []
-
-        while result = parse_value
-          row << result.value
-          break unless @input.scan(/,\s*/)
-        end
-
-        error('Unclosed row') unless @input.scan(/\)/)
-
-        AST.new(row)
-      end
-
-      def parse_value
-        parse_string ||
-        parse_number ||
-        parse_keyword
-      end
-
-      def parse_string
-        return unless @input.scan(/'/)
-
-        string = ''
-
-        while contents = parse_string_content || parse_string_escape
-          string << contents.value
-        end
-
-        error('Unclosed string') unless @input.scan(/'/)
-
-        AST.new(string)
-      end
-
-      def parse_string_content
-        if @input.scan(/[^\\']+/)
-          AST.new(@input.matched)
-        end
-      end
-
-      def parse_string_escape
-        if @input.scan(/\\[abtnvfr]/)
-          AST.new(eval(%Q{"#{@input.matched}"}))
-        elsif @input.scan(/\\.|''/)
-          AST.new(@input.matched[-1, 1])
-        end
-      end
-
-      def parse_number
-        if @input.scan(/-?(?:0|[1-9]\d*)(?:\.\d+)?(?:[eE][+-]?\d+)?/)
-          AST.new(eval(@input.matched))
-        end
-      end
-
-      def parse_keyword
-        if @input.scan(/null/i)
-          AST.new(nil)
-        end
-      end
-
-      def error(message)
-        if @input.eos?
-          raise "Unexpected end of input (#{message})."
-        else
-          raise "#{message} at #{$.}:#{@input.pos}: #{@input.peek(16).inspect}"
-        end
-      end
-
+      @sql_parser = Util::MySQL::Parser.new
     end
 
   end

data/lib/athena/formats/xml.rb

@@ -3,12 +3,14 @@
 #                                                                             #
 # A component of athena, the database file converter.                         #
 #                                                                             #
-# Copyright (C) 2007-2011 University of Cologne,                              #
+# Copyright (C) 2007-2012 University of Cologne,                              #
 #                         Albertus-Magnus-Platz,                              #
 #                         50923 Cologne, Germany                              #
 #                                                                             #
+# Copyright (C) 2013 Jens Wille                                               #
+#                                                                             #
 # Authors:                                                                    #
-#     Jens Wille <jens.wille@uni-koeln.de>                                    #
+#     Jens Wille <jens.wille@gmail.com>                                       #
 #                                                                             #
 # 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     #

data/lib/athena/record.rb

@@ -3,12 +3,14 @@
 #                                                                             #
 # A component of athena, the database file converter.                         #
 #                                                                             #
-# Copyright (C) 2007-2011 University of Cologne,                              #
+# Copyright (C) 2007-2012 University of Cologne,                              #
 #                         Albertus-Magnus-Platz,                              #
 #                         50923 Cologne, Germany                              #
 #                                                                             #
+# Copyright (C) 2013 Jens Wille                                               #
+#                                                                             #
 # Authors:                                                                    #
-#     Jens Wille <jens.wille@uni-koeln.de>                                    #
+#     Jens Wille <jens.wille@gmail.com>                                       #
 #                                                                             #
 # 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     #

data/lib/athena/version.rb

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

metadata

@@ -1,66 +1,73 @@
 --- !ruby/object:Gem::Specification
 name: athena
 version: !ruby/object:Gem::Version
-  version: 0.2.3
-  prerelease: 
+  version: 0.2.4
 platform: ruby
 authors:
 - Jens Wille
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-06 00:00:00.000000000 Z
+date: 2013-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: xmlstreamin
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby-nuggets
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.9.1
 description: Convert database files to various formats.
-email: jens.wille@uni-koeln.de
+email: jens.wille@gmail.com
 executables:
 - athena
 extensions: []
@@ -69,30 +76,31 @@ extra_rdoc_files:
 - COPYING
 - ChangeLog
 files:
-- lib/athena/formats/sql.rb
-- lib/athena/formats/xml.rb
+- lib/athena.rb
+- lib/athena/cli.rb
+- lib/athena/formats.rb
+- lib/athena/formats/dbm.rb
 - lib/athena/formats/ferret.rb
 - lib/athena/formats/lingo.rb
-- lib/athena/formats/dbm.rb
 - lib/athena/formats/sisis.rb
-- lib/athena/version.rb
-- lib/athena/cli.rb
+- lib/athena/formats/sql.rb
+- lib/athena/formats/xml.rb
 - lib/athena/record.rb
-- lib/athena/formats.rb
-- lib/athena.rb
+- lib/athena/version.rb
 - bin/athena
 - COPYING
 - ChangeLog
-- Rakefile
 - README
+- Rakefile
+- example/athena_plugin.rb
 - example/config.yaml
+- example/dump-my.sql
 - example/dump-pg.sql
 - example/example.xml
-- example/athena_plugin.rb
-- example/dump-my.sql
 - example/sisis-ex.txt
 homepage: http://prometheus.rubyforge.org/athena
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --charset
@@ -100,27 +108,25 @@ rdoc_options:
 - --line-numbers
 - --all
 - --title
-- athena Application documentation (v0.2.3)
+- athena Application documentation (v0.2.4)
 - --main
 - README
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: prometheus
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Convert database files to various formats.
 test_files: []