csv2hash 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78efc416ea706262ed45cd1732953a91ab59c3ac
-  data.tar.gz: 045440b7c850178eedeb7e0d54c8797a374a7aea
+  metadata.gz: 1d373a399e6b36122e3188d8ba7078b8f3c7de1f
+  data.tar.gz: 537b8221207eacd8c6f8294b7e192a52a9bc85ee
 SHA512:
-  metadata.gz: 9db537dbfddb6ef012bd23acdfb2faedb15c20b4471cb66457d0156d15773991a828c875f5d17f0232fe79e178b009e9eba7f48f879dd8497a6881a0c3c8d507
-  data.tar.gz: 33a571b8d8e0217abf628c73c83c6b6264705d0407b5bd0d217410c836a711f330af66f256321141ef6a5007355e4263fdf139d7c42b13b8a37107464eacf36f
+  metadata.gz: ab5e7774d96a99805fec0357004a63970c4162f7773a0f5d31e5334ad0b43a2a96e8559ebc0a433368640ca6ae8f7072af429254f9ff396f926056534a52fd9f
+  data.tar.gz: d86e84ed44b3d9ef11750a33fdff532fdf2ae4a98f44ba3eae4e9b722e31d928d3bd4830d4fcdd961342a2cc03d24cadd70cbc18fb0dd3b75fdceda99faf40f4

data/.travis.yml

@@ -1,4 +1,9 @@
 language: ruby
+script: bundle exec rspec
 rvm:
-  - 2.1.2
-script: bundle exec rspec spec
+  - 2.0.0
+  - 2.1.0
+  - ruby-head
+matrix:
+  allow_failures:
+    - rvm: ruby-head

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+### VERSION 0.7.2
+
+* bug fix
+  Fix bug and add case sensitive values
+* [fullchanges](https://github.com/FinalCAD/csv2hash/pull/22)
+* [Author Ale Paredes](https://github.com/ale7714)
+
+* enhancements
+  allow multiple versions of ruby
+* [fullchanges](https://github.com/FinalCAD/csv2hash/pull/23)
+* [Author Steve Chung](https://github.com/s12chung)
+
 ### VERSION 0.7.1
 
 * enhancements

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    csv2hash (0.7.1)
+    csv2hash (0.7.2)
       activesupport (~> 4.1)
 
 GEM
@@ -102,7 +102,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.6)
+  bundler (> 1.3)
   coveralls
   csv2hash!
   generator_spec

data/README.md

@@ -119,6 +119,12 @@ cell name: 'aswering', type: 'string', values: ['yes', 'no'], position: [0,0]
 cell name: 'aswering', values: ['yes', 'no'], position: [0,0]
 ```
 
+By default values are case sensitive but if you want the value to be a string that can be either 'yes' or 'no' case insentive ('Yes', 'YES', 'No', 'NO') you can define the following validation rule:
+
+```
+cell name: 'aswering', values: ['yes', 'no'], case_sensitive_values: false, position: [0,0]
+```
+
 You can define you own message but default message is 'undefined :key on :position'
 
 ```
@@ -155,6 +161,7 @@ All remaining keys are optionals:
 * mappable:    true
 * type:        'string'
 * values:      nil
+* case_sensitive_values: true
 * nested:      nil
 * allow_blank: false
 * extra_validator: nil

data/UPGRADE.md

@@ -1,41 +1,5 @@
 # Upgrading
 
-# Upgrading from 0.7.0 to 0.7.1
-
-nothing
-
-# Upgrading from 0.6.8 to 0.7.0
-
-nothing
-
-# Upgrading from 0.6.7 to 0.6.8
-
-nothing
-
-# Upgrading from 0.6.6 to 0.6.7
-
-nothing
-
-# Upgrading from 0.6.5 to 0.6.6
-
-nothing
-
-# Upgrading from 0.6.4 to 0.6.5
-
-nothing
-
-# Upgrading from 0.6.3 to 0.6.4
-
-nothing
-
-# Upgrading from 0.6.2 to 0.6.3
-
-nothing
-
-# 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

data/csv2hash.gemspec

@@ -19,10 +19,8 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'activesupport', '~> 4.1'
 
-  spec.add_development_dependency 'bundler', '~> 1.6'
+  spec.add_development_dependency 'bundler', '> 1.3'
   spec.add_development_dependency 'rake', '~> 10.3'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'its', '~> 0.2'
-
-  spec.required_ruby_version = '~> 2.1'
 end

data/lib/csv2hash/definition.rb

@@ -48,21 +48,15 @@ module Csv2hash
     def default!
       cells.each do |cell|
         cell.rules.fetch(:position)
-
         default_position cell
-        unless cell.rules.has_key? :message
-          if cell.rules.has_key? :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
-        end
-        cell.rules.merge! mappable:    true    unless cell.rules.has_key? :mappable
-        cell.rules.merge! type:       'string' unless cell.rules.has_key? :type
-        cell.rules.merge! values:      nil     unless cell.rules.has_key? :values
-        cell.rules.merge! nested:      nil     unless cell.rules.has_key? :nested
-        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
+        default_message cell
+        cell.rules.merge! mappable:               true  unless cell.rules.has_key? :mappable
+        cell.rules.merge! type:                'string' unless cell.rules.has_key? :type
+        cell.rules.merge! values:                  nil  unless cell.rules.has_key? :values
+        cell.rules.merge! case_sensitive_values:  true  unless cell.rules.has_key? :case_sensitive_values
+        cell.rules.merge! nested:                  nil  unless cell.rules.has_key? :nested
+        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
     end
 
@@ -79,5 +73,14 @@ module Csv2hash
       end
     end
 
+    def default_message cell
+      unless cell.rules.has_key? :message
+        if cell.rules.has_key? :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
+      end
+    end
   end
 end

data/lib/csv2hash/validator.rb

@@ -28,9 +28,8 @@ module Csv2hash
         if extra_validator?(cell)
           verify_extra_validator! cell, value
         else
-          if rang? cell, value
-            values = cell.rules.fetch(:values)
-            verify_rang! values, value
+          if has_valid_values? cell, value
+            verify_valid_values! cell, value
           end
         end
       rescue => e
@@ -59,21 +58,27 @@ module Csv2hash
     end
 
     def verify_blank! cell, value
-      raise unless value unless cell.rules.fetch :allow_blank
+      raise unless value.present? || cell.rules.fetch(:allow_blank)
     end
 
-    def rang? cell, value
-      value && (values = cell.rules.fetch(:values))
+    def has_valid_values? cell, value
+      value.present? && cell.rules.fetch(:values)
     end
 
-    def verify_rang! values, value
+    def verify_valid_values! cell, value
+      values = cell.rules.fetch(:values)
       if values.class == Range
         raise unless values.include?(value.to_f)
       else
-        raise unless values.include?(value)
+        case_sensitive_values = cell.rules.fetch(:case_sensitive_values)
+        raise unless valid_values_include? values, value, case_sensitive_values
       end
     end
 
+    def valid_values_include? values, value, case_sensitive
+      case_sensitive ? values.include?(value) : values.any?{ |v| v.casecmp(value)==0 }
+    end 
+
     def find_or_remove_dynamic_fields_on_mapping!
       cells = definition.cells.dup
       # cells without optional and not found dynamic field

data/lib/csv2hash/version.rb

@@ -1,3 +1,3 @@
 module Csv2hash
-  VERSION = '0.7.1'
+  VERSION = '0.7.2'
 end

data/spec/csv2hash/definition_spec.rb

@@ -64,6 +64,7 @@ module Csv2hash
           mappable: true,
           type: 'string',
           values: nil,
+          case_sensitive_values: true,
           nested: nil,
           allow_blank: false,
           extra_validator: nil })

data/spec/csv2hash/validator_spec.rb

@@ -3,15 +3,15 @@ require 'spec_helper'
 module Csv2hash
   describe 'Validator' do
 
+    subject do
+      Class.new do
+        include Validator
+      end.new
+    end
+
     describe '#message' do
       let(:cell) { double(:cell, rules: rules) }
 
-      subject do
-        Class.new do
-          include Validator
-        end.new
-      end
-
       context 'string value' do
         let(:rules) {{ foo: 'bar', message: ':foo are value of foo key', key: 'bar' }}
 
@@ -37,5 +37,69 @@ module Csv2hash
       end
     end
 
+    describe '#validate_cell' do
+      let(:x)                     { 0 }
+      let(:y)                     { 0 }
+      let(:allow_blank)           { false }
+      let(:values)                { nil } 
+      let(:case_sensitive_values) { false }
+      let(:data_source)           { [ ['John Doe'] ]}
+      let(:rules)                 { { position: [x, y],
+                                    key: 'name',
+                                    message: 'undefined :key on :position',
+                                    mappable: true,
+                                    type: 'string',
+                                    values: values,
+                                    case_sensitive_values: case_sensitive_values,
+                                    nested: nil,
+                                    allow_blank: allow_blank,
+                                    extra_validator: nil }}
+      let(:cell)                  { Cell.new(rules) }
+      
+      before do 
+        allow(subject).to receive(:break_on_failure) { true }
+        allow(subject).to receive(:data_source) { data_source }  
+      end
+
+      context 'when default cell' do
+        it{ expect{ subject.send(:validate_cell, x, y, cell) }.to_not raise_error }
+      end
+
+      context 'when position in data source is blank' do
+        let(:data_source) { [ [''] ]}
+        
+        context 'and allow_blank is false' do 
+          let(:allow_blank) { false }
+          it{ expect{ subject.send(:validate_cell, x, y, cell) }.to raise_error 'undefined :name on [0, 0]' }
+        end
+
+        context 'and allow_blank is true' do 
+          let(:allow_blank) { true }
+          it{ expect{ subject.send(:validate_cell, x, y, cell) }.to_not raise_error }
+
+          context 'and values are not nil' do
+            let(:values) { ['yes', 'no'] }
+            it{ expect{ subject.send(:validate_cell, x, y, cell) }.to_not raise_error }
+          end  
+        end              
+      end 
+
+      context 'when values are not nil' do
+        let(:values)      { ['john doe', 'jane doe'] }
+        let(:data_source) { [ ['John Doe'] ]} 
+        
+        context 'and case_sensitive_values is true' do
+          let(:case_sensitive_values) { true }
+
+          it{ expect{ subject.send(:validate_cell, x, y, cell) }.to raise_error }
+        end
+
+        context 'and case_sensitive_values is false' do
+          let(:case_sensitive_values) { false }
+          
+          it{ expect{ subject.send(:validate_cell, x, y, cell) }.to_not raise_error }
+        end
+      end     
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: csv2hash
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Joel AZEMAR
@@ -28,16 +28,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -172,9 +172,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="