simple_csv 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: accda7d430cbe5c71e9a775bac95f9f8f7c01038
-  data.tar.gz: c06a504dbdeaed0f91ee652655ce871a8ef5b18b
+  metadata.gz: 231e7fbad555b49a61b98371f3a05ee09808a553
+  data.tar.gz: 984bef2177800ab060792a42f77f6db230974243
 SHA512:
-  metadata.gz: a979d33a0aab1573a75f7e8f8c98f4fea21b7bd4752b3ef80945f7ccaccb06f289efc947e537929e22d05c3db081ae9b267fb4ba89a562b8067133d07875a2a4
-  data.tar.gz: d217b4ccea541d1136d5b2a6381720eb9defdf4d7232445b5d24c5870c3530a2cf3b84fab8266955a1c18cdba59786a6ab3d513a45f4b9fb9e7c61400061772f
+  metadata.gz: a720b5c40d5551eba6b13dbf18da0eebfd2eb7c8ad4ba7760ca065b663aa60b9349233aaee9d6237e4d58b657a8cd2210ee6ba9dea1a77099ffc90f7589f515d
+  data.tar.gz: 21eb0638cd1b3093f1ef6d425ad3b0948a907c4079a4ac0b6fd150b3034f4f2f06ad7d110fe35d02db24a8661e8dc77f67a9d883f2ffcbe2c58aa6d33a3d7502

data/README.md

@@ -43,13 +43,13 @@ The headers will be picked up and used instead of the first line.
 
 #### SimpleCsv default settings
 
-These are the settings that will be merged with settings passed throogh either `SimpleCsv#generate` or `SimpleCsv#read`
+These are the settings that will be merged with settings passed through either `SimpleCsv#generate` or `SimpleCsv#read`
 
 |        setting       |                   value               |
 |----------------------|---------------------------------------|
-|`:col_sep`            | `","`                                |
+|`:col_sep`            | `","`                                 |
 |`:row_sep`            | `:auto`                               |
-|`:quote_char`         | `"\"`                               |
+|`:quote_char`         | `"\"`                                 |
 |`:field_size_limit`    | `nil`                                 |
 |`:converters`         | `[:all, :blank_to_nil, :null_to_nil]` |
 |`:unconverted_fields`  | `nil`                                 |
@@ -109,6 +109,8 @@ SimpleCsv.generate path, options = { ... }, &block
 The `SimpleCsv#generate` method takes a (required) path, an (optional) hash of options and a (required) block to start building a CSV file.
 To generate a CSV file we use `SimpleCsv#generate` (using the [faker](https://github.com/stympy/faker) gem to provide fake data)
 
+While writing a row to a CSV, the value of a set property can be accessed by calling that property method again without arguments. (See the "inspect a value" comment in the following example)
+
 ```ruby
 require 'faker'
 
@@ -121,6 +123,8 @@ SimpleCsv.generate('output.csv') do
   100.times do
     # insert data in each field defined in headers to insert a row.
     first_name Faker::Name.first_name
+    # inspect a value
+    p first_name
     last_name Faker::Name.last_name
     birth_date Faker::Date.between(Date.today << 900, Date.today << 200)
     employed_at [Faker::Company.name, nil].sample

data/bin/console

@@ -5,9 +5,4 @@ require 'pry'
 require 'faker'
 require 'simple_csv'
 
-SimpleCsv.read('spec/files/headerless.csv', has_headers: false) do
-  headers :first_name, :last_name, :birth_date, :employed_at, employed_at: :job
-  each_row { p job }
-end
-
-# Pry.start
+Pry.start

data/lib/simple_csv/base.rb

@@ -4,11 +4,6 @@ module SimpleCsv
 
     COMMON_DELIMITERS = %w(, ; |).freeze
 
-    def debug_headers
-      p "@headers is now: #{@headers.join ','}"
-      p "@col_map is now #{@col_map}"
-    end
-
     private
 
     def settings(**opts)
@@ -18,16 +13,34 @@ module SimpleCsv
 
     def headers(*cols, **col_map)
       @headers ||= []
-      @headers.concat cols.map(&:to_s) if cols.any?
+
+      if cols.any?
+        @headers.concat cols.map { |col| col.to_s.strip }
+        alias_to_friendly_headers
+      end
 
       @col_map ||= {}
       @col_map.merge! stringify_col_map(col_map) if col_map.any?
 
       @headers_set ||= @headers.any?
-
       @headers
     end
 
+    def alias_to_friendly_headers
+      @col_map ||= {}
+      aliasses = headers.each_with_object({}) do |hdr, h|
+        n = hdr.to_s.strip.gsub(/([a-z])([A-Z])/, '\1_\2').downcase
+               .gsub(/[^\w]|\s/, '_')
+        h[n] = hdr unless @col_map.key? n
+      end
+
+      @col_map.merge! aliasses
+    end
+
+    def method_missing(mtd, *args, &block)
+      super
+    end
+
     def stringify_col_map(col_map)
       col_map.to_a.map { |m| m.reverse.map(&:to_s) }.to_h
     end

data/lib/simple_csv/reader.rb

@@ -70,10 +70,14 @@ module SimpleCsv
       @first_line ||= File.open @csv_path, &:readline
     end
 
+    def respond_to_missing?(mtd, include_private)
+      headers.include?(m) || @col_map.key?(m)
+    end
+
     def method_missing(mtd, *args, &block)
       m = mtd.to_s
       return @record[m] if headers.include?(m)
-      return @record[@col_map[m]] if @col_map[m]
+      return @record[@col_map[m]] if @col_map.key?(m)
       super
     end
   end

data/lib/simple_csv/version.rb

@@ -1,3 +1,3 @@
 module SimpleCsv
-  VERSION = "0.2.0"
+  VERSION = '0.2.1'.freeze
 end

data/lib/simple_csv/writer.rb

@@ -4,6 +4,7 @@ module SimpleCsv
       settings.apply({force_row_completion: true}, opts)
       CSV.open(File.expand_path(path), 'w', settings.for_csv) do |csv|
         @csv = csv
+        @last_row = {}
         @current_row = {}
         instance_eval(&block)
       end
@@ -12,29 +13,35 @@ module SimpleCsv
     private
 
     def respond_to_missing?(mtd, include_private = false)
-      super
+      super unless headers.include?(mtd.to_s) || @col_map.key?(mtd.to_s)
     end
 
     def method_missing(mtd, *args, &block)
       SimpleCsv.csv_manually_set_headers! unless @headers_written
-      super unless headers.include? mtd.to_s
+      current_val = @current_row[mtd] if @current_row.key?(mtd)
+      current_val = @last_row[mtd] if @last_row.key?(mtd)
+
+      return current_val if args.empty? && current_val
+      super unless headers.include?(mtd.to_s) || @col_map.key?(mtd.to_s)
 
-      if settings.force_row_completion && @current_row.key?(mtd)
+      if settings.force_row_completion && @current_row.key?(mtd) && args.any?
         SimpleCsv.row_not_complete!(mtd, args.first)
       end
 
-      @current_row[mtd] = args.first || ''
+      current_val = @current_row[mtd] = args.first || current_val
 
-      return unless @current_row.size == headers.size
+      return current_val unless @current_row.size == headers.size
 
+      @last_row = @current_row
       @csv << @current_row.values
       @current_row = {}
+      current_val
     end
 
-    def headers(*col_names)
-      return @headers if col_names.empty?
-      super(*col_names)
-      (@csv << @headers) && @headers_written = true if @csv
+    def headers(*args)
+      super
+      (@csv << @headers) && @headers_written = true if !@headers_written && @csv
+      @headers
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_csv
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Sidney Liebrand
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-20 00:00:00.000000000 Z
+date: 2016-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler