uc3-dmp-api-core 0.0.8 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b372c891259df150205f23eb61ad9c9c68951126c4bc4f1d5fd0d32ab4dd3ff2
-  data.tar.gz: '0508bbdf68392163c5a13900fd99c61823c090819d68aae5fb0e7dbfb0a62813'
+  metadata.gz: 63205a96813c40c4f0b7969dc629d998c263187277748bc1d934ff62f6a35fe4
+  data.tar.gz: ad1dfc82eb0fc361ca63b2acf2cc898f7cf8749f4fee9e9b43d8c1e7aa8827c5
 SHA512:
-  metadata.gz: ce17d75b93aea0290a32af242b675eb615a85361fdef226ed860d10df6c1cb4d22f6cf038ce9e4b03259c793ba4241d838012dfaf9cbc8f8142922d095bf8995
-  data.tar.gz: 0e3fb0a4d917ad4730ec6bebefbd450d993d140c7d790bb8408dbbd7b5022b7eab0d446f07c2e5cc2906f4b1bf4d279a454121b232214ef91a8e89c4e15cb683
+  metadata.gz: a6283ea52aa5caa6f2e03a0bd147796d16edc52642f93fa9e33320911d0b56ecaf7b7211de871fe642536ea7cd0f1b9ee2ca026b989c302d86d4b147355643c8
+  data.tar.gz: fd08016205d931d6ab40bb74df0893bc862b2b216da306cd9546b29fb8a35bd85a782c5654846531dccf1474c34aafb9f667f3632044b09fa2c9a68ff6ae7dfb

data/lib/uc3-dmp-api-core/paginator.rb

@@ -46,10 +46,10 @@ module Uc3DmpApiCore
 
       # Fetch the current :page and :per_page from the params or use the defaults
       def _current_page(item_count: 0, params: {})
-        page = params.fetch('page', DEFAULT_PAGE)
-        page = DEFAULT_PAGE if page.nil? || page <= 1
-        per_page = params.fetch('per_page', DEFAULT_PER_PAGE)
-        per_page = DEFAULT_PER_PAGE if per_page.nil? || per_page >= MAXIMUM_PER_PAGE || per_page < 1
+        page = params.fetch('page', DEFAULT_PAGE).to_i
+        page = DEFAULT_PAGE if page.nil? || page.to_i <= 1
+        per_page = params.fetch('per_page', DEFAULT_PER_PAGE).to_i
+        per_page = DEFAULT_PER_PAGE if per_page.nil? || per_page.to_i >= MAXIMUM_PER_PAGE || per_page.to_i < 1
 
         total_pages = _page_count(total: item_count, per_page: per_page)
         page = total_pages if page > total_pages

data/lib/uc3-dmp-api-core/responder.rb

@@ -44,7 +44,7 @@ module Uc3DmpApiCore
         body = body.merge(Paginator.pagination_meta(url: url, item_count: item_count, params: args))
 
         # If this is a server error, then notify the administrator!
-        Logger.log_error(source: url, message: errors, details: body, event: args[:event]) if status.to_s[0] == '5'
+        LogWriter.log_error(source: url, message: errors, details: body, event: args[:event]) if status.to_s[0] == '5'
 
         { statusCode: status.to_i, body: body.compact.to_json, headers: headers }
       rescue StandardError => e
@@ -82,11 +82,7 @@ module Uc3DmpApiCore
       def headers
         return {} if ENV['CORS_ORIGIN'].nil?
 
-        {
-          'Access-Control-Allow-Headers': ENV.fetch('CORS_HEADERS', nil),
-          'Access-Control-Allow-Origin': ENV.fetch('CORS_ORIGIN', nil),
-          'Access-Control-Allow-Methods': ENV.fetch('CORS_METHODS', nil)
-        }
+        { 'access-control-allow-origin': ENV['CORS_ORIGIN'] }
       end
     end
   end

data/lib/uc3-dmp-api-core/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Uc3DmpApiCore
-  VERSION = '0.0.8'
+  VERSION = '0.0.10'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uc3-dmp-api-core
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.10
 platform: ruby
 authors:
 - Brian Riley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-02 00:00:00.000000000 Z
+date: 2023-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json