active_record_api-rest 1.0.19 → 1.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f7d5bdb3dba9f5d4da9bc806bfe5d3bce9d09149b419c74648481b18840621f
-  data.tar.gz: '09f75577ff7bc0275d4faea7ae57f9a7103582263702429073fd1217fb8e3636'
+  metadata.gz: 164c784fae2fd7add5d47ffc1f6b31bfcc61d66dda43cd5b2bec8273421b8d0a
+  data.tar.gz: c1770286f9925be1005f2a1a1bd1237b7f1cba453a93f5a28d755f0386471466
 SHA512:
-  metadata.gz: cdfd4c5a8f7b668dd78b24803aa2de4bcb69be77a3d23cf97a80e26b82b5385f779500f8c4a210a57d11716a7cec6901553d1e3054b25b64bc31cda2118779bb
-  data.tar.gz: af8af57d6ca48745d71cc4add6c32a272bdda6e24b63b34da7c3adec42a2ccfba8b0cb2dde90df0fe330b1777a08c244eeda3d7f7ed7afd4fe8ab3f1b7a92aee
+  metadata.gz: 07def8142c96d536e7219d59d1514075fd284f856560cb0064053515f410573c4c1eb9eafc8179e27644cc9d566cf043e8f78b4a92ceac2e6f22188a7e56f000
+  data.tar.gz: fd8a436fcc2a0471a2ba6624925304a02ff82a52cc71923091c4e1eed63e4ab7da820371729909a9418d2d8e7e6e812de6ab934817dc6bb539fc794378a7b8a3

data/lib/active_record_api/rest/controller.rb

@@ -8,9 +8,9 @@ module ActiveRecordApi
       before_action :validate_params
 
       def index
-        response.headers['x-total'] = @total
+        response.headers['x-total'] = models_count
         response.headers['x-link-next'] = next_url unless next_url.nil?
-        render json: models.limit(limit), each_serializer: serializer
+        render json: models_remaining.limit(limit), each_serializer: serializer
       end
 
       def show
@@ -53,12 +53,19 @@ module ActiveRecordApi
         @model ||= authorized_models.find_by(id: queryable_params[:id])
       end
 
-      def models
-        return @models unless @models.nil?
-        @models = authorized_models.where(queryable_params).order(pagination_param_name => pagination_param_direction)
-        @total = @models.count
-        return @models unless pagination_param_value.present?
-        @models = @models&.where("\"#{pagination_param_name}\" > ?", pagination_param_value)
+      def models_full_results
+        return @models_full_results unless @models_full_results.nil?
+        @models_full_results = authorized_models.where(queryable_params).order(pagination_param_name => pagination_param_direction)
+      end
+
+      def models_count
+        @total = models_full_results.count
+      end
+
+      def models_remaining
+        return @models_remaining unless @models_remaining.nil?
+        @models_remaining = models_full_results&.where("\"#{pagination_param_name}\" > ?", pagination_param_value) if pagination_param_value.present?
+        @models_remaining
       end
 
       def initialize_model
@@ -103,9 +110,9 @@ module ActiveRecordApi
         RequestUrlGenerator.new(
           action_name: action_name,
           request: request,
-          models: models,
+          models_remaining: models_remaining,
           parameters: parameters,
-          total: @total,
+          total_count: models_count,
           pagination_param_name: pagination_param_name
         )
       end

data/lib/active_record_api/rest/request_url_generator.rb

@@ -5,20 +5,20 @@ module ActiveRecordApi
       include ActiveAttr::Model
       attribute :request
       attribute :action_name
-      attribute :models
+      attribute :models_remaining
       attribute :pagination_param_name
       attribute :parameters
-      attribute :count
+      attribute :total_count
       delegate :host_with_port, :path, :query_parameters, to: :request
       delegate :limit, to: :parameters
 
       def next_url
-        return if count == 0 || models.count <= limit
+        return if total_count == 0 || models_remaining.count <= limit
         "#{current_url}?#{new_params.to_param}"
       end
 
       def new_params
-        query_parameters.dup.merge(pagination_param_name.to_s => models.limit(limit).last.send(pagination_param_name))
+        query_parameters.dup.merge(pagination_param_name.to_s => models_remaining.limit(limit).last.send(pagination_param_name))
       end
 
       def current_url

data/lib/active_record_api/rest/version.rb

@@ -2,6 +2,6 @@
 
 module ActiveRecordApi
   module Rest
-    VERSION = '1.0.19'.freeze
+    VERSION = '1.0.20'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_api-rest
 version: !ruby/object:Gem::Version
-  version: 1.0.19
+  version: 1.0.20
 platform: ruby
 authors:
 - Full Measure Education