effective_resources 0.3.7 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eba61020b65a6e32afe9b254b63ea4566a5cceb8
-  data.tar.gz: df4d4f4b07974c76c288524bd4961baef118e929
+  metadata.gz: 3d1402ecc05965bee97bc9bc54cab706bac0fed5
+  data.tar.gz: 3f6b2afd4c260dc4ecd7460e0ab68043b778509c
 SHA512:
-  metadata.gz: 82609d5b75b873aa5a2cdf29e20f0c8226fd0fd956ebe53d2419601ace5985999a6eb79cf94c9992b808de9c0255fa7ca1858934b16e5b9b608d007efaff4bca
-  data.tar.gz: de1464c94be8db959eb5fd245a157d30f107b95eea31ac1c15bafc37642a2194479c27c22fcd2cc5127c0381faba1361f1b86f92b1bd04374fa991c3fff3f48d
+  metadata.gz: 4f8fcd372c81a61cf1592533a4914bf1bfff2a7a0ccfd83eb385a798fb4e81d7f157e876b0e61c99897bf510ce64b68cc69920d68061abddfddd79f25e84275c
+  data.tar.gz: 9f20ffeb34e900ba6e48d593613c8aeb4be46a8463cc4cd31c052b2b8aa2b9844dca83bb6fb5a1c4124dbd8708c72f734a8a8c715ae530d5db6f0f05a144fdf2

data/app/models/effective/resources/instance.rb

@@ -5,6 +5,10 @@ module Effective
 
       # This is written for use by effective_logging and effective_trash
 
+      def instance
+        @instance || klass.new
+      end
+
       def instance_attributes
         return {} unless instance.present?
 

data/app/models/effective/resources/relation.rb

@@ -184,7 +184,7 @@ module Effective
           keys = klass.joins(association.name)
             .where(association.name => { association.source_reflection.klass.primary_key => values })
             .pluck(klass.primary_key)
-        elsif association.macro == :has_many && association.options[:through].present?
+        elsif association.options[:through].present?
           key = sql_column(klass.primary_key)
 
           if association.source_reflection.options[:polymorphic]
@@ -201,7 +201,12 @@ module Effective
             scope = scope.where(association.source_reflection.foreign_type => reflected_klass.name)
           end
 
-          keys = scope.pluck(association.through_reflection.foreign_key)
+          if association.through_reflection.macro == :belongs_to
+            key = association.through_reflection.foreign_key
+            keys = scope.pluck(association.through_reflection.klass.primary_key)
+          else
+            keys = scope.pluck(association.through_reflection.foreign_key)
+          end
         elsif association.macro == :has_many
           key = sql_column(klass.primary_key)
           keys = relation.pluck(association.foreign_key)

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '0.3.7'.freeze
+  VERSION = '0.3.8'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-28 00:00:00.000000000 Z
+date: 2017-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails