csv2hash 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4017d9fec070fb90dc8c400f67f3c78b9fc6f536
-  data.tar.gz: 36ec66a10def761fff7f091aaf61160a8ad4b852
+  metadata.gz: 0cff06b049e0b90d0627bced7665e5212667a128
+  data.tar.gz: 6aaf21e5a862915914813ee0d65495b04f041fc1
 SHA512:
-  metadata.gz: 9e77b7043aff1425609cd7844ade388db5dda784a7d6fa1da3ea90d773af69327ea94e9efecb2e796e63e995c850c22e59228fda689a6ba694133a66decd1fb1
-  data.tar.gz: a54b994cc833b8381d38a4623b96b8a2f630ccd1228990320cf6645e401162ad6fcbe45fed6906c3eac79daeda149e4fc391192f1b19e9168e5f33aa178b508e
+  metadata.gz: 1951755e2eda195942d6abaacaff5b2bf859a3e46e5f36160640dc3035ff1f9e81e903f991fb81e8b8cc29b3d4046766183b8f983fe244e774b05e1381c8d934
+  data.tar.gz: f7ab7b90d43cbec0a3379ec8461b9a41f45c3152d90c3e8106bd01275a53d98ed81b68cdf0bd3581ada17e97d4c75febf98491aebeb23fbaf5036ad766023772

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+### VERSION 0.6.2
+
+* feature
+  * Auto discover, you can add floating position on mapping rules
+
 ### VERSION 0.6.1
 
 * deprecations

data/Gemfile.lock

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

data/README.md

@@ -121,7 +121,6 @@ Consider the following CSV:
 | First Name  |        John          |    yes   |
 | Last Name   |        Doe           |    yes   |
 
-
 Precise position validation sample:
 
 ```
@@ -154,6 +153,36 @@ Precise position validation sample:
 	end
 ```
 
+### Auto discover position
+
+This is a special feature for finding the Y index of row where you data start. For instance you have this following data :
+
+|---------------|---------------|------|-----|
+| Nickname      | jo            |      |     |
+| First Name    | John          |      |     |
+| Last Name     | Doe           |      |     |
+|               |               |      |     |
+| Employment    | CEO           |      |     |
+| Post          | Doe           |      |     |
+|               |               |      |     |
+|               | Personal info | Age  | 26  |
+|               | Sex           | Male |     |
+|               |               |      |     |
+
+You want extract `Employment` information and `Personal info` but we do not know if extra information will not come and break our index. This feature can be useful is this case.
+
+You must change Y position (rows) by the column index and regex, the parser will search on this column the index row of this regex, here our rule :
+
+```  
+  cell position: [4,1], key: 'employment'
+```
+
+became
+
+```
+  cell position: [[0, /Employment/],1], key: 'employment'
+```
+
 ### [COLLECTION] Validation of a collection (Regular CSV)
 
 Consider the following CSV:

data/UPGRADE.md

@@ -1,5 +1,13 @@
 # Upgrading
 
+# Upgrading from 0.6.1 to 0.6.2
+
+nothing
+
+# Upgrading from 0.6 to 0.6.1
+
+Change Structure validation rules, MinColumn, MaxColumn are replaced by :min_columns, :max_columns
+
 # Upgrading from 0.5 to 0.6
 
 Introduce DSL

data/lib/csv2hash/definition.rb

@@ -38,7 +38,6 @@ module Csv2hash
     end
 
     def validate!
-      # binding.pry
       unless TYPES.include?(@type)
         raise "not suitable type, please use '#{MAPPING}' or '#{COLLECTION}'"
       end
@@ -47,7 +46,6 @@ module Csv2hash
     end
 
     def default!
-      # binding.pry
       cells.each do |cell|
         cell.rules.fetch(:position)
 
@@ -66,7 +64,6 @@ module Csv2hash
         cell.rules.merge! allow_blank: false   unless cell.rules.has_key? :allow_blank
         cell.rules.merge! extra_validator: nil unless cell.rules.has_key? :extra_validator
       end
-      # binding.pry
     end
 
     private

data/lib/csv2hash/discover.rb

@@ -0,0 +1,16 @@
+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]
+        end
+      end
+    end
+
+  end
+end

data/lib/csv2hash/parser/mapping.rb

@@ -1,27 +1,31 @@
-module Csv2hash::Parser::Mapping
-  include Csv2hash::Parser
+module Csv2hash
+  module Parser
+    module Mapping
+      include Parser
 
-  def fill!
-    self.data = {}.tap do |data_computed|
-      data_computed[:data] ||= []
-      data_computed[:data] << {}.tap do |data_parsed|
-        fill_it data_parsed, data_source
+      def fill!
+        self.data = {}.tap do |data_computed|
+          data_computed[:data] ||= []
+          data_computed[:data] << {}.tap do |data_parsed|
+            fill_it data_parsed, data_source
+          end
+        end
       end
-    end
-  end
 
-  def fill_it parsed_data, source_data
-    definition.cells.each do |cell|
-      if cell.rules.fetch :mappable
-        y, x = cell.rules.fetch :position
-        if (nested = cell.rules.fetch :nested)
-          parsed_data[nested] ||= {}
-          parsed_data[nested][cell.rules.fetch(:key)] = source_data[y][x]
-        else
-          parsed_data[cell.rules.fetch(:key)] = source_data[y][x]
+      def fill_it parsed_data, source_data
+        definition.cells.each do |cell|
+          if cell.rules.fetch :mappable
+            y, x = cell.rules.fetch :position
+            if (nested = cell.rules.fetch :nested)
+              parsed_data[nested] ||= {}
+              parsed_data[nested][cell.rules.fetch(:key)] = source_data[y][x]
+            else
+              parsed_data[cell.rules.fetch(:key)] = source_data[y][x]
+            end
+          end
         end
       end
+
     end
   end
-
 end

data/lib/csv2hash/validator.rb

@@ -1,8 +1,12 @@
+require_relative 'discover'
+
 module Csv2hash
   module Validator
+    include Discover
 
     def validate_rules y=nil
-      # binding.pry
+      find_positions!
+
       definition.cells.each do |cell|
         _y, x = position cell.rules.fetch(:position)
         begin
@@ -22,7 +26,7 @@ module Csv2hash
       value = data_source[y][x] rescue nil
       begin
         raise unless value unless cell.rules.fetch :allow_blank
-        if (extra_validator = cell.rules.fetch :extra_validator) && extra_validator.kind_of?(Csv2hash::ExtraValidator)
+        if (extra_validator = cell.rules.fetch :extra_validator) && extra_validator.kind_of?(ExtraValidator)
           raise unless extra_validator.valid? cell.rules, value
         else
           if value && (values = cell.rules.fetch :values)

data/lib/csv2hash/version.rb

@@ -1,3 +1,3 @@
 module Csv2hash
-  VERSION = '0.6.1'
+  VERSION = '0.6.2'
 end

data/spec/csv2hash/parser/mapping_spec.rb

@@ -6,11 +6,26 @@ module Csv2hash
     let(:definition) do
       Main.generate_definition :foo do
         set_type { Definition::MAPPING }
-        mapping { cell position: [0,0], key: 'name' }
+        mapping do
+          cell position: [1,1], key: 'first_name'
+          cell position: [2,1], key: 'last_name'
+        end
       end
     end
 
-    let(:data_source) { [ [ 'John Doe' ] ] }
+    let(:data_source) do
+      [ ['Nickname', 'jo', nil, nil, nil],
+        ['FirstName', 'John', nil, nil, nil],
+        ['LastName', 'Doe', nil, nil, nil],
+        [nil, nil, nil, nil, nil],
+        ['Employment', 'CEO', nil, nil, nil],
+        ['Post', 'Doe', nil, nil, nil],
+        [nil, nil, nil, nil, nil],
+        [nil, 'Personal info', 'Age', 26, nil],
+        [nil, 'Sex', 'Male', nil, nil],
+        [nil, nil, nil, nil, nil]
+      ]
+    end
 
     subject do
       Main.new(definition, data_source, ignore_blank_line: false)
@@ -21,18 +36,28 @@ module Csv2hash
       it {
         expect(subject.tap do |csv2hash|
           csv2hash.parse!
-        end.data).to eql({ data: [ { 'name' => 'John Doe' } ] })
+        end.data).to eql({ data: [{ 'first_name' => 'John', 'last_name' => 'Doe' }]})
       }
     end
 
     context 'with nested' do
-      let(:data_source) { [ [ 'John Doe', 22 ] ] }
       before do
-        definition.cells << Cell.new({ position: [0,1], key: 'age', nested: 'infos' })
+        definition.cells << Cell.new({ position: [7,3], key: 'age', nested: 'infos' })
+      end
+      it {
+        expect(subject.tap { |c| c.parse! }.data).to eql(
+          { data: [ { 'first_name' => 'John', 'last_name' => 'Doe', 'infos' => { 'age' => 26 } } ] }
+        )
+      }
+    end
+
+    context 'discover' do
+      before do
+        definition.cells << Cell.new({ position: [[1,/Sex/],2], key: 'sex'})
       end
       it {
         expect(subject.tap { |c| c.parse! }.data).to eql(
-          { data: [ { 'name' => 'John Doe', 'infos' => { 'age' => 22 } } ] }
+          { data: [ { 'first_name' => 'John', 'last_name' => 'Doe', 'sex' => 'Male' } ] }
         )
       }
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: csv2hash
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Joel AZEMAR
@@ -112,6 +112,7 @@ files:
 - lib/csv2hash/csv_array.rb
 - lib/csv2hash/data_wrapper.rb
 - lib/csv2hash/definition.rb
+- lib/csv2hash/discover.rb
 - lib/csv2hash/expectation.rb
 - lib/csv2hash/extra_validator.rb
 - lib/csv2hash/notifier.rb