csv2hash 0.6.2 → 0.6.3

data/lib/csv2hash.rb

@@ -16,6 +16,7 @@ require_relative 'csv2hash/data_wrapper'
 require_relative 'csv2hash/notifier'
 require_relative 'csv2hash/extra_validator'
 require_relative 'csv2hash/adapters/base'
+require_relative 'csv2hash/yaml_loader'
 
 require 'active_support/core_ext/array/extract_options'
 
@@ -36,11 +37,11 @@ module Csv2hash
       end
 
       def [] definition_name
-        @@registry[definition_name]
+        @@registry[definition_name.to_sym]
       end
 
       def []= definition_name, role
-        @@registry[definition_name] = role
+        @@registry[definition_name.to_sym] = role
       end
     end
 
@@ -48,11 +49,13 @@ module Csv2hash
 
     attr_accessor :definition, :file_path_or_data, :data, :notifier, :break_on_failure, :errors, :options
 
-    def initialize definition, file_path_or_data, *args
-      self.options = args.extract_options!
-      self.definition, self.file_path_or_data = definition, file_path_or_data
-      self.break_on_failure, self.errors = false, []
-      self.notifier = Notifier.new
+    def initialize definition_file_or_symbol, file_path_or_data, *args
+      self.options           = args.extract_options!
+      self.definition        = load_definition(definition_file_or_symbol)
+      self.file_path_or_data = file_path_or_data
+      self.break_on_failure  = false
+      self.errors            = []
+      self.notifier          = Notifier.new
 
       dynamic_lib_loading 'Parser'
       dynamic_lib_loading 'Validator'
@@ -112,7 +115,7 @@ module Csv2hash
 
     def data_source
       @data_source ||= begin
-        adapter_name = self.file_path_or_data.is_a?(String) ? :csv : :memory
+        adapter_name = self.file_path_or_data.respond_to?(:to_path) ? :csv : :memory
         adapter = Adapter::Base.create(adapter_name, self.file_path_or_data)
         adapter.source
       end
@@ -129,5 +132,22 @@ module Csv2hash
         self.extend Module.module_eval("Csv2hash::#{type}::Collection")
       end
     end
+
+    def load_definition definition_file_or_symbol
+      case definition_file_or_symbol
+      when String
+        config_file = definition_file_or_symbol
+        config_file = Pathname(definition_file_or_symbol) unless config_file.respond_to?(:to_path)
+        loader      = YamlLoader.new(config_file).tap &:load!
+        loader.definition
+      when Symbol
+        Main[definition_file_or_symbol]
+      when Definition
+        definition_file_or_symbol
+      else
+        raise 'unsupported definition'
+      end
+    end
+
   end
 end

data/spec/csv2hash/yaml_loader_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+module Csv2hash
+  describe YamlLoader do
+    let(:config_file) { 'config/rules.yml' }
+
+    subject do
+      YamlLoader.new config_file
+    end
+
+    before do
+      subject.load!
+    end
+
+    specify do
+      expect(subject.definition.name).to eql('example')
+    end
+
+  end
+end

data/spec/csv2hash_spec.rb

@@ -1,17 +1,20 @@
 require 'spec_helper'
 
-describe Csv2hash do
-  let(:definition)  { double('definition', type: nil) }
-  let(:data_source) { nil }
+module Csv2hash
+  describe Main do
+    let(:config_file) { 'config/rules.yml' }
+    let(:loader)      { YamlLoader.new(config_file).tap &:load! }
+    let(:data_source) { 'config/example.csv' }
 
-  subject do
-    Csv2hash::Main.new(definition, data_source, ignore_blank_line: false)
-  end
+    subject do
+      Main.new(loader.definition, data_source, ignore_blank_line: false)
+    end
 
-  context '...' do
-    specify do
-      expect(subject.options.fetch(:ignore_blank_line)).to eql(false)
+    context '...' do
+      specify do
+        expect(subject.options.fetch(:ignore_blank_line)).to eql(false)
+      end
     end
-  end
 
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: csv2hash
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Joel AZEMAR
@@ -83,6 +83,7 @@ dependencies:
 description: DSL to map a CSV to a Ruby Hash
 email: joel.azemar@gmail.com
 executables:
+- generate_doc
 - launch_irb
 - load_rvm
 extensions: []
@@ -92,6 +93,10 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- ".yardoc/checksums"
+- ".yardoc/object_types"
+- ".yardoc/objects/root.dat"
+- ".yardoc/proxy_types"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -99,10 +104,56 @@ files:
 - README.md
 - Rakefile
 - UPGRADE.md
+- bin/generate_doc
 - bin/launch_irb
 - bin/load_rvm
+- config/example.csv
+- config/rules.yml
 - coverage/.resultset.json.lock
 - csv2hash.gemspec
+- doc/Cell.html
+- doc/Csv2hash.html
+- doc/Csv2hash/Adapter.html
+- doc/Csv2hash/Adapter/Abstract.html
+- doc/Csv2hash/Adapter/Base.html
+- doc/Csv2hash/Adapter/Base/UnsupportedAdapter.html
+- doc/Csv2hash/Adapter/CsvAdapter.html
+- doc/Csv2hash/Adapter/MemoryAdapter.html
+- doc/Csv2hash/DataWrapper.html
+- doc/Csv2hash/Definition.html
+- doc/Csv2hash/Discover.html
+- doc/Csv2hash/Expectation.html
+- doc/Csv2hash/ExtraValidator.html
+- doc/Csv2hash/Main.html
+- doc/Csv2hash/Notifier.html
+- doc/Csv2hash/Parser.html
+- doc/Csv2hash/Parser/Collection.html
+- doc/Csv2hash/Parser/Mapping.html
+- doc/Csv2hash/StructureValidator.html
+- doc/Csv2hash/StructureValidator/Deprecation.html
+- doc/Csv2hash/StructureValidator/MaxColumns.html
+- doc/Csv2hash/StructureValidator/MinColumns.html
+- doc/Csv2hash/StructureValidator/ValidationError.html
+- doc/Csv2hash/StructureValidator/Validator.html
+- doc/Csv2hash/Validator.html
+- doc/Csv2hash/Validator/Collection.html
+- doc/Csv2hash/Validator/Mapping.html
+- doc/CsvArray.html
+- doc/Registry.html
+- doc/_index.html
+- doc/class_list.html
+- doc/css/common.css
+- doc/css/full_list.css
+- doc/css/style.css
+- doc/file.README.html
+- doc/file_list.html
+- doc/frames.html
+- doc/index.html
+- doc/js/app.js
+- doc/js/full_list.js
+- doc/js/jquery.js
+- doc/method_list.html
+- doc/top-level-namespace.html
 - lib/csv2hash.rb
 - lib/csv2hash/adapters/abstract.rb
 - lib/csv2hash/adapters/base.rb
@@ -128,6 +179,7 @@ files:
 - lib/csv2hash/validator/collection.rb
 - lib/csv2hash/validator/mapping.rb
 - lib/csv2hash/version.rb
+- lib/csv2hash/yaml_loader.rb
 - spec/csv2hash/definition_spec.rb
 - spec/csv2hash/parser/collection_spec.rb
 - spec/csv2hash/parser/mapping_spec.rb
@@ -136,6 +188,7 @@ files:
 - spec/csv2hash/validator/collection_spec.rb
 - spec/csv2hash/validator/mapping_spec.rb
 - spec/csv2hash/validator_spec.rb
+- spec/csv2hash/yaml_loader_spec.rb
 - spec/csv2hash_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/joel/csv2hash
@@ -171,5 +224,7 @@ test_files:
 - spec/csv2hash/validator/collection_spec.rb
 - spec/csv2hash/validator/mapping_spec.rb
 - spec/csv2hash/validator_spec.rb
+- spec/csv2hash/yaml_loader_spec.rb
 - spec/csv2hash_spec.rb
 - spec/spec_helper.rb
+has_rdoc: