effective_resources 1.3.14 → 1.3.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8f669acc7d9842e3a4f72fd492b031b168cd3a338b65f7e39048c5d904315ce
-  data.tar.gz: 9c4063272dfb5a3a8c7ea72eda7593ec5d151a19ce0d884fcfa0713243668910
+  metadata.gz: c9401a04b558eb6438c84b7a4fefe259d37fc3deecf022aa95729a18fdc24511
+  data.tar.gz: 137da931f63327136a49d05ad14de51cd1b70f7d0878dc530978f9778d79da7e
 SHA512:
-  metadata.gz: 6afe90060b1da85f845e90366e583459f983146d257b73dd2fcf07dd1b8640f2dc7c8c7ecfcc90734da3ecba792ab9f38449425f0e05047a175402dbcc7ff5a9
-  data.tar.gz: ce169492089c7c33d24b0d72cfde11d00966370101d31502ebf5e403eb9115cc8cb3f499547e5ccecab2582ae8134aa243e874bff3aacf9af30dd347d0f38f36
+  metadata.gz: 4da7d55ebb3f63dff8f64a549cd6fc90331dcbf7e41b37c19dcf780390efd10e62f15db71175514e30344d60d448d3b9943bcfb165769ecfc4eb7d98c1976c08
+  data.tar.gz: 1301f38268a74ae5a159c0a63fa8af7f5b4ace3a157d10a45ebcf46abcec25eb0709519354a28394e2355b0507ba47c5ef5ffc7c22ce4062c70044a55151c040

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

@@ -27,7 +27,6 @@ module Effective
         case sql_type
         when :belongs_to
           relation
-            .order(Arel.sql("#{is_null(sql_column)} ASC"))
             .order(order_by_associated_conditions(association, sort: sort, direction: direction, limit: limit))
         when :belongs_to_polymorphic
           relation
@@ -71,13 +70,17 @@ module Effective
         term = Effective::Attribute.new(sql_type, klass: (association.try(:klass) rescue nil) || klass).parse(value, name: name)
 
         # term == 'nil' rescue false is a Rails 4.1 fix, where you can't compare a TimeWithZone to 'nil'
-        if (term == 'nil' rescue false) && ![:has_and_belongs_to_many, :has_many, :has_one, :belongs_to_polymorphic, :effective_roles].include?(sql_type)
+        if (term == 'nil' rescue false) && ![:has_and_belongs_to_many, :has_many, :has_one, :belongs_to, :belongs_to_polymorphic, :effective_roles].include?(sql_type)
           return relation.where(is_null(sql_column))
         end
 
         case sql_type
-        when :belongs_to, :has_and_belongs_to_many, :has_many, :has_one
-          relation.where(search_by_associated_conditions(association, term, fuzzy: fuzzy))
+        when :belongs_to
+          if term == 'nil'
+            relation.where(is_null(association.foreign_key))
+          else
+            relation.where(search_by_associated_conditions(association, term, fuzzy: fuzzy))
+          end
         when :belongs_to_polymorphic
           (type, id) = term.split('_')
 
@@ -89,6 +92,8 @@ module Effective
             id ||= Effective::Attribute.new(:integer).parse(term)
             relation.where("#{sql_column}_id = ? OR #{sql_column}_type = ?", id, (type || term))
           end
+        when :has_and_belongs_to_many, :has_many, :has_one
+          relation.where(search_by_associated_conditions(association, term, fuzzy: fuzzy))
         when :effective_addresses
           relation.where(id: Effective::Resource.new(association).search_any(value, fuzzy: fuzzy).pluck(:addressable_id))
         when :effective_obfuscation
@@ -160,6 +165,11 @@ module Effective
           return relation.where(klass.primary_key => value)
         end
 
+        # If the value is 3-something-like-this
+        if (values = value.to_s.split('-')).length > 0 && (maybe_id = values.first).present?
+          return relation.where(klass.primary_key => maybe_id) if (maybe_id.to_i.to_s == maybe_id)
+        end
+
         # Otherwise, we fall back to a string/text search of all columns
         columns = Array(columns || search_columns)
         fuzzy = true unless fuzzy == false
@@ -298,7 +308,7 @@ module Effective
       end
 
       def order_by_array_position(keys, field)
-        keys = Array(keys).uniq.compact
+        keys = Array(keys).uniq.compact.presence || [0]
 
         if postgres?
           Arel.sql("array_position(ARRAY[#{keys.first(TARGET_KEYS_LIMIT).join(',')}]::text::int[], #{field}::int)")

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.3.14'.freeze
+  VERSION = '1.3.15'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 1.3.14
+  version: 1.3.15
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-15 00:00:00.000000000 Z
+date: 2019-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails