upnxt-ransack 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c2a88b81d06252dd91c89c313089557acfabc4f
-  data.tar.gz: f79536b3aed41cadcfef79c228f646d05a31d23e
+  metadata.gz: fd78402254e1cae1f645e68535870c405fae5dc5
+  data.tar.gz: fd990e5a9b7f43590f2631f34b5abb03b9171f4b
 SHA512:
-  metadata.gz: b60fc519ba713232a5ea1bbe3f8305cb89d7d6f441e12d9477bc2d3b514303e0004e1d876b39816f47634898f779e7f310a0c92c5608e4bd162f69a18c1de763
-  data.tar.gz: 290ca016f8461887115813d553958b6f465db2f01bfd1f239e7c7aed1320048ad8ead6666b9d1322fe5933a83594448cae054bf2092c9f745acc2a3fa31e13bb
+  metadata.gz: 0515b7b391c36ea1d619e6708036fc9962162040101bd340278231c0ca02befab9d74ff6114b30b0678652cb49382fc441382e6c057720f1ce036c34f37d47f2
+  data.tar.gz: 807b0e5b9edfaad236f354e03b44ea04ce936640e50907c7d292246f99121559a43c6627a3d43525d05dd9fd141908e3c5851761bd1e08895f135347b22130d9

data/config/initializers/ransack.rb

@@ -5,14 +5,14 @@ module Ransack
     def initialize(object, params = {}, options = {})
       params.each do |str, _|
         str = str.to_s
-        Predicate.detect_and_strip_from_string!(str.to_s)
+        Predicate.detect_and_strip_from_string!(str)
         assoc = convert_to_associations(object, str)
         last = assoc.pop
         attr_name = last.last
         prev_class_sym = last.first.name.underscore.to_sym
         prev_assoc_sym = nil
         assoc.reverse.each do |klass, str|
-          assoc_sym = str.gsub(Regexp.new("_#{attr_name}\\z"), '').to_sym
+          assoc_sym = str.sub(/_#{attr_name}\z/, '').to_sym
           klass.has_one(assoc_sym, through: prev_class_sym, source: prev_assoc_sym) unless klass.reflections.keys.include?(assoc_sym)
           prev_assoc_sym = assoc_sym
           prev_class_sym = klass.name.underscore.to_sym
@@ -24,7 +24,8 @@ module Ransack
 
     private
     def convert_to_associations(klass, str)
-      klass.reflections.each do |name, reflection|
+      #sort backwards to favor longer names
+      Hash[klass.reflections.sort{|a,b| b<=>a}].each do |name, reflection|
         if str.start_with? name.to_s
           result = convert_to_associations(reflection.class_name.constantize, str.sub("#{name.to_s}_", ''))
           return [[klass, str]].concat(result) if result

data/lib/upnxt-ransack.rb

@@ -1,4 +1,4 @@
-require "ransack/engine"
+require "upnxt/ransack/engine"
 
 module Upnxt
   module Ransack

data/lib/upnxt/ransack/version.rb

@@ -1,5 +1,5 @@
 module Upnxt
   module Ransack
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: upnxt-ransack
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - bert bruynooghe