csv2psql 0.0.18 → 0.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4824cb04881e87ade843843235d2de41487bd60a
-  data.tar.gz: 2a74e2c7ee9bfefa6a016c089cef0927d02a1fca
+  metadata.gz: b10cfc839e97bdcfbeec14d7bb586da18833d656
+  data.tar.gz: 48666f90a52e26381c8bf9b75f1188c5af4b4f5a
 SHA512:
-  metadata.gz: 61286ce1ca7e1b6add7ae0d6fcce32d0bbd82ac5ca58a1cefa41257a2c4e241ccb922ee5ef832a44e624fa309608c13726d84e8e456955560860806ac46ee143
-  data.tar.gz: c07f96e3265f6faf07d84dd305dc74e322cd27ce8bcae095aebadcbbd31482504b888cb6f3d16e74012714eeeeb878faa664dda3e15d773fdd68bf77b2b8b2d3
+  metadata.gz: 7a7cb88c8f572c51a747fdb8029445ed13f967946848e19c27246f0740385e9d6b31165bbd741ecd2d97a2e5f02ed443274e64e1d438d7b0bd26bb350dee7bad
+  data.tar.gz: 7409042e49def5d650d894985faad9a7b105a95da7ecab4be130f5614ac8e1e8461a4538e600b43b86f9be85b9f38daa9a969846bee97ae1e6e027ccc712e185

data/lib/csv2psql/analyzer/types/macaddr.rb

@@ -0,0 +1,22 @@
+# encoding: UTF-8
+
+require_relative 'base_analyzer'
+
+module Csv2Psql
+  module Analyzers
+    # Bigint value matcher
+    class Macaddr < BaseAnalyzer
+      TYPE = :macaddr
+      CLASS = :special
+      WEIGHT = 4
+
+      RE = Regexp.new(/^([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2})$/)
+
+      class << self
+        def analyze(val)
+          val && RE.match(val)
+        end
+      end
+    end
+  end
+end

data/lib/csv2psql/frontend/csv.rb

@@ -10,7 +10,7 @@ module Csv2Psql
     # Csv frontend class
     class Csv < Base
       def open(path, open_opts = 'rt', csv_opts = {}, &_block)
-        CSV.open(path, open_opts, csv_opts) do |csv|
+        CSV.open(path, open_opts, csv_opts.merge(:col_sep => csv_opts[:delimiter] || csv_opts[:col_sep] || ',')) do |csv|
           Proc.new.call(csv)
         end
       end

data/lib/csv2psql/processor/processor.rb

@@ -94,7 +94,9 @@ module Csv2Psql
         quote_char: opts['quote'] || DEFAULT_OPTIONS['quote']
       }
       res[:col_sep] = opts['delimiter'] if opts['delimiter']
+      res[:col_sep] = opts[:delimiter] if opts[:delimiter]
       res[:row_sep] = opts['separator'] if opts['separator']
+      res[:row_sep] = opts[:separator] if opts[:separator]
       res
     end
 

data/lib/csv2psql/version.rb

@@ -2,5 +2,5 @@
 
 # Csv2Psql module
 module Csv2Psql
-  VERSION = '0.0.18'
+  VERSION = '0.0.19'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: csv2psql
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.19
 platform: ruby
 authors:
 - Tomas Korcak
@@ -292,6 +292,7 @@ files:
 - lib/csv2psql/analyzer/types/cidr.rb
 - lib/csv2psql/analyzer/types/date.rb
 - lib/csv2psql/analyzer/types/decimal.rb
+- lib/csv2psql/analyzer/types/macaddr.rb
 - lib/csv2psql/analyzer/types/null.rb
 - lib/csv2psql/analyzer/types/string.rb
 - lib/csv2psql/analyzer/types/time.rb