data_collector 0.43.0 → 0.45.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2c8102350695f8cfc598856372d9efd4bfa8b9cf4c3f84110b6dfbfdff3ee62
-  data.tar.gz: 042bf4690116ba07f34459068e3afbc7e63f483c7e0518ecb1581833cb85b3ae
+  metadata.gz: a49714819cab65865ffa979707a867868ac0ce744a2e5dc6c278b29f63b61cb7
+  data.tar.gz: 69bdbf4961d01e4f3f83fd5ab56dd24a62da4d24c9cf7ac7633bbcd10d2320dd
 SHA512:
-  metadata.gz: ff4a4c20f156dadbd665ff330f9c9f057a20391b2fc4fbab45afe59bb3071fd69aaaf6c67521b37a3d5d61b581761fcb21432be405d402a3571c32e47ce86f1b
-  data.tar.gz: a52836f02b727c1ed679520492921bfed09892d79155bf56fa2b823792a04512cfae267d15c22210acc32a460a8f2ed2a350e6ece388e860a41b0fbb473e778d
+  metadata.gz: 7e60a28fbcdc39cfa01540bca282de4ad4a2fd4c256c7ef8193b77cfec6aaf62955d741a342b8ba8f68d58bfab714bb54cdfabcfe3c4e9411da52bd5d3f9afbd
+  data.tar.gz: 6e8630411c26f55a74d6230f237370e31cc05ca1971d7bf849fc9258b15f03103ba97f952c5ae49ded8bf343c536b7baf39effb1a3f528408e6c14c22a9a1414

data/lib/data_collector/ext/base.rb

@@ -33,31 +33,32 @@ module BunnyBurrow
       :connection_name
     )
 
-    def initialize
-      @connection_name = "#{Process.pid}-#{SecureRandom.uuid}"
-    end
-    # private
-    #
-    # def connection
-    #   Connection.instance.connection_name = @connection_name
-    #   Connection.instance.verify_peer = @verify_peer
-    #   Connection.instance.rabbitmq_url = @rabbitmq_url
-    #
-    #   unless @connection
-    #     @connection = Connection.instance.connection
-    #     @connection.start unless @connection.open?
-    #   end
-    #
-    #   @connection
-    # end
-    #
-    # def channel
-    #   Connection.instance.connection_name = @connection_name
-    #   Connection.instance.verify_peer = @verify_peer
-    #   Connection.instance.rabbitmq_url = @rabbitmq_url
-    #
-    #   @channel = Connection.instance.channel
+    # def initialize
+    #   super
+    #   @connection_name = "#{Process.pid}-#{SecureRandom.uuid}"
     # end
+  #   private
+  #
+  #   def connection
+  #     Connection.instance.connection_name = @connection_name
+  #     Connection.instance.verify_peer = @verify_peer
+  #     Connection.instance.rabbitmq_url = @rabbitmq_url
+  #
+  #     unless @connection
+  #       @connection = Connection.instance.connection
+  #       @connection.start unless @connection.open?
+  #     end
+  #
+  #     @connection
+  #   end
+  #
+  #   def channel
+  #     Connection.instance.connection_name = @connection_name
+  #     Connection.instance.verify_peer = @verify_peer
+  #     Connection.instance.rabbitmq_url = @rabbitmq_url
+  #
+  #     @channel = Connection.instance.channel
+  #   end
   end
 end
 

data/lib/data_collector/input.rb

@@ -140,6 +140,11 @@ module DataCollector
         http_query_options[:body] = options[:body]
 
         http_response = http.follow.post(escape_uri(uri), http_query_options)
+      elsif options.key?(:method) && options[:method].downcase.eql?('put')
+        raise DataCollector::InputError, "No body found, a PUT request needs a body" unless options.key?(:body)
+        http_query_options[:body] = options[:body]
+
+        http_response = http.follow.put(escape_uri(uri), http_query_options)
       else
         http_response = http.follow.get(escape_uri(uri), http_query_options)
       end
@@ -172,7 +177,7 @@ module DataCollector
             data = html_to_hash(data, options)
           when 'text/turtle'
             graph = RDF::Graph.new do |graph|
-              RDF::Turtle::Reader.new(data) {|reader| graph << reader}
+              RDF::Turtle::Reader.new(data) { |reader| graph << reader }
             end
             data = JSON.parse(graph.dump(:jsonld, validate: false, standard_prefixes: true))
           when /^image/
@@ -238,9 +243,9 @@ module DataCollector
                     data << xml_to_hash(d, options)
                   end
                 end
-              end #block
-            end #entry
-          end #tar
+              end # block
+            end # entry
+          end # tar
         when '.csv'
           data = csv_to_hash(data, options)
         when '.jpg', '.png', '.gif'
@@ -267,7 +272,7 @@ module DataCollector
 
     def image_to_data(data, options = {})
       file_type = options['file_type']
-      "data:#{file_type};#{Base64.encode64(data)}"
+      "data:#{file_type};base64,#{Base64.encode64(data)}"
     end
 
     def xml_to_hash(data, options = {})
@@ -290,7 +295,7 @@ module DataCollector
 
     def csv_to_hash(data, options = {})
       csv_option_keys = options.keys & CSV::DEFAULT_OPTIONS.keys
-      all_cvs_options = {headers: true, header_converters: [:downcase, :symbol]}
+      all_cvs_options = { headers: true, header_converters: [:downcase, :symbol] }
 
       csv_option_keys.each do |k|
         all_cvs_options[k] = options[k]

data/lib/data_collector/output.rb

@@ -49,7 +49,8 @@ module DataCollector
             if v.is_a?(Array) # merge with array
               @data[k] = [@data[k]] + v
             else
-              @data[k] = [@data[k], v]
+              #@data[k] = [@data[k], v]
+              @data[k] = v
             end
           end
         else
@@ -287,8 +288,8 @@ module DataCollector
     end
 
     def to_https(uri, options)
-
-      raise 'TODO'
+      input = Input.new
+      input.from_uri(uri.to_s, options)
     end
 
     def to_file(uri, options)

data/lib/data_collector/rules_ng.rb

@@ -22,8 +22,16 @@ module DataCollector
 
       case rule
       when Array
+        odata = {}
         rule.each do |sub_rule|
-          apply_rule(tag, sub_rule, input_data, output_data, options)
+          d=apply_rule(tag, sub_rule, input_data, output_data, options)
+          next if d.nil?
+          odata.merge!(d) {|k,v, n|
+            [v,n].flatten
+          }
+        end
+        odata.each do |k,v|
+          output_data.data[k] = v
         end
         return output_data
       when String

data/lib/data_collector/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: data_collector
 version: !ruby/object:Gem::Version
-  version: 0.43.0
+  version: 0.45.0
 platform: ruby
 authors:
 - Mehmet Celik
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-01-08 00:00:00.000000000 Z
+date: 2024-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport