tzispa_data 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c993bbf69b11cff81ce5a89dddbea0b85887d7e
-  data.tar.gz: fac0de04377df2b585d676c9dd64519adf9acf55
+  metadata.gz: f5f62e83e7841de62a58aa78f224c3db34309d26
+  data.tar.gz: 0b1d235688062640c82c169b2ee27984f1d0737d
 SHA512:
-  metadata.gz: b724e5aa56ba59f22741aefe0b68d04abf606aed5440d4b38c975ae08b19cc60215d8b20859672bfb96f90a6096c9b6854a0a96356fc47e96d2922220d787344
-  data.tar.gz: fa8f3e9d0347c72be63e315e4ffba1e198237cdad1682c359ab858b419895cfaa1fec2dc1cb11a7a02f75ab7945ef3459cf4de8e78f290cd23608f53e1c6cfdf
+  metadata.gz: 0b4a11fdd82d87034f0a8d2511b10190b6daf0a4bf82513dd189778783d8c61a1aab2831c3d4a0448278e3f38ca7d8696c0cfd9a5d127dec2e0b5b93f45eb096
+  data.tar.gz: bf0b3f8eed295981562576b4198c6789e578e7840af26de2976541475fd0f79044c64882e0a62261a065fe31dfc44ed210005220cbcfdf56f1e8d0ffa87d3552

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 Tzispa Data
 
+## v0.4.4
+- fix missing block param at Transporter import method
+
+## v0.4.3
+- updated tzispa_utils needed version
+
 ## v0.4.2
 - new cache system use Dalli for model Sequel caching
 - independent caching per repository

data/lib/tzispa/data/transporter.rb

@@ -27,10 +27,10 @@ module Tzispa
         File.exist? filename
       end
 
-      def import(dataset, columns)
+      def import(dataset, columns, &block)
         errors.clear
         File.open(filename, "rb:#{encoding}") do |fh|
-          lines = process_file_import fh, dataset, columns
+          lines = process_file_import fh, dataset, columns, &block
           ds_count = dataset.count
           raise TransporterRecordCount.new(lines, ds_count) if check_count && lines != ds_count
           [lines, ds_count]
@@ -58,10 +58,11 @@ module Tzispa
       private
 
       def process_file_import(fh, dataset, columns)
+        lines = 0
         while (line = read_line(fh, lines))
-          lines = (lines || 0) + 1
+          lines += 1
           values = block_given? ? yield(line) : line.split(data_separator)
-          columns? lines, values.count
+          columns? lines, values.count, columns.count
           (buffer ||= []) << values
           flush_data(dataset, columns, buffer)
         end
@@ -118,8 +119,8 @@ module Tzispa
         raise TransporterBadFormat.new(line) unless res.nil? || res.strip.empty?
       end
 
-      def columns?(line, cols)
-        raise TransporterBadFormat.new(line) unless cols == columns.count
+      def columns?(line, cols, expected)
+        raise TransporterBadFormat.new(line) unless cols == expected
       end
     end
 

data/lib/tzispa/data/version.rb

@@ -3,7 +3,7 @@
 module Tzispa
   module Data
 
-    VERSION  = '0.4.3'
+    VERSION  = '0.4.4'
     NAME     = 'Tzispa Data'
     GEM_NAME = 'tzispa_data'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tzispa_data
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Juan Antonio Piñero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-14 00:00:00.000000000 Z
+date: 2017-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel