flattendb 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33d368b4ee2cd36d0e968a8237b66bc349a49352
-  data.tar.gz: e578a7ac382877e76e0523364b7bbd1ffbf5c881
+  metadata.gz: 0bf6ce4e0242288394dd70d6c06f3fbc921d86f2
+  data.tar.gz: e068b6f84762dc9f170ab9c5c5eafff15de9677a
 SHA512:
-  metadata.gz: fbf89d4936dd20e96717e94d2da16cdf35b6530ed1262cb325b44e63120334f6c5e1967e7afaf07b6fe300819b3b10d9ec41650aafd4240682900bfe1f358143
-  data.tar.gz: c2daea8bd1275ca1e5d2bd85c42d986452aef319acb34d871333fa0398b0697b1abdb51b81027bb35ac974e1f0dd63f23c0f4d5a5149710afbaddba32abd05df
+  metadata.gz: f012835b0b2d5f587d8686669d081641a247a045621eae3eb218136f9867d06eac3549b3ed12eb4d434d2321026550891319a632102614b68130a1808531239b
+  data.tar.gz: 9d1044499a8af06a52d295c8097cea45ee0c541b5753a2f8a4fa95d0a8208f478ee72917c0ef55bde9e502fe99ecc2a42b2dafd14b82ffc1216e25ba6359165d

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to flattendb version 0.2.0
+This documentation refers to flattendb version 0.2.1
 
 
 == DESCRIPTION
@@ -13,9 +13,9 @@ TODO: well, the description... ;-)
 == LINKS
 
 <b></b>
-Documentation::     http://prometheus.rubyforge.org/flattendb
-Source code::       http://github.com/blackwinter/flattendb
-RubyForge project:: http://rubyforge.org/projects/prometheus
+Documentation:: http://blackwinter.github.com/flattendb
+Source code::   http://github.com/blackwinter/flattendb
+RubyGem::       http://rubygems.org/gems/flattendb
 
 
 == AUTHORS

data/Rakefile

@@ -4,17 +4,14 @@ begin
   require 'hen'
 
   Hen.lay! {{
-    :rubyforge => {
-      :project => %q{prometheus},
-      :package => %q{flattendb}
-    },
-
     :gem => {
+      :name         => %q{flattendb},
       :version      => FlattenDB::VERSION,
       :summary      => %q{Flatten relational databases.},
       :author       => %q{Jens Wille},
       :email        => %q{jens.wille@gmail.com},
-      :dependencies => %w[builder highline libxml-ruby] << ['ruby-nuggets', '>= 0.9.1']
+      :homepage     => :blackwinter,
+      :dependencies => %w[builder highline libxml-ruby] << ['ruby-nuggets', '>= 0.9.2']
     }
   }}
 rescue LoadError => err

data/lib/flattendb/base.rb

@@ -76,7 +76,7 @@ module FlattenDB
       config = options.select { |k, _| k.is_a?(String) }
       raise ArgumentError, "can't have more than one primary (root) table" if config.size > 1
 
-      (@root, @config), _ = *config  # get "first" (and only) hash element
+      @root, @config = config.keys.first, config.values.first
 
       @input, @output = options.values_at(:input, :output)
     end

data/lib/flattendb/cli.rb

@@ -28,12 +28,12 @@
 ###############################################################################
 #++
 
-require 'nuggets/util/cli'
+require 'nuggets/cli'
 require 'flattendb'
 
 module FlattenDB
 
-  class CLI < ::Util::CLI
+  class CLI < ::Nuggets::CLI
 
     TYPES = {
       :mysql => {

data/lib/flattendb/types/mdb.rb

@@ -52,7 +52,7 @@ module FlattenDB
       # ...
     end
 
-    def flatten!(options = {}, builder_options = {})
+    def flatten!(options = {})
       self
     end
 

data/lib/flattendb/types/mysql.rb

@@ -29,7 +29,7 @@
 #++
 
 require 'libxml'
-require 'nuggets/util/mysql'
+require 'nuggets/mysql'
 require 'flattendb'
 
 module FlattenDB
@@ -51,7 +51,7 @@ module FlattenDB
       [send("parse_#{type}", tables) || 'root', tables]
     end
 
-    def flatten!(options = {}, builder_options = {})
+    def flatten!(options = {})
       flatten_tables!(tables, root, config)
       self
     end
@@ -63,13 +63,10 @@ module FlattenDB
 
       if tables.size > 1
         builder.tag!(name) {
-          tables.sort.each { |table, rows|
-            table_to_xml(table, rows, builder)
-          }
+          tables.sort.each { |table, rows| table_to_xml(table, rows, builder) }
         }
       else
-        (table, rows), _ = *tables  # get "first" (and only) hash element
-        table_to_xml(name, rows, builder)
+        table_to_xml(name, tables.values.first, builder)
       end
 
       self
@@ -101,7 +98,7 @@ module FlattenDB
     def parse_sql(tables)
       name = nil
 
-      Util::MySQL::Parser.parse(input) { |event, *args|
+      Nuggets::MySQL::Parser.parse(input) { |event, *args|
         case event
           when :use
             raise 'dump file contains more than one database' if name
@@ -130,28 +127,48 @@ module FlattenDB
           when Array
             inject_foreign(tables, primary_table, foreign_table, *spec)
           when Hash
-            raise ArgumentError, "invalid join table spec, #{JOIN_KEY.inspect} missing" unless spec.has_key?(JOIN_KEY)
+            unless spec.has_key?(JOIN_KEY)
+              raise ArgumentError,
+                "invalid join table spec, #{JOIN_KEY.inspect} missing"
+            end
 
-            join_key_spec = spec.delete(JOIN_KEY)
+            unless (join_key_spec = spec.delete(JOIN_KEY)).is_a?(Hash)
+              join_key_spec = { foreign_table => join_key_spec }
+            end
 
-            joined_tables = tables.dup
-            flatten_tables!(joined_tables, foreign_table, spec)
+            foreign_tables = Marshal.load(Marshal.dump(tables))
+            flatten_tables!(foreign_tables, foreign_table, spec)
 
-            (join_key_spec.is_a?(Hash) ? join_key_spec : { foreign_table => join_key_spec }).each { |foreign_table_name, join_key|
+            join_key_spec.each { |foreign_table_name, join_key|
               local_key, foreign_key = join_key
 
-              inject_foreign(tables, primary_table, foreign_table, local_key, foreign_key || local_key, joined_tables, foreign_table_name)
+              inject_foreign(
+                tables, primary_table, foreign_table,
+                local_key, foreign_key || local_key,
+                foreign_tables, foreign_table_name
+              )
             }
           else
-            raise ArgumentError, "don't know how to handle spec of type '#{spec.class}'"
+            raise ArgumentError,
+              "don't know how to handle spec of type #{spec.class}"
         end
       } if config
 
       tables.delete_if { |table, _| table != primary_table }
     end
 
-    def inject_foreign(tables, primary_table, foreign_table, local_key, foreign_key = local_key, foreign_tables = tables, foreign_table_name = foreign_table)
-      raise ArgumentError, "no such foreign table: #{foreign_table}" unless foreign_tables.has_key?(foreign_table)
+    def inject_foreign(
+      tables, primary_table, foreign_table,
+      local_key, foreign_key = local_key,
+      foreign_tables = tables, foreign_table_name = foreign_table
+    )
+      unless tables.has_key?(primary_table)
+        raise ArgumentError, "no such primary table: #{primary_table}"
+      end
+
+      unless foreign_tables.has_key?(foreign_table)
+        raise ArgumentError, "no such foreign table: #{foreign_table}"
+      end
 
       foreign_rows = Hash.new { |h, k| h[k] = [] }
 
@@ -169,32 +186,27 @@ module FlattenDB
 
     def table_to_xml(table, rows, builder)
       builder.tag!(table) {
-        rows.each { |row|
-          row_to_xml('row', row, builder)
-        } if rows
+        rows.each { |row| row_to_xml('row', row, builder) } if rows
       }
     end
 
     def row_to_xml(name, row, builder)
       builder.tag!(name) {
-        row.sort.each { |field, content|
-          field_to_xml(field, content, builder)
-        }
+        row.sort.each { |field, value| field_to_xml(field, value, builder) }
       }
     end
 
-    def field_to_xml(field, content, builder)
-      case content
+    def field_to_xml(field, value, builder)
+      case value
         when String, Numeric, true, false, nil
-          builder.tag!(column_to_element(field), content)
+          builder.tag!(column_to_element(field), value)
         when Array
-          content.each { |item|
-            field_to_xml(field, item, builder)
-          }
+          value.each { |item| field_to_xml(field, item, builder) }
         when Hash
-          row_to_xml(field, content, builder)
+          row_to_xml(field, value, builder)
         else
-          raise ArgumentError, "don't know how to handle content of type '#{content.class}'"
+          raise ArgumentError,
+            "don't know how to handle value of type #{value.class}"
       end
     end
 

data/lib/flattendb/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flattendb
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 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: Flatten relational databases.
 email: jens.wille@gmail.com
 executables:
@@ -96,7 +96,7 @@ files:
 - example/mysql-sample.sql
 - example/mysql-sample.xml
 - example/mysql-sample2flat.yaml
-homepage: http://prometheus.rubyforge.org/flattendb
+homepage: http://github.com/blackwinter/flattendb
 licenses: []
 metadata: {}
 post_install_message: 
@@ -106,7 +106,7 @@ rdoc_options:
 - --line-numbers
 - --all
 - --title
-- flattendb Application documentation (v0.2.0)
+- flattendb Application documentation (v0.2.1)
 - --main
 - README
 require_paths:
@@ -122,7 +122,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