toast 1.0.11 → 1.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b91449bc966996f84da87e01c7788088fb429ef4
-  data.tar.gz: b0986f54a342b73fb228aae8cd5b2ceb27e5e322
+  metadata.gz: ef2a1167b071463b05602eafb1512b3e3ec8ad16
+  data.tar.gz: 49aff897ffcca410526d3ad99a932f71223dfcec
 SHA512:
-  metadata.gz: de5754881ff246d16513363a307f36b3a65a4dddbc46dae44083fc245d240dbaaf2ffa28ef2cfeb15686946272a062e5e0627b8d7f961ad4583ead50211fb207
-  data.tar.gz: 1b59e4a0a096db8bf621eb3448651322de390c9fe25746d8ee397cff1312ac6f127c7ab06cdf06099c391db411e4c91985501f747b97b84c57c0f82353cf2eea
+  metadata.gz: 9119ba7f10a88228e1a88c11a313e1cfb9c3308c6d665c36b67adc0fe0595b87042320b6464820733dbe087c16b1eb1f1b4d6b37e80c07edc2bf3ba2b7084277
+  data.tar.gz: 7dc4fd2e26e3a3aefc19930244d1dcf15b4be3856757a2c3ce992c00671ea07d55e19b8afadcd2d2b1177ea128a8267da549eaa8b6056eac787a628a4bc6e4b1

data/lib/toast/collection_request.rb

@@ -51,6 +51,8 @@ class Toast::CollectionRequest
         if relation.is_a?(ActiveRecord::Relation) and
           relation.model == @config.base_model_class
 
+          result = relation.limit(window).offset(range_start)
+
           # count = relation.count doesn't always work
           # fix problematic select extensions for counting (-> { select(...) })
           # this fails if the where clause depends on the the extended select
@@ -58,19 +60,13 @@ class Toast::CollectionRequest
           headers = {"Content-Type" => @config.media_type}
 
           if count > 0
-            range_end = if (range_start + window - 1) > (count - 1) # behind last
-                        count - 1
-                      else
-                        (range_start + window - 1)
-                      end
-
-            headers[ "Content-Range"] = "items=#{range_start}-#{range_end}/#{count}"
+            headers["Content-Range"] = "items=#{range_start}-#{range_start + result.length - 1}/#{count}"
           end
 
           response :ok,
                    headers: headers,
-                   body: represent(relation.limit(window).offset(range_start), @base_config),
-                   msg: "sent #{count} of #{@config.mode_class}"
+                   body: represent(result, @base_config),
+                   msg: "sent #{result.length} records of #{@base_config.model_class}"
 
         else
           # wrong class/model_class

data/lib/toast/plural_assoc_request.rb

@@ -60,6 +60,8 @@ class Toast::PluralAssocRequest
 
         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
         # fix problematic select extensions for counting (-> { select(...) })
         # this fails if the where clause depends on the the extended select
@@ -70,19 +72,13 @@ class Toast::PluralAssocRequest
         headers = {"Content-Type" => @config.media_type}
 
         if count > 0
-          range_end = if (range_start + window - 1) > (count - 1) # behind last
-                      count - 1
-                    else
-                      (range_start + window - 1)
-                    end
-
-          headers[ "Content-Range"] = "items=#{range_start}-#{range_end}/#{count}"
+          headers["Content-Range"] = "items=#{range_start}-#{range_start + result.length - 1}/#{count}"
         end
 
         response :ok,
                  headers: headers,
-                 body: represent(relation.limit(window).offset(range_start), target_config),
-                 msg: "sent #{count} of #{target_config.model_class}"
+                 body: represent(result, target_config),
+                 msg: "sent #{result.length} records of #{target_config.model_class}"
 
 
       rescue  ActiveRecord::RecordNotFound

data/lib/toast/request_helpers.rb

@@ -90,7 +90,7 @@ module Toast::RequestHelpers
   #
   # Return: Rack conform response
   def response status_sym, headers: {}, msg: nil, body: nil
-    Toast.logger.info "[#{Thread.current.object_id}] done:  #{msg}"
+    Toast.logger.info "[#{Thread.current.object_id}] done: #{msg}"
 
     unless Rails.env == 'production'
       # put message in body, too, if body is free

data/lib/toast/version.rb

@@ -1,3 +1,3 @@
 module Toast
-  VERSION = '1.0.11'
+  VERSION = '1.0.12'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toast
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 1.0.12
 platform: ruby
 authors:
 - robokopp (Robert Annies)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-29 00:00:00.000000000 Z
+date: 2019-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails