csv_madness 0.0.9 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f4f9b06af750b458f7eb43b10053dfce2b60a69cc55ea4410d4466c72680f0c
-  data.tar.gz: 23ddbf472f0b52973769e21eb72939622bee0e5b13e43e8c292ae28203106145
+  metadata.gz: 42f85a8b4ddb7980a36703eb43e7ecd8cb3c03d7c178ed0f52cc94ad95a2df74
+  data.tar.gz: 395986cb7c3b79a131b419d0325667b538d77920fd2cca254ab0a2dcbcb2676c
 SHA512:
-  metadata.gz: 1e44f1666c4118cf68a16f254ea5ad8808f9a0036b346755d187c74baf24a65cff718323d81741cd5478b036fcea3518daa3b2b5f72f6de2bf89b3b435392de8
-  data.tar.gz: b44d0fa470ec59317f5a93b0e73d1ec6a032f300083734e2b0aef27b2077b51303dce1b504e77102e6cfb5f79cc2c229d136d4a5d7eca049402bb88e740e711a
+  metadata.gz: 6cecc00b6235ed7e9239007334dede81e8d531b448971920bd436dfeec39124951d6ad35769c5281615a6aeffc6428f54ae9bd0a6bad0a7be11a8636abff5dc7
+  data.tar.gz: 2cfe890a54be62402d34faa546525393e8e70fd3923131f422b0a39d58541d9969b222d510aa379886cc33bf7902248bfe43f337c2078efb70dceb051dde6ff5

data/Rakefile

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'fun_with_gems'
 require_relative File.join( "lib", "csv_madness" )
-self.extend( FunWith::Gems::Rakefile)
+extend FunWith::Gems::Rakefile
 
 rakefile_setup CsvMadness
 

data/VERSION

@@ -1 +1 @@
-0.0.9
+0.0.12

data/lib/csv_madness/builder.rb

@@ -24,20 +24,22 @@ module CsvMadness
                       end
     end
 
+    # verbose: true - reports errors to stdout as they're encountered
+    #
     # Three :on_error values:
     #    :print  => Put an error message in the cell instead of a value
     #    :raise  => Raise the error, halting the process
     #    :ignore => Hand back an empty cell
     # 
     # Although ideally it should be configurable by column...   
-    def build( objects, opts = { :on_error => :print } )
+    def build( objects, build_opts: { :on_error => :print, :verbose => false } )
       spreadsheet = CsvMadness::Sheet.new( @column_syms )
 
       for object in objects
         STDOUT << "."
         record = {}
         for sym in @column_syms
-          record[sym] = build_cell( object, sym, opts )
+          record[sym] = build_cell( object, sym, build_opts: build_opts )
         end
 
         spreadsheet.add_record( record )  # hash form
@@ -46,14 +48,14 @@ module CsvMadness
       spreadsheet
     end
 
-    def build_cell( object, sym, opts = { :on_error => :print } )
+    def build_cell( object, sym, build_opts: { :on_error => :print } )
       column = @columns[sym]
 
       case column
       when String
-        build_cell_by_pathstring( object, column, opts )
+        build_cell_by_pathstring( object, column, build_opts )
       when Proc
-        build_cell_by_proc( object, column, opts )
+        build_cell_by_proc( object, column, build_opts )
       else
         "no idea what to do"
       end
@@ -64,8 +66,8 @@ module CsvMadness
     end
 
     protected
-    def build_cell_by_pathstring( object, str, opts )
-      handle_cell_build_error( :build_cell_by_pathstring, opts ) do
+    def build_cell_by_pathstring( object, str, build_opts )
+      handle_cell_build_error( :build_cell_by_pathstring, build_opts ) do
         for method in str.split(".").map(&:to_sym)
           object = object.send(method)
         end
@@ -74,23 +76,23 @@ module CsvMadness
       end
     end
 
-    def build_cell_by_proc( object, proc, opts )
-      handle_cell_build_error( :build_cell_by_proc, opts ) do
+    def build_cell_by_proc( object, proc, build_opts )
+      handle_cell_build_error( :build_cell_by_proc, build_opts ) do
         proc.call(object)
       end
     end
     
-    def handle_cell_build_error( caller, opts, &block )
+    def handle_cell_build_error( caller, build_opts, &block )
       begin
         yield
       end
     rescue Exception => e
-      case opts[:on_error]
+      case build_opts[:on_error]
       when nil, :print
-        puts "error #{e.message} #{caller}" if opts[:verbose]
+        puts "error #{e.message} #{caller}" if build_opts[:verbose]
         "ERROR: #{e.message} (#{caller}())"
       when :raise
-        puts "Re-raisinge error #{e.message}.  Set opts[:on_error] to :print or :ignore if you want Builder to continue on errors."
+        puts "Re-raisinge error #{e.message}.  Set build_opts[:on_error] to :print or :ignore if you want Builder to continue on errors."
         raise e
       when :ignore
         ""

data/lib/csv_madness/record.rb

@@ -50,7 +50,7 @@ module CsvMadness
     end
     
     def to_csv( opts = {} )
-      self.columns.map{|col| self.send(col) }.to_csv( opts )
+      self.columns.map{|col| self.send(col) }.to_csv( **opts )
     end
     
     def to_hash

data/lib/csv_madness/sheet.rb

@@ -54,9 +54,9 @@ module CsvMadness
     
     
 
-    def to_csv( opts = {} )
-      self.records.inject( self.columns.to_csv( opts ) ) do |output, record|
-        output << record.to_csv( opts )
+    def to_csv
+      self.records.inject( self.columns.to_csv ) do |output, record|
+        output << record.to_csv
       end
     end
 
@@ -143,11 +143,10 @@ module CsvMadness
     attr_writer :columns, :index_columns, :records, :record_class, :opts    
     
     def load_csv
-      
       # encoding seems to solve a specific problem with a specific spreadsheet, at an unknown cost.
       @csv = CSV.new( File.read(@spreadsheet_file).force_encoding("ISO-8859-1").encode("UTF-8"), 
-                        { write_headers: true, 
-                          headers: ( @opts[:header] ? :first_row : false ) } )
+                      write_headers: true, 
+                      headers: ( @opts[:header] ? :first_row : false ))
     end
     
     # Each spreadsheet has its own anonymous record class, and each CSV row instantiates

data/lib/csv_madness/sheet_methods/class_methods.rb

@@ -62,15 +62,15 @@ module CsvMadness
     
       # opts are passed to underlying CSV (:row_sep, :encoding, :force_quotes)
       def to_csv( spreadsheet, opts = {} )
-        out = spreadsheet.columns.to_csv( opts )
+        out = spreadsheet.columns.to_csv
         spreadsheet.records.inject( out ) do |output, record|
-          output << record.to_csv( opts )
+          output << record.to_csv
         end
       end
     
-      def write_to_file( spreadsheet, file, opts = {} )
+      def write_to_file( spreadsheet, file )
         file = file.fwf_filepath.expand_path
-        file.write( spreadsheet.to_csv( opts ) )
+        file.write( spreadsheet.to_csv )
       end
     end
   end

data/lib/csv_madness/sheet_methods/file_methods.rb

@@ -1,8 +1,8 @@
 module CsvMadness
   module SheetMethods
     module FileMethods
-      def write_to_file( file, opts = {} )
-        self.class.write_to_file( self, file, opts )
+      def write_to_file( file )
+        self.class.write_to_file( self, file )
       end
     
       # pass an arbitrary filepath to save sheet to that filepath
@@ -20,7 +20,7 @@ module CsvMadness
         end
       
         if file
-          self.write_to_file( self.spreadsheet_file, @opts || {} )
+          self.write_to_file( file )
         else
           raise "CsvMadness.save(:timestamp) - Spreadsheet must be specified by spreadsheet_file"
         end

data/lib/csv_madness.rb

@@ -1,6 +1,5 @@
 require 'csv'
 require 'fun_with_gems'
-# require 'fun_with_version_strings'
 require 'time'        # to use Time.parse to parse cells to get the date
 
 FunWith::Gems.make_gem_fun( "CsvMadness" )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: csv_madness
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.12
 platform: ruby
 authors:
 - Bryce Anderson