csv2hash 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 388884c9854027a36c9f704d77f8cd31d2fe8aba
-  data.tar.gz: ffb86ac1d924c8cb6041aec965c42edf19b1226d
+  metadata.gz: 043c4be4542235e09772f8ca2249288158f7230f
+  data.tar.gz: 2eb0e8d2a0e13854f103b21b34d4a54fbb55e64f
 SHA512:
-  metadata.gz: fa1f10d91cb064ae715673074dc4bfd8e095c79cee29efa8cee1db95556a2ac909bd7f3337024c8121f5972fe87d9911a3a921566195859862b5d0f4c832880b
-  data.tar.gz: 710c7f822206b531de694f316ab2f2a5d0c76afe83a0d44f92816054f519b20e9fd32d70b5da0865481c6770f0f2319519e52203c5fc8d0ada551abd565ebf15
+  metadata.gz: 43c070b76ca768925631f70c3e95750b5ec7edf9438e856ee58160c288f04a9c6d2215bc04c01af7a464ef80a991c1adb88797b5f4183d7c53922b1d09ca893b
+  data.tar.gz: 62050c84397a144b712a592cc9e39d28d1bec6965fdbe31d35263016cf31a4b4a35b2450538088da239583ed76a0d9ce7e8ec0c3e129176792ed39e5a6c06715

data/Gemfile.lock

@@ -1,11 +1,18 @@
 PATH
   remote: .
   specs:
-    csv2hash (0.4.0)
+    csv2hash (0.5.0)
+      activesupport (~> 4.1)
 
 GEM
   remote: http://rubygems.org/
   specs:
+    activesupport (4.1.4)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
     coderay (1.1.0)
     coveralls (0.7.1)
       multi_json (~> 1.3)
@@ -15,10 +22,13 @@ GEM
       thor
     diff-lcs (1.2.5)
     docile (1.1.5)
+    i18n (0.6.11)
     its (0.2.0)
       rspec-core
+    json (1.8.1)
     method_source (0.8.2)
     mime-types (2.3)
+    minitest (5.4.0)
     multi_json (1.10.1)
     netrc (0.7.7)
     pry (0.10.0)
@@ -50,16 +60,19 @@ GEM
     term-ansicolor (1.3.0)
       tins (~> 1.0)
     thor (0.19.1)
+    thread_safe (0.3.4)
     tins (1.3.2)
+    tzinfo (1.2.1)
+      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.3)
+  bundler (~> 1.6)
   coveralls
   csv2hash!
-  its
+  its (~> 0.2)
   pry
-  rake
-  rspec
+  rake (~> 10.3)
+  rspec (~> 3.0)

data/README.md

@@ -227,7 +227,7 @@ You can define the number of rows to skip in the header of the CSV.
 Pasrer can take several parameters like that:
 
 ```
-	definition, file_path_or_data, ignore_blank_line=false
+	definition, file_path_or_data, ignore_blank_line: false
 ```
 
 in file_path_or_data attribute you can pass directly an Array of data (Array with 2 dimensions) really useful for testing, if you don't care about blank lines in your CSV you can ignore them.
@@ -266,7 +266,7 @@ You need call `.parse()` return `data_wrapper` if `.parse()` is invalid, you can
 in your code
 
 ```
-	parser = Csv2hash::Main.new(definition, file_path_or_data, ignore_blank_line=false).new
+	parser = Csv2hash::Main.new(definition, file_path_or_data, ignore_blank_line: false).new
 	response = parser.parse
 	return response if response.valid?
 	# Whatever
@@ -352,11 +352,28 @@ Csv data
 ```
 	[ [ 'Foo' ] ]
 ```
+
+# Upgrading from 0.4 to 0.5
+
+Signature of ```Csv2hash::Main#new``` has changed too
+
+Prior to 0.5 :
+
+```
+  Csv2Hash::Main.new(definition, file_path_or_data, ignore_blank_line=false)
+```
+
+Starting from 0.5 :
+
+```
+  Csv2Hash::Main.new(definition, file_path_or_data, ignore_blank_line: false)
+```
+
 # Upgrading from 0.3 to 0.4
 
 Signature of ```Csv2hash::Main#new``` has changed too
 
-Prior to 0.3 :
+Prior to 0.4 :
 
 ```
   Csv2Hash::Main.new(definition, file_path_or_data, break_on_failure=true, ignore_blank_line=false)
@@ -364,7 +381,7 @@ Prior to 0.3 :
 
 call ```.parse!``` for same result
 
-Starting from 0.3 :
+Starting from 0.4 :
 
 ```
   Csv2Hash::Main.new(definition, file_path_or_data, ignore_blank_line=false)

data/ReleaseNotes.md

@@ -1,3 +1,11 @@
+### VERSION 0.5.0
+
+* backwards incompatible changes
+  * The signature of Csv2hash::Main#new has changed.
+
+* refactoring
+  * remove params ``` ignore_blank_line ``` to benefit of options of Hash 
+
 ### VERSION 0.4.0
 
 * backwards incompatible changes

data/csv2hash.gemspec

@@ -17,9 +17,12 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.3'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'its'
+  spec.add_dependency 'activesupport', '~> 4.1'
+
+  spec.add_development_dependency 'bundler', '~> 1.6'
+  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/parser/collection.rb

@@ -6,7 +6,7 @@ module Csv2hash::Parser::Collection
       data_computed[:data] ||= []
       self.data_source.each_with_index do |line, y|
         next if y < definition.header_size
-        next if self.ignore_blank_line and line.compact.empty?
+        next if self.options.fetch(:ignore_blank_line) and line.compact.empty?
         data_computed[:data] << {}.tap do |data_parsed|
           fill_it data_parsed, line
         end

data/lib/csv2hash/validator/collection.rb

@@ -4,7 +4,7 @@ module Csv2hash::Validator::Collection
   def validate_data!
     self.data_source.each_with_index do |line, y|
       next if y < definition.header_size
-      next if self.ignore_blank_line and line.compact.empty?
+      next if self.options.fetch(:ignore_blank_line) and line.compact.empty?
       validate_rules y
     end
   end

data/lib/csv2hash/version.rb

@@ -1,3 +1,3 @@
 module Csv2hash
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 end

data/lib/csv2hash.rb

@@ -15,6 +15,8 @@ require_relative 'csv2hash/notifier'
 require_relative 'csv2hash/extra_validator'
 require_relative 'csv2hash/adapters/base'
 
+require 'active_support/core_ext/array/extract_options'
+
 begin
   require 'pry'
 rescue LoadError
@@ -24,16 +26,18 @@ module Csv2hash
   class Main
     include Csv2hash::StructureValidator
 
-    attr_accessor :definition, :file_path_or_data, :data, :notifier, :break_on_failure, :errors, :ignore_blank_line
+    attr_accessor :definition, :file_path_or_data, :data, :notifier, :break_on_failure, :errors, :options
 
-    def initialize definition, file_path_or_data, ignore_blank_line=false
+    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
-      @data_source = data_source
-      dynamic_lib_loading 'Parser'
       self.break_on_failure, self.errors = false, []
-      dynamic_lib_loading 'Validator'
       self.notifier = Notifier.new
-      self.ignore_blank_line = ignore_blank_line
+
+      dynamic_lib_loading 'Parser'
+      dynamic_lib_loading 'Validator'
+
+      @data_source = data_source
 
       init_plugins
     end

data/spec/csv2hash/parser/collection_spec.rb

@@ -7,9 +7,10 @@ describe Csv2hash::Parser::Collection do
   end
 
   let(:data_source) { [ [ 'John Doe' ], [ 'Jane Doe' ] ] }
+  let(:ignore_blank_line) { false }
 
   subject do
-    Csv2hash::Main.new(definition, data_source, ignore_blank_line=false)
+    Csv2hash::Main.new(definition, data_source, ignore_blank_line: ignore_blank_line)
   end
 
   context 'regular way' do
@@ -47,9 +48,9 @@ describe Csv2hash::Parser::Collection do
 
   context '#ignore_blank_line' do
     let(:data_source) { [ [ 'John Doe' ], [ 'Jane Doe' ], [ nil ] ] }
+    let(:ignore_blank_line) { true }
     it {
       expect(subject.tap do |parser|
-        parser.ignore_blank_line = true
         parser.parse
       end.data).to eql({ data: [ { 'name' => 'John Doe' }, { 'name' => 'Jane Doe' } ] })
     }

data/spec/csv2hash/parser/mapping_spec.rb

@@ -9,7 +9,7 @@ describe Csv2hash::Parser::Mapping do
   let(:data_source) { [ [ 'John Doe' ] ] }
 
   subject do
-    Csv2hash::Main.new(definition, data_source, ignore_blank_line=false)
+    Csv2hash::Main.new(definition, data_source, ignore_blank_line: false)
   end
 
   context 'regular way' do

data/spec/csv2hash/structure_validator_spec.rb

@@ -12,7 +12,7 @@ describe Csv2hash::StructureValidator do
   end
 
   subject do
-    Csv2hash::Main.new(definition, data_source, ignore_blank_line=false)
+    Csv2hash::Main.new(definition, data_source, ignore_blank_line: false)
   end
 
   context 'the csv with errors' do

data/spec/csv2hash/validator/collection_spec.rb

@@ -8,9 +8,10 @@ describe Csv2hash::Validator::Collection do
       definition.default!
     end
   end
+  let(:ignore_blank_line) { false }
 
   subject do
-    Csv2hash::Main.new(definition, data_source, ignore_blank_line=false)
+    Csv2hash::Main.new(definition, data_source, ignore_blank_line: ignore_blank_line)
   end
 
   before do
@@ -30,7 +31,7 @@ describe Csv2hash::Validator::Collection do
 
   context '#ignore_blank_line' do
     let(:data_source) { [ [ ] ] }
-    before { subject.ignore_blank_line = true }
+    let(:ignore_blank_line) { true }
     it { expect { subject.validate_data! }.to_not raise_error }
     context 'csv mode' do
       before { subject.break_on_failure = false }
@@ -50,7 +51,7 @@ describe Csv2hash::Validator::Collection do
 
   context 'wihtout exception' do
     let(:data_source) { [ [ ] ]}
-    
+
     before do
       allow(subject).to receive(:break_on_failure) { false }
     end

data/spec/csv2hash/validator/mapping_spec.rb

@@ -10,7 +10,7 @@ describe Csv2hash::Validator::Mapping do
   end
 
   subject do
-    Csv2hash::Main.new(definition, data_source, ignore_blank_line=false)
+    Csv2hash::Main.new(definition, data_source, ignore_blank_line: false)
   end
 
   before do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: csv2hash
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Joel AZEMAR
@@ -10,62 +10,76 @@ bindir: bin
 cert_chain: []
 date: 2013-11-26 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: its
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.2'
 description: DSL to map a CSV to a Ruby Hash
 email: joel.azemar@gmail.com
 executables: