ehbrs_ruby_utils 0.20.0 → 0.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd6cda8266cb8a597f2a1c3847fca05b4002a9d387feae26339a1e9d808191d6
-  data.tar.gz: b69eab41353b59a452dbb4a44a23e54fc9c34458902d4e48e1d1dc423a1e63c0
+  metadata.gz: 2a241af9b0a27b447cef66e7d719fbda116547b7cfe5ceac348b9bb1bd5662d9
+  data.tar.gz: b02d61f6840f2a602535c24c655bc6a5655a6daa531995a9d78523165517c066
 SHA512:
-  metadata.gz: ced46b8aa2ebecd983986c3f6ff6e386aeeb0e3741457933a8da7d24cc945bc743a75695aea753aff086a7fe536608edd0631b1f538ae62d4b05b13409de1ae1
-  data.tar.gz: '0673885d858f19ed325b95708c749e7b25cf20c0ac3f9b2e2a78cafb151c48b696f7ac1aa4534c9f81ac591b3e68714489f41f40982884bfb1ea39396fce96a7'
+  metadata.gz: 54762c964c78d7335f8efc92b19c29b6b7281a37d473e1b3cdd5515177e3e54492808c84481ce075c6a758c3d5d6ccb1fe1ad07ca5d75512600cb026a605697d
+  data.tar.gz: bf4f9ea658f93e2285735d98f22dde951a921f8d7f271b16c5d91c677119ef4c1f6c5f073427b30a4dc7b8dd207fe3bea2b05b00db0af76558b6e21cd246ec60

data/lib/ehbrs_ruby_utils/executables.rb

@@ -15,7 +15,7 @@ module EhbrsRubyUtils
       private
 
       {
-        '-version' => %w[ffprobe]
+        '-version' => %w[ffmpeg ffprobe]
       }.each do |validate_arg, commands|
         commands.each do |command|
           define_method("#{command}_uncached") do

data/lib/ehbrs_ruby_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EhbrsRubyUtils
-  VERSION = '0.20.0'
+  VERSION = '0.22.0'
 end

data/lib/ehbrs_ruby_utils/web_utils/instance/finances/bills/consume/file.rb

@@ -28,17 +28,16 @@ module EhbrsRubyUtils
               end
 
               def process_response
-                if response_status_result.success?
-                  move_to_registered
-                else
-                  warn("  * Retornou com status de erro:\n\n#{response.body}")
-                end
-                infov '  * Response status', response_status_result.label
+                response
+                move_to_registered
+              rescue ::EhbrsRubyUtils::WebUtils::RequestError
+                warn("  * Retornou com status de erro:\n\n#{response.body}")
               end
 
               def move_to_registered
                 ::FileUtils.mkdir_p(::File.dirname(target_path))
                 ::File.rename(path, target_path)
+                infom 'Moved to registered'
               end
 
               def target_path
@@ -57,13 +56,6 @@ module EhbrsRubyUtils
                   }
                 )
               end
-
-              def response_status_result
-                ::Avm::Result.success_or_error(
-                  response.status.to_s.match?(/\A2\d{2}\z/),
-                  response.status
-                )
-              end
             end
           end
         end

data/lib/ehbrs_ruby_utils/web_utils/instance/http_request.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require 'eac_rest/api'
+require 'eac_ruby_utils/core_ext'
+require 'ehbrs_ruby_utils/web_utils/request_error'
+require 'avm/instances/base'
+
+module EhbrsRubyUtils
+  module WebUtils
+    class Instance < ::Avm::Instances::Base
+      class HttpRequest
+        enable_method_class
+        enable_simple_cache
+        common_constructor :instance, :resource_url_suffix, :source_options, default: [{}]
+
+        # @return [EacRest::Response]
+        def result
+          r = request.response
+          ::EhbrsRubyUtils::WebUtils::RequestError.raise_if_error(r)
+          ::Struct.new(:status, :body).new(r.status, ::JSON.parse(r.body_str))
+        end
+
+        private
+
+        # @return [::Struct.new(:verb, :body_data, :headers)]
+        def options_uncached
+          options = source_options.to_options_consumer
+          verb = options.consume(:method, :get).to_sym
+          body_data = options.consume(:body)
+          headers = options.consume(:header)
+          options.validate
+          ::Struct.new(:verb, :body_data, :headers).new(verb, body_data, headers)
+        end
+
+        # @return [EacRest::Request]
+        def request
+          instance.api.request(resource_url_suffix).verb(options.verb).headers(options.headers)
+            .body_data(options.body_data)
+        end
+      end
+    end
+  end
+end

data/lib/ehbrs_ruby_utils/web_utils/instance.rb

@@ -7,7 +7,7 @@ require 'avm/instances/base'
 module EhbrsRubyUtils
   module WebUtils
     class Instance < ::Avm::Instances::Base
-      require_sub __FILE__
+      require_sub __FILE__, require_dependency: true
 
       # @return [EacRest::Api]
       def api
@@ -21,28 +21,6 @@ module EhbrsRubyUtils
       def root_url
         read_entry(::Avm::Instances::EntryKeys::WEB_URL)
       end
-
-      # @param resource_url_suffix [String]
-      # @param options [Hash]
-      # @return [EacRest::Response]
-      def http_request(resource_url_suffix, options = {})
-        options = http_request_options(options)
-        r = api.request(resource_url_suffix).verb(options.verb).headers(options.headers)
-              .body_data(options.body_data).response
-        ::Struct.new(:status, :body).new(r.status, r.body_str)
-      end
-
-      private
-
-      # @return [::Struct.new(:verb, :body_data, :headers)]
-      def http_request_options(options)
-        options = options.to_options_consumer
-        verb = options.consume(:method, :get).to_sym
-        body_data = options.consume(:body)
-        headers = options.consume(:header)
-        options.validate
-        ::Struct.new(:verb, :body_data, :headers).new(verb, body_data, headers)
-      end
     end
   end
 end

data/lib/ehbrs_ruby_utils/web_utils/request_error.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module EhbrsRubyUtils
+  module WebUtils
+    class RequestError < ::RuntimeError
+      class << self
+        def raise_if_error(response)
+          by_error(response).if_present { |v| raise v }
+        end
+
+        def by_error(response)
+          return new(response, "status #{response.status}") unless
+            response.status.to_s.match?(/\A2\d{2}\z/)
+
+          data = ::JSON.parse(response.body_str)
+          return nil unless data.is_a?(::Hash)
+
+          errors = data['errors'] || {}
+          return nil if errors.empty?
+
+          new(response, "errors #{errors.pretty_inspect}")
+        end
+      end
+
+      enable_simple_cache
+      common_constructor :response, :message_suffix, super_args: -> { build_message }
+
+      # @return [String]
+      def build_message
+        "Request for \"#{response.url}\" failed: #{message_suffix}\nBody file: #{body_file_path}"
+      end
+
+      private
+
+      # @return [Pathname]
+      def body_file_path_uncached
+        r = ::EacRubyUtils::Fs::Temp.file(body_file_path_naming)
+        r.write(response.body_str)
+        r.to_path.to_pathname
+      end
+
+      def body_file_path_naming
+        r = ['request_error']
+        r << '.json' if response.status == 200
+        r
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ehbrs_ruby_utils
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.22.0
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-30 00:00:00.000000000 Z
+date: 2023-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha
@@ -66,6 +66,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.16'
+- !ruby/object:Gem::Dependency
+  name: eac_rest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.7.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.7.1
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
   requirement: !ruby/object:Gem::Requirement
@@ -235,6 +255,8 @@ files:
 - lib/ehbrs_ruby_utils/web_utils/instance/finances/bills.rb
 - lib/ehbrs_ruby_utils/web_utils/instance/finances/bills/consume.rb
 - lib/ehbrs_ruby_utils/web_utils/instance/finances/bills/consume/file.rb
+- lib/ehbrs_ruby_utils/web_utils/instance/http_request.rb
+- lib/ehbrs_ruby_utils/web_utils/request_error.rb
 - lib/ehbrs_ruby_utils/web_utils/videos.rb
 - lib/ehbrs_ruby_utils/web_utils/videos/file.rb
 - lib/ehbrs_ruby_utils/web_utils/videos/file/rename.rb