jsonapi_compliable 0.11.17 → 0.11.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 649f0580f8ec8efbfbb9cec9a190390fa7b99cb9
-  data.tar.gz: fd775c165ecee97fc424ac0b4f9ab9196b6e8f9b
+  metadata.gz: 8ae4537ec81c633eb467154e5652f75ec7c67616
+  data.tar.gz: c6c9b4a8920411b3fb493a021c768ebaead6702f
 SHA512:
-  metadata.gz: b35775bc5eb4c3bd7b7b0812fe8b42e60cf8a1f5c55b0b272df64f6243ab8a2a260fa325c0d4bdebcf5f173b4d530666b659858c361d586ac72675b6634f2103
-  data.tar.gz: 96cfc2f2b74d39fce6a746b1e5e61ef67a943d6ad234f103b78796fbc9a9ccd4e1d52a73fdd865b3d4fe68be4d62bbc553b563f678c49d6e7b72b2ce63ffbe45
+  metadata.gz: 9289db353d5542c7cd347ecaa875c3794d89ab1f49e67eea3b49ca8c176ba229c00834b16253644690a46c6f2580b2387c74961ad8039913c8e2aa67ce4c85ef
+  data.tar.gz: fa52bb8ced3115a8037ef8e9d97ab7180d373fde955c1aa5d812d7a5c4479586b217092cb164a21f30178df5792f2c0ebb4de8ebc622b5e40433eb81388c274b

data/lib/jsonapi_compliable/scope.rb

@@ -118,13 +118,17 @@ module JsonapiCompliable
       end
     end
 
-    def apply_scoping(opts)
-      @object = JsonapiCompliable::Scoping::DefaultFilter.new(@resource, query_hash, @object).apply
-      @object = JsonapiCompliable::Scoping::Filter.new(@resource, query_hash, @object).apply unless opts[:filter] == false
-      @object = JsonapiCompliable::Scoping::ExtraFields.new(@resource, query_hash, @object).apply unless opts[:extra_fields] == false
-      @object = JsonapiCompliable::Scoping::Sort.new(@resource, query_hash, @object).apply unless opts[:sort] == false
-      @unpaginated_object = @object
-      @object = JsonapiCompliable::Scoping::Paginate.new(@resource, query_hash, @object, default: opts[:default_paginate]).apply unless opts[:paginate] == false
+     def apply_scoping(opts)
+      add_scoping(nil, JsonapiCompliable::Scoping::DefaultFilter, opts)
+      add_scoping(:filter, JsonapiCompliable::Scoping::Filter, opts)
+      add_scoping(:extra_fields, JsonapiCompliable::Scoping::ExtraFields, opts)
+      add_scoping(:sort, JsonapiCompliable::Scoping::Sort, opts)
+      add_scoping(:paginate, JsonapiCompliable::Scoping::Paginate, opts, default: opts[:default_paginate])
+    end
+
+    def add_scoping(key, scoping_class, opts, default = {})
+      @object = scoping_class.new(@resource, query_hash, @object, default).apply unless opts[key] == false
+      @unpaginated_object = @object unless key == :paginate
     end
   end
 end

data/lib/jsonapi_compliable/version.rb

@@ -1,3 +1,3 @@
 module JsonapiCompliable
-  VERSION = "0.11.17"
+  VERSION = "0.11.18"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsonapi_compliable
 version: !ruby/object:Gem::Version
-  version: 0.11.17
+  version: 0.11.18
 platform: ruby
 authors:
 - Lee Richmond
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-02 00:00:00.000000000 Z
+date: 2018-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsonapi-serializable