bullet_train-api 1.21.1 → 1.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0cc7361e38527a5ca7fbc9b6bf36fd988a16f0ccc2180f5f28c8657735fbd725
-  data.tar.gz: cedc02f621eea399406289cfe5dc05d34749796d3bcd665b49ec2d7075d7dd2a
+  metadata.gz: 3b7a3614e89a9ae0ddffe302d628205c02131faf10a20d98895d58b82001a2d8
+  data.tar.gz: bfc27b83f7888559aad0dd0bf2153bbc402829012e1960d0a5c9d6fcc662900a
 SHA512:
-  metadata.gz: 889cc44e12f07d4eac3425f5fc8c94897e59ba136e8039eb6f9053933aed8be90ce29f0e985f2951b8044752112142c04b460b1bb71fabaff27e89897537502c
-  data.tar.gz: a9c14fd2d334dea0516e6807d0f2baff36d6a87039eff49152cfaa7015bf509efeb11e2f57b68ce5ab3f9a7e15330c105d829a6737315af192b4476fc1984f82
+  metadata.gz: 1141c3b197a201cbe7fdc5a7a571f5935e4308f23aa46822850a5a93388a7e27cdbec0812753584d5c5188a8e0be96ccb4b9f3f7b5d1eecc784874f3cd6bf779
+  data.tar.gz: 6983da4808837519ac2332fa6ffd2f53755b044b5162de6ee22e664f16f167d2ad4398688a1193e5f0600f8a7c595aec9d193b623a26aae2d53d4481f4f35279

data/app/controllers/concerns/api/controllers/base.rb

@@ -1,6 +1,3 @@
-require "pagy_cursor/pagy/extras/cursor"
-require "pagy_cursor/pagy/extras/uuid_cursor"
-
 module Api::Controllers::Base
   extend ActiveSupport::Concern
 
@@ -18,6 +15,9 @@ module Api::Controllers::Base
     before_action :set_default_response_format
     after_action :set_pagination_headers
 
+    before_action :apply_filters, only: [:index]
+    before_action :apply_pagination, only: [:index]
+
     def modify_url_params(url, new_params)
       uri = URI.parse(url)
       query = Rack::Utils.parse_query(uri.query)
@@ -30,18 +30,24 @@ module Api::Controllers::Base
 
     def set_pagination_headers
       return unless @pagy
-
-      if @pagy.has_more?
-        if (collection = instance_variable_get(collection_variable))
-          next_cursor = collection.last.id
-          link_header = response.headers["Link"]
-          link_value = "<#{modify_url_params(request.url, after: next_cursor)}>; rel=\"next\""
-          response.headers["Link"] = link_header ? "#{link_header}, #{link_value}" : link_value
-          response.headers["Pagination-Next"] = next_cursor
-        end
+      if collection_has_more?
+        link_header = response.headers["Link"]
+        link_value = "<#{modify_url_params(request.url, after: last_id_in_collection)}>; rel=\"next\""
+        response.headers["Link"] = link_header ? "#{link_header}, #{link_value}" : link_value
+        response.headers["Pagination-Next"] = last_id_in_collection
       end
     end
 
+    def collection_has_more?
+      return false unless last_id_in_collection
+      remaining_collection = collection.limit(nil).order(id: :asc).where("id > ?", last_id_in_collection)
+      remaining_collection.any?
+    end
+
+    def last_id_in_collection
+      @last_id_in_collection ||= collection&.last&.id
+    end
+
     rescue_from CanCan::AccessDenied, ActiveRecord::RecordNotFound do |exception|
       render json: {error: "Not found"}, status: :not_found
     end
@@ -49,8 +55,6 @@ module Api::Controllers::Base
     rescue_from NotAuthenticatedError do |exception|
       render json: {error: "Invalid token or no user signed in"}, status: :unauthorized
     end
-
-    before_action :apply_pagination, only: [:index]
   end
 
   def permitted_fields
@@ -97,10 +101,32 @@ module Api::Controllers::Base
     @collection_variable ||= "@#{self.class.name.split("::").last.gsub("Controller", "").underscore}"
   end
 
+  def collection
+    @collection ||= instance_variable_get(collection_variable)
+  end
+
+  def collection=(new_collection)
+    @collection = new_collection
+    instance_variable_set collection_variable, new_collection
+  end
+
+  def apply_filters
+    # An empty method that descendant controllers can override
+    # A possible implementation might look like:
+    #
+    # self.collection = collection.where(status: params[:filter_status]) if params[:filter_status]
+    #
+    # Keep in mind that for adding filters to auto-generated documentation, you
+    # will need to override index.yaml.erb or _paths.yaml.erbs.
+  end
+
   def apply_pagination
-    collection = instance_variable_get collection_variable
-    @pagy, collection = pagy_cursor collection, after: params[:after], order: {id: :asc}
-    instance_variable_set collection_variable, collection
+    pagination_collection = collection.order(id: :asc)
+    if params[:after]
+      pagination_collection = pagination_collection.where("id > ?", params[:after])
+    end
+    @pagy, pagination_collection = pagy(pagination_collection)
+    self.collection = pagination_collection
   end
 
   def set_default_response_format

data/lib/bullet_train/api/version.rb

@@ -1,5 +1,5 @@
 module BulletTrain
   module Api
-    VERSION = "1.21.1"
+    VERSION = "1.22.0"
   end
 end

data/lib/bullet_train/api.rb

@@ -7,7 +7,6 @@ require "bullet_train/platform/connection_workflow"
 
 # require "wine_bouncer"
 require "pagy"
-require "pagy_cursor"
 require "doorkeeper"
 require "scaffolding"
 require "scaffolding/block_manipulator"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bullet_train-api
 version: !ruby/object:Gem::Version
-  version: 1.21.1
+  version: 1.22.0
 platform: ruby
 authors:
 - Andrew Culver
@@ -93,20 +93,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '8'
-- !ruby/object:Gem::Dependency
-  name: pagy_cursor
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: doorkeeper
   requirement: !ruby/object:Gem::Requirement