jsonapi.rb 1.5.6 → 1.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01dd65d6881984784e66ada7c2f9b6a551df29ba
-  data.tar.gz: 49f56ed690ce73266c3647106b24feac1795f84a
+  metadata.gz: 521d608a58983b2c99246e34faf27eae9bb38b32
+  data.tar.gz: 02a2e7a0086ede91a907d8c7d097150f0222b768
 SHA512:
-  metadata.gz: f1690aedae0537c30374eebb9322fb21b99eb4312226ce1b1db1ff014ed621a7c20e8d828ea2784cad51d467681104e2273993e8f1a7d1453382c934145d51fe
-  data.tar.gz: 810c694b033419721279c8dd3c0297081894d855003d1e88852cab94e94dc671aea3cdb68eb76014f7a8e5b78d6cbbc1c5c1c4920a9d815196d9c72fd3027dc3
+  metadata.gz: 23f3ebb21b586e5995b6cb4f2c2ae8f3636f93f5f0e11b9fdbbabdb4087c32850bcda172aeda4aabb8f58f762a23e8c034128f4b48bb7ed38d5ee2c573778ff4
+  data.tar.gz: b0cdb369d4265dd306a1af8206a46f837322ec00142ec2fac9c40c0ebcc6010cd4f2b7982e05f7ff2f489a960def72431ffc140f3460bffcf9ebecf65aee710d

data/.github/workflows/ci.yml

@@ -1,6 +1,6 @@
 name: CI
 
-on: [push]
+on: [push, pull_request]
 
 jobs:
   ruby_rails_test_matrix:
@@ -27,7 +27,9 @@ jobs:
         RAILS_VERSION: ~> ${{ matrix.rails }}
       run: |
         rm -rf Gemfile.lock
+        sudo apt-get update
         sudo apt-get install libsqlite3-dev
+        gem uninstall bundler -a --force
         gem install bundler -v '~> 1'
         echo $RAILS_VERSION | grep -q '4' && export SQLITE3_VERSION='~> 1.3.6'
         bundle

data/lib/jsonapi/pagination.rb

@@ -30,14 +30,14 @@ module JSONAPI
     #
     # @return [Array]
     def jsonapi_pagination(resources)
-      links = { self: request.base_url + request.original_fullpath }
+      links = { self: request.base_url + request.fullpath }
       pagination = jsonapi_pagination_meta(resources)
 
       return links if pagination.blank?
 
       original_params = params.except(
-        *request.path_parameters.keys.map(&:to_s)
-      ).to_unsafe_h.with_indifferent_access
+        *jsonapi_path_parameters.keys.map(&:to_s)
+      ).as_json.with_indifferent_access
 
       original_params[:page] = original_params[:page].dup || {}
       original_url = request.base_url + request.path + '?'
@@ -63,7 +63,7 @@ module JSONAPI
       numbers = { current: page }
 
       if resources.respond_to?(:unscope)
-        total = resources.unscope(:limit, :offset).count()
+        total = resources.unscope(:limit, :offset, :order).count()
       else
         # Try to fetch the cached size first
         total = resources.instance_variable_get(:@original_size)
@@ -98,5 +98,14 @@ module JSONAPI
 
       [(num - 1) * per_page, per_page, num]
     end
+
+    # Fallback to Rack's parsed query string when Rails is not available
+    #
+    # @return [Hash]
+    def jsonapi_path_parameters
+      return request.path_parameters if request.respond_to?(:path_parameters)
+
+      request.send(:parse_query, request.query_string, '&;')
+    end
   end
 end

data/lib/jsonapi/version.rb

@@ -1,3 +1,3 @@
 module JSONAPI
-  VERSION = '1.5.6'
+  VERSION = '1.5.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jsonapi.rb
 version: !ruby/object:Gem::Version
-  version: 1.5.6
+  version: 1.5.7
 platform: ruby
 authors:
 - Stas Suscov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-08 00:00:00.000000000 Z
+date: 2020-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fast_jsonapi