cotcube-helpers 0.2.2.4 → 0.2.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e416bde4f3c3a8dbba8290c74fa4a54d8f0b5f84f61eb9af8e7bd669bab5a43
-  data.tar.gz: abb4a2842d5b11f2fcb38bbede59bd693b18117547c94d9eb11a2342d1f76665
+  metadata.gz: 7496f5774fbcb9b661dac0f9315081a4b5f4d30a8c89334ef13d0639b789ba73
+  data.tar.gz: 596ab3ed0cc578c6321beb1b07b6400e109f4537d91cf0903a0c0542b9a962df
 SHA512:
-  metadata.gz: 60f1bc2438ef256bc3d772dec73e22a12711e4088a8ffa07463976c0931e149d471f9d7ea93c6930aff3b96fe06d15537cf96319946ed0fb4cbbbdf70573295a
-  data.tar.gz: b372776b0d180c6007b0c652d1eeb056d1845ac12775a8853e6e9e9ba9de128cf411527c4912174c722d5c6c4705d4524240665e917928ab50bb9ca0a3fe53cf
+  metadata.gz: 7447d4f4d2297c60eb37a815b8cd0c91ddd70d1c4af0d2f8bab89ada65c2ac0c328da6e6dd2e99f46d39d75cc765ee4d724598c3d9fdbf42cd15b6a7f30a22fc
+  data.tar.gz: 348426b27122a2be123f93f4db63b7d57e032cf2451f6822a10fce94124d9d0f2cf6c9d3621b920daa651e80ec1b69a5e777d4d94a169cb03f6067f13d1d693f

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.2.2.5 (December 23, 2021)
+  - hash_ext: reworked keys_to_sym!
+  - minor changes
+  - deep_decode_datetime: added helper for conversion of timestrings in nested arrays and hashed
+  - cache_client: rewritten as class
+  - gemspec: raised activesupport to version 7
+
 ## 0.2.2.4 (December 07, 2021)
   - introduced cache_client as client to readcache
 

data/VERSION

@@ -1 +1 @@
-0.2.2.4
+0.2.2.5

data/cotcube-helpers.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'activesupport', '~> 6'
+  spec.add_dependency 'activesupport', '~> 7'
   spec.add_dependency 'colorize',      '~> 0.8'
 
 

data/lib/cotcube-helpers/cache_client.rb

@@ -3,26 +3,50 @@ require 'json'
 
 module Cotcube
   module Helpers
-    def cached(query, timezone: Cotcube::Helpers::CHICAGO, debug: false, deflate: false)
-      # TODO: set param to enable deflate on transmission via HTTPARRTY Header
-      request_headers = {} 
-      request_headers['Accept-Encoding' => 'deflate'] if deflate
-      res = JSON.parse(HTTParty.get("http://100.100.0.14:8081/#{query}").parsed_response, symbolize_names: true) rescue { error: 1, msg: "Could not parse response for query '#{query}'." }
-      unless res[:error] and res[:error].zero? 
-        puts "ERROR: #{res}"
-        return false
+    class CacheClient
+
+      def initialize(query='keys', timezone: Cotcube::Helpers::CHICAGO, debug: false, deflate: false, update: false)
+        raise ArgumentError, "Query must not be empty." if [ nil, '' ].include? query
+        raise ArgumentError, "Query '#{query}' is garbage." if query.split('/').size > 2 or not query.match? /\A[a-zA-Z0-9?=\/]+\Z/
+        @update = update ? '?update=true' : ''
+        @request_headers = {} 
+        @request_headers['Accept-Encoding'] = 'deflate' if deflate
+        @query = query
+        @result = JSON.parse(HTTParty.get("http://100.100.0.14:8081/#{query}#{@update}").body, headers: @request_headers, symbolize_names: true) rescue { error: 1, msg: "Could not parse response for query '#{query}'." }
+        retry_once if has_errors?
       end
-      #res[:valid_until] = timezone.parse(res[:valid_until])
-      #res[:modified]    = timezone.parse(res[:modified_at])
-      if debug
-        puts "Warnings: #{res[:warnings]}"
-        puts "Modified: #{res[:modified]}"
-        puts "Valid_un: #{res[:valid_until]}"
-        puts "payload:  #{res[:payload].to_s.size}"
+
+      def retry_once
+        sleep 2
+        raw = HTTParty.get("http://100.100.0.14:8081/#{query}#{update}")
+        @result = JSON.parse(raw.body, symbolize_names: true) rescue { error: 1, msg: "Could not parse response for query '#{query}'." }
+        if has_errors?
+          puts "ERROR in parsing response: #{raw[..300]}"
+        end
+      end
+
+      def has_errors?
+        result[:error].nil? or result[:error] > 0
+      end
+
+      def warnings
+        result[:warnings]
       end
-      res[:payload]
-    end
 
-    module_function :cached
+      def payload
+        has_errors? ? false : @result[:payload]
+      end
+
+      def entity
+        query.split('/').first
+      end
+
+      def asset
+        entity, asset = query.split('/')
+        asset
+      end
+
+      attr_reader :query, :result, :update
+    end
   end
 end

data/lib/cotcube-helpers/constants.rb

@@ -30,6 +30,8 @@ module Cotcube
 
 
     CHICAGO  = Time.find_zone('America/Chicago')
+    NEW_YORK = Time.find_zone('America/New_York')
+    BERLIN   = Time.find_zone('Europe/Berlin')
 
     DATE_FMT = '%Y-%m-%d'
 

data/lib/cotcube-helpers/data_client.rb

@@ -44,7 +44,7 @@ module Cotcube
       #     otherwise times out --- the counterpart here is the subscription within 
       #     setup_reply_queue
       #
-      def command(command, timeout: 5)
+      def command(command, timeout: 10)
         command = { command: command.to_s } unless command.is_a? Hash
         command[:timestamp] ||= (Time.now.to_f * 1000).to_i
         request_id = Digest::SHA256.hexdigest(command.to_json)[..6]

data/lib/cotcube-helpers/deep_decode_datetime.rb

@@ -0,0 +1,25 @@
+module Cotcube
+  module Helpers
+    VALID_DATETIME_STRING = lambda {|str| str.is_a?(String) and [10,25,29].include?(str.length) and str.count("^0-9:TZ+-= ").zero? }
+
+    def deep_decode_datetime(data, zone: DateTime)
+      case data
+      when nil;    nil
+      when VALID_DATETIME_STRING
+        res = nil
+        begin
+          res = zone.parse(data)
+        rescue ArgumentError
+          data
+        end
+        [ DateTime, ActiveSupport::TimeWithZone ].include?(res.class) ? res : data
+      when Array; data.map!              { |d| deep_decode_datetime(d, zone: zone) }
+      when Hash;  data.transform_values! { |v| deep_decode_datetime(v, zone: zone) }
+      else;       data
+      end
+    end
+
+    module_function :deep_decode_datetime
+  end
+end
+

data/lib/cotcube-helpers/hash_ext.rb

@@ -2,15 +2,15 @@
 
 # Monkey patching the Ruby Core class Hash
 class Hash
-  def keys_to_sym
-    each_key do |key|
+  def keys_to_sym!
+    self.keys.each do |key|
       case self[key].class.to_s
       when 'Hash'
-        self[key].keys_to_sym
+        self[key].keys_to_sym!
       when 'Array'
-        self[key].map { |el| el.is_a?(Hash) ? el.keys_to_sym : el }
+        self[key].map { |el| el.is_a?(Hash) ? el.keys_to_sym! : el }
       end
-      self[key.to_sym] = delete(key)
+      self["#{key}".to_sym] = delete(key)
     end
     self
   end

data/lib/cotcube-helpers/init.rb

@@ -34,7 +34,7 @@ module Cotcube
       end
 
       defaults = { 
-        data_path: '/var/cotcube/' + name,
+        data_path: '/var/cotcube/' + name.split('::').last.downcase,
       }
 
       config = defaults.merge(config)

data/lib/cotcube-helpers.rb

@@ -21,6 +21,7 @@ require_relative 'cotcube-helpers/subpattern'
 require_relative 'cotcube-helpers/parallelize'
 require_relative 'cotcube-helpers/simple_output'
 require_relative 'cotcube-helpers/simple_series_stats'
+require_relative 'cotcube-helpers/deep_decode_datetime'
 require_relative 'cotcube-helpers/constants'
 require_relative 'cotcube-helpers/input'
 require_relative 'cotcube-helpers/output'

data/scripts/cron_ruby_wrapper.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-export rubyenv=/home/pepe/.rvm/environments/default
+export rubyenv=/home/pepe/.rvm/environments/ruby-2.7.5
 
 . $rubyenv 
 cd /home/pepe/GEMS/${1}
@@ -10,6 +10,7 @@ ruby ${2} ${3} ${4} ${5} ${6}
 
  
 exit
+
 for testing run 
 env - `cat /home/pepe/bin/cron_ruby_wrapper.sh | tail -n 6` /bin/bash
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cotcube-helpers
 version: !ruby/object:Gem::Version
-  version: 0.2.2.4
+  version: 0.2.2.5
 platform: ruby
 authors:
 - Benjamin L. Tischendorf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-07 00:00:00.000000000 Z
+date: 2021-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -100,6 +100,7 @@ files:
 - lib/cotcube-helpers/constants.rb
 - lib/cotcube-helpers/data_client.rb
 - lib/cotcube-helpers/datetime_ext.rb
+- lib/cotcube-helpers/deep_decode_datetime.rb
 - lib/cotcube-helpers/enum_ext.rb
 - lib/cotcube-helpers/expiration.rb
 - lib/cotcube-helpers/get_id_set.rb