jbuilder_pagination_plus 0.0.5 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5cc64afe36c2c07f15f597880a0b359c78018443
-  data.tar.gz: 260decbe1eb3f34d4863d6ea33ca8a9cb44dc244
+SHA256:
+  metadata.gz: cececb634f26e00fe8a3d65d1144eccef856b13a707529594abde9fc1c27d0da
+  data.tar.gz: 3ac8472d5ff0b3c2b5fe9aee0d9585db0e8458bd4ff01477ea0ea01c2dbc0515
 SHA512:
-  metadata.gz: 3178350c163c1f0fba32fd2b530acefcc53dd8f987a019d70ab0fcf8d7e0491eb3ea1630f46eb7541d63c824f40950e9957a4c4978588a52aa2fcd5317c21be3
-  data.tar.gz: f33763dbdfe7dad071898bd3e9de0c21451d48721dc4beb3c3503227861551ab12f4eb0bfb05ec42c561abf0410fabe7bcc0a8957c8ee44498d3444d14d6e100
+  metadata.gz: 7069f7c1bbfdabe4d0ed7c617e30867d59e61d32bfdd911661fbd8b95c05ab0ee2d9a38e80a8b78bd00965ff673e96fc1a66b1dfabb313adc2e61d630d5c9b14
+  data.tar.gz: c8bce1f559d82dd49a18aa052f5af9692895382331c2cea4e31ddb2f94ea9f5c0849b168f1d59905e2bbd8d3dddd9faff2824ff64d5680d5ecd743bd2fb8386a

data/.ruby-version

@@ -1 +1 @@
-ruby-2.4.3
+ruby-2.5.3

data/.travis.yml

@@ -0,0 +1,7 @@
+language: ruby
+rvm:
+  - 2.5.3
+sudo: false
+install: bin/setup
+script:
+  - bundle exec rspec spec

data/Rakefile

@@ -1 +1,9 @@
 require "bundler/gem_tasks"
+require 'rspec/core'
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = 'spec/**/*_spec.rb'
+end
+
+task default: %i[spec]

data/jbuilder_pagination_plus.gemspec

@@ -19,8 +19,9 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency 'jbuilder', '~> 2.2', '>= 2.2.0'
-  spec.add_development_dependency 'rspec', '~> 3.2', '>= 3.2.0'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_runtime_dependency 'rack', '~> 2.0', '>= 2.0.0'
+  spec.add_runtime_dependency 'jbuilder', '~> 2.8', '>= 2.8.0'
+  spec.add_development_dependency 'rspec', '~> 3.8', '>= 3.8.0'
+  spec.add_development_dependency 'rake', '~> 12.0', '>= 12.0.0'
   spec.add_development_dependency 'pry', '~> 0'
 end

data/lib/jbuilder/pagination.rb

@@ -1,5 +1,6 @@
-require "jbuilder"
-require "jbuilder/pagination/pages"
+require 'rack/utils'
+require 'jbuilder'
+require 'jbuilder/pagination/pages'
 require 'jbuilder/pagination/exceptions/unpageable_resource_error'
 
 module Pagination

data/lib/jbuilder/pagination/pages.rb

@@ -1,41 +1,50 @@
 class Jbuilder
   ONE_PAGE = 1
 
-  def pages!(collection, options={})
+  def pages!(collection, options = {})
     return unless collection && is_paginated?(collection)
 
+    options_url = options.fetch(:url, nil)
+    original_url = nil
+    original_params = {}
+    if options_url
+      original_url, original_params = options_url.split("?")
+      original_params = ::Rack::Utils.parse_nested_query(original_params).deep_symbolize_keys
+    end
+    options_query_parameters = options.fetch(:query_parameters, {})
+
     pages_from(collection).map do |key, value|
-      params = query_parameters(options).merge(page: { number: value, size: collection.size }).to_query
-      _set_value key, "#{options.fetch(:url, nil)}?#{params}"
+      params = query_parameters(options_query_parameters, original_params).deep_merge(page: { number: value, size: collection.size }).to_query
+      _set_value key, "#{original_url}?#{params}"
     end
   end
 
   private
 
-  def pages_from(collection)
-    {}.tap do |pages|
-      pages[:self] = collection.current_page
-      return pages if collection.total_pages <= ONE_PAGE
+    def pages_from(collection)
+      {}.tap do |pages|
+        pages[:self] = collection.current_page
+        return pages if collection.total_pages <= ONE_PAGE
 
-      unless collection.current_page == ONE_PAGE
-        pages[:first] = ONE_PAGE
-        pages[:prev]  = collection.current_page - ONE_PAGE
-      end
+        unless collection.current_page == ONE_PAGE
+          pages[:first] = ONE_PAGE
+          pages[:prev] = collection.current_page - ONE_PAGE
+        end
 
-      unless collection.current_page == collection.total_pages
-        pages[:next] = collection.current_page + ONE_PAGE
-        pages[:last] = collection.total_pages
+        unless collection.current_page == collection.total_pages
+          pages[:next] = collection.current_page + ONE_PAGE
+          pages[:last] = collection.total_pages
+        end
       end
     end
-  end
 
-  def query_parameters(options)
-    @query_parameters ||= (options.fetch(:query_parameters, {}) || {}).compact
-  end
+    def query_parameters(query_parameters, original_parameters)
+      @query_parameters ||= original_parameters.deep_merge(query_parameters || {}).compact
+    end
 
-  def is_paginated?(collection)
-    collection.respond_to?(:current_page) &&
-      collection.respond_to?(:total_pages) &&
-      collection.respond_to?(:size)
-  end
+    def is_paginated?(collection)
+      collection.respond_to?(:current_page) &&
+          collection.respond_to?(:total_pages) &&
+          collection.respond_to?(:size)
+    end
 end

data/lib/jbuilder/pagination/version.rb

@@ -1,5 +1,5 @@
 module Jbuilder
   class Pagination
-    VERSION = "0.0.5"
+    VERSION = "1.0.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jbuilder_pagination_plus
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 1.0.0
 platform: ruby
 authors:
 - Bruno Bacarini
@@ -9,62 +9,88 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-24 00:00:00.000000000 Z
+date: 2019-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: jbuilder
+  name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.0.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: jbuilder
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.8.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.8.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.8'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.8.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.8.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.8'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 12.0.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 12.0.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -93,6 +119,7 @@ files:
 - ".rspec"
 - ".ruby-gemset"
 - ".ruby-version"
+- ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -125,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: Jbuilder extension to allows pagination according to JSON API format