jsonapi.rb 1.3.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b953a7e7e5eba1a9cb24e6b7e4eb11a3d992b1f9
-  data.tar.gz: d082592d88b8b2e6a87ecc02f83ae5a4b9c8dc82
+  metadata.gz: 28e026528b72f7e8474b8ac1c7dd868aa4dc31c2
+  data.tar.gz: bef3b693f87d95ea19dee1ea5af22899585153ca
 SHA512:
-  metadata.gz: b4ceecb9f9765f5b1f6ba3c765163871b9d5a1e898fb81f6a4ca356ff365230b188cc103da845e6ea5e237be3d17ee413d217d4bca926803c00b564a20eefad0
-  data.tar.gz: c05b90c5b9853652f7111a4d323a6e9489f6df405b121e3219fcd0c8479960c534de8bbe616fdbe59042367b2a8f570095203ef922aa73f080009dc4f8e5d40c
+  metadata.gz: bc20a859dfdccfe05188360736c38b5575de904e26b7647218b27f511fc978c6ce6e546698734ba2add7c7dbfe009d32d12d192990e71122c164789be11079c4
+  data.tar.gz: 4b5e1a141b28cacb86e08c3276791e67cc297803b5de4632c22e5c5e89ad36812810bcb32e396d6c8e04196d1f8299184919444be125734519b6f9fc006107fa

data/Gemfile.lock

@@ -8,7 +8,7 @@ GIT
 PATH
   remote: .
   specs:
-    jsonapi.rb (1.3.2)
+    jsonapi.rb (1.3.3)
       fast_jsonapi (~> 1.5)
       rack
       ransack
@@ -70,7 +70,7 @@ GEM
     ffaker (2.10.0)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    i18n (1.5.1)
+    i18n (1.5.3)
       concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.2)
     json (2.1.0)
@@ -87,10 +87,10 @@ GEM
     mini_portile2 (2.4.0)
     minitest (5.11.3)
     nio4r (2.3.1)
-    nokogiri (1.10.0)
+    nokogiri (1.10.1)
       mini_portile2 (~> 2.4.0)
-    parallel (1.12.1)
-    parser (2.5.3.0)
+    parallel (1.13.0)
+    parser (2.6.0.0)
       ast (~> 2.4.0)
     powerpack (0.1.2)
     rack (2.0.6)
@@ -139,7 +139,7 @@ GEM
     rspec-mocks (3.8.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
-    rspec-rails (3.8.1)
+    rspec-rails (3.8.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
@@ -148,7 +148,7 @@ GEM
       rspec-mocks (~> 3.8.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.0)
-    rubocop (0.62.0)
+    rubocop (0.63.1)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.5, != 2.5.1.1)
@@ -156,7 +156,7 @@ GEM
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.4.0)
-    rubocop-rails_config (0.4.0)
+    rubocop-rails_config (0.4.2)
       railties (>= 3.0)
       rubocop (~> 0.58)
     ruby-progressbar (1.10.0)
@@ -181,7 +181,7 @@ GEM
     websocket-driver (0.7.0)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.3)
-    yard (0.9.16)
+    yard (0.9.18)
     yardstick (0.9.9)
       yard (~> 0.8, >= 0.8.7.2)
 
@@ -202,4 +202,4 @@ DEPENDENCIES
   yardstick
 
 BUNDLED WITH
-   1.16.3
+   1.17.3

data/lib/jsonapi/fetching.rb

@@ -9,8 +9,10 @@ module JSONAPI
     #
     # @return [Hash]
     def jsonapi_fields
+      return {} unless params[:fields].respond_to?(:each_pair)
+
       ActiveSupport::HashWithIndifferentAccess.new.tap do |h|
-        (params[:fields] || []).each do |k, v|
+        params[:fields].each do |k, v|
           h[k] = v.split(',').map(&:strip).compact
         end
       end

data/lib/jsonapi/filtering.rb

@@ -8,7 +8,7 @@ module JSONAPI
     #
     # @param requested_field [String] the field to parse
     # @return [Array] with the fields and the predicate
-    def self.extract_attributes_and_predicate(requested_field)
+    def self.extract_attributes_and_predicates(requested_field)
       predicates = []
       field_name = requested_field.to_s.dup
 
@@ -55,7 +55,7 @@ module JSONAPI
 
       requested.each_pair do |requested_field, to_filter|
         field_names, predicates = JSONAPI::Filtering
-          .extract_attributes_and_predicate(requested_field)
+          .extract_attributes_and_predicates(requested_field)
 
         if to_filter.is_a?(String) && to_filter.include?(',')
           to_filter = to_filter.split(',')
@@ -87,7 +87,7 @@ module JSONAPI
         end
 
         field_names, predicates = JSONAPI::Filtering
-          .extract_attributes_and_predicate(requested_field)
+          .extract_attributes_and_predicates(requested_field)
 
         next unless (field_names - allowed_fields).empty?
         next if !options[:sort_with_expressions] && predicates.any?

data/lib/jsonapi/patches.rb

@@ -50,7 +50,10 @@ Ransack::Visitor.class_eval do
     valid = (binded.valid? if binded.respond_to?(:valid?)) || true
     return unless binded.present? && valid
 
-    binded.arel_predicate.public_send(node.dir)
+    arel_pred = binded.arel_predicate
+    # Remove any alias when sorting...
+    arel_pred.alias = nil if arel_pred.respond_to?(:alias=)
+    arel_pred.public_send(node.dir)
   end
 end
 

data/lib/jsonapi/version.rb

@@ -1,3 +1,3 @@
 module JSONAPI
-  VERSION = '1.3.2'
+  VERSION = '1.3.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jsonapi.rb
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors:
 - Stas Suscov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-27 00:00:00.000000000 Z
+date: 2019-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fast_jsonapi