pragma-decorator 2.2.2 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8bb3d13a9c56f66c118d61a10b39ec6c747085e668b56a43506d1e4a98df3642
-  data.tar.gz: 124016af425c1c97362816995a381d6fed4933c4f6a2b94aa7876a5dadbbb011
+  metadata.gz: d1f2bd7c761c330889bdc0ade7c83f1e9cd6921fc8c81d5b5fc3352bfdc114a9
+  data.tar.gz: d2bf1594ada1c8793dee81d0bccb0768ad24b8e6b2a797c148e247c0bde2e4be
 SHA512:
-  metadata.gz: 699a8306445e1849e2d4665f516747e0239fd4388abf27990efcfceaef6cfb71da37224a7418a2a8cbd8918cd60f9c4f82594b4e49c569848506a1e12ecf699a
-  data.tar.gz: 15d9195932dd144757582d004f32f0c4e2f873860944f1009160fe60bf55183b6b8fa394d62ef4779d0871d824000d68105d44ca307cd3060ba3b0ecc13b3f68
+  metadata.gz: e149d329a44e39fe7004bd5a79a5612ef2ef8dd9cf0893f871d009ffe47ebb759ad39ee10d98947a3a11948b9403ce1dd0038f93c8940d9dcf6253cb85fc236a
+  data.tar.gz: f879896b77db56e45224138a0e0f59289a7ddf8e602d4b4f876ebb7a60fa04a69b57bba64fc7bc93c1a8aa3f6fd064c0e715b129faa4ca84dc03b377b826d0aa

data/CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [2.2.3]
+
+### Fixed
+
+- Fixed an issue with the loading of polymorphic associations
+
 ## [2.2.2]
 
 ### Fixed
@@ -69,7 +75,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 First Pragma 2 release.
 
 [Unreleased]: https://github.com/pragmarb/pragma-decorator/compare/v2.2.2...HEAD
-[2.2.1]: https://github.com/pragmarb/pragma-decorator/compare/v2.2.1...v2.2.2
+[2.2.3]: https://github.com/pragmarb/pragma-decorator/compare/v2.2.2...v2.2.3
+[2.2.2]: https://github.com/pragmarb/pragma-decorator/compare/v2.2.1...v2.2.2
 [2.2.1]: https://github.com/pragmarb/pragma-decorator/compare/v2.2.0...v2.2.1
 [2.2.0]: https://github.com/pragmarb/pragma-decorator/compare/v2.1.1...v2.2.0
 [2.1.1]: https://github.com/pragmarb/pragma-decorator/compare/v2.1.0...v2.1.1

data/lib/pragma/decorator/association/adapter/active_record.rb

@@ -91,8 +91,14 @@ module Pragma
           private
 
           def compute_belongs_to_fk
+            primary_key = if association_reflection.polymorphic?
+              association_reflection.options[:primary_key] || associated_object.class.primary_key
+            else
+              association_reflection.association_primary_key
+            end
+
             if model.association(reflection.property).loaded?
-              return associated_object&.public_send(association_reflection.association_primary_key)
+              return associated_object&.public_send(primary_key)
             end
 
             if association_reflection.scope.nil?
@@ -101,7 +107,7 @@ module Pragma
 
             pluck_association_fk do |scope|
               fk = model.public_send(association_reflection.foreign_key)
-              scope.where(association_reflection.association_primary_key => fk)
+              scope.where(primary_key => fk)
             end
           end
 

data/lib/pragma/decorator/version.rb

@@ -2,6 +2,6 @@
 
 module Pragma
   module Decorator
-    VERSION = '2.2.2'
+    VERSION = '2.2.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pragma-decorator
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.2.3
 platform: ruby
 authors:
 - Alessandro Desantis
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-28 00:00:00.000000000 Z
+date: 2018-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: roar
@@ -194,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.5
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: Convert your API resources into JSON with minimum hassle.