data_imp 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f0439c9288775b796fde25b0df3ca58dea69d5cec9a657ddf7ee3fc6ebc685e
-  data.tar.gz: d6b13a0de84abe385cf41e78f3ec4987d89562022737dc41d39e74b9374251d6
+  metadata.gz: 81d55fb7b8c1448a0b86acbb28212b70947e9ccc4ae095105faf277fec8cc6a9
+  data.tar.gz: a8ffd88e7b050c9863c41cba7a54517ad784cd6e374ba3349053affc3d0ddf43
 SHA512:
-  metadata.gz: 2d3e93db677416e1bdb7d865ca7e0a0980d750c15701647c9350f8f292dd6fe1c60bb8e6b2430a30587dc157c8c24a91ee6e0fc85a3f8a211bd7bcb06630c3bc
-  data.tar.gz: dd0f6839002332342b3b425b8f237eb28547cf45d3f5017ba2e98182b788de76e9042848356c7c0b35f9c8381ef33a93373783650c2de558e0925694453e0696
+  metadata.gz: f4ff94a5f29d045a8a9bef3a8313928599006442d5aa3b7e9008928a4c8d883935aca4329f66091d7ad33a9a4e1b27a4ec75255d53928bf499926a78f98ad22a
+  data.tar.gz: c090b135de0d03f7467aba862ffc92cf274f16e8247b55e45cf268d6560ec2d0c39e3717bae6fd606b86a30f42d521665ca08837112f51760f265d935fa65a87

data/lib/data_imp/finders.rb

@@ -14,16 +14,20 @@ module DataImp::Finders
   def find_parser type
     return type if type.kind_of? DataImp::Parser
     type = type.to_s.camelize
-    const_get "#{type}Parser"
-  rescue NameError => e
-    DataImp::Parser.find_parser type
+    "#{type}Parser".safe_constantize ||
+      "#{type.singularize}Parser".safe_constantize ||
+      "#{type.pluralize}Parser".safe_constantize ||
+      DataImp::Parser.find_parser(type)
   end
 
   def find_importer type
     return type if type.kind_of? DataImp::Porter
     type = type.to_s.camelize
-    const_get "#{type}Importer"
-  rescue NameError => e
-    DataImp::Porter.find_importer type
+    "#{type}Importer".safe_constantize ||
+      "#{type.singularize}Importer".safe_constantize ||
+      "#{type.pluralize}Importer".safe_constantize ||
+      "#{type.singularize}Porter".safe_constantize ||
+      "#{type.pluralize}Porter".safe_constantize ||
+      DataImp::Porter.find_importer(type)
   end
 end

data/lib/data_imp/import_methods.rb

@@ -5,7 +5,7 @@ require_relative "importer"
 
 module DataImp::ImportMethods
   def import(*files, **options, &block)
-    files.each do |file|
+    files.flatten.each do |file|
       file.strip!
       unless file =~ /^#/
         new(file, **options, &block).import
@@ -14,7 +14,7 @@ module DataImp::ImportMethods
   end
 
   def import_list(*lists, **options, &block)
-    lists.each do |list|
+    lists.flatten.each do |list|
       list.each_line do |file|
         import file, **options, &block
       end

data/lib/data_imp/parser/csv.rb

@@ -1,4 +1,3 @@
-require 'csv'
 
 class DataImp::Parser::Csv < DataImp::Parser
   def options

data/lib/data_imp/parser.rb

@@ -10,7 +10,8 @@ class DataImp::Parser
     def find_parser type
       return self if type.blank?
       begin
-        const_get type.camelize
+        type = type.to_s.camelize
+        const_get type
       rescue NameError => e
         if require_relative "parser/#{type.underscore}"
           retry 
@@ -19,8 +20,6 @@ class DataImp::Parser
     rescue LoadError => e
       raise DataImp::NoParser.new(type)
     end
-
-    alias_method :find, :find_parser
   end
 
   def parse chunk
@@ -42,4 +41,7 @@ class DataImp::Parser
     end
   end
 end
+require_relative './parser/csv.rb'
+require_relative './parser/json.rb'
+require_relative './parser/yaml.rb'
 

data/lib/data_imp/porter.rb

@@ -5,9 +5,11 @@ class DataImp::Porter
 
   class << self
     def find_importer type
+      return type if type.kind_of? DataImp::Porter
       return self if type.blank?
       begin
-        const_get type.classify
+        type = type.to_s.camelize
+        const_get type
       rescue NameError => e
         if require_relative "porter/#{type.underscore}"
           retry 
@@ -16,8 +18,6 @@ class DataImp::Porter
     rescue LoadError => e
       raise DataImp::NoImporter.new(type)
     end
-
-    alias_method :find, :find_importer
   end
 
   def initialize(hash, index = nil)

data/lib/data_imp/version.rb

@@ -1,3 +1,3 @@
 class DataImp
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/lib/data_imp.rb

@@ -4,6 +4,9 @@ end
 
 require 'active_support'
 require 'active_support/all'
+require 'csv'
+require 'yaml'
+require 'json'
 
 require_relative "data_imp/version"
 require_relative "data_imp/options"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: data_imp
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Robert W. Ferney
@@ -23,6 +23,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: csv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: yaml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement