like_query 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0cb474c6c4f84bd5197241f8aba6fba22a65e8eb186b390eb62ed92ebb1c6900
-  data.tar.gz: 573d9725dd2467394fbfaf7ac8ddc0ad85fae5e6461f10f23df83f9471811a6c
+  metadata.gz: 4acb76ba7e99c858ec318cb2f52d82e3c063d53941775c5b18d34cb084f8d624
+  data.tar.gz: 619ed012558607d25ef0bef7766a96b5ee1ec9923185d6ff7c4dfda0a62ee08c
 SHA512:
-  metadata.gz: dfe938db839e0a98b4a086cd8c9ef22db27f5d752ddf8749b93a4144a75ea1a9ea7c1a3b77900077fee92cd7293082083d567cbaa223bf143f3216cc6dfae2b0
-  data.tar.gz: b9ba846502a4a31f3b53565679b7d7befe2c59978c362099cf03b242087f5dba3daeeb4ad9d4f6393acbfeaa13afc0dfaf153057732982e441ff23beb8822845
+  metadata.gz: 5846f20fa64023168c9f4468dadb90aa5f73ea131b63eae29e6ad9b06b750d4e5b9d38cd670accdad72be12eb2940a4af11dfac96c865fda0c7cfcc3ccc71aad
+  data.tar.gz: 66c59b0de6ebaa45fe6d237561c88a6e266575dade903dacbd6880df001cc4f172631a26040e9a7322f227f6bee1d787b300d8e9d2e19abb44211dd2d4510e8e

data/README.md

@@ -106,6 +106,25 @@ 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
 ```
 
+**Column specific search**
+
+```ruby
+Book.like('title:history', [:title, :price])
+# => find books where title includes "history"
+
+Book.like('author.name:marc', [{author: [:name]}])
+# => find books where author.name includes "marc"
+```
+
+There is a helper for allowing the user translating the column names:
+
+```ruby
+LikeQuery::Formatter.translate_columns('one N:two', [['n','name']], case_sensitive: false)
+# => 'one name:two'
+# case_sensitive: Default is true
+```
+Only upper and lower chars  (if case-insensitive), point, underscore, and no German-Umlaute are allowed on the column-key
+
 **Class LikeQuery::Collect**
 
 ```ruby

data/lib/like_query/formatter.rb

@@ -9,7 +9,7 @@ module LikeQuery
     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_]+(?=:)/)
+        reg = (case_sensitive ? /^[a-z_\.]+(?=:)/ : /^[a-zA-Z_\.]+(?=:)/)
 
         column = if case_sensitive
                    str.match(reg)

data/lib/like_query/model_extensions.rb

@@ -55,7 +55,8 @@ module LikeQuery
 
         end
 
-        queries.push("(#{q.compact.join(' OR ')})")
+        __q = q.compact
+        queries.push("(#{__q.join(' OR ')})") if __q.present?
       end
 
       if associations.present?
@@ -100,7 +101,7 @@ module LikeQuery
 
     def format_string_element(str)
 
-      column = str.match(/^[a-z_]+(?=:)/)
+      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+)?)$/)
@@ -121,7 +122,7 @@ module LikeQuery
               {}
             end
       res[:string] = _str
-      res[:column] = column.to_s.to_sym if column
+      res[:column] = column.to_s if column
       res
     end
 
@@ -135,7 +136,9 @@ module LikeQuery
       end
       arel = base_object.arel_table[schema_column]
 
-      if !search_string[:column] || schema_column == search_string[:column]
+      col = (association ? [association.name, schema_column.to_s].join('.') : schema_column.to_s)
+
+      if !search_string[:column] || col == 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

data/lib/like_query/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: like_query
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - christian