yaqb 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81c719ba263011c2edd7c75f4aa4d5f08ab9bacbff7a8e981eb081bd16889a52
-  data.tar.gz: 027c7b040694c8550e5fe0190730b00fe84ab834db33626712c00500701d49d2
+  metadata.gz: 4c6f3df2bfa123895902a6cc6482f20097c9f9a85164c50c81a6ba8878eb9199
+  data.tar.gz: 602dd55100b586b9716009085115f3d760ed0504fe157740ce1c04e75ea21835
 SHA512:
-  metadata.gz: 418be649ee123b450da292a9d2db97e04957a0cbde7247d4638724f19fc4bb091cdef2f65278ddbe2605a398774e85674109b1495eb0c2fbee5442aa4d0a4eb7
-  data.tar.gz: 6395ca043f73d580cc937e37e872d92f560173c05172639bb80205064cc3cfd9e542cc92abdbf7c0f6de96dfc599e42a45aaa1a1d55a7ee28d56c9e091465933
+  metadata.gz: 4c2dc6e22a9891e8e48b0a7d488ae590a4bd17f93472f04dfec041c8e425fa9be3e61910a619e219744e3be1ef3dd578de8a73ecca43cb06f38dd9f26b722e3c
+  data.tar.gz: 6fe88fe10f56aa19394e68df9ce4d17b335bc493349c965e7f3a918afe44beeb453e7d0c8eed5681f2e18999f7dc5a6520d4f107fc250729ecd4cff5e8ff323c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    yaqb (0.3.1)
+    yaqb (0.4.0)
 
 GEM
   remote: https://rubygems.org/

data/lib/yaqb/{configuration.rb → config.rb}

@@ -1,15 +1,27 @@
 # frozen_string_literal: true
 
 module Yaqb
-  class Configuration
+  class << self
+    def configure
+      yield(config)
+    end
+
+    def config
+      @config ||= Config.new
+    end
+  end
+
+  class Config
     def paginator
-      @paginator || set_paginator
+      instance_variable_defined?(:@paginator) ? @paginator : set_paginator
     end
 
     def paginator=(paginator)
       case paginator.to_sym
       when :kaminari
         @paginator = :kaminari
+      when :will_paginate
+        @paginator = :will_paginate
       else
         raise StandardError, paginator_error_message(paginator)
       end
@@ -18,12 +30,16 @@ module Yaqb
     private
 
     def set_paginator
-      @paginator = :kaminari if defined?(Kaminari)
+      @paginator = if defined?(Kaminari)
+        :kaminari
+      elsif defined?(WillPaginate::CollectionMethods)
+        :will_paginate
+      end
     end
 
     def paginator_error_message(paginator)
       <<~HEREDOC.chomp
-        Invalid Paginator: (#{paginator}). Currently supported paginators are: [Kaminari].
+        Invalid Paginator: (#{paginator}). Currently supported paginators are: [Kaminari, WillPaginate].
       HEREDOC
     end
   end

data/lib/yaqb/hooks.rb

@@ -1,11 +1,27 @@
 # frozen_string_literal: true
 
 begin; require 'kaminari'; rescue LoadError; end
+begin; require 'will_paginate'; rescue LoadError; end
 
-unless defined?(Kaminari)
+unless defined?(Kaminari) || defined?(WillPaginate::CollectionMethods)
   Kernel.warn <<~HEREDOC
-    Warning: Yaqb relies on Kaminari. Please
-    install dependency by adding the following to your Gemfile:
-    gem 'kaminari'\n
+    Warning: Yaqb relies on Kaminari or WillPaginate. Please
+    install dependency by adding one of the following to your Gemfile:
+    gem 'kaminari'
+    gem 'will_paginate'\n
   HEREDOC
 end
+
+begin
+  if defined?(Kaminari)
+    require 'yaqb/query_builders/paginators/kaminari_helper'
+    Yaqb::QueryBuilders::Paginate.send(:include, Yaqb::QueryBuilders::Paginators::KaminariHelper)
+  elsif defined?(WillPaginate::CollectionMethods)
+    require 'yaqb/query_builders/paginators/will_paginate_helper'
+    Yaqb::QueryBuilders::Paginate.send(:include, Yaqb::QueryBuilders::Paginators::WillPaginateHelper)
+  else
+    raise LoadError
+  end
+rescue LoadError
+  exit
+end

data/lib/yaqb/query_builders/paginate.rb

@@ -6,8 +6,8 @@ module Yaqb
       def initialize(scope, query_params, url)
         @query_params = query_params
         @page = validate_param!(:page, 1)
-        @per = validate_param!(:per, Kaminari.config.default_per_page)
-        @scope = scope.page(@page).per(@per)
+        @per = validate_param!(:per, default_per_page)
+        @scope = paginate!(scope)
         @url = url
       end
 
@@ -24,37 +24,12 @@ module Yaqb
 
       private
 
-      def show_first_link?
-        @scope.total_pages > 1 && !@scope.first_page?
-      end
-
-      def show_previous_link?
-        !@scope.first_page?
-      end
-
-      def show_next_link?
-        !@scope.last_page?
-      end
-
-      def show_last_link?
-        @scope.total_pages > 1 && !@scope.last_page?
-      end
-
-      def pages
-        @pages ||= {}.tap do |h|
-          h[:first] = 1 if show_first_link?
-          h[:prev] = @scope.current_page - 1 if show_previous_link?
-          h[:next] = @scope.current_page + 1 if show_next_link?
-          h[:last] = @scope.total_pages if show_last_link?
-        end
-      end
-
       def validate_param!(name, default)
         return default unless @query_params[name]
 
         unless @query_params[name] =~ /\A\d+\z/
           raise Errors::QueryBuilderError.new("#{name}=#{@query_params[name]}"),
-          'Invalid Pagination params. Only numbers are supported for "page" and "per"'
+          'Invalid pagination params. Only numbers are supported for "page" and "per"'
         end
 
         @query_params[name]

data/lib/yaqb/query_builders/paginators/kaminari_helper.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module Yaqb
+  module QueryBuilders
+    module Paginators
+      module KaminariHelper
+        private
+
+        def paginate!(scope)
+          scope.page(@page).per(@per)
+        end
+
+        def show_first_link?
+          @scope.total_pages > 1 && !@scope.first_page?
+        end
+
+        def show_previous_link?
+          !@scope.first_page?
+        end
+
+        def show_next_link?
+          !@scope.last_page?
+        end
+
+        def show_last_link?
+          @scope.total_pages > 1 && !@scope.last_page?
+        end
+
+        def pages
+          @pages ||= {}.tap do |h|
+            h[:first] = 1 if show_first_link?
+            h[:prev] = @scope.current_page - 1 if show_previous_link?
+            h[:next] = @scope.current_page + 1 if show_next_link?
+            h[:last] = @scope.total_pages if show_last_link?
+          end
+        end
+
+        def default_per_page
+          Kaminari.config.default_per_page
+        end
+      end
+    end
+  end
+end

data/lib/yaqb/query_builders/paginators/will_paginate_helper.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module Yaqb
+  module QueryBuilders
+    module Paginators
+      module WillPaginateHelper
+        private
+
+        def paginate!(scope)
+          scope.paginate(page: @page, per_page: @per)
+        end
+
+        def show_first_link?
+          @scope.total_pages > 1 && !!@scope.previous_page
+        end
+
+        def show_previous_link?
+          !!@scope.previous_page
+        end
+
+        def show_next_link?
+          !!@scope.next_page
+        end
+
+        def show_last_link?
+          @scope.total_pages > 1 && !!@scope.next_page
+        end
+
+        def pages
+          @pages ||= {}.tap do |h|
+            h[:first] = 1 if show_first_link?
+            h[:prev] = @scope.current_page - 1 if show_previous_link?
+            h[:next] = @scope.current_page + 1 if show_next_link?
+            h[:last] = @scope.total_pages if show_last_link?
+          end
+        end
+
+        def default_per_page
+          WillPaginate.per_page
+        end
+      end
+    end
+  end
+end

data/lib/yaqb/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Yaqb
-  VERSION = '0.3.1'.freeze
+  VERSION = '0.4.0'
 end

data/lib/yaqb.rb

@@ -1,21 +1,11 @@
 # frozen_string_literal: true
 
-require 'yaqb/version'
-require 'yaqb/hooks'
-require 'yaqb/configuration'
-require 'yaqb/presenter'
-require 'yaqb/base'
-require 'yaqb/errors/query_builder_error'
+module Yaqb; end
 
-module Yaqb
-  class << self
-    def configure
-      yield(configuration)
-    end
+begin; require 'rails'; rescue LoadError; end
 
-    def configuration
-      @configuration ||= Configuration.new
-    end
-    alias config configuration
-  end
-end
+require 'yaqb/config'
+require 'yaqb/errors/query_builder_error'
+require 'yaqb/presenter'
+require 'yaqb/base'
+require 'yaqb/hooks'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yaqb
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Ronald Chacon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-12 00:00:00.000000000 Z
+date: 2019-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,12 +86,14 @@ files:
 - bin/setup
 - lib/yaqb.rb
 - lib/yaqb/base.rb
-- lib/yaqb/configuration.rb
+- lib/yaqb/config.rb
 - lib/yaqb/errors/query_builder_error.rb
 - lib/yaqb/hooks.rb
 - lib/yaqb/presenter.rb
 - lib/yaqb/query_builders/filter.rb
 - lib/yaqb/query_builders/paginate.rb
+- lib/yaqb/query_builders/paginators/kaminari_helper.rb
+- lib/yaqb/query_builders/paginators/will_paginate_helper.rb
 - lib/yaqb/query_builders/query_orchestrator.rb
 - lib/yaqb/query_builders/sort.rb
 - lib/yaqb/version.rb