Remove all the "magic" from #options

Author: tmaier

lib/pliny/helpers/paginator/integer_paginator.rb

@@ -2,7 +2,7 @@ module Pliny::Helpers
   module Paginator
     class IntegerPaginator
       attr_reader :sinatra, :count
-      attr_writer :options
+      attr_accessor :options
 
       class << self
         def run(*args, &block)
@@ -13,23 +13,21 @@ def run(*args, &block)
       def initialize(sinatra, count, options = {})
         @sinatra = sinatra
         @count   = count
-        @opts    = options
+        @options = options
       end
 
       def run
+        options = calculate_pages
+
         {
           order_by: options[:sort_by],
           offset: options[:first],
           limit: options[:args][:max]
         }
       end
 
-      def options
-        @options ||= calculate_pages
-      end
-
       def calculate_pages
-        Paginator.run(self, count, @opts) do |paginator|
+        Paginator.run(self, count, options) do |paginator|
           max = paginator[:args][:max].to_i
           paginator[:last] =
             paginator[:first].to_i + max - 1

lib/pliny/helpers/paginator/paginator.rb

@@ -9,8 +9,8 @@ class Paginator
       ARGS = /(?<args>.*)/
       RANGE = /\A#{SORT_BY}(?:\s+#{FIRST})?(\.{2}#{LAST})?#{COUNT}?(;\s*#{ARGS})?\z/
 
+      attr_accessor :options
       attr_reader :sinatra, :count
-      attr_writer :options
 
       class << self
         def run(*args, &block)
@@ -21,7 +21,7 @@ def run(*args, &block)
       def initialize(sinatra, count, options = {})
         @sinatra = sinatra
         @count   = count
-        @opts =
+        @options =
           {
             accepted_ranges: [:id],
             sort_by: :id,
@@ -35,6 +35,8 @@ def initialize(sinatra, count, options = {})
       end
 
       def run
+        options.merge!(request_options)
+
         result = yield(self) if block_given?
 
         halt unless valid_options?
@@ -43,10 +45,6 @@ def run
         result
       end
 
-      def options
-        @options ||= @opts.merge(request_options)
-      end
-
       def request_options
         range = sinatra.request.env['Range']
         return {} if range.nil? || range.empty?

test/helpers/paginator/paginator_test.rb

@@ -9,6 +9,7 @@
 
   describe '#run' do
     it 'evaluates block' do
+      mock(subject).request_options { {} }
       mock(subject).valid_options? { true }
       mock(subject).set_headers
       subject.instance_variable_set(:@options, args: { max: 200 })