like_query 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4cbeab01984ef5c872a39167c49487b4ad47ed80db8c44f5bac94b2db3dc0c7d
-  data.tar.gz: 49bd373e430ca83c3b533913b5adf83aa2191bc8fbaab6ad1c19c85cd014d577
+  metadata.gz: c7de4a5d2ad260480095855c658997269624ccb606be9e38bd054342404bd7ad
+  data.tar.gz: 11f20847057ba089d2cf7020799f420bcf1f99ef2bc7aa09ed5a9a266a614725
 SHA512:
-  metadata.gz: e3ca7b08324a456eb2440d765d359c154378db6fb833d377be1236f7021f7acb0420a879af59d6558bd511888c50126edb80c8618b731ad6d1c2f429a6b47a04
-  data.tar.gz: da945a9c6f70920557841285aa792274c32f22f1aa79884ce041d21789e3b5d2882f1af3be6583335c6ca627f576b53a5ad7bb7086ed8ca36b012c6acee42175
+  metadata.gz: e2540e87f1eabbab29fd0f032e99e98029dfdfe6c558b7793fc3d63d8635171f76b110cd56ee0c34beca883908c1a32063c610f8af52f4f52223050e830006af
+  data.tar.gz: 458da755375fc2651a95a13f1c4722da0f85711f9742ba701fd0aa79b528f377852b01c222c1423287d7c731ed36dacc0eef61512b03271d89ae07599141aa3e

data/lib/like_query/model_extensions.rb

@@ -1,16 +1,20 @@
 module LikeQuery
   module ModelExtensions
 
-    def like(search_string, schema = nil)
+    def like(search_string, schema = nil, debug: false)
 
       search_string = '' if !search_string
       search_string = search_string.to_s unless search_string.is_a?(String)
+      schema = [schema] if schema.is_a?(Symbol)
+      @debug_like_query = debug
 
       raise 'like can only be called from a model' if self == ApplicationRecord
+      if schema.first.is_a?(Array) && schema.length >= 2
+        raise "only one array can be given: Either schema as one array or as multiple args, not as array"
+      end
 
       queries = nil
       associations = []
-      schema = [schema] if schema.is_a?(Symbol)
       @like_query_schema = schema
 
       search_string.split(' ').each do |s|
@@ -18,13 +22,13 @@ module LikeQuery
         f_str = format_string_element(s)
 
         q = nil
-        if schema.first.is_a?(Array) && schema.length >= 2
-          raise "only one array can be given: Either schema as one array or as multiple args, not as array"
-        end
+
         (schema.first.is_a?(Array) ? schema.first : schema).each do |p|
+          dbg("• Iterate schema => #{p}")
           enum_lab = enum_keys(p, s)
           if enum_lab.present?
             q = arel_table[p].in(enum_lab)
+            dbg(-> { "     Query from enum => #{q.to_sql}" })
           elsif p.is_a?(Hash)
             p.each do |k, v|
               assoc = reflect_on_association(k)
@@ -101,23 +105,25 @@ module LikeQuery
       match_number = str.match(/^(\d+(?:\.\d+)?)$/)
       match_range = str.match(/^(\d+(?:\.\d+)?)(\.\.)(\d+(?:\.\d+)?)$/)
 
-      if match_range
-        mr = match_range.to_s
-        {
-          float_from: mr.split('..').first.to_f,
-          float_until: mr.split('..').last.to_f,
-        }
-      elsif match_number
-        mn = match_number.to_s
-        {
-          float_from: mn,
-          float_until: mn,
-        }
-      else
-        {
-          string: "%#{str}%"
-        }
-      end
+      res = if match_range
+              mr = match_range.to_s
+              {
+                float_from: mr.split('..').first.to_f,
+                float_until: mr.split('..').last.to_f,
+              }
+            elsif match_number
+              mn = match_number.to_s
+              {
+                float_from: mn,
+                float_until: mn,
+              }
+            else
+              {
+                string: "%#{str}%"
+              }
+            end
+      res[:string] = "%#{str}%"
+      res
     end
 
     def create_arel(schema_column, search_string, association = nil)
@@ -130,13 +136,31 @@ module LikeQuery
       end
       arel = base_object.arel_table[schema_column]
 
-      if search_string[:float_from]
-        if [:float, :decimal, :big_decimal, :integer, :bigint].include?(type)
-          arel.between(search_string[:float_from]..search_string[:float_until])
-        end
+      if search_string[:float_from] && [:float, :decimal, :big_decimal, :integer, :bigint].include?(type)
+
+        q = arel.between(search_string[:float_from]..search_string[:float_until])
+        dbg(-> { "     Query from string-field => #{q.to_sql}" })
+        q
+
+      else
+
+        q = arel.matches(search_string[:string])
+        dbg(-> { "     Query from string-field => #{q.to_sql}" })
+        q
+
+      end
+    end
+
+    def dbg(label)
+
+      return unless @debug_like_query
+
+      if label.is_a?(Proc)
+        lab = label.call
       else
-        arel.matches(search_string[:string])
+        lab = label
       end
+      Rails.logger.debug("LikeQuery: #{lab}")
     end
   end
 end

data/lib/like_query/version.rb

@@ -1,3 +1,3 @@
 module LikeQuery
-  VERSION = "0.1.4"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: like_query
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors:
 - christian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-21 00:00:00.000000000 Z
+date: 2024-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails