json_api_toolbox 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc9706da38e740273930904f1f8c2921fa7172ac47f73a1f4130683c5774c624
-  data.tar.gz: dd5b01dfad5c434d8b569769ad6149da78e317aaa8bb3f58102e1eb53b8f4630
+  metadata.gz: 57d15d5fd3e2fd4747a2606e83d3f38f8a1991dac1ce62bfa9dd9ccc45e27f94
+  data.tar.gz: ecbb101680a6767f7d83238a6e0500ef67ac4addbebc6500c9881172678b7d1e
 SHA512:
-  metadata.gz: 91111bdba8cbe7562eb92f1b73172fbefbf062c501e298546ff6a795573e585ee3e53dfcafeee86a78631735f8b5f8935d5f9f11e499f3a7f8e64de60425b399
-  data.tar.gz: 11a64750e2c53a541e9df20bce0032d122352bfacbf976500ebb22c1c8a2f949a9f93ee50570bb7dcf99dc905382b348c5e6089f9d5e3ac13fdb26c141499873
+  metadata.gz: 76bee9fcd248fd05746574fbcc763bfe83150c4822574ea3238c068613c712a09eb11c8d46426e2b8f4f43a5475642aedc6a2f2ea893108a954a4bddf1b63f14
+  data.tar.gz: 365556a551fb49c8050a78c106df2d7c5e1d02eee6e9c289f8ea0abe3f16c150902505a67be7ebfe86a3d7d942b7dc7922e7e8418d3c63fcc3757ac5055fdf18

data/.version

@@ -0,0 +1 @@
+2.1.0

data/CHANGELOG.md

@@ -6,6 +6,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [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
+
 ## [2.0.0] - 2021-06-23
 ### Added
 - New README file describing the gem and it's uses

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,7 +1,7 @@
 PATH
   remote: .
   specs:
-    json_api_toolbox (2.0.0)
+    json_api_toolbox (2.1.0)
       activerecord (>= 5.1.0)
       activesupport (>= 5.1.0)
       json-api-vanilla
@@ -82,15 +82,15 @@ GEM
     diff-lcs (1.4.4)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    erubi (1.10.0)
-    globalid (0.4.2)
-      activesupport (>= 4.2.0)
+    erubi (1.11.0)
+    globalid (1.0.0)
+      activesupport (>= 5.0)
     http-accept (1.7.0)
-    http-cookie (1.0.4)
+    http-cookie (1.0.5)
       domain_name (~> 0.5)
     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)
@@ -99,7 +99,7 @@ GEM
       logstash-event (>= 1.2.02)
       logstash-logger (>= 0.26.1)
       rails (>= 5.0)
-    lograge (0.11.2)
+    lograge (0.12.0)
       actionpack (>= 4)
       activesupport (>= 4)
       railties (>= 4)
@@ -107,24 +107,26 @@ GEM
     logstash-event (1.2.02)
     logstash-logger (0.26.1)
       logstash-event (~> 1.2)
-    loofah (2.10.0)
+    loofah (2.19.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
-    marcel (1.0.1)
+    marcel (1.0.2)
     method_source (1.0.0)
-    mime-types (3.3.1)
+    mime-types (3.4.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.0704)
-    mini_mime (1.1.0)
+    mime-types-data (3.2022.0105)
+    mini_mime (1.1.2)
     minitest (5.14.4)
     netrc (0.11.0)
-    nio4r (2.5.7)
-    nokogiri (1.11.7-x86_64-linux)
+    nio4r (2.5.8)
+    nokogiri (1.13.9-x86_64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.13.9-x86_64-linux)
       racc (~> 1.4)
     parallel (1.20.1)
-    parser (3.0.1.1)
+    parser (3.0.2.0)
       ast (~> 2.4.1)
     pry (0.13.1)
       coderay (~> 1.1)
@@ -132,10 +134,10 @@ 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)
+    racc (1.6.0)
+    rack (2.2.4)
+    rack-test (2.0.2)
+      rack (>= 1.3)
     rails (6.1.4)
       actioncable (= 6.1.4)
       actionmailbox (= 6.1.4)
@@ -154,7 +156,7 @@ GEM
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.3.0)
+    rails-html-sanitizer (1.4.3)
       loofah (~> 2.3)
     railties (6.1.4)
       actionpack (= 6.1.4)
@@ -163,9 +165,9 @@ GEM
       rake (>= 0.13)
       thor (~> 1.0)
     rainbow (3.0.0)
-    rake (13.0.4)
+    rake (13.0.6)
     regexp_parser (2.1.1)
-    request_store (1.5.0)
+    request_store (1.5.1)
       rack (>= 1.4)
     rest-client (2.1.0)
       http-accept (>= 1.7.0, < 2.0)
@@ -186,38 +188,38 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.2)
-    rubocop (1.18.3)
+    rubocop (1.19.0)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.7.0, < 2.0)
+      rubocop-ast (>= 1.9.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.7.0)
+    rubocop-ast (1.10.0)
       parser (>= 3.0.1.1)
     ruby-progressbar (1.11.0)
-    shoulda-matchers (4.5.1)
-      activesupport (>= 4.2.0)
-    sprockets (4.0.2)
+    shoulda-matchers (5.0.0)
+      activesupport (>= 5.2.0)
+    sprockets (4.1.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.2)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
+    sprockets-rails (3.4.2)
+      actionpack (>= 5.2)
+      activesupport (>= 5.2)
       sprockets (>= 3.0.0)
-    thor (1.1.0)
+    thor (1.2.1)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.7)
+    unf_ext (0.0.8.2)
     unicode-display_width (2.0.0)
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    will_paginate (3.3.0)
+    will_paginate (3.3.1)
     zeitwerk (2.4.2)
 
 PLATFORMS
@@ -234,4 +236,4 @@ DEPENDENCIES
   shoulda-matchers
 
 BUNDLED WITH
-   2.2.22
+   2.2.25

data/bin/docker

@@ -0,0 +1,61 @@
+#! /usr/bin/env sh
+
+NAMETAG="json-api-toolbox:dev"
+COMMAND=${1:-help}
+shift
+
+command_help() {
+    echo "
+Usage:  docker COMMAND [code]
+
+A simple script to control the project container
+
+Commands:
+  run                      Run [code] on a new container
+  exec                     Run [code] on the current active container
+  build                    Build the project image
+  help                     Show this help message
+"
+}
+
+command_build() {
+    docker build -t $NAMETAG --ssh=default . 
+}
+
+config_ssh_agent() {
+  if [ uname == "Darwin" ]; then
+    AUTH_PATH="/run/host-services/ssh-auth.sock"
+  else 
+    AUTH_PATH=$(echo $SSH_AUTH_SOCK)
+  fi
+
+  echo "-v $(echo $HOME)/.ssh:/root/.ssh \
+        -v $(echo $AUTH_PATH):/ssh-agent \
+        -e SSH_AUTH_SOCK=/ssh-agent \
+  "
+}
+
+command_run() {
+    [[ $1 == "--build" ]] && { command_build; shift; }
+
+    docker volume create bundler_cache > /dev/null
+    docker run -it \
+               -v bundler_cache:/usr/local/bundle \
+               -v $(pwd):/gem \
+               $(config_ssh_agent) \
+               $NAMETAG
+               $@
+}
+
+command_exec() {
+    [[ $1 == "--build" ]] && { command_build; shift; }
+
+    docker exec $NAMETAG $@
+}
+
+case $COMMAND in
+  build) command_build "$@" ;;
+  exec)  command_exec  "$@" ;;
+  run)   command_run   "$@" ;;
+  *)     command_help  "$@" ;;
+esac

data/bin/setup.sh

@@ -3,28 +3,31 @@
 DEFAULT_REPO=git@bitbucket.org:guideinvestimentos/rails_defaults.git
 STRICT=${1:-no}
 ONE_WEEK_AGO=$(( $(date +%s) - 604800 ))
-FILE_TIME=$(date +%s -r .rubocop.base.yml 2> /dev/null)
+
+if [ -f .rubocop.base.yml ]; then
+  FILE_TIME=$(date -r .rubocop.base.yml +%s)
+fi
 
 info(){
-  echo -e "\\e[34;1m$1\\e[0m"
+  printf "\033[34;1m$1\033[0m\n"
 }
 
 step(){
-  printf "- $1: \\e7\n"
+  printf " - $1: \0337\n"
 }
 
 success(){
-  printf "\\e8\\e[32;1mOK!\\e[0m\n\\e[2K"
+  printf "\0338\033[1A\033[32;1mOK!\033[0m\n\033[2K"
 }
 
 skipped(){
-  printf "\\e8\\e[33;1mSKIPPED ($1)\\e[0m\n\\e[2K"
+  printf "\0338\033[1A\033[33;1mSKIPPED ($1)\033[0m\n\033[2K"
 }
 
 error() {
-  printf "\\e8\\e[31;1mERRO!\\e[0m\n\\e[2K"
-  printf "\\e[31m  $1\\e[0m\n"
-  [ $STRICT == "--strict" ] && exit $2
+  printf "\0338\033[1A\033[31;1mERRO!\033[0m\n\033[2K"
+  printf "\033[31m  $1\033[0m\n"
+  [ $STRICT -eq "--strict" ] && exit $2
 }
 
 info "Configurando o projeto\n"
@@ -48,7 +51,7 @@ step "Instalando dependências"
 
 bundle check 2>&1 > /dev/null && skipped "up-to date" || {
   RESULT=$(bundle install 2>&1 > /dev/null)
-  [ $? == 0 ] && success || error "$RESULT" 2
+  [ $? -eq "0" ] && success || error "$RESULT" 2
 }
 
 info "\nConfiguração executada com sucesso"

data/bitbucket-pipelines.yml

@@ -22,12 +22,10 @@ definitions:
           - gem update --system
           - bundle config set --local path "vendor/bundle"
           - bundle install
-          - "[ -d ~/.gem/ ] || mkdir -p ~/.gem/"
-          - curl -u $RUBYGEMS_USERNAME:$RUBYGEMS_PASSWORD https://rubygems.org/api/v1/api_key.yaml -o ~/.gem/credentials
+          - mkdir -p ~/.gem/
+          - curl -sSL -u $RUBYGEMS_USERNAME:$RUBYGEMS_PASSWORD https://rubygems.org/api/v1/api_key.yaml -o ~/.gem/credentials
           - chmod 0600 ~/.gem/credentials
-          - bundle exec rake release
-        caches:
-          - bundler-26
+          - bundle exec rake release --trace
 
 pipelines:
   pull-requests:

data/lib/json_api_toolbox/rspec.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'rspec'
-
 module JsonApiToolbox
   module Rspec
     RSpec.shared_examples 'a http method' do

data/lib/json_api_toolbox/version.rb

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

data/lib/postable.rb

@@ -7,7 +7,7 @@ module JsonApiToolbox
         associations = model.reflect_on_all_associations.map(&:name)
         normalized_hash = hash.map do |key, value|
           child_model = association_class(model, key) if value.is_a? Hash
-          key = associations.include?(key.to_sym) ? "#{key}_attributes" : key
+          key = "#{key}_attributes" if associations.include?(key.to_sym)
           hash_value = check_child_association(value, key, model, child_model)
           [key, hash_value]
         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.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Adriano Bacha
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-10 00:00:00.000000000 Z
+date: 2022-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -216,12 +216,14 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- ".version"
 - CHANGELOG.md
 - Dockerfile
 - Gemfile
 - Gemfile.lock
 - README.md
 - Rakefile
+- bin/docker
 - bin/setup.sh
 - bitbucket-pipelines.yml
 - docker-entrypoint.sh
@@ -257,7 +259,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.25
+rubygems_version: 3.3.25
 signing_key: 
 specification_version: 4
 summary: Json API usefull tools