csv2psql 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7cf1fee8ae3b9863f3e0fc1c34353d93289f167
-  data.tar.gz: c2679fdf68f83282630724958b6345b658b5d5c0
+  metadata.gz: 10897155d2898ad210bce318b945f7d468873908
+  data.tar.gz: b3e56271eee38410818e889e92d8d22411966a6f
 SHA512:
-  metadata.gz: 9893af6b95b14d28fb61b270585a028e00d7c176f5e3d0e1b77a9c5059f6aa70ae37f9f7522803811a3f1115f7bdbc913e4c35fe5441a51cdacabefcba11ce72
-  data.tar.gz: a6598639b04050e381a759a099187a1c69f10ab87487cb58fb5dcc29ca1e3d3261000131bd58450f54b9af41df60eb46a92075917c313f7021209519ff2e57d6
+  metadata.gz: 3d6283c4da46766cac76785dc0b4961d1cc2d0b874a53e7767ed640ce1e55a81b0196dc8faecc079f859efbd3607013cfe76873164839758551ac23bcb933792
+  data.tar.gz: ea96a5231e5dcaef6a6b75245c0b7318bf7ab2fe9b80de384a956bd4df91728584cd5147378d9da894fc2c53036f98ec3db488ba6bf255760711ee471275c7f7

data/README.md

@@ -4,7 +4,7 @@ Tool for transforming CSV into SQL statements
 
 ## Status
 
-[![Gem Version](https://badge.fury.io/rb/csv2psql.svg)](http://badge.fury.io/rb/csv2psql)
+[![Gem Version](https://badge.fury.io/rb/csv2psql.svg)](http://badge.fury.io/rb/csv2psql) 
 [![Downloads](http://img.shields.io/gem/dt/csv2psql.svg)](http://rubygems.org/gems/csv2psql)
 [![Build Status](https://travis-ci.org/korczis/csv2psql.svg?branch=master)](https://travis-ci.org/korczis/csv2psql)
 [![Code Climate](https://codeclimate.com/github/korczis/csv2psql/badges/gpa.svg)](https://codeclimate.com/github/korczis/csv2psql)

data/Rakefile

@@ -36,7 +36,7 @@ namespace :test do
 
   desc "Run coding style tests"
   RSpec::Core::RakeTask.new(:cop) do |t|
-    # Rake::Task['cop'].invoke
+    Rake::Task['cop'].invoke
   end
 
   task :all => [:unit, :cop]

data/lib/csv2psql/cli/cmd/convert_cmd.rb

@@ -7,10 +7,40 @@ include GLI::App
 require_relative '../shared'
 require_relative '../../convert/convert'
 
+cmds = {
+  h: {
+    desc: 'Header row included',
+    default_value: true
+  },
+
+  d: {
+    desc: 'Column delimiter',
+    type: String, default_value: ','
+  },
+
+  t: {
+    desc: 'Table to insert to',
+    type: String, default_value: 'my_table'
+  },
+
+  q: {
+    desc: 'Quoting character',
+    type: String, default_value: '"'
+  },
+
+  s: {
+    desc: 'Line separator',
+    type: String, default_value: :auto
+  }
+}
+
 desc 'Convert csv file'
 command :convert do |c|
-  c.switch [:h, :header], desc: 'Header row included', default_value: true
-  c.flag [:d, :delimiter], type: String, default_value: ','
+  c.switch [:h, :header], cmds[:h]
+  c.flag [:d, :delimiter], cmds[:d]
+  c.flag [:t, :table], cmds[:t]
+  c.flag [:q, :quote], cmds[:q]
+  c.flag [:s, :separator], cmds[:s]
 
   c.action do |global_options, options, args|
     fail ArgumentError, 'No file to convert specified' if args.empty?

data/lib/csv2psql/convert/convert.rb

@@ -6,51 +6,15 @@ require 'pathname'
 require 'pp'
 
 require_relative '../version'
+require_relative '../processor/processor'
 
 module Csv2Psql
   # Csv2Psql convert module
   module Convert
-    DEFAULT_OPTIONS = {
-      delimiter: ',',
-      header: true
-    }
-
     class << self
-      def format_row(row)
-        headers = row.headers.map do |h|
-          h.downcase.gsub(/\./, '_')
-        end
-
-        values = row.headers.map do |h|
-          "'#{row[h]}'"
-        end
-
-        "INSERT INTO aaa(#{headers.join(', ')}) VALUES(#{values.join(', ')});"
-      end
-
       def convert(paths, opts = {})
-        paths = [paths] unless paths.is_a?(Array)
-        paths.each do |path|
-          puts "Converting #{path}"
-
-          header = !opts[:header].nil? ? opts[:header] : DEFAULT_OPTIONS[:header]
-          csv_opts = {
-            col_sep: opts[:delimiter] || DEFAULT_OPTIONS[:delimiter],
-            :headers => header
-          }
-
-          CSV.open(path, 'rt', csv_opts) do |csv|
-            csv.each do |row|
-              puts format_row(row)
-            end
-          end
-        end
-      end
-
-      def sanitize_header(header)
-        header.map do |h|
-          h.downcase
-        end
+        p = Processor.new
+        p.convert(paths, opts)
       end
     end
   end

data/lib/csv2psql/processor/processor.rb

@@ -0,0 +1,82 @@
+# encoding: UTF-8
+
+require 'csv'
+require 'multi_json'
+require 'pathname'
+require 'pp'
+
+require_relative '../version'
+
+module Csv2Psql
+  # Csv2Psql processor class
+  class Processor
+    attr_reader :path
+
+    DEFAULT_OPTIONS = {
+      delimiter: ',',
+      header: true,
+      separator: :auto,
+      quote: '"'
+    }
+
+    def format_row(row, opts = {})
+      headers = row.headers.map do |h|
+        h.downcase.gsub(/\./, '_')
+      end
+
+      values = row.headers.map do |h|
+        "'#{row[h]}'"
+      end
+
+      h_str = headers.join(', ')
+      v_str = values.join(', ')
+      "INSERT INTO #{opts[:table]}(#{h_str}) VALUES(#{v_str});"
+    end
+
+    def convert(paths, opts = {})
+      with_paths(paths, opts) do |data|
+        puts format_row(data[:row], opts)
+      end
+    end
+
+    def merge_csv_options(opts = {})
+      header = !opts[:header].nil? ? opts[:header] : DEFAULT_OPTIONS[:header]
+      {
+        col_sep: opts[:delimiter] || DEFAULT_OPTIONS[:delimiter],
+        headers: header,
+        row_sep: opts[:separator] || DEFAULT_OPTIONS[:separator],
+        quote_char: opts[:quote] || DEFAULT_OPTIONS[:quote]
+      }
+    end
+
+    def sanitize_header(header)
+      header.map do |h|
+        h.downcase
+      end
+    end
+
+    def with_path(path, opts = {}, &block)
+      csv_opts = merge_csv_options(opts)
+      CSV.open(path, 'rt', csv_opts) do |csv|
+        csv.each do |row|
+          with_row(path, row, &block)
+        end
+      end
+    end
+
+    def with_paths(paths, opts = {}, &block)
+      paths = [paths] unless paths.is_a?(Array)
+      paths.each do |path|
+        with_path(path, opts, &block)
+      end
+    end
+
+    def with_row(path, row, &block)
+      args = {
+        path: path,
+        row: row
+      }
+      block.call(args) if block_given?
+    end
+  end
+end

data/lib/csv2psql/version.rb

@@ -2,5 +2,5 @@
 
 # Csv2Psql module
 module Csv2Psql
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: csv2psql
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Tomas Korcak
@@ -202,6 +202,7 @@ files:
 - lib/csv2psql/cli/shared.rb
 - lib/csv2psql/convert/convert.rb
 - lib/csv2psql/lib.rb
+- lib/csv2psql/processor/processor.rb
 - lib/csv2psql/version.rb
 - spec/spec_helper.rb
 homepage: https://github.com/korczis/csv2psql