about summary refs log tree commit diff
path: root/app
diff options
context:
space:
mode:
authorMatt Jankowski <mjankowski@thoughtbot.com>2017-05-31 14:31:14 -0400
committerEugen Rochko <eugen@zeonfederated.com>2017-05-31 20:31:14 +0200
commit84dda45df944d973c83417c697b7d871bb84be35 (patch)
tree219f4fbeed2648278fff262d28091464d20a42c8 /app
parent9c7505489f9348feade8f8a7b0836cb8f3e92df5 (diff)
Improve spec coverage and clean up api/v1/domain_blocks controller (#3466)
Diffstat (limited to 'app')
-rw-r--r--app/controllers/api/v1/domain_blocks_controller.rb50
1 files changed, 44 insertions, 6 deletions
diff --git a/app/controllers/api/v1/domain_blocks_controller.rb b/app/controllers/api/v1/domain_blocks_controller.rb
index f223dd16e..772c04687 100644
--- a/app/controllers/api/v1/domain_blocks_controller.rb
+++ b/app/controllers/api/v1/domain_blocks_controller.rb
@@ -1,18 +1,16 @@
 # frozen_string_literal: true
 
 class Api::V1::DomainBlocksController < ApiController
+  BLOCK_LIMIT = 100
+
   before_action -> { doorkeeper_authorize! :follow }
   before_action :require_user!
+  after_action :insert_pagination_headers, only: :show
 
   respond_to :json
 
   def show
-    @blocks = AccountDomainBlock.where(account: current_account).paginate_by_max_id(limit_param(100), params[:max_id], params[:since_id])
-
-    next_path = api_v1_domain_blocks_url(pagination_params(max_id: @blocks.last.id))    if @blocks.size == limit_param(100)
-    prev_path = api_v1_domain_blocks_url(pagination_params(since_id: @blocks.first.id)) unless @blocks.empty?
-
-    set_pagination_headers(next_path, prev_path)
+    @blocks = load_domain_blocks
     render json: @blocks.map(&:domain)
   end
 
@@ -28,6 +26,46 @@ class Api::V1::DomainBlocksController < ApiController
 
   private
 
+  def load_domain_blocks
+    account_domain_blocks.paginate_by_max_id(
+      limit_param(BLOCK_LIMIT),
+      params[:max_id],
+      params[:since_id]
+    )
+  end
+
+  def account_domain_blocks
+    current_account.domain_blocks
+  end
+
+  def insert_pagination_headers
+    set_pagination_headers(next_path, prev_path)
+  end
+
+  def next_path
+    if records_continue?
+      api_v1_domain_blocks_url pagination_params(max_id: pagination_max_id)
+    end
+  end
+
+  def prev_path
+    unless @blocks.empty?
+      api_v1_domain_blocks_url pagination_params(since_id: pagination_since_id)
+    end
+  end
+
+  def pagination_max_id
+    @blocks.last.id
+  end
+
+  def pagination_since_id
+    @blocks.first.id
+  end
+
+  def records_continue?
+    @blocks.size == limit_param(BLOCK_LIMIT)
+  end
+
   def pagination_params(core_params)
     params.permit(:limit).merge(core_params)
   end