like_query 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2244376c37da7206ec259ae99b3ce2e42588141cc6b45251cff9baec1d118882
-  data.tar.gz: 6d8c20860daa488b5c70a87c6b751cadf7bd668062df0039cf859ba93d720c0d
+  metadata.gz: 0cb474c6c4f84bd5197241f8aba6fba22a65e8eb186b390eb62ed92ebb1c6900
+  data.tar.gz: 573d9725dd2467394fbfaf7ac8ddc0ad85fae5e6461f10f23df83f9471811a6c
 SHA512:
-  metadata.gz: 2bf07d4bbe541b83cb78aad5ca59107d19d8269ab89bfed4b495bdfa13ef020ad3d016740a8a07f5e6dfcfad066cc60811b8806754718ad867110894354da4ce
-  data.tar.gz: a235b679dcb95c7a90302e67aeb9c16b599e42696387573e09a3a73ad1168d0ad29c349223e943e3a32ae2f95fc63449de9afa0cf96d100f1ebb82f31e10c551
+  metadata.gz: dfe938db839e0a98b4a086cd8c9ef22db27f5d752ddf8749b93a4144a75ea1a9ea7c1a3b77900077fee92cd7293082083d567cbaa223bf143f3216cc6dfae2b0
+  data.tar.gz: b9ba846502a4a31f3b53565679b7d7befe2c59978c362099cf03b242087f5dba3daeeb4ad9d4f6393acbfeaa13afc0dfaf153057732982e441ff23beb8822845

data/lib/like_query/formatter.rb

@@ -0,0 +1,32 @@
+module LikeQuery
+  class Formatter
+
+    #== Translate columns for more convenient usage
+    # second parameter is always a Array of Arrays
+    # Example:
+    # translate_columns('d:50', [[:d,:diameter], ['w', 'width']], case_sensitive: false)
+    # => "diameter:50"
+    def self.translate_columns(search_string, column_translations, case_sensitive: true)
+      search_string.split(' ').map do |str|
+
+        reg = (case_sensitive ? /^[a-z_]+(?=:)/ : /^[a-zA-Z_]+(?=:)/)
+
+        column = if case_sensitive
+                   str.match(reg)
+                 else
+                   str.downcase.match(reg)
+                 end
+        if column
+          column_translations.each do |tr|
+            key = (case_sensitive ? tr.first : tr.first.downcase).to_s
+            if column.to_s == key
+              str = str.sub(reg, tr.second.to_s)
+              break
+            end
+          end
+        end
+        str
+      end.join(' ')
+    end
+  end
+end

data/lib/like_query/model_extensions.rb

@@ -54,18 +54,20 @@ module LikeQuery
           end
 
         end
-        queries.push("(#{q.join(' OR ')})")
+
+        queries.push("(#{q.compact.join(' OR ')})")
       end
 
       if associations.present?
         r = left_outer_joins(associations).where(queries.join(" AND "))
-        dbg(->{"RESULT => #{r.to_sql}"})
+        dbg(-> { "RESULT => #{r.to_sql}" })
         r
       else
         r = where(queries.join(" AND "))
-        dbg(->{"RESULT => #{r.to_sql}"})
+        dbg(-> { "RESULT => #{r.to_sql}" })
         r
       end
+
     end
 
     def generate_hash(output_schema = nil, limit: 50, image: nil, url: nil)
@@ -98,8 +100,10 @@ module LikeQuery
 
     def format_string_element(str)
 
-      match_number = str.match(/^(\d+(?:\.\d+)?)$/)
-      match_range = str.match(/^(\d+(?:\.\d+)?)(\.\.)(\d+(?:\.\d+)?)$/)
+      column = str.match(/^[a-z_]+(?=:)/)
+      _str = (column ? str.match(/(?<=:)[\s\S]+/) : str).to_s
+      match_number = _str.match(/^(\d+(?:\.\d+)?)$/)
+      match_range = _str.match(/^(\d+(?:\.\d+)?)(\.\.)(\d+(?:\.\d+)?)$/)
 
       res = if match_range
               mr = match_range.to_s
@@ -114,11 +118,10 @@ module LikeQuery
                 float_until: mn,
               }
             else
-              {
-                string: "%#{str}%"
-              }
+              {}
             end
-      res[:string] = "%#{str}%"
+      res[:string] = _str
+      res[:column] = column.to_s.to_sym if column
       res
     end
 
@@ -132,18 +135,20 @@ module LikeQuery
       end
       arel = base_object.arel_table[schema_column]
 
-      if search_string[:float_from] && [:float, :decimal, :big_decimal, :integer, :bigint].include?(type)
+      if !search_string[:column] || schema_column == search_string[:column]
+        if search_string[:float_from] && [:float, :decimal, :big_decimal, :integer, :bigint].include?(type)
 
-        q = arel.between(search_string[:float_from]..search_string[:float_until]).to_sql
-        dbg("     Query from number-field => #{q}")
-        q
+          q = arel.between(search_string[:float_from]..search_string[:float_until]).to_sql
+          dbg("     Query from number-field => #{q}")
+          q
 
-      else
+        else
 
-        q = arel.matches(search_string[:string]).to_sql
-        dbg("     Query from string-field => #{q}")
-        q
+          q = arel.matches("%#{search_string[:string]}%").to_sql
+          dbg("     Query from string-field => #{q}")
+          q
 
+        end
       end
     end
 

data/lib/like_query/version.rb

@@ -1,3 +1,3 @@
 module LikeQuery
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/like_query.rb

@@ -3,4 +3,5 @@ require 'like_query/model_extensions'
 require 'like_query/extender'
 require 'like_query/railtie'
 require 'like_query/collect'
+require 'like_query/formatter'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: like_query
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - christian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-22 00:00:00.000000000 Z
+date: 2024-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -35,6 +35,7 @@ files:
 - lib/like_query.rb
 - lib/like_query/collect.rb
 - lib/like_query/extender.rb
+- lib/like_query/formatter.rb
 - lib/like_query/model_extensions.rb
 - lib/like_query/railtie.rb
 - lib/like_query/version.rb