dwc-archive 0.5.0 → 0.5.1

data/.gitignore

@@ -21,3 +21,4 @@ pkg
 
 ## PROJECT::SPECIFIC
 tags
+bin

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.5.1

data/features/step_definitions/dwc-reader_steps.rb

@@ -143,21 +143,20 @@ end
 Then /^I can read its core content using block$/ do
   res = []
   @dwc.core.ignore_headers.should be_true
-  tail_data, tail_errors = @dwc.core.read(200) do |r, err|
+  read_result = @dwc.core.read(200) do |r, err|
     res << [r.size, err.size]
   end
-  res << [tail_data.size, tail_errors.size]
   res.should == [[198,2],[200,0],[186,1]]
+  read_result[0].size.should == 186
 end
 
 Then /^I can read extensions content using block$/ do
   res = []
   ext = @dwc.extensions[0]
   ext.ignore_headers.should be_true
-  tail_data, tail_errors = ext.read(200) do |r, err|
+  ext.read(200) do |r, err|
     res << [r.size, err.size]
   end
-  res << [tail_data.size, tail_errors.size]
   res.should == [[1,0]]
 end
 

data/lib/dwc-archive.rb

@@ -16,6 +16,7 @@ else
   end
 end
 
+require 'logger'
 require 'dwc-archive/ingester'
 require 'dwc-archive/errors'
 require 'dwc-archive/expander'
@@ -51,6 +52,18 @@ class DarwinCore
     end
   end
 
+  def self.logger
+    @@logger ||= Logger.new(nil)
+  end
+
+  def self.logger=(logger)
+    @@logger = logger
+  end
+
+  def self.logger_reset
+    @@logger = Logger.new(nil)
+  end
+
   def initialize(dwc_path, tmp_dir = DEFAULT_TMP_DIR)
     @archive = DarwinCore::Archive.new(dwc_path, tmp_dir) 
     @core = DarwinCore::Core.new(@archive)

data/lib/dwc-archive/ingester.rb

@@ -12,12 +12,16 @@ class DarwinCore
       CSV.open(@file_path, args).each_with_index do |r, i|
         index_fix = 0; next if @ignore_headers && i == 0
         min_size > r.size ? errors << r : process_csv_row(res, errors, r)
-        if block_given? && (i + index_fix) % batch_size == 0
-          yield [res, errors]
-          res = []
-          errors = []
+        if (i + index_fix) % batch_size == 0
+          DarwinCore.logger.info("%s| Ingested %s records" % [self.object_id, (i + index_fix)])
+          if block_given? 
+            yield [res, errors]
+            res = []
+            errors = []
+          end
         end
       end
+      yield [res, errors] if block_given?
       [res, errors]
     end
     

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dwc-archive
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 5
-  - 0
-  version: 0.5.0
+  - 1
+  version: 0.5.1
 platform: ruby
 authors: 
 - Dmitry Mozzherin
@@ -66,8 +66,9 @@ dependencies:
   version_requirements: *id003
 description: Darwin Core Archive is the current standard exchange format for GLobal Names Architecture modules. This gem makes it easy to incorporate files in Darwin Core Archive format into a ruby project.
 email: dmozzherin at gmail dot com
-executables: []
-
+executables: 
+- preparse.rb
+- t
 extensions: []
 
 extra_rdoc_files: 
@@ -118,6 +119,8 @@ files:
 - spec/lib/ruby_extenstions_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+- bin/preparse.rb
+- bin/t
 has_rdoc: true
 homepage: http://github.com/GlobalNamesArchitecture/dwc-archive
 licenses: []