jsonapi_compliable 0.5.6 → 0.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1a466dbd616c05cad9dd31c7c57904056e86e7a
-  data.tar.gz: ed4007bed09c929be5a54b1e65d8da25721b8b61
+  metadata.gz: 51079670b0c1dedbb613140f18d466467aac8176
+  data.tar.gz: 25aa3bb0cafd200e8508d7e9492ca6334f2451d4
 SHA512:
-  metadata.gz: fd5d8efef4d85afae6f027f89ac1082e28041b6c78cd24a7da33a5e2474132f392b0c97048877fc1ed505ecb943d5a9a587486fc7b87087b34d42a7c9e874f7f
-  data.tar.gz: 56ceebd8d57413fd798fabe9bb3940f8c73a5bc7c8e3bb9f0d709a77e75f62e261c344a23536c317cd1e214454a1dc5ced7cd55e4829cca9b3d46d315b305e7c
+  metadata.gz: a11eafba78c92d9b13d547b0ab43d6fec831a4f0f872c79d122a289f76be3a22dd16c53e78fb7f2a242c6b4bec92b3795fd3c0d8a8fee4b7d75788572200a938
+  data.tar.gz: a654eea7228308a1a057522fa6c0b5783a93c7644ef4c5b444100a1c543cfc3365e03a40d5f8aa9038b8557790dcfd60067ad8e0f6665e04a4636ec0f40dc1fa

data/lib/jsonapi_compliable/adapters/active_record_sideloading.rb

@@ -7,7 +7,7 @@ module JsonapiCompliable
         allow_sideload association_name, resource: resource do
           scope do |parents|
             parent_ids = parents.map { |p| p.send(primary_key) }
-            _scope.call.where(foreign_key => parent_ids)
+            _scope.call.where(foreign_key => parent_ids.uniq.compact)
           end
 
           assign do |parents, children|
@@ -30,7 +30,7 @@ module JsonapiCompliable
         allow_sideload association_name, resource: resource do
           scope do |parents|
             parent_ids = parents.map { |p| p.send(foreign_key) }
-            _scope.call.where(primary_key => parent_ids)
+            _scope.call.where(primary_key => parent_ids.uniq.compact)
           end
 
           assign do |parents, children|
@@ -50,7 +50,7 @@ module JsonapiCompliable
         allow_sideload association_name, resource: resource do
           scope do |parents|
             parent_ids = parents.map { |p| p.send(primary_key) }
-            _scope.call.where(foreign_key => parent_ids)
+            _scope.call.where(foreign_key => parent_ids.uniq.compact)
           end
 
           assign do |parents, children|
@@ -73,7 +73,10 @@ module JsonapiCompliable
 
         allow_sideload association_name, resource: resource do
           scope do |parents|
-            _scope.call.joins(through).where(through => { fk => parents.map { |p| p.send(primary_key) } })
+            parent_ids = parents.map { |p| p.send(primary_key) }
+            parent_ids.uniq!
+            parent_ids.compact!
+            _scope.call.joins(through).where(through => { fk => parent_ids })
           end
 
           assign do |parents, children|
@@ -100,7 +103,10 @@ module JsonapiCompliable
 
             allow_sideload type, resource: config[:resource] do
               scope do |parents|
-                config[:scope].call.where(primary_key => parents.map { |p| p.send(foreign_key) })
+                parent_ids = parents.map { |p| p.send(foreign_key) }
+                parent_ids.compact!
+                parent_ids.uniq!
+                config[:scope].call.where(primary_key => parent_ids)
               end
 
               assign do |parents, children|

data/lib/jsonapi_compliable/deserializable.rb

@@ -61,7 +61,7 @@ module JsonapiCompliable
         hash = attributes
         hash = hash.merge(relationships)
         hash = @namespace ? { parsed_type => hash } : hash
-        hash.merge(@params.except(:data)).deep_symbolize_keys
+        hash.reverse_merge(@params.except(:data)).deep_symbolize_keys
       end
 
       private

data/lib/jsonapi_compliable/scope.rb

@@ -35,6 +35,8 @@ module JsonapiCompliable
     private
 
     def sideload(results, includes)
+      return if results == []
+
       includes.each_pair do |name, nested|
         if @resource.allowed_sideloads.has_key?(name)
           sideload = @resource.sideload(name)
@@ -49,7 +51,7 @@ module JsonapiCompliable
       @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).apply unless opts[:paginate] == false
+      @object = JsonapiCompliable::Scoping::Paginate.new(@resource, query_hash, @object, default: opts[:default_paginate]).apply unless opts[:paginate] == false
     end
   end
 end

data/lib/jsonapi_compliable/scoping/base.rb

@@ -3,14 +3,23 @@ module JsonapiCompliable
     class Base
       attr_reader :resource, :query_hash
 
-      def initialize(resource, query_hash, scope)
+      def initialize(resource, query_hash, scope, opts = {})
         @query_hash = query_hash
         @resource   = resource
         @scope      = scope
+        @opts       = opts
       end
 
       def apply
-        apply_standard_or_override
+        if apply?
+          apply_standard_or_override
+        else
+          @scope
+        end
+      end
+
+      def apply?
+        true
       end
 
       def apply_standard_or_override

data/lib/jsonapi_compliable/scoping/paginate.rb

@@ -11,6 +11,14 @@ module JsonapiCompliable
       end
     end
 
+    def apply?
+      if @opts[:default] == false
+        not [page_param[:size], page_param[:number]].all?(&:nil?)
+      else
+        true
+      end
+    end
+
     def custom_scope
       resource.pagination
     end

data/lib/jsonapi_compliable/sideload.rb

@@ -93,7 +93,7 @@ module JsonapiCompliable
 
     def resolve_basic(parents, query, namespace)
       sideload_scope   = scope_proc.call(parents)
-      sideload_scope   = Scope.new(sideload_scope, resource_class.new, query, namespace: namespace)
+      sideload_scope   = Scope.new(sideload_scope, resource_class.new, query, default_paginate: false, namespace: namespace)
       sideload_results = sideload_scope.resolve
       assign_proc.call(parents, sideload_results)
     end

data/lib/jsonapi_compliable/version.rb

@@ -1,3 +1,3 @@
 module JsonapiCompliable
-  VERSION = "0.5.6"
+  VERSION = "0.5.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsonapi_compliable
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.5.7
 platform: ruby
 authors:
 - Lee Richmond
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-08 00:00:00.000000000 Z
+date: 2017-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsonapi-serializable