data_collector 0.51.0 → 0.53.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c14c5e51a7f7eb0afc8b3c9e8580dd6f76324f08ee1fd06c73e58df68e368bd7
-  data.tar.gz: f2c856272c5feea8a432055b8d4c3220bddadde7fe66d1d0602e408f7686f082
+  metadata.gz: 749914ea43bad2734c79a131eb5db2f1ef2b953fa386a9cb3eb50698e7d2f1f4
+  data.tar.gz: 0402100bbfe402ad1c96cc0b767c608a917402e748ea4f57b9bf298ca9510dba
 SHA512:
-  metadata.gz: 2d8324edc28e85ddb5641da200d584b4d4a59d5ac7a8686fe297ca52ef326eccba9d183b3971f27070dd5779bac9a371999336f0b8f20d36b237fa3ced7feaaa
-  data.tar.gz: 462d507afd995e24b98fdd98c2aecd1325d60eb61d582c34b0b6590cdd181bab6d499cae15cb1895d1fb2863ebc4fc60328907ff6b83a10e9bc8d2ba77dad1f0
+  metadata.gz: b00c092e0670a26a85bbe1299c687a132c65af7950c5b0f74ff537a8ba948af27617164bd8beebc3b072d424fafdd58865e8cafbaa03d5e6aafb8e682806ba43
+  data.tar.gz: 4072e26cfd9a2ef57b094b3ea7cc340f0d735e8ca4356d6e346f725b2486e7284b624936724c0545677571d7ff2a0c447785374778cb55080e69cf54bc7df1a3

data/lib/data_collector/input.rb

@@ -29,60 +29,64 @@ module DataCollector
 
     def from_uri(source, options = {}, &block)
       block_consumed = false
-      source = CGI.unescapeHTML(source)
-      @logger.info("Reading #{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)}"
-      uri = URI(source)
-      begin
-        data = nil
-        case uri.scheme
-        when 'http'
-          data = from_http(uri, options)
-        when 'https'
-          data = from_https(uri, options)
-        when 'file'
-          absolute_path = File.absolute_path("#{URI.decode_www_form_component("#{uri.host}#{uri.path}")}")
-          if File.directory?(absolute_path)
-            return from_dir(uri, options)
-          else
-            if block_given?
-              data = from_file(uri, options, &block)
-              block_consumed = true if data.is_a?(TrueClass)
+      data = nil
+      if source.is_a?(StringIO)
+        data = from_stringio(source, options)
+      else
+        source = CGI.unescapeHTML(source)
+        @logger.info("Reading #{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)}"
+        uri = URI(source)
+        begin
+          case uri.scheme
+          when 'http'
+            data = from_http(uri, options)
+          when 'https'
+            data = from_https(uri, options)
+          when 'file'
+            absolute_path = File.absolute_path("#{URI.decode_www_form_component("#{uri.host}#{uri.path}")}")
+            if File.directory?(absolute_path)
+              return from_dir(uri, options)
+            else
+              if block_given?
+                data = from_file(uri, options, &block)
+                block_consumed = true if data.is_a?(TrueClass)
+              else
+                data = from_file(uri, options)
+              end
+            end
+          when /amqp/
+            if uri.scheme =~ /^rpc/
+              data = from_rpc(uri, options)
             else
-              data = from_file(uri, options)
+              data = from_queue(uri, options)
             end
-          end
-        when /amqp/
-          if uri.scheme =~ /^rpc/
-            data = from_rpc(uri, options)
           else
-            data = from_queue(uri, options)
+            raise "Do not know how to process #{source}"
           end
-        else
-          raise "Do not know how to process #{source}"
-        end
 
-        data = data.nil? ? 'no data found' : data
-
-        if block_given? && !block_consumed
-          yield data
-        else
-          data
         end
-      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
+      data = data.nil? ? 'no data found' : data
+
+      if block_given? && !block_consumed
+        yield data
+      else
+        data
+      end
+    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
 
     private
@@ -204,6 +208,23 @@ module DataCollector
       data
     end
 
+    def from_stringio(sio, options = {}, &block)
+      raise DataCollector::InputError, "No IO input" unless sio.is_a?(StringIO)
+      raise DataCollector::InputError, "content_type option not supplied" unless options.key?(:content_type)
+
+      preferred_extension = MIME::Types[options[:content_type]].first.extensions.first || 'txt'
+
+      file = Tempfile.new(["dc_", ".#{preferred_extension}"])
+      begin
+        sio.rewind
+        file.write(sio.read)
+        file.close
+        from_file(URI("file://#{file.path}"))
+      ensure
+        file.unlink
+      end
+    end
+
     def from_file(uri, options = {}, &block)
       data = nil
       uri = normalize_uri(uri)

data/lib/data_collector/output.rb

@@ -167,7 +167,8 @@ module DataCollector
 
       data[:response_date] = DateTime.now.xmlschema
 
-      ERB.new(File.read(erb_file), 0, '>').result(binding)
+      #ERB.new(File.read(erb_file), 0, '>').result(binding)
+      ERB.new(File.read(erb_file),  trim_mode: '-').result(binding)
     rescue Exception => e
       raise "unable to transform to text: #{e.message}"
     end

data/lib/data_collector/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: data_collector
 version: !ruby/object:Gem::Version
-  version: 0.51.0
+  version: 0.53.0
 platform: ruby
 authors:
 - Mehmet Celik
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-04-17 00:00:00.000000000 Z
+date: 2024-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -351,7 +351,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.6
+rubygems_version: 3.5.10
 signing_key:
 specification_version: 4
 summary: ETL helper library