json_api_toolbox 2.0.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07cee6578d3ec72b85799bb88a7b8f0fee45c63950516209dca50d65ee0d4bcb
-  data.tar.gz: 9e6171341031bba7809a8337256d882e05ee5b11095bedd58e2f7ff2f62000d3
+  metadata.gz: d9c03a1afc1da78c6af3a8d92549ccee5cb1901eb996ee87a54d9fe918c5d313
+  data.tar.gz: cb6e51096559d9ad400cd4e3cd02a59f9a79afac1af504f91b283e26bb2cc456
 SHA512:
-  metadata.gz: 24ab8d780ec3b8a21ace2100b29c8f60593bc01cef3f23dbe81a6d3993687aa7c3a93a22dd6e04c9647de17b62f693452c8e7b1a40941d191459879f89342c35
-  data.tar.gz: 5aa57f37c3c11b462755ab90a3d85986ade02bdbb9d1d5a78a3f6ac5df025f5ee73eeb23ba9011277ace4a3a3742626a516ef8d62573976156d30cdc50bec496
+  metadata.gz: ad46e9d5e2a669d6471c7a8013afe86e13beae98867d0962e77eb3f89411de192b072266af5d455de695edf8ca5e621e9283dc40c67fded2fe55a3a2d66420f8
+  data.tar.gz: cf72e98693263a8a9b587443ec29fe0a0a7dad9a4ce4ba39a666e50993f255e4c09c24a72109c45480d0d87a3279ac31130e6f90a5d3594bb8b04641b0e54b32

data/.rubocop.yml

@@ -2,5 +2,5 @@ inherit_from:
   - '.rubocop.base.yml'
 
 AllCops:
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 3.0
   SuggestExtensions: false

data/.version

@@ -1 +1 @@
-2.0.1
+3.0.0

data/CHANGELOG.md

@@ -6,6 +6,21 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [3.0.0] - 2024-06-04
+### Changed
+- Atualiza imagem do ruby de 2.6 para 3.0
+- Adiciona elastic-apm no renderizable exceptions
+
+### Added
+- Adiciona gem elastic-apm
+
+### Removed
+- Rake task: rake lint-and-test
+
+## [2.1.0] - 2022-11-09
+### Changed
+- Permite seja via parametro, seja via ENV alterar o timeout do RestClient
+
 ## [2.0.1] - 2021-08-13
 ### Fixed
 - Fixed a constant loading problem on rails

data/Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:2.6-alpine
+FROM ruby:3.0.0-alpine
 
 RUN apk update \
     && apk upgrade \

data/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    json_api_toolbox (2.0.1)
+    json_api_toolbox (3.0.0)
       activerecord (>= 5.1.0)
       activesupport (>= 5.1.0)
+      elastic-apm
       json-api-vanilla
       jsonapi-serializable
       log_toolbox
@@ -73,33 +74,54 @@ GEM
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
+    addressable (2.8.6)
+      public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
+    base64 (0.2.0)
     builder (3.2.4)
     byebug (11.1.3)
     coderay (1.1.3)
     concurrent-ruby (1.1.9)
     crass (1.0.6)
+    date (3.3.4)
     diff-lcs (1.4.4)
-    domain_name (0.5.20190701)
-      unf (>= 0.0.5, < 1.0.0)
-    erubi (1.10.0)
-    globalid (0.5.2)
-      activesupport (>= 5.0)
+    domain_name (0.6.20240107)
+    elastic-apm (4.7.3)
+      concurrent-ruby (~> 1.0)
+      http (>= 3.0)
+      ruby2_keywords
+    erubi (1.12.0)
+    ffi (1.17.0)
+    ffi-compiler (1.3.2)
+      ffi (>= 1.15.5)
+      rake
+    globalid (1.2.1)
+      activesupport (>= 6.1)
+    http (5.2.0)
+      addressable (~> 2.8)
+      base64 (~> 0.1)
+      http-cookie (~> 1.0)
+      http-form_data (~> 2.2)
+      llhttp-ffi (~> 0.5.0)
     http-accept (1.7.0)
-    http-cookie (1.0.4)
+    http-cookie (1.0.6)
       domain_name (~> 0.5)
+    http-form_data (2.3.0)
     i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    json-api-vanilla (1.0.2)
+    json-api-vanilla (1.0.4)
     jsonapi-renderer (0.2.2)
     jsonapi-serializable (0.3.1)
       jsonapi-renderer (~> 0.2.0)
+    llhttp-ffi (0.5.0)
+      ffi-compiler (~> 1.0)
+      rake (~> 13.0)
     log_toolbox (1.3.11)
       lograge (>= 0.11.1)
       logstash-event (>= 1.2.02)
       logstash-logger (>= 0.26.1)
       rails (>= 5.0)
-    lograge (0.11.2)
+    lograge (0.14.0)
       actionpack (>= 4)
       activesupport (>= 4)
       railties (>= 4)
@@ -107,23 +129,33 @@ GEM
     logstash-event (1.2.02)
     logstash-logger (0.26.1)
       logstash-event (~> 1.2)
-    loofah (2.12.0)
+    loofah (2.22.0)
       crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    mail (2.7.1)
+      nokogiri (>= 1.12.0)
+    mail (2.8.1)
       mini_mime (>= 0.1.1)
-    marcel (1.0.1)
+      net-imap
+      net-pop
+      net-smtp
+    marcel (1.0.4)
     method_source (1.0.0)
-    mime-types (3.3.1)
+    mime-types (3.5.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.0704)
-    mini_mime (1.1.0)
+    mime-types-data (3.2024.0507)
+    mini_mime (1.1.5)
     minitest (5.14.4)
+    net-imap (0.4.12)
+      date
+      net-protocol
+    net-pop (0.1.2)
+      net-protocol
+    net-protocol (0.2.2)
+      timeout
+    net-smtp (0.5.0)
+      net-protocol
     netrc (0.11.0)
-    nio4r (2.5.8)
-    nokogiri (1.12.3-x86_64-darwin)
-      racc (~> 1.4)
-    nokogiri (1.12.3-x86_64-linux)
+    nio4r (2.7.3)
+    nokogiri (1.16.5-x86_64-linux)
       racc (~> 1.4)
     parallel (1.20.1)
     parser (3.0.2.0)
@@ -134,10 +166,11 @@ GEM
     pry-byebug (3.9.0)
       byebug (~> 11.0)
       pry (~> 0.13.0)
-    racc (1.5.2)
-    rack (2.2.3)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
+    public_suffix (5.0.5)
+    racc (1.8.0)
+    rack (2.2.9)
+    rack-test (2.1.0)
+      rack (>= 1.3)
     rails (6.1.4)
       actioncable (= 6.1.4)
       actionmailbox (= 6.1.4)
@@ -153,11 +186,13 @@ GEM
       bundler (>= 1.15.0)
       railties (= 6.1.4)
       sprockets-rails (>= 2.0.0)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
+    rails-dom-testing (2.2.0)
+      activesupport (>= 5.0.0)
+      minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.3.0)
-      loofah (~> 2.3)
+    rails-html-sanitizer (1.6.0)
+      loofah (~> 2.21)
+      nokogiri (~> 1.14)
     railties (6.1.4)
       actionpack (= 6.1.4)
       activesupport (= 6.1.4)
@@ -167,7 +202,7 @@ GEM
     rainbow (3.0.0)
     rake (13.0.6)
     regexp_parser (2.1.1)
-    request_store (1.5.0)
+    request_store (1.7.0)
       rack (>= 1.4)
     rest-client (2.1.0)
       http-accept (>= 1.7.0, < 2.0)
@@ -200,26 +235,25 @@ GEM
     rubocop-ast (1.10.0)
       parser (>= 3.0.1.1)
     ruby-progressbar (1.11.0)
+    ruby2_keywords (0.0.5)
     shoulda-matchers (5.0.0)
       activesupport (>= 5.2.0)
-    sprockets (4.0.2)
+    sprockets (4.2.1)
       concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.2.2)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
+      rack (>= 2.2.4, < 4)
+    sprockets-rails (3.4.2)
+      actionpack (>= 5.2)
+      activesupport (>= 5.2)
       sprockets (>= 3.0.0)
-    thor (1.1.0)
+    thor (1.3.1)
+    timeout (0.4.1)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.7.7)
     unicode-display_width (2.0.0)
-    websocket-driver (0.7.5)
+    websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    will_paginate (3.3.1)
+    will_paginate (4.0.0)
     zeitwerk (2.4.2)
 
 PLATFORMS

data/Rakefile

@@ -1,11 +1,3 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 require "rubocop/rake_task"
-
-RSpec::Core::RakeTask.new(:spec)
-RuboCop::RakeTask.new(:lint)
-
-task default: :spec
-
-desc 'Execute both RuboCop and RSpec'
-task "lint-and-test" => [:lint, :spec]

data/bitbucket-pipelines.yml

@@ -1,10 +1,9 @@
-image: ruby:2.6
+image: ruby:3.0
 
 definitions:
   caches:
-    bundler-26: vendor/bundle
-    bundler-27: vendor/bundle
     bundler-30: vendor/bundle
+    bundler-31: vendor/bundle
 
   steps:
     - step: &test
@@ -12,9 +11,12 @@ definitions:
         script: 
           - apt-get install git
           - gem update --system
+          - gem install bundler -v $(cat Gemfile.lock | awk '/BUNDLED WITH/{ getline;print; }')
+          - bundle install
           - bundle config set --local path "vendor/bundle"
           - bin/setup.sh --strict
-          - bundle exec rake lint-and-test
+          - bundle exec rubocop .
+          - RAILS_ENV=test bundle exec rspec
     - step: &release
         name: Release gem
         script:
@@ -31,24 +33,18 @@ pipelines:
   pull-requests:
     '**':
       - parallel:
-        - step:
-            <<: *test
-            name: Ruby 2.6
-            image: ruby:2.6
-            caches:
-              - bundler-26
-        - step:
-            <<: *test
-            name: Ruby 2.7
-            image: ruby:2.7
-            caches:
-              - bundler-27
         - step:
             <<: *test
             name: Ruby 3.0
             image: ruby:3.0
             caches:
               - bundler-30
+        - step:
+            <<: *test
+            name: Ruby 3.1
+            image: ruby:3.1
+            caches:
+              - bundler-31
   branches:
     master:
       - step: *release

data/json_api_toolbox.gemspec

@@ -4,8 +4,9 @@ lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'json_api_toolbox/version'
 
+# rubocop:disable Metrics/BlockLength
 Gem::Specification.new do |spec|
-  spec.required_ruby_version  = '>= 2.6.0'
+  spec.required_ruby_version  = '>= 3.0'
   spec.name                   = 'json_api_toolbox'
   spec.version                = JsonApiToolbox::VERSION
 
@@ -22,6 +23,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'activerecord',  '>= 5.1.0'
   spec.add_dependency 'activesupport', '>= 5.1.0'
+  spec.add_dependency 'elastic-apm'
   spec.add_dependency 'jsonapi-serializable'
   spec.add_dependency 'json-api-vanilla'
   spec.add_dependency 'log_toolbox'
@@ -36,3 +38,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'shoulda-matchers'
 end
+# rubocop:enable Metrics/BlockLength

data/lib/json_api_toolbox/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JsonApiToolbox
-  VERSION = '2.0.1'
+  VERSION = '3.0.0'
 end

data/lib/renderizable_exceptions.rb

@@ -11,12 +11,8 @@ module JsonApiToolbox
     end
 
     def render_any_exception(exception)
-      if Gem.loaded_specs.key?('log_toolbox')
-        log_critical(exception)
-      else
-        puts_build_log_error(exception)
-      end
-
+      log_exception(exception)
+      send_to_apm(exception)
       render build_jsonapi(exception)
     end
 
@@ -32,6 +28,18 @@ module JsonApiToolbox
         }, status: :internal_server_error }
     end
 
+    def log_exception(exception)
+      if Gem.loaded_specs.key?('log_toolbox')
+        log_critical(exception)
+      else
+        puts_build_log_error(exception)
+      end
+    end
+
+    def send_to_apm(exception)
+      ElasticAPM.report(exception) if Gem.loaded_specs.key?('elastic-apm')
+    end
+
     def puts_build_log_error(error)
       puts messages: error.try(:message), trace: error.try(:backtrace)
     end

data/lib/service.rb

@@ -6,12 +6,15 @@ require 'json-api-vanilla'
 
 module JsonApiToolbox
   class Service
-    attr_reader :http_method, :url, :body, :extra_headers
+    attr_reader :http_method, :url, :body, :extra_headers, :timeout
 
-    def initialize(http_method, url, body, extra_headers = {})
+    DEFAULT_TIMEOUT = ENV.fetch('JSON_API_TOOLBOX_TIMEOUT', 60).to_i
+
+    def initialize(http_method, url, body, timeout, extra_headers = {})
       @http_method = http_method
       @url = url
       @body = body
+      @timeout = timeout
       @extra_headers = extra_headers
     end
 
@@ -24,7 +27,8 @@ module JsonApiToolbox
         method: http_method,
         url: url,
         payload: build_body,
-        headers: build_header
+        headers: build_header,
+        timeout: timeout
       )
     end
 
@@ -44,21 +48,21 @@ module JsonApiToolbox
     end
 
     class << self
-      def get(url: nil, includes: nil, query_string: nil, headers: {})
+      def get(url: nil, includes: nil, query_string: nil, timeout: DEFAULT_TIMEOUT, headers: {})
         body = build_query_string(includes, query_string)
-        new(:get, url, body, headers).execute
+        new(:get, url, body, timeout, headers).execute
       end
 
-      def post(url: nil, body: nil, headers: {})
-        new(:post, url, body, headers).execute
+      def post(url: nil, body: nil, timeout: DEFAULT_TIMEOUT, headers: {})
+        new(:post, url, body, timeout, headers).execute
       end
 
-      def patch(url: nil, body: nil, headers: {})
-        new(:patch, url, body, headers).execute
+      def patch(url: nil, body: nil, timeout: DEFAULT_TIMEOUT, headers: {})
+        new(:patch, url, body, timeout, headers).execute
       end
 
-      def put(url: nil, body: nil, headers: {})
-        new(:put, url, body, headers).execute
+      def put(url: nil, body: nil, timeout: DEFAULT_TIMEOUT, headers: {})
+        new(:put, url, body, timeout, headers).execute
       end
 
       def parse_response(response)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json_api_toolbox
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 3.0.0
 platform: ruby
 authors:
 - Adriano Bacha
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-16 00:00:00.000000000 Z
+date: 2024-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.1.0
+- !ruby/object:Gem::Dependency
+  name: elastic-apm
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jsonapi-serializable
   requirement: !ruby/object:Gem::Requirement
@@ -252,14 +266,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.25
+rubygems_version: 3.5.11
 signing_key: 
 specification_version: 4
 summary: Json API usefull tools