eivo-rails-api 0.1.10 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 293a3f3bef35b46009f162831c7cac036911d95691acd7663de201201e77cf0b
-  data.tar.gz: 34cea63eec948fb39809de3556d828f736b88e64a68e5569ea840d04b6fd7263
+  metadata.gz: b8362e17aaf35365ac1f318195f53ead6c07f67ae136f5d8330043582f293c5d
+  data.tar.gz: 15334f702a62f2f1ca0b8bb44ed28c0b20b74d87e6ef66139564f498abfdd0e0
 SHA512:
-  metadata.gz: 9b825140beec644c8b2a3329624dfd6ede68869436fa788b998cd1f45e24388c5bcc5e467330fc587a06589612c39bddd20f80d05552304d6e9a2449a62a9839
-  data.tar.gz: 882e34dc80ec565cbab69571ad8e27e9f406f1ab33ec0cb193e945e9da6276139851c8b4ca9f8a2c7b1810a32b8bbd8634a4d11bc2c3a2e10f6b11152598957d
+  metadata.gz: 0c0941d7283903837f7e051039167872bd3c3ce9f118cd25883556155798373db0d53777ef6efc21d7d71d50635f9224de10d35358060caea7f834a3ff8c6b1a
+  data.tar.gz: 8396499cf5728012a59f3c9c4be2afbc53ff2b80250114c0663594230ff47a4376b95b6201fb32b49185cb35c78545ae7c87866139b2c0498b01fe12b02c1099

data/app/controllers/eivo/concerns/pagination.rb

@@ -5,7 +5,7 @@ module EIVO
     module Pagination
       extend ::ActiveSupport::Concern
 
-      def paginate(collection)
+      def paginate(collection, options = {})
         unless ::ActiveModel::Type::Boolean.new.cast(params[:pagination]) == false
           limit = 50
           if params[:limit]
@@ -22,22 +22,32 @@ module EIVO
       def pagination_options(collection)
         options = {
           is_collection: true,
-          meta: {
-            total: collection.total_count,
-            pages: collection.total_pages
-          },
           links: {
             self: url_for(params.to_unsafe_h.merge(page: collection.current_page)),
             first: url_for(params.to_unsafe_h.merge(page: 1)),
-            last: url_for(params.to_unsafe_h.merge(page: collection.total_pages))
           }
         }
 
-        if !collection.out_of_range? && !collection.first_page?
-          options[:links][:prev] = url_for(params.to_unsafe_h.merge(page: collection.prev_page))
-        end
-        if !collection.out_of_range? && !collection.last_page?
-          options[:links][:next] = url_for(params.to_unsafe_h.merge(page: collection.next_page))
+        # avoid count request on large table
+        if params[:pagination] == 'infinite'
+          options[:links][:next] = url_for(params.to_unsafe_h.merge(page: collection.current_page + 1))
+
+          if !collection.first_page?
+            options[:links][:prev] = url_for(params.to_unsafe_h.merge(page: collection.current_page - 1))
+          end
+        else
+          options[:links][:last] = url_for(params.to_unsafe_h.merge(page: collection.total_pages))
+          options[:meta] = {
+            total: collection.total_count,
+            pages: collection.total_pages
+          }
+
+          if !collection.out_of_range? && !collection.last_page?
+            options[:links][:next] = url_for(params.to_unsafe_h.merge(page: collection.next_page))
+          end
+          if !collection.out_of_range? && !collection.first_page?
+            options[:links][:prev] = url_for(params.to_unsafe_h.merge(page: collection.prev_page))
+          end
         end
 
         options

data/app/controllers/eivo/concerns/rendering.rb

@@ -52,9 +52,11 @@ module EIVO
         render_errors json_errors.flatten
       end
 
-      def render_error(code, status: :bad_request, source: nil)
+      def render_error(code, status: :bad_request, title: nil, detail: nil, source: nil)
         render_errors([{
           code: code,
+          title: title,
+          detail: detail,
           source: source,
           status: ::Rack::Utils::SYMBOL_TO_STATUS_CODE[status].to_s
         }.compact], status: status)

data/config/initializers/logger.rb

@@ -16,13 +16,14 @@ if Rails.env.staging? || Rails.env.production?
     config.lograge.ignore_actions = ['EIVO::StatusController#index']
 
     config.lograge.custom_options = ->(event) do
-      result = {
-        params: event.payload[:params].except('controller', 'action', 'format'),
-        request_id: event.payload[:request_id]
-      }
+      result = event.payload.dup || {}
 
-      result[:user_id] = event.payload[:user_id] if event.payload[:user_id]
-      result[:organization_id] = event.payload[:organization_id] if event.payload[:organization_id]
+      result.delete(:headers)
+
+      # Removed because already present in event.payload
+      if result[:params]
+        result[:params] = result[:params].except('controller', 'action', 'format')
+      end
 
       # https://github.com/roidrage/lograge/pull/307
       if event.respond_to?(:allocations)

data/eivo-rails-api.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.push File.expand_path('lib', __dir__)
 
 Gem::Specification.new do |spec|
   spec.name          = 'eivo-rails-api'
-  spec.version       = '0.1.10'
+  spec.version       = '0.1.14'
   spec.authors       = ['Jonathan VUKOVICH-TRIBOUHARET']
   spec.email         = ['jonathan@eivo.co']
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eivo-rails-api
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.14
 platform: ruby
 authors:
 - Jonathan VUKOVICH-TRIBOUHARET
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-22 00:00:00.000000000 Z
+date: 2021-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -218,7 +218,7 @@ homepage: https://www.eivo.co
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -234,7 +234,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: EIVO Rails API
 test_files: []