csv2hash 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67ed51815f96624700e2abe37d284061c776c386
-  data.tar.gz: 2652b7a9c10c3470b257f9500f53aee4b0ebb4f4
+  metadata.gz: 1abbff1cb3d760b2d6f7c762a69cd6dbdcbbd2b3
+  data.tar.gz: aa458b6a73cc2de62b4245431f5adf987aaa7517
 SHA512:
-  metadata.gz: bdf2f34865b2e4f88e57b314b2c6376225e5083589bb91774b534d71cace7e149fcf4097df9fad43a03f4c7ec2e427b91897df61c958912fffcd21129b3b7810
-  data.tar.gz: 12cabfe3603c445771917d4832e53ca4c7cd09792be38d024f616c19edaab78a94622dcdc7146a4e36e877aebd4ca2e34a63ed3af0ca4bc3bb5e6666a74c8983
+  metadata.gz: 535644564d7d73cf9a7c28baade14ea09e53443b2f98d1223794e1336f3a0bfa2849ba3ef42b5b0e82adf798aa4faf2a93f291439d5f505437ba40fe5fce8aa5
+  data.tar.gz: 5f12fe8e872273087f117885885618f4fd67c2a3e178b4d6192bdfd4c51188a572c52c32664246e6a5b5f2c1944bd41c385f92e66e41ad8eb3f54b23533fc860

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+### VERSION 0.6.5
+
+* enhancements
+  * Add Coercer for deserialize field from Yaml like ExtraValidator and Regex
+  * Add Coercer for deserialize field from Csv value to ruby value like 'true' => true
+  * Add missing module prefix Csv2hash
+  * remove rule for dynmaic field with field is optional and not found
+
+* feature
+  * Add generator for configure csv2hash on Rails app
+
 ### VERSION 0.6.4
 
 * feature

data/Gemfile

@@ -5,6 +5,7 @@ gemspec
 group :test do
   gem 'coveralls', require: false
   gem 'pry'
+  # gem 'rails'
 end
 
 group :doc do

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    csv2hash (0.6.4)
+    csv2hash (0.6.5)
       activesupport (~> 4.1)
 
 GEM

data/README.md

@@ -426,8 +426,68 @@ rules:
   - { position: [2,1], key: 'first_name' }
 ```
 
+or for complex and verbose rule
+
+```
+name: 'example'
+mapping: 'mapping'
+header_size: 2
+structure_rules: { max_columns: 20 }
+rules:
+  - !rule
+    position: [1,1]
+    key: 'first_name'
+  - !rule
+    position: [2,1]
+    key: 'last_name'
+```
+
+Special attention, if you use `ExtraValidator` you must give only the String name of the classe, like that :
+
+```
+extra_validator: DowncaseValidator.new
+```
+
+should become
+
+```
+extra_validator: 'DowncaseValidator'
+```
+
+for autodiscover field you must give String without Regex like that :
+
+```
+position: [[0,/LastName/],1]
+```
+
+should become
+
+```
+position: [[0,'LastName'],1]
+```
+
+this change is due to Yaml conversion
+
 You can write ERB file, should be named with following convention ```<file name>.erb.yml```
 
+# Type conversion
+
+By default Csv2hash doesn't convert basic value, but you can activate this on configuration, for Rails use :
+
+add file `config/initializers/csv2hash.rb`
+
+```
+Csv2hash.configure do |conf|
+  conf.convert = true
+end
+```
+
+```
+rails generate csh2hash:install
+```
+
+If you want add your specific conversion
+
 # Changes
 
 please refere to [CHANGELOG.md](https://github.com/FinalCAD/csv2hash/blob/master/CHANGELOG.md) doc

data/UPGRADE.md

@@ -1,5 +1,9 @@
 # Upgrading
 
+# Upgrading from 0.6.4 to 0.6.5
+
+nothing
+
 # Upgrading from 0.6.3 to 0.6.4
 
 nothing

data/config/rules.erb.yml

@@ -4,4 +4,5 @@ header_size: <%= 3 - 1 %>
 structure_rules: { max_columns: 20 }
 rules:
   - { position: [1,1], key: 'first_name' }
-  - { position: [2,1], key: 'first_name' }
+  - { position: [2,1], key: 'last_name' }
+  - { position: [7,3], key: 'age', values: (18..90) }

data/config/rules.extra_validator.erb.yml

@@ -0,0 +1,8 @@
+name: 'example'
+mapping: 'mapping'
+header_size: 0
+structure_rules: { max_columns: 20 }
+rules:
+  - { position: [0,1], key: 'nick_name', extra_validator: 'Csv2hash::DowncaseValidator', message: 'your data should be writting in downcase only' }
+  - { position: [1,1], key: 'first_name', extra_validator: 'Csv2hash::DowncaseValidator', message: 'your data should be writting in downcase only' }
+  - { position: [[0,'LastName'],1], key: 'last_name', extra_validator: 'Csv2hash::DowncaseValidator', message: 'your data should be writting in downcase only' }

data/config/rules.yml

@@ -3,5 +3,9 @@ mapping: 'mapping'
 header_size: 2
 structure_rules: { max_columns: 20 }
 rules:
-  - { position: [1,1], key: 'first_name' }
-  - { position: [2,1], key: 'first_name' }
+  - !rule
+    position: [1,1]
+    key: 'first_name'
+  - !rule
+    position: [2,1]
+    key: 'last_name'

data/lib/csv2hash/cell.rb

@@ -1,11 +1,16 @@
 require 'active_support/core_ext/array/extract_options'
 
-class Cell
+require_relative 'coercers/yaml_coercer'
 
-  attr_accessor :rules
+module Csv2hash
+  class Cell
 
-  def initialize *args
-    self.rules = args.extract_options!
-  end
+    attr_accessor :rules
+
+    def initialize *args
+      self.rules = args.extract_options!
+      Csv2hash::Coercers::YamlCoercer.new(rules).deserialize!
+    end
 
+  end
 end

data/lib/csv2hash/coercers/type_coercer.rb

@@ -0,0 +1,25 @@
+module Csv2hash
+  class TypeCoercer < Struct.new(:data)
+
+    def deserialize!
+      data.each do |line|
+        line.each do |key, value|
+          _value = value.to_s.strip.downcase
+          change.each do |keys, v|
+            line[key] = v if keys.include?(_value)
+          end
+        end
+      end
+    end
+
+    private
+
+    def change
+      {
+        Csv2hash.configuration.true_values  => true,
+        Csv2hash.configuration.false_values => false,
+        Csv2hash.configuration.nil_values   => nil,
+      }
+    end
+  end
+end

data/lib/csv2hash/coercers/yaml_coercer.rb

@@ -0,0 +1,43 @@
+module Csv2hash
+  module Coercers
+    class YamlCoercer < Struct.new(:rules)
+
+      def deserialize!
+        deserialize_validator!
+        deserialize_regex!
+        deserialize_range!
+      end
+
+      private
+
+      def deserialize_validator!
+        begin
+          extra_validator = self.rules.fetch(:extra_validator)
+          self.rules[:extra_validator] = eval("::#{extra_validator}").new
+        rescue KeyError # Rules without ExtraValidator
+        rescue SyntaxError # When extra validator is a instance of Object
+        end
+      end
+
+      def deserialize_regex!
+        y, x = self.rules.fetch :position
+        if y.is_a?(Array)
+          column, matcher_string = y
+          self.rules[:position] = [[column, Regexp.new(matcher_string)],x]
+        end
+      end
+
+      def deserialize_range!
+        begin
+          values = self.rules.fetch(:values)
+          if values.is_a?(String)
+            match_data = values.match(/^\((?<range>.*)\)$/)
+            self.rules[:values] = eval(match_data[:range])
+          end
+        rescue KeyError # Rules without ExtraValidator
+        end
+      end
+
+    end
+  end
+end

data/lib/csv2hash/configuration.rb

@@ -0,0 +1,17 @@
+module Csv2hash
+  class Configuration
+    attr_accessor :true_values
+    attr_accessor :false_values
+    attr_accessor :nil_values
+    # attr_accessor :extra_values
+    attr_accessor :convert
+
+    def initialize
+      self.convert = false
+      self.true_values  = ['yes','y','t']
+      self.false_values = ['no','n','f']
+      self.nil_values   = ['nil','null']
+      # self.extra_values = {} # { [] => }
+    end
+  end
+end

data/lib/csv2hash/csv_array.rb

@@ -1,12 +1,14 @@
 require 'csv'
-class CsvArray < Array
 
-  def to_csv options = {}
-    CSV.generate(options) do |csv|
-      self.each do |element|
-        csv << [element[:value], element[:message]]
+module Csv2hash
+  class CsvArray < Array
+
+    def to_csv options = {}
+      CSV.generate(options) do |csv|
+        self.each do |element|
+          csv << [element[:value], element[:message]]
+        end
       end
     end
   end
-
 end

data/lib/csv2hash/definition.rb

@@ -52,7 +52,7 @@ module Csv2hash
         default_position cell
         unless cell.rules.has_key? :message
           if cell.rules.has_key? :values
-            cell.rules.merge! message: ':key not supported, please use one of :values'
+            cell.rules.merge! message: 'value :found not supported for :key, please use one of :values'
           else
             cell.rules.merge! message: 'undefined :key on :position'
           end

data/lib/csv2hash/discover.rb

@@ -1,14 +1,20 @@
 module Csv2hash
   module Discover
 
-    def find_positions!
-      definition.cells.each do |cell|
-        y, x = cell.rules.fetch :position
-        if y.is_a?(Array)
-          column, matcher = y
-          y = data_source.index { |entries| entries[column] =~ matcher }
-          cell.rules[:position] = [y, x]
+    def find_dynamic_position cell
+      y, x = cell.rules.fetch :position
+      column, matcher = y
+      dynamic_y_axe = data_source.index { |entries| entries[column] =~ matcher }
+
+      if dynamic_y_axe.nil?
+        if cell.rules.fetch(:allow_blank)
+          return nil
+        else
+          raise "Y doesn't found for #{cell.rules[:position]} on :#{cell.rules.fetch(:key)}"
         end
+      else
+        cell.rules[:position] = [dynamic_y_axe, x]
+        cell
       end
     end
 

data/lib/csv2hash/railtie.rb

@@ -0,0 +1,6 @@
+require 'rails'
+
+module Csv2hash
+  class Railtie < Rails::Railtie
+  end
+end

data/lib/csv2hash/registry.rb

@@ -1,13 +1,15 @@
-class Registry
-    def initialize
-    @definitions = Hash.new
-  end
+module Csv2hash
+  class Registry
+      def initialize
+      @definitions = Hash.new
+    end
 
-  def [] name
-    @definitions[name]
-  end
+    def [] name
+      @definitions[name]
+    end
 
-  def []= name, definition
-    @definitions[name] = definition
+    def []= name, definition
+      @definitions[name] = definition
+    end
   end
 end

data/lib/csv2hash/structure_validator.rb

@@ -21,6 +21,7 @@ module Csv2hash
           raise if break_on_failure
         end
       end
+      nil
     end
 
     def rule_instance rule, options

data/lib/csv2hash/validator/collection.rb

@@ -11,6 +11,7 @@ module Csv2hash
           next if unexpected_line?(line, y)
           validate_rules y
         end
+        nil
       end
 
       protected

data/lib/csv2hash/validator/mapping.rb

@@ -5,6 +5,7 @@ module Csv2hash
 
       def validate_data!
         validate_rules data_source
+        nil
       end
 
       protected

data/lib/csv2hash/validator.rb

@@ -5,7 +5,7 @@ module Csv2hash
     include Discover
 
     def validate_rules y=nil
-      find_positions!
+      find_or_remove_dynamic_fields! if definition.type == Definition::MAPPING
 
       definition.cells.each do |cell|
         _y, x = position cell.rules.fetch(:position)
@@ -38,15 +38,48 @@ module Csv2hash
           end
         end
       rescue => e
-        raise message(cell, y, x)
+        raise message(cell, y, x, value)
       end
     end
 
-    def message cell, y, x
-      msg = cell.rules.fetch(:message).tap do |msg|
-        cell.rules.each { |key, value| msg.gsub!(":#{key.to_s}", value.to_s) unless key == :position }
+    def message cell, y, x, value
+      msg = cell.rules.fetch(:message)
+      msg = msg.gsub(':position', "[#{y}, #{x}]")
+      msg = msg.gsub(':key', ":#{cell.rules.fetch(:key, :no_key_given)}")
+      msg = msg.gsub(':found', "<#{value}>")
+      msg = msg.gsub(':values', "<#{cell.rules.fetch(:values, :no_values_given)}>")
+      cell.rules.each { |key, _value| msg.gsub!(":#{key.to_s}", _value.to_s) unless key == :position }
+      msg
+    end
+
+    private
+
+    def find_or_remove_dynamic_fields!
+      cells = definition.cells.dup
+      _cells = []
+
+      while(!cells.empty?) do
+        cell = cells.pop
+        _y, x = cell.rules.fetch(:position)
+        if dynamic_field?(_y)
+          begin
+            _cell = find_dynamic_position cell
+            _cells << _cell if _cell
+          rescue => e
+            self.errors << { y: (_y||y), x: x, message: e.message, key: cell.rules.fetch(:key) }
+            raise if break_on_failure
+          end
+        else
+          _cells << cell
+        end
       end
-      msg.gsub ':position', "[#{y}, #{x}]"
+
+      definition.cells = _cells # cells without optional and not found dynamic field
+      nil
+    end
+
+    def dynamic_field? field
+      field.is_a?(Array)
     end
 
   end

data/lib/csv2hash/version.rb

@@ -1,3 +1,3 @@
 module Csv2hash
-  VERSION = '0.6.4'
+  VERSION = '0.6.5'
 end

data/lib/csv2hash.rb

@@ -1,4 +1,5 @@
 require_relative 'csv2hash/version'
+require_relative 'csv2hash/configuration'
 require_relative 'csv2hash/registry'
 require_relative 'csv2hash/cell'
 require_relative 'csv2hash/definition'
@@ -17,6 +18,9 @@ require_relative 'csv2hash/notifier'
 require_relative 'csv2hash/extra_validator'
 require_relative 'csv2hash/adapters/base'
 require_relative 'csv2hash/yaml_loader'
+require_relative 'csv2hash/coercers/type_coercer'
+
+require 'csv2hash/railtie' if defined?(Rails)
 
 require 'active_support/core_ext/array/extract_options'
 
@@ -26,8 +30,25 @@ rescue LoadError
 end
 
 module Csv2hash
+
+  class << self
+    attr_writer :configuration
+  end
+
+  def self.configuration
+    @configuration ||= Configuration.new
+  end
+
+  def self.reset
+    @configuration = Configuration.new
+  end
+
+  def self.configure
+    yield(configuration)
+  end
+
   class Main
-    include Csv2hash::StructureValidator
+    include StructureValidator
 
     class << self
 
@@ -89,9 +110,10 @@ module Csv2hash
       validate_structure!
       validate_data!
 
-      Csv2hash::DataWrapper.new.tap do |response|
+      DataWrapper.new.tap do |response|
         if valid?
           fill!
+          TypeCoercer.new(data[:data]).deserialize! if Csv2hash.configuration.convert
           response.data = data[:data]
         else
           response.valid = false
@@ -115,6 +137,7 @@ module Csv2hash
 
     def data_source
       @data_source ||= begin
+        self.file_path_or_data = Pathname(self.file_path_or_data) if self.file_path_or_data.is_a?(String)
         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

data/lib/generators/csv2hash/install/install_generator.rb

@@ -0,0 +1,15 @@
+module Csv2hash
+  module Generator
+    class InstallGenerator < Rails::Generators::Base
+      source_root File.expand_path('../templates', __FILE__)
+
+      desc <<DESC
+description:
+    copy csv2hash configuration to an initializer.
+DESC
+      def create_configuration
+        template 'csh2hash.rb', 'config/initializers/csh2hash.rb'
+      end
+    end
+  end
+end

data/lib/generators/csv2hash/install/templates/csh2hash.rb

@@ -0,0 +1,6 @@
+Csv2hash.configure do |conf|
+  # conf.convert = false # default: false
+  # conf.true_values  = ['yes','y','t'] # default: ['yes','y','t']
+  # conf.false_values = ['no','n','f']  # default: ['no','n','f']
+  # conf.nil_values   = ['nil','null']  # default: ['nil','null']
+end

data/spec/csv2hash/coniguration_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+module Csv2hash
+  describe Configuration do
+    let(:configuration) { Configuration.new }
+
+    describe '#default' do
+      let(:true_values)  { ['yes','y','t'] }
+      let(:false_values) { ['no','n','f']  }
+      let(:nil_values)   { ['nil','null']  }
+
+      it 'true values' do
+        expect(configuration.true_values).to eq(true_values)
+      end
+    end
+
+  end
+end

data/spec/csv2hash/parser/mapping_spec.rb

@@ -53,7 +53,7 @@ module Csv2hash
 
     context 'discover' do
       before do
-        definition.cells << Cell.new({ position: [[1,/Sex/],2], key: 'sex'})
+        definition.cells << Cell.new({ position: [[1,/Sex/],2], key: 'sex' })
       end
       it {
         expect(subject.tap { |c| c.parse! }.data).to eql(
@@ -62,5 +62,40 @@ module Csv2hash
       }
     end
 
+    context 'discover with fail!' do
+      before do
+        definition.cells << Cell.new({ position: [[1,/foo/],2], key: 'sex', allow_blank: false })
+      end
+      it {
+        expect { subject.tap { |c| c.parse! }}.to raise_error("Y doesn't found for [[1, /foo/], 2] on :sex")
+      }
+    end
+
+    context 'discover with fail' do
+      context 'allow_blank: false' do
+        before do
+          definition.cells << Cell.new({ position: [[1,/foo/],2], key: 'sex', allow_blank: false })
+          subject.tap { |c| c.parse }
+        end
+        specify do
+          expect(subject.errors).to_not be_empty
+          expect(subject.errors).to eql(
+            [{y: [1, /foo/], x: 2, message: "Y doesn't found for [[1, /foo/], 2] on :sex", key: 'sex'}])
+        end
+      end
+
+      context 'allow_blank: true' do
+        before do
+          definition.cells << Cell.new({ position: [[1,/foo/],2], key: 'sex', allow_blank: true })
+        end
+        specify do
+          expect(subject.definition.cells.size).to eql(3)
+          subject.tap { |c| c.parse }
+          expect(subject.errors).to be_empty
+          expect(subject.definition.cells.size).to eql(2)
+        end
+      end
+    end
+
   end
 end

data/spec/csv2hash/structure_validator_spec.rb

@@ -6,10 +6,7 @@ module Csv2hash
       Main.generate_definition :foo do
         set_type { Definition::MAPPING }
         mapping { cell position: [0,0], key: 'name' }
-      end.tap do |definition|
-        definition.validate!
-        definition.default!
-      end
+      end.tap { |d| d.validate! ; d.default! }
     end
 
     subject do

data/spec/csv2hash/type_coercer_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+module Csv2hash
+  describe TypeCoercer do
+    let(:data) do
+      [{ foo: ' y   ', bar: 'no', zone: ' Null', mischievous: ' pronoun ' }]
+    end
+    let(:coercer) { TypeCoercer.new(data) }
+
+    before { coercer.deserialize! }
+
+    specify do
+      expect(coercer.data).to eql([{ foo: true, bar: false, zone: nil, mischievous: ' pronoun ' }])
+    end
+  end
+end

data/spec/csv2hash/validator/collection_spec.rb

@@ -7,10 +7,7 @@ module Csv2hash
       Main.generate_definition :foo do
         set_type { Definition::COLLECTION }
         mapping { cell position: 0, key: 'name' }
-      end.tap do |definition|
-        definition.validate!
-        definition.default!
-      end
+      end.tap { |d| d.validate! ; d.default! }
     end
     let(:ignore_blank_line) { false }
 
@@ -45,11 +42,11 @@ module Csv2hash
 
     context 'with invalid data' do
       let(:data_source) { [ [ ] ] }
-      it { expect { subject.validate_data! }.to raise_error('undefined name on [0, 0]') }
+      it { expect { subject.validate_data! }.to raise_error('undefined :name on [0, 0]') }
       context 'with header' do
         let(:options) { { header_size: 1 } }
         let(:data_source) { [ [ 'Name' ], [ ] ]}
-        it { expect { subject.validate_data! }.to raise_error('undefined name on [1, 0]') }
+        it { expect { subject.validate_data! }.to raise_error('undefined :name on [1, 0]') }
       end
     end
 
@@ -60,11 +57,11 @@ module Csv2hash
         allow(subject).to receive(:break_on_failure) { false }
       end
 
-      it { expect(subject.parse.errors.to_csv).to 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 }
-        its(:errors) { should eql [{x: 0, y: 0, message: 'undefined name on [0, 0]', key: 'name'}] }
+        its(:errors) { should eql [{x: 0, y: 0, message: 'undefined :name on [0, 0]', key: 'name'}] }
       end
 
       context 'original csv + errors should returned' do
@@ -72,13 +69,12 @@ module Csv2hash
           Main.generate_definition :foo do
             set_type { Definition::COLLECTION }
             mapping  { cell position: 0, key: 'agree', values: ['yes', 'no'] }
-          end.tap do |definition|
-            definition.validate!
-            definition.default!
-          end
+          end.tap { |d| d.validate! ; d.default! }
         end
         let(:data_source) { [ [ 'what?' ], [ 'yes' ], [ 'no' ] ] }
-        it { expect(subject.parse.errors.to_csv).to eql "what?,\"agree not supported, please use one of [\"\"yes\"\", \"\"no\"\"]\"\n" }
+        it { expect(subject.parse.errors.to_csv).to eql(
+          "what?,\"value <what?> not supported for :agree, please use one of <[\"\"yes\"\", \"\"no\"\"]>\"\n"
+          ) }
       end
     end
 

data/spec/csv2hash/validator/mapping_spec.rb

@@ -25,7 +25,7 @@ module Csv2hash
 
     context 'with invalid data' do
       let(:data_source) { [ [ ] ]}
-      it { expect { subject.validate_data! }.to raise_error('undefined name on [0, 0]') }
+      it { expect { subject.validate_data! }.to raise_error('undefined :name on [0, 0]') }
     end
 
     context 'wihtout exception' do
@@ -35,11 +35,11 @@ module Csv2hash
         allow(subject).to receive(:break_on_failure) { false }
       end
 
-      it { expect(subject.parse.errors.to_csv).to 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 }
-        its(:errors) { should eql [{x: 0, y: 0, message: 'undefined name on [0, 0]', key: 'name'}] }
+        its(:errors) { should eql [{x: 0, y: 0, message: 'undefined :name on [0, 0]', key: 'name'}] }
       end
 
       context 'original csv + errors should be returned' do
@@ -56,7 +56,7 @@ module Csv2hash
         context 'string values' do
           let(:data_source) { [ [ 'what?' ], [ 'yes', 'what?' ], [ 'yes', 'what?', 'no' ] ] }
           it { expect(subject.parse.errors.to_csv).to eql(
-            "what?,\"agree not supported, please use one of [\"\"yes\"\", \"\"no\"\"]\"\n") }
+            "what?,\"value <what?> not supported for :agree, please use one of <[\"\"yes\"\", \"\"no\"\"]>\"\n") }
         end
         context 'range values' do
           let(:definition) do
@@ -70,7 +70,8 @@ module Csv2hash
             end.tap { |d| d.validate! ; d.default! }
           end
           let(:data_source) { [ [ 12 ], [ 2, 12 ], [ 3, 12, 1 ] ] }
-          it { expect(subject.parse.errors.to_csv).to eql("12,\"score not supported, please use one of 1..10\"\n") }
+          it { expect(subject.parse.errors.to_csv).to eql(
+            "12,\"value <12> not supported for :score, please use one of <1..10>\"\n") }
         end
       end
 

data/spec/csv2hash/validator_spec.rb

@@ -13,10 +13,10 @@ module Csv2hash
       end
 
       context 'string value' do
-        let(:rules) {{ foo: 'bar', message: ':foo are value of foo key' }}
+        let(:rules) {{ foo: 'bar', message: ':foo are value of foo key', key: 'bar' }}
 
         it 'substitue value of key' do
-          expect(subject.send(:message, cell, nil, nil)).to eql 'bar are value of foo key'
+          expect(subject.send(:message, cell, nil, nil, 'foo')).to eql 'bar are value of foo key'
         end
       end
 
@@ -24,7 +24,7 @@ module Csv2hash
         let(:rules) { { foo: ['bar', 'zone'], message: ':foo are values of foo key' } }
 
         it 'substitue value of key' do
-          expect(subject.send(:message, cell, nil, nil)).to eql '["bar", "zone"] are values of foo key'
+          expect(subject.send(:message, cell, nil, nil, nil)).to eql '["bar", "zone"] are values of foo key'
         end
       end
 
@@ -32,7 +32,7 @@ module Csv2hash
         let(:rules) { { message: 'value not found on :position' } }
 
         it 'substitue value of key' do
-          expect(subject.send(:message, cell, 0, 2)).to eql 'value not found on [0, 2]'
+          expect(subject.send(:message, cell, 0, 2, nil)).to eql 'value not found on [0, 2]'
         end
       end
     end

data/spec/csv2hash/yaml_loader_spec.rb

@@ -11,6 +11,7 @@ module Csv2hash
       specify do
         expect(subject.definition.name).to eql('example')
         expect(subject.definition.header_size).to eql(2)
+        expect(subject.definition.cells.last.rules.fetch(:values)).to eql(18..90)
       end
     end
 
@@ -23,5 +24,16 @@ module Csv2hash
       end
     end
 
+    context 'extra validator' do
+      let(:config_file) { 'config/rules.extra_validator.erb.yml' }
+
+      specify do
+        expect(subject.definition.name).to eql('example')
+        expect(subject.definition.header_size).to eql(0)
+        expect(subject.definition.cells.first.rules.fetch(:extra_validator)).to be_a(DowncaseValidator)
+        expect(subject.definition.cells.last.rules.fetch(:position)[0][1]).to eql(/LastName/)
+      end
+    end
+
   end
 end

data/spec/generators/csv2hash/install_generator_spec.rb

@@ -0,0 +1,32 @@
+# require 'generators_helper'
+#
+# # Generators are not automatically loaded by Rails
+# require 'generators/csv2hash/install_generator'
+#
+# describe Csv2hash::Generators::InstallGenerator do
+#   # Tell the generator where to put its output (what it thinks of as Rails.root)
+#   destination File.expand_path('../../../tmp', __FILE__)
+#   teardown :cleanup_destination_root
+#
+#   before {
+#     prepare_destination
+#   }
+#
+#   def cleanup_destination_root
+#     FileUtils.rm_rf destination_root
+#   end
+#
+#   describe '...' do
+#     before { run_generator }
+#
+#     describe 'config/initializers/csv2hash.rb' do
+#       subject { file('config/initializers/csv2hash.rb') }
+#       it { should exist }
+#       it { should contain "Csv2hash.configure do |config|"}
+#       # it { should contain "# conf.convert = false" }
+#       # it { should contain "# conf.true_values  = ['yes','y','t']" }
+#       # it { should contain "# conf.false_values = ['no','n','f']" }
+#       # it { should contain "# conf.nil_values   = ['nil','null']" }
+#     end
+#   end
+# end

data/spec/generators_helper.rb

@@ -0,0 +1,10 @@
+require 'csv2hash'
+require 'bundler/setup'
+
+# require 'rails'
+
+module TestApp
+  class Application < ::Rails::Application
+    config.root = File.dirname(__FILE__)
+  end
+end

data/spec/lib/extra_validators/downcase_validator.rb

@@ -0,0 +1,9 @@
+require_relative '../../../lib/csv2hash/extra_validator'
+
+module Csv2Hash
+  class DowncaseValidator < ExtraValidator
+    def valid? rule, value
+      !!(value.match /^[a-z]+$/)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: csv2hash
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - Joel AZEMAR
@@ -109,6 +109,7 @@ files:
 - bin/load_rvm
 - config/example.csv
 - config/rules.erb.yml
+- config/rules.extra_validator.erb.yml
 - config/rules.yml
 - coverage/.resultset.json.lock
 - csv2hash.gemspec
@@ -118,6 +119,9 @@ files:
 - lib/csv2hash/adapters/csv_adapter.rb
 - lib/csv2hash/adapters/memory_adapter.rb
 - lib/csv2hash/cell.rb
+- lib/csv2hash/coercers/type_coercer.rb
+- lib/csv2hash/coercers/yaml_coercer.rb
+- lib/csv2hash/configuration.rb
 - lib/csv2hash/csv_array.rb
 - lib/csv2hash/data_wrapper.rb
 - lib/csv2hash/definition.rb
@@ -128,6 +132,7 @@ files:
 - lib/csv2hash/parser.rb
 - lib/csv2hash/parser/collection.rb
 - lib/csv2hash/parser/mapping.rb
+- lib/csv2hash/railtie.rb
 - lib/csv2hash/registry.rb
 - lib/csv2hash/structure_validator.rb
 - lib/csv2hash/structure_validator/deprecation.rb
@@ -138,16 +143,23 @@ files:
 - lib/csv2hash/validator/mapping.rb
 - lib/csv2hash/version.rb
 - lib/csv2hash/yaml_loader.rb
+- lib/generators/csv2hash/install/install_generator.rb
+- lib/generators/csv2hash/install/templates/csh2hash.rb
+- spec/csv2hash/coniguration_spec.rb
 - spec/csv2hash/definition_spec.rb
 - spec/csv2hash/parser/collection_spec.rb
 - spec/csv2hash/parser/mapping_spec.rb
 - spec/csv2hash/parser_spec.rb
 - spec/csv2hash/structure_validator_spec.rb
+- spec/csv2hash/type_coercer_spec.rb
 - 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/generators/csv2hash/install_generator_spec.rb
+- spec/generators_helper.rb
+- spec/lib/extra_validators/downcase_validator.rb
 - spec/spec_helper.rb
 homepage: https://github.com/joel/csv2hash
 licenses:
@@ -174,15 +186,20 @@ signing_key:
 specification_version: 4
 summary: Mapping a CSV to a Ruby Hash
 test_files:
+- spec/csv2hash/coniguration_spec.rb
 - spec/csv2hash/definition_spec.rb
 - spec/csv2hash/parser/collection_spec.rb
 - spec/csv2hash/parser/mapping_spec.rb
 - spec/csv2hash/parser_spec.rb
 - spec/csv2hash/structure_validator_spec.rb
+- spec/csv2hash/type_coercer_spec.rb
 - 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/generators/csv2hash/install_generator_spec.rb
+- spec/generators_helper.rb
+- spec/lib/extra_validators/downcase_validator.rb
 - spec/spec_helper.rb
 has_rdoc: