csv2psql 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 017e866dc4a84a448f04c6d360ee95d215b8e6bc
-  data.tar.gz: 036e31c4b92508fb0d66942779378c8b11f46d94
+  metadata.gz: 5299e63f4ab0f21575bc04d1b0f4e863f3121197
+  data.tar.gz: 32532a0c828576f90c016f51a880756c4161ee71
 SHA512:
-  metadata.gz: 6910eb4b0578c3a5699b494673e61f3dec5c1f98c0fe503e359e27e4804d8739258ec0fc8db6effed1df08728bae21b0cec63d02caccb6d1cea2933602e459ad
-  data.tar.gz: dc146c73e70760956c91a7b947eac86fb3d1f212f997c117ddea8b3a2b22be6ae402d15f1400107b565411c946235e6f86598e1fe5dccea6cf3c47fa92ee5c79
+  metadata.gz: b227bf6c07fff2c0beafe9bfdba44654aaf372c2852ebf4d7430ac95cbd5478fc7cf2d4c0b26d0a168f551bd753f8997ebf17d54b8b59896b3614fe1df9cc394
+  data.tar.gz: 41595c98914f724d354b530e5fa9a21082d3d03b490e99e6cfb5b1efe6c60be1214b164f38403353d448bf42cc67bdf8a9fe93dde3ee4c5f955d9c3afb9b253b

data/.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'gli', '~> 2.11', '>= 2.11.0'
   s.add_dependency 'json_pure', '~> 1.8.1'
+  s.add_dependency 'lru', '~> 0.1', '>= 0.1.0'
   s.add_dependency 'multi_json', '~> 1.10.0'
   s.add_dependency 'rake', '~> 10.3', '>= 10.3.2'
   s.add_dependency 'terminal-table', '~> 1.4', '>= 1.4.5'

data/config/config.json

@@ -0,0 +1,8 @@
+{
+    "processor": {
+        "delimiter": ",",
+        "header": true,
+        "transaction": false,
+        "quote": "\""
+    }
+}

data/data/sample_bool.csv

@@ -0,0 +1,13 @@
+id,Firstname,Lastname,Address.Street,Address.City,Address.Details.Note,Married
+12345,Joe,Doe,"#2140 Taylor Street, 94133",San Francisco,Pool available,True
+45678,Jack,Plumber,"#111 Sutter St, 94104",San Francisco,Korean Deli near to main entrance,False
+12345,Joe,Doe,"#2140 Taylor Street, 94133",San Francisco,Pool available,1
+45678,Jack,Plumber,"#111 Sutter St, 94104",San Francisco,Korean Deli near to main entrance,0
+12345,Joe,Doe,"#2140 Taylor Street, 94133",San Francisco,Pool available,blah
+45678,Jack,Plumber,"#111 Sutter St, 94104",San Francisco,Korean Deli near to main entrance,no
+12345,Joe,Doe,"#2140 Taylor Street, 94133",San Francisco,Pool available,"0"
+45678,Jack,Plumber,"#111 Sutter St, 94104",San Francisco,Korean Deli near to main entrance,"1"
+12345,Joe,Doe,"#2140 Taylor Street, 94133",San Francisco,Pool available,"True"
+45678,Jack,Plumber,"#111 Sutter St, 94104",San Francisco,Korean Deli near to main entrance,"False"
+12345,Joe,Doe,"#2140 Taylor Street, 94133",San Francisco,Pool available,"blah"
+45678,Jack,Plumber,"#111 Sutter St, 94104",San Francisco,Korean Deli near to main entrance,"no"

data/lib/csv2psql/analyzer/analyzer.rb

@@ -1,7 +1,5 @@
 # encoding: UTF-8
 
-require 'csv'
-require 'multi_json'
 require 'pathname'
 require 'pp'
 
@@ -10,14 +8,16 @@ require_relative '../extensions/string'
 
 module Csv2Psql
   # Analyzer file analyzer class
-  class Analyzer
+  class Analyzer # rubocop:disable Metrics/ClassLength
     DEFAULT_OPTIONS = {}
     ANALYZERS_DIR = File.join(File.dirname(__FILE__), 'types')
+    EXCLUDED_ANALYZERS = ['base_analyzer']
 
     attr_reader :analyzers, :files
 
-    def initialize
+    def initialize(cache = nil)
       @files = {}
+      @cache = cache
       @analyzers = load_analyzers
     end
 
@@ -25,23 +25,52 @@ module Csv2Psql
       data = get_data(path)
 
       header = CsvHelper.get_header(row, opts)
+      analyze_row(header, row, data)
+
+      data[:lines] = data[:lines] + 1
+    end
+
+    def analyze_column(analyzer, val, opts = { use_cache: false })
+      if opts[:use_cache]
+        res = cached_result(val) do
+          analyzer[:class].analyze(val)
+        end
+      else
+        res = analyzer[:class].analyze(val)
+      end
+
+      update_results(analyzer, res, val) if res
+    end
+
+    def analyze_row(header, row, data)
       header.each do |h|
         col = get_column(data, h)
-        val = row[h]
         col.each do |_name, analyzer|
-          analyzer.analyze(val)
+          analyze_column(analyzer, row[h])
         end
       end
+    end
 
-      data[:lines] = data[:lines] + 1
+    def cached_result(val, &_block)
+      res = @cache.get(val)
+      if res.nil?
+        res = Proc.new.call(val)
+        @cache.put(val, res)
+      end
+      res
     end
 
+    # Create column analyzers
     def create_column(data, column)
       data[:columns][column] = {}
       res = data[:columns][column]
 
       analyzers.each do |analyzer|
-        res[analyzer[:name]] = analyzer[:class].new
+        analyzer_class = analyzer[:class]
+        res[analyzer[:name]] = {
+          class: analyzer_class.new,
+          results: create_results(analyzer_class)
+        }
       end
 
       res
@@ -56,6 +85,17 @@ module Csv2Psql
       files[path]
     end
 
+    def create_results(analyzer_class)
+      res = {
+        count: 0
+      }
+
+      res[:min] = nil if analyzer_class.numeric?
+      res[:max] = nil if analyzer_class.numeric?
+
+      res
+    end
+
     def get_data(path)
       return files[path] if files.key?(path)
 
@@ -69,23 +109,49 @@ module Csv2Psql
       create_column(data, column)
     end
 
-    def load_analyze_class(analyzer_class)
+    def load_analyzer_class(analyzer_class)
       Object.const_get('Csv2Psql')
-        .const_get('Analyzers')
-        .const_get(analyzer_class)
+      .const_get('Analyzers')
+      .const_get(analyzer_class)
+    end
+
+    def load_analyzer(path)
+      fname = File.basename(path, '.rb')
+      analyzer_class = fname.camel_case
+      require(path)
+
+      {
+        name: analyzer_class,
+        class: load_analyzer_class(analyzer_class)
+      }
     end
 
     def load_analyzers
-      Dir[ANALYZERS_DIR + '**/*.rb'].map do |path|
-        fname = File.basename(path, '.rb')
-        analyzer_class = fname.camel_case
-        require(path)
-
-        {
-          name: analyzer_class,
-          class: load_analyze_class(analyzer_class)
-        }
+      res = Dir[ANALYZERS_DIR + '**/*.rb'].map do |path|
+        name = File.basename(path, '.rb')
+        next if EXCLUDED_ANALYZERS.include?(name)
+        load_analyzer(path)
       end
+
+      res.compact
+    end
+
+    # Update numeric results
+    # @param ac analyzer class
+    # @param ar analyzer results
+    # @param val value to be analyzed
+    def update_numeric_results(ac, ar, val)
+      cval = ac.convert(val)
+      ar[:min] = cval if ar[:min].nil? || cval < ar[:min]
+      ar[:max] = cval if ar[:max].nil? || cval > ar[:max]
+    end
+
+    def update_results(analyzer, res, val)
+      ac = analyzer[:class]
+      ar = analyzer[:results]
+      ar[:count] += 1
+
+      update_numeric_results(ac, ar, val) if res && ac.numeric?
     end
   end
 end

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

@@ -0,0 +1,36 @@
+# encoding: UTF-8
+
+require_relative 'base_analyzer'
+
+module Csv2Psql
+  module Analyzers
+    # BaseAnalyzer value matcher
+    class BaseAnalyzer
+      class << self
+        def analyze(_val)
+          nil
+        end
+
+        def convert(val)
+          val
+        end
+
+        def numeric?
+          const_get('CLASS') == :numeric
+        end
+      end
+
+      def analyze(val)
+        self.class.analyze(val)
+      end
+
+      def convert(val)
+        self.class.convert(val)
+      end
+
+      def numeric?
+        self.class.numeric?
+      end
+    end
+  end
+end

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

@@ -1,43 +1,23 @@
 # encoding: UTF-8
 
+require_relative 'base_analyzer'
+
 module Csv2Psql
   module Analyzers
     # Bigint value matcher
-    class Bigint
+    class Bigint < BaseAnalyzer
       TYPE = :bigint
       CLASS = :numeric
       WEIGHT = 4
 
-      attr_reader :count, :min, :max
-
-      def initialize
-        @count = 0
-        @min = nil
-        @max = nil
-      end
-
-      def analyze(val)
-        return unless val.is_a?(Integer) || (val && val.match(/^\d+$/))
-
-        update(convert(val))
-      end
-
-      def convert(val)
-        val.to_i
-      end
-
-      def to_h
-        {
-          count: @count,
-          min: @min,
-          max: @max
-        }
-      end
+      class << self
+        def analyze(val)
+          val.is_a?(Integer) || (val && !val.match(/^\d+$/).nil?)
+        end
 
-      def update(val)
-        @count += 1
-        @min = val if @min.nil? || val < @min
-        @max = val if @max.nil? || val > @max
+        def convert(val)
+          val.to_i
+        end
       end
     end
   end

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

@@ -0,0 +1,31 @@
+# encoding: UTF-8
+
+require_relative 'base_analyzer'
+
+module Csv2Psql
+  module Analyzers
+    # Bolean value matcher
+    class Boolean < BaseAnalyzer
+      TYPE = :boolean
+      CLASS = :boolean
+      WEIGHT = 5
+
+      BOOLEAN_VALUES = %w(true false 0 1)
+      BOOLEAN_VALUES_MAP = {}
+      BOOLEAN_VALUES.each do |k|
+        BOOLEAN_VALUES_MAP[k] = true
+      end
+
+      class << self
+        def analyze(val)
+          return if val.nil? || val.empty?
+          BOOLEAN_VALUES_MAP.key?(val.downcase)
+        end
+
+        def convert(val)
+          val.to_i
+        end
+      end
+    end
+  end
+end

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

@@ -1,29 +1,19 @@
 # encoding: UTF-8
 
+require_relative 'base_analyzer'
+
 module Csv2Psql
   module Analyzers
     # Character value matcher
-    class Character
+    class Character < BaseAnalyzer
       TYPE = :bigint
       CLASS = :character
       WEIGHT = 2
 
-      attr_reader :count
-
-      def initialize
-        @count = 0
-      end
-
-      def analyze(val)
-        match = val && val.to_s.length == 1
-        return unless match
-        @count += 1
-      end
-
-      def to_h
-        {
-          count: @count
-        }
+      class << self
+        def analyze(val)
+          val && val.to_s.length == 1
+        end
       end
     end
   end

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

@@ -1,43 +1,26 @@
 # encoding: UTF-8
 
+require_relative 'base_analyzer'
+
 module Csv2Psql
   module Analyzers
     # Decimal value matcher
-    class Decimal
+    class Decimal < BaseAnalyzer
       TYPE = :decimal
       CLASS = :numeric
       WEIGHT = 3
-
-      attr_reader :count, :min, :max
-
-      def initialize
-        @count = 0
-        @min = nil
-        @max = nil
-      end
-
-      def analyze(val)
-        return unless val.is_a?(Float) || (val && val.match(/(\d+[,.]\d+)/))
-
-        update(convert(val))
-      end
-
-      def convert(val)
-        val.to_f
-      end
-
-      def to_h
-        {
-          count: @count,
-          min: @min,
-          max: @max
-        }
-      end
-
-      def update(val)
-        @count += 1
-        @min = val if @min.nil? || val < @min
-        @max = val if @max.nil? || val > @max
+      RE = /^[-+]?[0-9]*[.,]?[0-9]+([eE][-+]?[0-9]+)?$/
+
+      class << self
+        def analyze(val)
+          return true if val.is_a?(Float)
+          res = val && val.match(RE)
+          !res.nil?
+        end
+
+        def convert(val)
+          val.to_f
+        end
       end
     end
   end

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

@@ -1,29 +1,19 @@
 # encoding: UTF-8
 
+require_relative 'base_analyzer'
+
 module Csv2Psql
   module Analyzers
     # Null value matcher
-    class Null
+    class Null < BaseAnalyzer
       TYPE = :null
       CLASS = nil # TODO: Maybe use better class for Null type?
       WEIGHT = 0
 
-      attr_reader :count
-
-      def initialize
-        @count = 0
-      end
-
-      def analyze(val)
-        match = val.nil? || val.empty?
-        return unless match
-        @count += 1
-      end
-
-      def to_h
-        {
-          count: @count
-        }
+      class << self
+        def analyze(val)
+          val.nil? || val.empty?
+        end
       end
     end
   end

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

@@ -1,36 +1,19 @@
 # encoding: UTF-8
 
+require_relative 'base_analyzer'
+
 module Csv2Psql
   module Analyzers
     # UUID value matcher
-    class String
+    class String < BaseAnalyzer
       TYPE = :string
       CLASS = :character
       WEIGHT = 1
 
-      attr_reader :count, :min, :max
-
-      def initialize
-        @count = 0
-        @min = nil
-        @max = nil
-      end
-
-      def analyze(val)
-        match = val.is_a?(::String)
-        return unless match
-        len = val.length
-        @min = len if @min.nil? || len < @min
-        @max = len if @max.nil? || len > @max
-        @count += 1
-      end
-
-      def to_h
-        {
-          count: @count,
-          min: @min,
-          max: @max
-        }
+      class << self
+        def analyze(val)
+          val.is_a?(::String)
+        end
       end
     end
   end

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

@@ -1,31 +1,22 @@
 # encoding: UTF-8
 
+require_relative 'base_analyzer'
+
 module Csv2Psql
   module Analyzers
     # UUID value matcher
-    class Uuid
+    class Uuid < BaseAnalyzer
       TYPE = :uuid
       CLASS = :uuid
       WEIGHT = 5
 
-      RE = /[a-f0-9]{8}-[a-f0-9]{4}-4[a-f0-9]{3}-[89aAbB][a-f0-9]{3}-[a-f0-9]{12}/ # rubocop:disable Metrics/LineLength
-
-      attr_reader :count
-
-      def initialize
-        @count = 0
-      end
-
-      def analyze(val)
-        match = val && val.match(RE)
-        return if match.nil?
-        @count += 1
-      end
+      RE = /^[a-f0-9]{8}-[a-f0-9]{4}-4[a-f0-9]{3}-[89aAbB][a-f0-9]{3}-[a-f0-9]{12}$/ # rubocop:disable Metrics/LineLength
 
-      def to_h
-        {
-          count: @count
-        }
+      class << self
+        def analyze(val)
+          match = val && val.match(RE)
+          !match.nil?
+        end
       end
     end
   end

data/lib/csv2psql/cache/cache.rb

@@ -0,0 +1,22 @@
+# encoding: UTF-8
+
+require 'lru'
+
+module Csv2Psql
+  # Last Recently Used cache implementation
+  class Cache
+    attr_accessor :max_size
+
+    def initialize(max_size = 1000)
+      @cache = ::Cache::LRU.new(max_elements: max_size)
+    end
+
+    def put(key, value)
+      @cache.put(key, value)
+    end
+
+    def get(key, &block)
+      @cache.get(key, &block)
+    end
+  end
+end

data/lib/csv2psql/cli/app.rb

@@ -20,13 +20,13 @@ program_desc "csv2psql #{Csv2Psql::VERSION} (Codename: #{Csv2Psql::CODENAME})"
 cmds = {
   h: {
     desc: 'Header row included',
-    default_value: Csv2Psql::Processor::DEFAULT_OPTIONS[:header]
+    default_value: Csv2Psql::Processor::DEFAULT_OPTIONS['header']
   },
 
   d: {
     desc: 'Column delimiter',
     type: String,
-    default_value: Csv2Psql::Processor::DEFAULT_OPTIONS[:delimiter]
+    default_value: Csv2Psql::Processor::DEFAULT_OPTIONS['delimiter']
   },
 
   l: {
@@ -38,13 +38,13 @@ cmds = {
   q: {
     desc: 'Quoting character',
     type: String,
-    default_value: Csv2Psql::Processor::DEFAULT_OPTIONS[:quote]
+    default_value: Csv2Psql::Processor::DEFAULT_OPTIONS['quote']
   },
 
   s: {
     desc: 'Line separator',
     type: String,
-    default_value: Csv2Psql::Processor::DEFAULT_OPTIONS[:separator]
+    default_value: Csv2Psql::Processor::DEFAULT_OPTIONS['separator']
   },
 
   'skip' => {

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

@@ -17,7 +17,7 @@ Csv2Psql::Cli.module_eval do
       res.files.each do |_fname, results|
         results[:columns].each do |_k, v|
           v.each do |d, det|
-            v[d] = det.to_h
+            v[d] = det[:results]
           end
         end
       end
@@ -30,7 +30,7 @@ Csv2Psql::Cli.module_eval do
         header = ['column'] + res.analyzers.map { |a| a[:name] }
 
         rows = details[:columns].map do |k, v|
-          [k] + v.keys.map { |name| v[name].count }
+          [k] + v.keys.map { |name| v[name][:results][:count] }
         end
 
         Terminal::Table.new title: file, headings: header, rows: rows

data/lib/csv2psql/cli/shared.rb

@@ -13,13 +13,13 @@ Csv2Psql::Cli.module_eval do
   cmds = {
     h: {
       desc: 'Header row included',
-      default_value: Csv2Psql::Processor::DEFAULT_OPTIONS[:header]
+      default_value: Csv2Psql::Processor::DEFAULT_OPTIONS['header']
     },
 
     d: {
       desc: 'Column delimiter',
       type: String,
-      default_value: Csv2Psql::Processor::DEFAULT_OPTIONS[:delimiter]
+      default_value: Csv2Psql::Processor::DEFAULT_OPTIONS['delimiter']
     },
 
     l: {
@@ -31,13 +31,13 @@ Csv2Psql::Cli.module_eval do
     q: {
       desc: 'Quoting character',
       type: String,
-      default_value: Csv2Psql::Processor::DEFAULT_OPTIONS[:quote]
+      default_value: Csv2Psql::Processor::DEFAULT_OPTIONS['quote']
     },
 
     s: {
       desc: 'Line separator',
       type: String,
-      default_value: Csv2Psql::Processor::DEFAULT_OPTIONS[:separator]
+      default_value: Csv2Psql::Processor::DEFAULT_OPTIONS['separator']
     },
 
     'skip' => {

data/lib/csv2psql/config/config.rb

@@ -0,0 +1,24 @@
+# encoding: UTF-8
+
+require 'multi_json'
+
+require_relative '../helpers/json_helper'
+
+module Csv2Psql
+  # Configuration module
+  module Config
+    BASE_DIR = File.join(File.dirname(__FILE__), '..', '..', '..')
+    CONFIG_PATH = File.join(BASE_DIR, 'config', 'config.json')
+
+    class << self
+      def config(path = CONFIG_PATH)
+        @config ||= load_config(path)
+        @config
+      end
+
+      def load_config(path = CONFIG_PATH)
+        JsonHelper.load_file(path)
+      end
+    end
+  end
+end

data/lib/csv2psql/convert/convert.rb

@@ -1,10 +1,5 @@
 # encoding: UTF-8
 
-require 'csv'
-require 'multi_json'
-require 'pathname'
-require 'pp'
-
 require_relative '../version'
 require_relative '../processor/processor'
 

data/lib/csv2psql/extensions/string.rb

@@ -4,7 +4,7 @@
 class String
   def camel_case
     return self if self !~ /_/ && self =~ /[A-Z]+.*/
-    split('_').map { |e| e.capitalize }.join
+    split('_').map(&:capitalize).join
   end
 
   def camel_case_lower

data/lib/csv2psql/frontend/base.rb

@@ -0,0 +1,10 @@
+# encoding: UTF-8
+
+module Csv2Psql
+  # Frontend parsers
+  module Frontend
+    # Base class
+    class Base
+    end
+  end
+end

data/lib/csv2psql/frontend/csv.rb

@@ -0,0 +1,19 @@
+# encoding: UTF-8
+
+require 'csv'
+
+require_relative 'base'
+
+module Csv2Psql
+  # Frontend parsers
+  module Frontend
+    # Csv frontend class
+    class Csv < Base
+      def open(path, open_opts = 'rt', csv_opts = {}, &_block)
+        CSV.open(path, open_opts, csv_opts) do |csv|
+          Proc.new.call(csv)
+        end
+      end
+    end
+  end
+end

data/lib/csv2psql/frontend/frontend.rb

@@ -0,0 +1,9 @@
+# encoding: UTF-8
+
+require_relative 'base'
+
+module Csv2Psql
+  # Frontend parsers
+  module Frontend
+  end
+end

data/lib/csv2psql/generator/generator.rb

@@ -1,7 +1,5 @@
 # encoding: UTF-8
 
-require 'csv'
-require 'multi_json'
 require 'pathname'
 require 'pp'
 

data/lib/csv2psql/helpers/config_helper.rb

@@ -0,0 +1,14 @@
+# encoding: UTF-8
+
+require_relative '../config/config'
+
+module Csv2Psql
+  # CSV Helper
+  class ConfigHelper
+    class << self
+      def config(path = Config::CONFIG_PATH)
+        Config.config(path)
+      end
+    end
+  end
+end

data/lib/csv2psql/helpers/json_helper.rb

@@ -0,0 +1,31 @@
+# encoding: UTF-8
+
+require 'multi_json'
+
+module Csv2Psql
+  # Json Helper
+  class JsonHelper
+    BASE_DIR = File.join(File.dirname(__FILE__), '..')
+
+    class << self
+      def load_file(path)
+        # Load input file
+        raw = IO.read(path)
+
+        # Try to parse json from loaded data
+        begin
+          return MultiJson.load(raw)
+        rescue Exception => e # rubocop:disable RescueException
+          log_exception(e)
+          raise e
+        end
+        nil
+      end
+
+      def log_exception(e)
+        puts 'Invalid json, see error.txt'
+        File.open('error.txt', 'wt') { |f| f.write(e.to_s) }
+      end
+    end
+  end
+end

data/lib/csv2psql/output/output.rb

@@ -1,10 +1,5 @@
 # encoding: UTF-8
 
-require 'csv'
-require 'multi_json'
-require 'pathname'
-require 'pp'
-
 require_relative '../version'
 require_relative '../helpers/erb_helper'
 

data/lib/csv2psql/processor/processor.rb

@@ -1,12 +1,14 @@
 # encoding: UTF-8
 
 require 'csv'
-require 'multi_json'
 require 'pathname'
 require 'pp'
 
 require_relative '../analyzer/analyzer'
+require_relative '../cache/cache'
+require_relative '../frontend/csv'
 require_relative '../generator/generator'
+require_relative '../helpers/config_helper'
 require_relative '../helpers/csv_helper'
 require_relative '../helpers/erb_helper'
 require_relative '../output/output'
@@ -17,18 +19,14 @@ module Csv2Psql
   class Processor
     attr_reader :analyzer, :generator, :output, :path
 
-    DEFAULT_OPTIONS = {
-      delimiter: ',',
-      header: true,
-      separator: :auto,
-      transaction: false,
-      quote: '"'
-    }
+    DEFAULT_OPTIONS = ConfigHelper.config['processor']
 
     def initialize
       @output = Output.new
       @generator = Generator.new(@output)
-      @analyzer = Analyzer.new
+      @cache = Cache.new
+      @analyzer = Analyzer.new(@cache)
+      @frontend = Frontend::Csv.new
     end
 
     def analyze(paths, opts = {})
@@ -73,23 +71,36 @@ module Csv2Psql
     end
 
     def merge_csv_options(opts = {})
-      header = !opts[:header].nil? ? opts[:header] : DEFAULT_OPTIONS[:header]
-      {
-        col_sep: opts[:delimiter] || DEFAULT_OPTIONS[:delimiter],
+      header = !opts['header'].nil? ? opts['header'] : DEFAULT_OPTIONS['header']
+      res = {
         headers: header,
-        row_sep: opts[:separator] || DEFAULT_OPTIONS[:separator],
-        quote_char: opts[:quote] || DEFAULT_OPTIONS[:quote]
+        quote_char: opts['quote'] || DEFAULT_OPTIONS['quote']
       }
+      res[:col_sep] = opts['delimiter'] if opts['delimiter']
+      res[:row_sep] = opts['separator'] if opts['separator']
+      res
+    end
+
+    def process_file(path, csv, opts, &block)
+      lines = 0
+      limit = opts[:l]
+      skip = opts[:skip]
+      csv.each do |row|
+        lines += 1
+        next if skip > 0 && lines <= skip
+
+        with_row(path, row, opts, &block)
+
+        return if limit > 0 && lines >= limit
+      end
     end
 
     def with_path(path, opts = {}, &block)
       output.write 'BEGIN;' if opts[:transaction]
       csv_opts = merge_csv_options(opts)
       @first_row = true
-      CSV.open(path, 'rt', csv_opts) do |csv|
-        csv.each do |row|
-          with_row(path, row, opts, &block)
-        end
+      @frontend.open(path, 'rt', csv_opts) do |csv|
+        process_file(path, csv, opts, &block)
       end
       output.write 'COMMIT;' if opts[:transaction]
     end
@@ -101,9 +112,9 @@ module Csv2Psql
       end
     end
 
-    def with_row(path, row, _opts = {}, &block)
+    def with_row(path, row, _opts = {}, &_block)
       args = { path: path, row: row }
-      block.call(args) if block_given?
+      Proc.new.call(args)
     end
   end
 end

data/lib/csv2psql/version.rb

@@ -2,6 +2,6 @@
 
 # Csv2Psql module
 module Csv2Psql
-  CODENAME = 'Lazy dog'
-  VERSION = '0.0.10'
+  CODENAME = 'Famous rat'
+  VERSION = '0.0.11'
 end

data/spec/helpers/cli_helper.rb

@@ -7,11 +7,11 @@ module CliHelper
   # Execute block and capture its stdou
   # @param block Block to be executed with stdout redirected
   # @returns Captured output as string
-  def capture_stdout(&block)
+  def capture_stdout(&_block)
     original_stdout = $stdout
     $stdout = fake = StringIO.new
     begin
-      block.call if block_given?
+      Proc.new.call if block_given?
     ensure
       $stdout = original_stdout
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: csv2psql
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Tomas Korcak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-01 00:00:00.000000000 Z
+date: 2014-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -44,6 +44,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.1
+- !ruby/object:Gem::Dependency
+  name: lru
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -244,29 +264,40 @@ files:
 - Rakefile
 - TODO.md
 - bin/csv2psql
+- config/config.json
 - data/cia-data-all.csv
 - data/sample.csv
+- data/sample_bool.csv
 - data/sample_semicolons.csv
 - lib/csv2psql.rb
 - lib/csv2psql/analyzer/analyzer.rb
+- lib/csv2psql/analyzer/types/base_analyzer.rb
 - lib/csv2psql/analyzer/types/bigint.rb
+- lib/csv2psql/analyzer/types/boolean.rb
 - lib/csv2psql/analyzer/types/character.rb
 - lib/csv2psql/analyzer/types/decimal.rb
 - lib/csv2psql/analyzer/types/null.rb
 - lib/csv2psql/analyzer/types/string.rb
 - lib/csv2psql/analyzer/types/uuid.rb
+- lib/csv2psql/cache/cache.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/config/config.rb
 - lib/csv2psql/convert/convert.rb
-- lib/csv2psql/dialects/psql.rb
 - lib/csv2psql/extensions/string.rb
+- lib/csv2psql/frontend/base.rb
+- lib/csv2psql/frontend/csv.rb
+- lib/csv2psql/frontend/frontend.rb
+- lib/csv2psql/generator/dialects/psql.rb
 - lib/csv2psql/generator/generator.rb
+- lib/csv2psql/helpers/config_helper.rb
 - lib/csv2psql/helpers/csv_helper.rb
 - lib/csv2psql/helpers/erb_helper.rb
+- lib/csv2psql/helpers/json_helper.rb
 - lib/csv2psql/lib.rb
 - lib/csv2psql/output/output.rb
 - lib/csv2psql/processor/processor.rb