csv2hash 0.2.1 → 0.3.0

data/lib/csv2hash/parser.rb

@@ -1,4 +1,4 @@
-class Csv2hash
+module Csv2hash
   module Parser
   end
 end

data/lib/csv2hash/structure_validator.rb

@@ -1,3 +1,5 @@
+# require 'active_support/core_ext'
+
 module Csv2hash::StructureValidator
   class ValidationError < StandardError ; end
 
@@ -14,6 +16,7 @@ module Csv2hash::StructureValidator
 
   def rule_instance rule, options
     Csv2hash::StructureValidator.const_get(rule).new(options)
+    # 'min_columns'.camelize.constantize.new
   end
 
   module Validator
@@ -24,4 +27,4 @@ module Csv2hash::StructureValidator
       true
     end
   end
-end
+end

data/lib/csv2hash/validator.rb

@@ -1,4 +1,4 @@
-class Csv2hash
+module Csv2hash
   module Validator
 
     def validate_rules y=nil

data/lib/csv2hash/version.rb

@@ -1,3 +1,3 @@
-module Cvs2hash
-  VERSION = '0.2.1'
-end
+module Csv2hash
+  VERSION = '0.3.0'
+end

data/lib/csv2hash.rb

@@ -1,94 +1,102 @@
-require 'csv2hash/version'
-require 'csv2hash/definition'
-require 'csv2hash/validator'
-require 'csv2hash/validator/mapping'
-require 'csv2hash/validator/collection'
-require 'csv2hash/structure_validator'
-require 'csv2hash/structure_validator/max_columns'
-require 'csv2hash/structure_validator/min_columns'
-require 'csv2hash/parser'
-require 'csv2hash/parser/mapping'
-require 'csv2hash/parser/collection'
-require 'csv2hash/csv_array'
-require 'csv2hash/data_wrapper'
-require 'csv2hash/notifier'
-require 'csv2hash/extra_validator'
-
-require 'csv'
-
-class Csv2hash
-
-  include Csv2hash::StructureValidator
-
-  attr_accessor :definition, :file_path, :data, :notifier, :exception_mode, :errors, :ignore_blank_line
-
-  def initialize definition, file_path, exception_mode=true, data_source=nil, ignore_blank_line=false
-    @data_source = data_source
-    self.definition, self.file_path = definition, file_path
-    dynamic_lib_loading 'Parser'
-    self.exception_mode, self.errors = exception_mode, []
-    dynamic_lib_loading 'Validator'
-    self.notifier = Notifier.new
-    self.ignore_blank_line = ignore_blank_line
-    init_plugins
-
-  end
-
-  def init_plugins
-    begin
-      @plugins = []
-      ::Csv2hash::Plugins.constants.each do |name|
-        @plugins << ::Csv2hash::Plugins.const_get(name).new(self)
-      end
-    rescue; end
-  end
-
-  def parse
-    load_data_source
+require_relative 'csv2hash/version'
+require_relative 'csv2hash/definition'
+require_relative 'csv2hash/validator'
+require_relative 'csv2hash/validator/mapping'
+require_relative 'csv2hash/validator/collection'
+require_relative 'csv2hash/structure_validator'
+require_relative 'csv2hash/structure_validator/max_columns'
+require_relative 'csv2hash/structure_validator/min_columns'
+require_relative 'csv2hash/parser'
+require_relative 'csv2hash/parser/mapping'
+require_relative 'csv2hash/parser/collection'
+require_relative 'csv2hash/csv_array'
+require_relative 'csv2hash/data_wrapper'
+require_relative 'csv2hash/notifier'
+require_relative 'csv2hash/extra_validator'
+require_relative 'csv2hash/adapters/base'
+
+begin
+  require 'pry'
+rescue LoadError
+end
+
+module Csv2hash
+  class Main
+    include Csv2hash::StructureValidator
+
+    attr_accessor :definition, :file_path_or_data, :data, :notifier, :exception_mode, :errors, :ignore_blank_line
+
+    def initialize definition, file_path_or_data, exception_mode=true, ignore_blank_line=false
+      self.definition, self.file_path_or_data = definition, file_path_or_data
+      @data_source = data_source
+      dynamic_lib_loading 'Parser'
+      self.exception_mode, self.errors = exception_mode, []
+      dynamic_lib_loading 'Validator'
+      self.notifier = Notifier.new
+      self.ignore_blank_line = ignore_blank_line
+
+      init_plugins
+    end
 
-    definition.validate!
-    definition.default!
-    validate_structure!
-    validate_data!
+    def init_plugins
+      begin
+        @plugins = []
+        ::Csv2hash::Plugins.constants.each do |name|
+          @plugins << ::Csv2hash::Plugins.const_get(name).new(self)
+        end
+      rescue; end
+    end
 
-    Csv2hash::DataWrapper.new.tap do |response|
-      if valid?
-        fill!
-        response.data = data[:data]
-      else
-        response.valid = false
-        response.errors = csv_with_errors
-        notifier.notify response
+    def parse
+      load_data_source
+
+      definition.validate!
+      definition.default!
+      validate_structure!
+      validate_data!
+
+      Csv2hash::DataWrapper.new.tap do |response|
+        if valid?
+          fill!
+          response.data = data[:data]
+        else
+          response.valid = false
+          response.errors = csv_with_errors
+          notifier.notify response
+        end
       end
     end
-  end
 
-  def csv_with_errors
-    @csv_with_errors ||= begin
-      CsvArray.new.tap do |rows|
-        errors.each do |error|
-          rows << error.merge({ value: (data_source[error[:y]][error[:x]] rescue nil) })
-        end
-      end #.to_csv
+    def csv_with_errors
+      @csv_with_errors ||= begin
+        CsvArray.new.tap do |rows|
+          errors.each do |error|
+            rows << error.merge({ value: (data_source[error[:y]][error[:x]] rescue nil) })
+          end
+        end #.to_csv
+      end
     end
-  end
 
-  # protected
+    # protected
 
-  def data_source
-    @data_source ||= CSV.read self.file_path
-  end
-  alias_method :load_data_source, :data_source
+    def data_source
+      @data_source ||= begin
+        adapter_name = self.file_path_or_data.is_a?(String) ? :csv : :memory
+        adapter = Adapter::Base.create(adapter_name, self.file_path_or_data)
+        adapter.source
+      end
+    end
+    alias_method :load_data_source, :data_source
 
-  private
+    private
 
-  def dynamic_lib_loading type
-    case definition.type
-    when Csv2hash::Definition::MAPPING
-      self.extend Module.module_eval("Csv2hash::#{type}::Mapping")
-    when Csv2hash::Definition::COLLECTION
-      self.extend Module.module_eval("Csv2hash::#{type}::Collection")
+    def dynamic_lib_loading type
+      case definition.type
+      when Csv2hash::Definition::MAPPING
+        self.extend Module.module_eval("Csv2hash::#{type}::Mapping")
+      when Csv2hash::Definition::COLLECTION
+        self.extend Module.module_eval("Csv2hash::#{type}::Collection")
+      end
     end
   end
-
-end
+end

data/spec/csv2hash/definition_spec.rb

@@ -12,8 +12,8 @@ describe Csv2hash::Definition do
     end
 
     it 'variable should be assigned' do
-      subject.type.should eql Csv2hash::Definition::MAPPING
-      subject.rules.should eql [ { position: [0,0], key: 'name' } ]
+      expect(subject.type).to eql Csv2hash::Definition::MAPPING
+      expect(subject.rules).to eql [ { position: [0,0], key: 'name' } ]
     end
   end
 
@@ -56,7 +56,7 @@ describe Csv2hash::Definition do
     before { subject.default! }
 
     it 'missing key must be filled' do
-      subject.rules.should eql([{ position: [0, 0],
+      expect(subject.rules).to eql([{ position: [0, 0],
         key: 'name',
         message: 'undefined :key on :position',
         mappable: true,
@@ -68,7 +68,3 @@ describe Csv2hash::Definition do
     end
   end
 end
-
-
-
-

data/spec/csv2hash/parser/collection_spec.rb

@@ -9,21 +9,22 @@ describe Csv2hash::Parser::Collection do
   let(:data_source) { [ [ 'John Doe' ], [ 'Jane Doe' ] ] }
 
   subject do
-    Csv2hash.new(definition, 'file_path', false, data_source)
+    Csv2hash::Main.new(definition, data_source, exception_mode=false, ignore_blank_line=false)
   end
 
   context 'regular way' do
     it { expect { subject.parse }.to_not raise_error }
     it {
-      subject.tap do |parser|
+      expect(subject.tap do |parser|
         parser.parse
-      end.data.should eql({ data: [ { 'name' => 'John Doe' }, { 'name' => 'Jane Doe' } ] })
+      end.data).to eql({ data: [ { 'name' => 'John Doe' }, { 'name' => 'Jane Doe' } ] })
     }
     context 'with header' do
       before { subject.definition.header_size = 1 }
       let(:data_source) { [ [ 'Name' ], [ 'John Doe' ], [ 'Jane Doe' ] ] }
       it {
-        subject.tap { |c| c.parse }.data.should eql({ data: [ { 'name' => 'John Doe' }, { 'name' => 'Jane Doe' } ] })
+        expect(subject.tap { |c| c.parse }.data).to eql(
+          { data: [ { 'name' => 'John Doe' }, { 'name' => 'Jane Doe' } ] })
       }
     end
   end
@@ -34,7 +35,7 @@ describe Csv2hash::Parser::Collection do
       definition.rules << { position: 1, key: 'age', nested: 'infos' }
     end
     it {
-      subject.tap { |c| c.parse }.data.should eql(
+      expect(subject.tap { |c| c.parse }.data).to eql(
         { data: [
           { 'name' => 'John Doe', 'infos' => { 'age' => 22 } },
           { 'name' => 'Jane Doe', 'infos' => { 'age' => 19 } }
@@ -47,10 +48,10 @@ describe Csv2hash::Parser::Collection do
   context '#ignore_blank_line' do
     let(:data_source) { [ [ 'John Doe' ], [ 'Jane Doe' ], [ nil ] ] }
     it {
-      subject.tap do |parser|
+      expect(subject.tap do |parser|
         parser.ignore_blank_line = true
         parser.parse
-      end.data.should eql({ data: [ { 'name' => 'John Doe' }, { 'name' => 'Jane Doe' } ] })
+      end.data).to eql({ data: [ { 'name' => 'John Doe' }, { 'name' => 'Jane Doe' } ] })
     }
   end
-end
+end

data/spec/csv2hash/parser/mapping_spec.rb

@@ -9,15 +9,15 @@ describe Csv2hash::Parser::Mapping do
   let(:data_source) { [ [ 'John Doe' ] ] }
 
   subject do
-    Csv2hash.new(definition, 'file_path', false, data_source)
+    Csv2hash::Main.new(definition, data_source, exception_mode=false, ignore_blank_line=false)
   end
 
   context 'regular way' do
     it { expect { subject.parse }.to_not raise_error }
     it {
-      subject.tap do |csv2hash|
+      expect(subject.tap do |csv2hash|
         csv2hash.parse
-      end.data.should eql({ data: [ { 'name' => 'John Doe' } ] })
+      end.data).to eql({ data: [ { 'name' => 'John Doe' } ] })
     }
   end
 
@@ -27,10 +27,10 @@ describe Csv2hash::Parser::Mapping do
       definition.rules << { position: [0,1], key: 'age', nested: 'infos' }
     end
     it {
-      subject.tap { |c| c.parse }.data.should eql(
+      expect(subject.tap { |c| c.parse }.data).to eql(
         { data: [ { 'name' => 'John Doe', 'infos' => { 'age' => 22 } } ] }
       )
     }
   end
 
-end
+end

data/spec/csv2hash/structure_validator_spec.rb

@@ -13,7 +13,7 @@ describe Csv2hash::StructureValidator do
   end
 
   subject do
-    Csv2hash.new(definition, 'file_path', exception_mode, data_source)
+    Csv2hash::Main.new(definition, data_source, exception_mode, ignore_blank_line=false)
   end
 
   context 'the csv with errors' do
@@ -29,7 +29,7 @@ describe Csv2hash::StructureValidator do
 
     its(:csv_with_errors) { should be_kind_of CsvArray }
     it "adds structure error in first cell" do
-      subject.csv_with_errors.first[:message].should eq 'Too many columns (max. 2) on line 1'
+      expect(subject.csv_with_errors.first[:message]).to eq 'Too many columns (max. 2) on line 1'
     end
   end
 
@@ -80,4 +80,4 @@ describe Csv2hash::StructureValidator do
     end
   end
 
-end
+end

data/spec/csv2hash/validator/collection_spec.rb

@@ -10,7 +10,7 @@ describe Csv2hash::Validator::Collection do
   end
 
   subject do
-    Csv2hash.new(definition, 'file_path', true, data_source)
+    Csv2hash::Main.new(definition, data_source, exception_mode=true, ignore_blank_line=false)
   end
 
   context 'with valid data' do
@@ -46,7 +46,7 @@ describe Csv2hash::Validator::Collection do
   context 'wihtout exception' do
     let(:data_source) { [ [ ] ]}
     before { subject.exception_mode = false }
-    it { subject.parse.errors.to_csv.should eql ",\"undefined name on [0, 0]\"\n" }
+    it { expect(subject.parse.errors.to_csv).to eql ",\"undefined name on [0, 0]\"\n" }
 
     context 'errors should be filled' do
       before { subject.parse }
@@ -61,7 +61,7 @@ describe Csv2hash::Validator::Collection do
         end
       end
       let(:data_source) { [ [ 'what?' ], [ 'yes' ], [ 'no' ] ] }
-      it { subject.parse.errors.to_csv.should eql "what?,\"agree not supported, please use one of [\"\"yes\"\", \"\"no\"\"]\"\n" }
+      it { expect(subject.parse.errors.to_csv).to eql "what?,\"agree not supported, please use one of [\"\"yes\"\", \"\"no\"\"]\"\n" }
     end
   end
 

data/spec/csv2hash/validator/mapping_spec.rb

@@ -10,7 +10,7 @@ describe Csv2hash::Validator::Mapping do
   end
 
   subject do
-    Csv2hash.new(definition, 'file_path', true, data_source)
+    Csv2hash::Main.new(definition, data_source, exception_mode=true, ignore_blank_line=false)
   end
 
   context 'with valid data' do
@@ -26,7 +26,7 @@ describe Csv2hash::Validator::Mapping do
   context 'wihtout exception' do
     let(:data_source) { [ [ ] ] }
     before { subject.exception_mode = false }
-    it { subject.parse.errors.to_csv.should eql ",\"undefined name on [0, 0]\"\n" }
+    it { expect(subject.parse.errors.to_csv).to eql ",\"undefined name on [0, 0]\"\n" }
 
     context 'errors should be filled' do
       before { subject.parse }
@@ -48,7 +48,7 @@ describe Csv2hash::Validator::Mapping do
           ]
         end
         let(:data_source) { [ [ 'what?' ], [ 'yes', 'what?' ], [ 'yes', 'what?', 'no' ] ] }
-        it { subject.parse.errors.to_csv.should eql(
+        it { expect(subject.parse.errors.to_csv).to eql(
           "what?,\"agree not supported, please use one of [\"\"yes\"\", \"\"no\"\"]\"\n") }
       end
       context 'range values' do
@@ -60,7 +60,7 @@ describe Csv2hash::Validator::Mapping do
           ]
         end
         let(:data_source) { [ [ 12 ], [ 2, 12 ], [ 3, 12, 1 ] ] }
-        it { subject.parse.errors.to_csv.should eql("12,\"score not supported, please use one of 1..10\"\n") }
+        it { expect(subject.parse.errors.to_csv).to eql("12,\"score not supported, please use one of 1..10\"\n") }
       end
     end
 
@@ -93,4 +93,3 @@ class DowncaseValidator < Csv2hash::ExtraValidator
     !!(value.match /^[a-z]+$/)
   end
 end
-

data/spec/csv2hash/validator_spec.rb

@@ -10,13 +10,13 @@ describe Csv2hash::Validator do
   end
 
   describe '#message' do
-    subject { Csv2hash.new double('definition', type: Csv2hash::Definition::COLLECTION), nil }
+    subject { Csv2hash::Main.new double('definition', type: Csv2hash::Definition::COLLECTION), nil }
 
     context 'string value' do
       let(:rule) { { foo: 'bar', message: ':foo are value of foo key' } }
 
       it 'substitue value of key' do
-        subject.send(:message, rule, nil, nil).should eql 'bar are value of foo key'
+        expect(subject.send(:message, rule, nil, nil)).to eql 'bar are value of foo key'
       end
     end
 
@@ -24,7 +24,7 @@ describe Csv2hash::Validator do
       let(:rule) { { foo: ['bar', 'zone'], message: ':foo are values of foo key' } }
 
       it 'substitue value of key' do
-        subject.send(:message, rule, nil, nil).should eql '["bar", "zone"] are values of foo key'
+        expect(subject.send(:message, rule, nil, nil)).to eql '["bar", "zone"] are values of foo key'
       end
     end
 
@@ -32,7 +32,7 @@ describe Csv2hash::Validator do
       let(:rule) { { message: 'value not found on :position' } }
 
       it 'substitue value of key' do
-        subject.send(:message, rule, 0, 2).should eql 'value not found on [0, 2]'
+        expect(subject.send(:message, rule, 0, 2)).to eql 'value not found on [0, 2]'
       end
     end
   end

data/spec/spec_helper.rb

@@ -1,10 +1,15 @@
 require 'csv2hash'
 require 'bundler/setup'
 require 'coveralls'
+require 'its'
+
+begin
+  require 'pry'
+rescue LoadError
+end
 
 Coveralls.wear!
 
 RSpec.configure do |c|
   c.run_all_when_everything_filtered = true
 end
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: csv2hash
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Joel AZEMAR
@@ -14,67 +14,83 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: its
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: DSL to map a CSV to a Ruby Hash
 email: joel.azemar@gmail.com
 executables:
 - load_rvm
-- publish
 extensions: []
 extra_rdoc_files: []
 files:
-- .coveralls.yml
-- .gitignore
-- .rspec
-- .travis.yml
+- ".coveralls.yml"
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
-- Guardfile
 - LICENSE
 - README.md
 - Rakefile
 - ReleaseNotes.md
 - bin/load_rvm
-- bin/publish
+- coverage/.resultset.json.lock
 - csv2hash.gemspec
 - lib/csv2hash.rb
+- lib/csv2hash/adapters/abstract.rb
+- lib/csv2hash/adapters/base.rb
+- lib/csv2hash/adapters/csv_adapter.rb
+- lib/csv2hash/adapters/memory_adapter.rb
 - lib/csv2hash/csv_array.rb
 - lib/csv2hash/data_wrapper.rb
 - lib/csv2hash/definition.rb
@@ -110,17 +126,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ~>
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Mapping a CSV to a Ruby Hash

data/Guardfile

@@ -1,8 +0,0 @@
-# A sample Guardfile
-# More info at https://github.com/guard/guard#readme
-
-guard :rspec, cmd: 'rspec --color --fail-fast' do
-  watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
-  watch('spec/spec_helper.rb')  { "spec" }
-end

data/bin/publish

@@ -1,24 +0,0 @@
-#!/usr/bin/env ruby
-
-# bin/publish 0.0.1
-
-class Publish
-
-  def start version
-    system "bundle && bundle exec rake spec"
-    system "gem build csv2hash.gemspec"
-    system "git tag -a v#{version} -m 'version #{version}'"
-    system "git push --tags"
-    system "gem push csv2hash-#{version}.gem"
-    system "git push origin master"
-  end
-
-end
-
-if ARGV.length != 1 # or !ARGV[0].match(/\d{1,3}.\d{1,3}.\d{1,3}/)
-  puts 'HELP: '
-  puts '$ bin/publish 0.0.1'
-  exit 0
-end
-
-Publish.new.start ARGV[0]