effective_resources 0.7.7 → 0.7.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1aa7e76fe50300298a588eba9b2e78cebb8fc8fa
-  data.tar.gz: c2f1e411a4bee8da004429832034947e215a6e5a
+  metadata.gz: 3deaacf629c453d765b048261350ddc03cc9f45e
+  data.tar.gz: 25fc0245a9598ad7c007de51b19e7fa1ca3e3df5
 SHA512:
-  metadata.gz: 7e9698bc84efc80a4c45b9ed43edc576375167139c729469f8e07bb6aef69b8f344d65d802d8fd72f4e07ff9a8b2377cd7a327cfd51a30d4d0a272f9e085bb7a
-  data.tar.gz: b620b567f3eb8c6312ad1b0ae324af77816b56e22bfaaaad0ce3c51ae6c2268e8d830f70c397ababb46d3e070ff22a92fb71210ca9862b3a04a9a3a15bc8bff0
+  metadata.gz: 0f928dcba37bb38344262d307c254476456af1055df9e4a0f83f47c33da92bc153735b1c220f7b3719e323ae9dac6832460a6d3ab4b8279f2c64b2575f822177
+  data.tar.gz: 75fa4e057ce348f2090a5afdf7d805493b026b8fe9a8dfe8164d7c9f6f3b274c70433f98d96cedcce203639b90b963c80eeed90997474d47e69e7a5106497daf

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

@@ -39,9 +39,9 @@ module Effective
       def belongs_to(name)
         if name.kind_of?(String) || name.kind_of?(Symbol)
           name = (name.to_s.end_with?('_id') ? name.to_s[0...-3] : name).to_sym
-          belong_tos.find { |ass| ass.name == name }
+          belong_tos.find { |ass| ass.name == name && !ass.options[:polymorphic] }
         else
-          belong_tos.find { |ass| ass.klass == name.class }
+          belong_tos.find { |ass| ass.klass == name.class && !ass.options[:polymorphic] }
         end
       end
 

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

@@ -26,8 +26,8 @@ module Effective
             .order(order_by_associated_conditions(association, sort: sort, direction: direction, limit: limit))
         when :belongs_to_polymorphic
           relation
-            .order("#{sql_column.sub('_id', '_type')} #{sql_direction}")
-            .order("#{sql_column} #{sql_direction}")
+            .order("#{sql_column}_type #{sql_direction}")
+            .order("#{sql_column}_id #{sql_direction}")
         when :has_and_belongs_to_many, :has_many, :has_one
           relation
             .order(order_by_associated_conditions(association, sort: sort, direction: direction, limit: limit))
@@ -77,10 +77,10 @@ module Effective
           (type, id) = term.split('_')
 
           if type.present? && id.present?
-            relation.where("#{sql_column} = ?", id).where("#{sql_column.sub('_id', '_type')} = ?", type)
+            relation.where("#{sql_column}_id = ?", id).where("#{sql_column}_type = ?", type)
           else
             id ||= Effective::Attribute.new(:integer).parse(term)
-            relation.where("#{sql_column} = ? OR #{sql_column.sub('_id', '_type')} = ?", id, (type || term))
+            relation.where("#{sql_column}_id = ? OR #{sql_column}_type = ?", id, (type || term))
           end
         when :effective_addresses
           relation.where(id: Effective::Resource.new(association).search_any(value, fuzzy: fuzzy).pluck(:addressable_id))

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '0.7.7'.freeze
+  VERSION = '0.7.8'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 0.7.7
+  version: 0.7.8
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-11 00:00:00.000000000 Z
+date: 2018-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails