toast 1.1.6 → 1.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6692615b00bca742bd0efb94bc2a4636881c5c71761f2f2fedf2d08ee640e99d
-  data.tar.gz: 4e076fba2705931d64bba25dd75090c1d8e7d7317cdd0f2aaf07d92c79ea304b
+  metadata.gz: 0f41632506c8ae81b4268d1f84d714da161b61cf13591b7d197fa17b788e2a7b
+  data.tar.gz: 4419a0ddf47f807671ea9f91a741f054850b4e23144ed1ffdc930d06a4d3a1c7
 SHA512:
-  metadata.gz: e38ed6e2b1b87faabeef54d87a8a538eeb86931b48d067bbfd73a1195740a8a6bb28311d118fb604fa47cf5f66949accd9051add2f0ed701cdf155d1c639f521
-  data.tar.gz: 19c475e42ffdf0052247dd9ed05786fddb12d88b6228f7895d59b40e7b29fc66face6662d5d051dac0be09b821ff7133b1b8a554fc20dce5ef07a12d729c9c1b
+  metadata.gz: d4276af92bbb3970260b3f5037a541364c1e91fd2e1f570da0da09d8fab39a08066d7e4a19de91e38d4868c92ff6fdc487b966c567525207d3d383f47647fb70
+  data.tar.gz: 17e9fb003dec88439635f434b04e7ca782f48176e8cbdc86b840d791de42f32ce8d3211bfa81425fdb02e2dc4b4547e65f750e7bc57c5528791de71d197e7233

data/lib/toast/plural_assoc_request.rb

@@ -51,15 +51,15 @@ class Toast::PluralAssocRequest
                       end
 
         source = @base_config.model_class.find(@id) # may raise ActiveRecord::RecordNotFound
+
+        call_allow(@config.via_get.permissions, @auth, source, @uri_params) # may raise NotAllowed, AllowError
         relation = call_handler(@config.via_get.handler, source, @uri_params) # may raise HandlerError
 
         unless relation.is_a? ActiveRecord::Relation and relation.model.name == @config.target_model_class.name
           return response :internal_server_error,
                           msg: "plural association handler returned `#{relation.class}', expected `ActiveRecord::Relation' (#{@config.target_model_class})"
         end
-
-        call_allow(@config.via_get.permissions, @auth, source, @uri_params) # may raise NotAllowed, AllowError
-
+        
         result = relation.limit(window).offset(range_start)
 
         # count = relation.count doesn't always work
@@ -68,6 +68,11 @@ class Toast::PluralAssocRequest
         # also remove any ORDER clauses
 
         count = relation.unscope(:select).select(:id).count
+        if(count.is_a? Hash) 
+          # can happen with 'GROUP BY' 
+          count = count.length 
+        end
+
         headers = {"Content-Type" => @config.media_type}
 
         if count > 0

data/lib/toast/singular_assoc_request.rb

@@ -93,8 +93,7 @@ class Toast::SingularAssocRequest
 
           call_allow(@config.via_link.permissions, @auth, source, @uri_params)
 
-
-          link = LinkHeader.parse(@request.headers['Link']).find_link(['ref','related'])
+          link = LinkHeader.parse(@request.headers['Link']).find_link(['rel','related'])
 
           if link.nil?
             return response :bad_request, msg: "Link header missing or invalid"
@@ -151,7 +150,7 @@ class Toast::SingularAssocRequest
         source = @base_config.model_class.find(@id)
         call_allow(@config.via_unlink.permissions, @auth, source, @uri_params)
 
-        link = LinkHeader.parse(@request.headers['Link']).find_link(['ref','related'])
+        link = LinkHeader.parse(@request.headers['Link']).find_link(['rel','related'])
 
         if link.nil?
           return response :bad_request, msg: "Link header missing or invalid"

data/lib/toast/version.rb

@@ -1,3 +1,3 @@
 module Toast
-  VERSION = '1.1.6'
+  VERSION = '1.1.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toast
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.8
 platform: ruby
 authors:
 - robokopp (Robert Annies)
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-25 00:00:00.000000000 Z
+date: 2023-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -94,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: Toast exposes ActiveRecord models as a web service (REST API).