jsonapi_compliable 0.7.4 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4824fc1b2bdda9663ce448f1625067b7a13a5eb
-  data.tar.gz: a9899e4acc340f754b8572439f2d2557f6e17318
+  metadata.gz: 52e6a7995d336578ca203daba3bfc589ab698bb6
+  data.tar.gz: 6b0e1ce3de7b1efe8244082cfff43555342db8be
 SHA512:
-  metadata.gz: 2f09e4b11092e568eca6564ffcfff9a0532be6b9ce2ad56bc414c0333aadcb2011e7f854828c29568508afdb2efce6ac43fc57dd9e4e7045a4bc57739ea102cd
-  data.tar.gz: a75fa2b148bf3d20638ce829f6b53bb2329990432e2684fac8f9ba8ba0e628ae0e83bd0fc5dd363cc554e6d04be9d21560bb73faa36cdb0be6b282e678b38f2e
+  metadata.gz: 25f14cc6324bc5bdc7142ffb87a2753c662663496f57870192ca0b390a6cee968410e0c6bb5ed96c08aad802e481f355bcc83f0cd0a30dbab95f023d83732e99
+  data.tar.gz: 915dee64a3968483f19c63afbc8e8d055be6b6c4d2e74df09dbb0ea3b08bd537da365a6094b42a5349d7dffb7a90a2a45a89c5988d003d943cf54c3e56df121d

data/gemfiles/rails_5.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "rails", ['>= 5.0', '< 5.1']
+gem "rails", "~> 5.0"
 gem "jsonapi-rails", "~> 0.1.0", :require => "jsonapi/rails"
 gem "rspec-rails"
 

data/lib/jsonapi_compliable/adapters/active_record_sideloading.rb

@@ -76,7 +76,7 @@ module JsonapiCompliable
             parent_ids = parents.map { |p| p.send(primary_key) }
             parent_ids.uniq!
             parent_ids.compact!
-            _scope.call.joins(through).where(through => { fk => parent_ids })
+            _scope.call.joins(through).where(through => { fk => parent_ids }).distinct
           end
 
           assign do |parents, children|

data/lib/jsonapi_compliable/sideload.rb

@@ -310,7 +310,10 @@ module JsonapiCompliable
     # @return [Hash] The nested include hash
     # @api private
     def to_hash(processed = [])
-      return { name => {} } if processed.include?(self)
+      # Cut off at 5 recursions
+      if processed.select { |p| p == self }.length == 5
+        return { name => {} }
+      end
       processed << self
 
       result = { name => {} }.tap do |hash|

data/lib/jsonapi_compliable/version.rb

@@ -1,3 +1,3 @@
 module JsonapiCompliable
-  VERSION = "0.7.4"
+  VERSION = "0.7.5"
 end

metadata

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