data_collector 0.27.0 → 0.29.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b001584d7cb8f525f22370a79a4921104358f9de512d81da6236f65a590220bc
-  data.tar.gz: 773bf24b624e28e056a82f0c665e603a119830c9cc872d1938be02ab7251ad03
+  metadata.gz: d09248a6f7a15b7c6ad783502506e9cdc3ba5010070a810b9bc8c803b15fc862
+  data.tar.gz: d47019eddd26810162229555997d957f35823e45b105036cbd1e4f90d361be81
 SHA512:
-  metadata.gz: 8d0a62ddf8408c72e6277080f7105bd8d12f39c2f30e4a44910d890932a50ef9399d096d98b990b87db422a6af7557821e45045a049c64ebbdd90d8cd811062c
-  data.tar.gz: 53e2290744797a8763ccd0491a02c9dd1ee4e73919f95c20d66bb03889cca18f31cb4090728f1ef3acee6b76ef9e062f4196d17b90b5bf0ec3d2132e74543c2a
+  metadata.gz: 8f508edbc7ad18d413bf6deac82c0848ab04955edd347b2a749b0ecf8baf3caef4052fdcd8b424d6b17e82b8da18e4f9cc8b40160d1b22566241986a4d5c6e7c
+  data.tar.gz: 4c339eb2adc53e2afe615a9b1ebca1649c0466c51366babd574bf7bdfbb4ef0c8df121308561514c69dc6fcd31cd6c4fa6e8d689ab0cff0e9bcff9554f96f85a

data/lib/data_collector/input.rb

@@ -28,7 +28,7 @@ module DataCollector
     def from_uri(source, options = {})
       source = CGI.unescapeHTML(source)
       @logger.info("Reading #{source}")
-      raise DataCollector::Error 'from_uri expects a scheme like file:// of https://' unless source =~ /:\/\//
+      raise DataCollector::Error, 'from_uri expects a scheme like file:// of https://' unless source =~ /:\/\//
 
       scheme, path = source.split('://')
       source="#{scheme}://#{URI.encode_www_form_component(path)}"
@@ -66,8 +66,14 @@ module DataCollector
         else
           data
         end
-      rescue => e
-        @logger.info(e.message)
+      rescue DataCollector::InputError => e
+        @logger.error(e.message)
+        raise e
+      rescue DataCollector::Error => e
+        @logger.error(e.message)
+        nil
+      rescue StandardError => e
+        @logger.error(e.message)
         puts e.backtrace.join("\n")
         nil
       end
@@ -156,13 +162,13 @@ module DataCollector
         raise '206 Partial Content' if http_response.code ==206
 
       when 401
-        raise 'Unauthorized'
+        raise DataCollector::InputError, 'Unauthorized'
       when 403
-        raise 'Forbidden'
+        raise DataCollector::InputError, 'Forbidden'
       when 404
-        raise 'Not found'
+        raise DataCollector::InputError, 'Not found'
       else
-        raise "Unable to process received status code = #{http_response.code}"
+        raise DataCollector::InputError, "Unable to process received status code = #{http_response.code}"
       end
 
       #[data, http_response.code]
@@ -214,11 +220,11 @@ module DataCollector
 
     def xml_to_hash(data, options = {})
       #gsub('<\/', '< /') outherwise wrong XML-parsing (see records lirias1729192 )
+      data.force_encoding('UTF-8') #encode("UTF-8", invalid: :replace, replace: "")
       data = data.gsub /</, '< /'
       xml_typecast = options.with_indifferent_access.key?('xml_typecast') ? options.with_indifferent_access['xml_typecast'] : true
       nori = Nori.new(parser: :nokogiri, advanced_typecasting: xml_typecast, strip_namespaces: true, convert_tags_to: lambda { |tag| tag.gsub(/^@/, '_') })
       nori.parse(data)
-      #JSON.parse(nori.parse(data).to_json)
     end
 
     def csv_to_hash(data)

data/lib/data_collector/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module DataCollector
-  VERSION = "0.27.0"
+  VERSION = "0.29.0"
 end

data/lib/data_collector.rb

@@ -8,5 +8,9 @@ require 'data_collector/pipeline'
 require 'data_collector/ext/xml_utility_node'
 
 module DataCollector
-  class Error < StandardError; end
+  class Error < StandardError
+  end
+
+  class InputError < Error
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: data_collector
 version: !ruby/object:Gem::Version
-  version: 0.27.0
+  version: 0.29.0
 platform: ruby
 authors:
 - Mehmet Celik
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-08-04 00:00:00.000000000 Z
+date: 2023-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport