csv2psql 0.0.6 → 0.0.8

data/lib/csv2psql/processor/processor.rb

@@ -5,115 +5,54 @@ require 'multi_json'
 require 'pathname'
 require 'pp'
 
-require_relative '../version'
+require_relative '../analyzer/analyzer'
+require_relative '../generator/generator'
+require_relative '../helpers/csv_helper'
 require_relative '../helpers/erb_helper'
+require_relative '../output/output'
+require_relative '../version'
 
 module Csv2Psql
   # Csv2Psql processor class
-  class Processor # rubocop:disable Metrics/ClassLength
-    attr_reader :path
+  class Processor
+    attr_reader :analyzer, :generator, :output, :path
 
     DEFAULT_OPTIONS = {
-      'create-table' => false,
-      'drop-table' => false,
       delimiter: ',',
       header: true,
       separator: :auto,
-      table: 'my_table',
-      transaction: true,
+      transaction: false,
       quote: '"'
     }
 
-    TABLE_FUNCTIONS = {
-      'drop-table' => :drop_table,
-      'create-table' => :create_table,
-      'truncate-table' => :truncate_table
-    }
-
-    BASE_DIR = File.join(File.dirname(__FILE__), '..', '..', '..')
-    TEMPLATE_DIR = File.join(BASE_DIR, 'templates')
-    CREATE_TABLE_TEMPLATE = File.join(TEMPLATE_DIR, 'create_table.sql.erb')
-    DROP_TABLE_TEMPLATE = File.join(TEMPLATE_DIR, 'drop_table.sql.erb')
-    HEADER_TEMPLATE = File.join(TEMPLATE_DIR, 'header.sql.erb')
-    TRUNCATE_TABLE_TEMPLATE = File.join(TEMPLATE_DIR, 'truncate_table.sql.erb')
-
-    def convert(paths, opts = {})
-      with_paths(paths, opts) do |data|
-        puts format_row(data[:row], opts)
-      end
+    def initialize
+      @output = Output.new
+      @generator = Generator.new(@output)
+      @analyzer = Analyzer.new
     end
 
-    def create_erb_context(path, row, opts = {})
-      header = get_header(row, opts)
-      columns = get_columns(row, opts, header)
-      {
-        path: path,
-        header: header,
-        columns: columns,
-        table: opts[:table] || DEFAULT_OPTIONS[:table]
-      }
-    end
-
-    def create_header(path, row, opts = {})
-      ctx = create_erb_context(path, row, opts)
-      erb = ErbHelper.new
-      erb.process(HEADER_TEMPLATE, ctx)
-    end
-
-    def create_table(path, row, opts = {})
-      ctx = create_erb_context(path, row, opts)
-      erb = ErbHelper.new
-      erb.process(CREATE_TABLE_TEMPLATE, ctx)
-    end
-
-    def create_sql_script(path, row, opts = {})
-      return unless @first_row
-
-      puts create_header(path, row, opts)
-
-      TABLE_FUNCTIONS.each do |k, v|
-        t = DEFAULT_OPTIONS[k]
-        t = opts[k] unless opts[k].nil?
-        puts send(v, path, row, opts) if t
+    def analyze(paths, opts = {})
+      with_paths(paths, opts) do |data|
+        path = data[:path]
+        row = data[:row]
+        analyzer.analyze(path, row, opts)
       end
-
-      @first_row = false
+      analyzer
     end
 
-    def drop_table(path, row, opts = {})
-      ctx = create_erb_context(path, row, opts)
-      erb = ErbHelper.new
-      erb.process(DROP_TABLE_TEMPLATE, ctx)
-    end
 
-    def format_row(row, opts = {})
-      header = get_header(row, opts)
-      columns = get_columns(row, opts, header).join(', ')
-      values = get_values(row, opts, header).join(', ')
-      "INSERT INTO #{opts[:table]}(#{columns}) VALUES(#{values});"
-    end
-
-    def get_header(row, opts = {})
-      if opts[:header]
-        row.headers
-      else
-        row.map.with_index { |_item, i| i }
-      end
-    end
+    def convert(paths, opts = {})
+      file_headers = {}
 
-    def get_columns(row, opts = {}, header = get_header(row, opts))
-      if opts[:header]
-        header.map { |h| sanitize_header(h) }
-      else
-        row.map.with_index do |_item, i|
-          "col_#{i}"
+      with_paths(paths, opts) do |data|
+        path = data[:path]
+        row = data[:row]
+        unless file_headers.key?(path)
+          generator.create_sql_script(path, row, opts)
+          file_headers[path] = true
         end
-      end
-    end
 
-    def get_values(row, opts = {}, header = get_header(row, opts))
-      header.map do |h|
-        "'#{row[h]}'"
+        output.write generator.format_row(row, opts)
       end
     end
 
@@ -127,18 +66,8 @@ module Csv2Psql
       }
     end
 
-    def sanitize_header(header_column)
-      header_column.downcase.gsub(/[^0-9a-z ]/i, '_')
-    end
-
-    def truncate_table(path, row, opts = {})
-      ctx = create_erb_context(path, row, opts)
-      erb = ErbHelper.new
-      erb.process(TRUNCATE_TABLE_TEMPLATE, ctx)
-    end
-
     def with_path(path, opts = {}, &block)
-      puts 'BEGIN;' if opts[:transaction]
+      output.write 'BEGIN;' if opts[:transaction]
       csv_opts = merge_csv_options(opts)
       @first_row = true
       CSV.open(path, 'rt', csv_opts) do |csv|
@@ -146,7 +75,7 @@ module Csv2Psql
           with_row(path, row, opts, &block)
         end
       end
-      puts 'COMMIT;' if opts[:transaction]
+      output.write 'COMMIT;' if opts[:transaction]
     end
 
     def with_paths(paths, opts = {}, &block)
@@ -156,9 +85,7 @@ module Csv2Psql
       end
     end
 
-    def with_row(path, row, opts = {}, &block)
-      create_sql_script(path, row, opts)
-
+    def with_row(path, row, _opts = {}, &block)
       args = { path: path, row: row }
       block.call(args) if block_given?
     end

data/lib/csv2psql/version.rb

@@ -2,5 +2,6 @@
 
 # Csv2Psql module
 module Csv2Psql
-  VERSION = '0.0.6'
+  CODENAME = 'Blurry bat'
+  VERSION = '0.0.8'
 end

data/templates/header.sql.erb

@@ -1,2 +1,2 @@
--- Table <%= ctx[:table] + "\n" %>
+-- Table: <%= ctx[:table] + "\n" %>
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: csv2psql
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.8
 platform: ruby
 authors:
 - Tomas Korcak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-31 00:00:00.000000000 Z
+date: 2014-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -192,17 +192,28 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- TODO.md
 - bin/csv2psql
+- data/cia-data-all.csv
 - data/sample.csv
 - lib/csv2psql.rb
+- lib/csv2psql/analyzer/analyzer.rb
+- lib/csv2psql/analyzer/types/bigint.rb
+- lib/csv2psql/analyzer/types/decimal.rb
 - lib/csv2psql/cli/app.rb
 - lib/csv2psql/cli/cli.rb
+- lib/csv2psql/cli/cmd/analyze_cmd.rb
 - lib/csv2psql/cli/cmd/convert_cmd.rb
 - lib/csv2psql/cli/cmd/version_cmd.rb
 - lib/csv2psql/cli/shared.rb
 - lib/csv2psql/convert/convert.rb
+- lib/csv2psql/dialects/psql.rb
+- lib/csv2psql/extensions/string.rb
+- lib/csv2psql/generator/generator.rb
+- lib/csv2psql/helpers/csv_helper.rb
 - lib/csv2psql/helpers/erb_helper.rb
 - lib/csv2psql/lib.rb
+- lib/csv2psql/output/output.rb
 - lib/csv2psql/processor/processor.rb
 - lib/csv2psql/version.rb
 - spec/spec_helper.rb