like_query 0.0.17 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: caf444e80b657a38ee1834b353137f6cf6b9dfbfc1828804706ecd9f7dc5d775
-  data.tar.gz: 3823fc56fa8aad401a26c2a88ec68532cf235a4fbb0c6ac8ccc321e0333c9fbf
+  metadata.gz: 5b3ecb102cd58ed1ecefe66b9bd8c760b599285d8259c65b813d82fabae3be2d
+  data.tar.gz: 10c48700df9e2179ae0eeab011be58e6a70faf74c9483d13edea52f4a03ce7f1
 SHA512:
-  metadata.gz: ce925c7474309b9e4ecdefb9834a32d63ef93eb84bdc52f7ff36717cf864332532d03fdd55be31ffa9c46791214a5fe9619e265ac9376878c4a966f1806830f3
-  data.tar.gz: 66d742112d96c97740072a83bb2d76a2e13859fcb7d51cf00111b5034f60e9b1d1fe45d7f05995063f21098c5f8261b11aae1093da1c02d173c75a0cb5c06f59
+  metadata.gz: 5ce052feef2d7dd04737c3df8e741189da3d09a0d17443c61a60a254121d57f024c1d52adddf9d2fcfad361d2ca44043087964b97ba2c3dc43460cfbdb023f9e
+  data.tar.gz: fa8ffaa79f5c3b6583741f8b7344d61dc1a1abaadc9faf4a3e3f6ff0b2c2d4cf2b12262988274075e4e4fa758e1f517e59eb6ea3a2488d9b459800eccc773a1e

data/README.md

@@ -99,6 +99,13 @@ Article.like('Truck', [:type_enum]).count #=> 1
 
 Translated enums and enums on associated models (e.g. article.customer) not yet implemented
 
+**Numbers**
+
+```ruby
+Book.like('Nelson 3.4..8', [:title, :price])
+# => find books where title includes "Nelson" and price (must be number column) is between 3.4 and 8
+```
+
 **Class LikeQuery::Collect**
 
 ```ruby

data/lib/like_query/model_extensions.rb

@@ -3,7 +3,9 @@ module LikeQuery
 
     def like(search_string, schema = nil)
 
-      search_string = '' unless search_string
+      search_string = '' if !search_string
+      search_string = search_string.to_s unless search_string.is_a?(String)
+
       raise 'like can only be called from a model' if self == ApplicationRecord
 
       queries = nil
@@ -11,8 +13,10 @@ module LikeQuery
       schema = [schema] if schema.is_a?(Symbol)
       @like_query_schema = schema
 
-      (search_string.is_a?(String) ? search_string.split(' ') : search_string).each do |s|
-        str = "%#{s}%"
+      search_string.split(' ').each do |s|
+
+        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"
@@ -21,26 +25,32 @@ module LikeQuery
           enum_lab = enum_keys(p, s)
           if enum_lab.present?
             q = arel_table[p].in(enum_lab)
-          elsif p.is_a?(Symbol) || p.is_a?(String)
-            _q = arel_table[p].matches(str)
-            q = (q ? q.or(_q) : _q)
           elsif p.is_a?(Hash)
             p.each do |k, v|
               assoc = reflect_on_association(k)
               raise "Unknown association: :#{k}" unless assoc.present?
               associations.push(k.to_sym) unless associations.include?(k.to_sym)
               if v.is_a?(Symbol) || v.is_a?(String)
-                _q = assoc.klass.arel_table[v].matches(str)
-                q = (q ? q.or(_q) : _q)
+                _q = create_arel(v, f_str, assoc)
+                if _q.present?
+                  q = (q ? q.or(_q) : _q)
+                end
               elsif v.is_a?(Array)
                 v.each do |_v|
-                  _q = assoc.klass.arel_table[_v].matches(str)
-                  q = (q ? q.or(_q) : _q)
+                  _q = create_arel(_v, f_str, assoc)
+                  if _q.present?
+                    q = (q ? q.or(_q) : _q)
+                  end
                 end
               else
                 raise "unknown element: #{p}"
               end
             end
+          else
+            _q = create_arel(p, f_str)
+            if _q.present?
+              q = (q ? q.or(_q) : _q)
+            end
           end
 
         end
@@ -80,11 +90,49 @@ module LikeQuery
       en = defined_enums[column_name.to_s]
       return nil if en.nil?
       r = []
-      en.each do |k,v|
+      en.each do |k, v|
         r.push(v) if k.downcase.include?(value.downcase)
       end
       r
     end
 
+    def format_string_element(str)
+
+      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
+    end
+
+    def create_arel(schema_column, search_string, association = nil)
+
+      base_object = association&.klass || self
+      type = base_object.columns_hash[schema_column.to_s].type
+      arel = base_object.arel_table[schema_column]
+
+      if search_string[:float_from]
+        if [:float, :big_decimal, :integer].include?(type)
+          arel.between(search_string[:float_from]..search_string[:float_until])
+        end
+      else
+        arel.matches(search_string[:string])
+      end
+    end
   end
 end

data/lib/like_query/version.rb

@@ -1,3 +1,3 @@
 module LikeQuery
-  VERSION = "0.0.17"
+  VERSION = "0.1.2"
 end

metadata

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