groovy 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3c4f437e2e27b7c9d405155bb305d02d989da2beb16a0c70b08ef28c5c07d0b
-  data.tar.gz: 47c29f69d84a6c012f395d728fa7a6a680936592741bdeef00c921e274547872
+  metadata.gz: f2e7655a8fefa2f17295105acb6ba387f275eb158c0babed04675d566f736766
+  data.tar.gz: 5a9b94a767f58b033a11044d3b7992911a6cde0ad068955c76d85bdd2c0464b9
 SHA512:
-  metadata.gz: e1353493e18aaced9276d9c82236c1b2ef4529731f41f379d28415d3ce99bf63741152813eab5c2e613e7d9da8fd088c9bddf4bf3677f27e86019156c7187ced
-  data.tar.gz: 536c0c4180b8207444a3000e4dd7a5d7a3a9a516963721c2fbd8fe956aa7aa7bb0fdbb76c1599af5ec4a26c7b41c61ca1ecf05f0d3cf6815c838d0e734e95cdc
+  metadata.gz: 2c8813e0920559c6422f8129ca40e51c42a6db26efc65c9f2d9a1d47d8f5f6d5638f9677f970a38d36a180c93cf610b99b7adc372579eaff92ae4d8bd9aa41ae
+  data.tar.gz: d12ed329507b8a5c191308e198a5434f8226fd24bf4f25c8b2b8d64a832c05df39ff9946dddd53b7da5df11c2d14bc9ab97e4dcf84d67e60c9c2811d0c0122b6

data/lib/groovy/query.rb

@@ -6,6 +6,7 @@ module Groovy
     AND = '+'.freeze
     NOT = '-'.freeze
     PER_PAGE = 50.freeze
+    # ESCAPE_CHARS_REGEX = /([\(\)\/\\])/.freeze
     VALID_QUERY_CHARS = 'a-zA-Z0-9_\.,&-'.freeze
     REMOVE_INVALID_CHARS_REGEX = Regexp.new('[^\s' + VALID_QUERY_CHARS + ']').freeze
 
@@ -81,7 +82,7 @@ module Groovy
               add_param(AND + [key, val.max].join(':<=')) if val.max # gte
 
             elsif val.is_a?(Regexp)
-              str = val.source.gsub(REMOVE_INVALID_CHARS_REGEX, '')
+              str = val.source.gsub('/', '_slash_').gsub('(', '_openp_').gsub(')', '_closep_').gsub(REMOVE_INVALID_CHARS_REGEX, '')
               param = val.source[0] == '^' ? ':^' : val.source[-1] == '$' ? ':$' : ':~' # starts with or regexp
               add_param(AND + [key, str.downcase].join(param)) # regex must be downcase
 
@@ -115,7 +116,7 @@ module Groovy
               add_param(AND + [key, val.max].join(':>=')) if val.max # lte, nil if range.max is -1
 
             elsif val.is_a?(Regexp)
-              str = val.source.gsub(REMOVE_INVALID_CHARS_REGEX, '')
+              str = val.source.gsub('/', '_slash_').gsub('(', '_openp_').gsub(')', '_closep_').gsub(REMOVE_INVALID_CHARS_REGEX, '')
               param = val.source[0] == '^' ? ':^' : val.source[-1] == '$' ? ':$' : ':~' # starts with or regexp
               add_param(NOT + [key, str.downcase].join(param)) # regex must be downcase
 
@@ -296,6 +297,7 @@ module Groovy
       query = parameters.join(' ').split(/ or /i).map do |part|
         part.gsub('  ', ' ') # replace double with single spaces
             .gsub(space_regex, '\ \1') # escape spaces before word letters
+            .gsub('_slash_', '\/').gsub('_openp_', '\(').gsub('_closep_', '\)')
             .gsub(/(\d\d):(\d\d):(\d\d)/, '\1\:\2\:\3') # escape hh:mm:ss in timestamps
       end.join(' OR ').sub(/^-/, '_id:>0 -') #.gsub(' OR -', ' -')
     end

data/lib/groovy/version.rb

@@ -1,3 +1,3 @@
 module Groovy
-  VERSION = '0.4.4'.freeze
+  VERSION = '0.4.5'.freeze
 end

data/spec/query_spec.rb

@@ -8,7 +8,7 @@ describe Groovy::Query do
     @p1 = TestProduct.create!(name: "Product 1", visible: true, price: 10, tag_list: 'one, number two & three')
     @p2 = TestProduct.create!(name: "Product 2", visible: false, price: 20, tag_list: 'number two, three')
     @p3 = TestProduct.create!(name: "Product 3: The Best", visible: true, price: 30, tag_list: nil)
-    @p4 = TestProduct.create!(name: "Product 4", visible: false, price: 40, tag_list: 'one, number two')
+    @p4 = TestProduct.create!(name: "Product 4", visible: false, price: 40, tag_list: 'one, number two / something')
     @p5 = TestProduct.create!(name: "Product 5", visible: true, price: 50, tag_list: '')
   end
 
@@ -124,6 +124,12 @@ describe Groovy::Query do
         res = TestProduct.where(tag_list: /two & three/)
         expect(res.map(&:id)).to eq([@p1.id])
       end
+
+      it 'works with slashes' do
+        str = 'two / something'
+        res = TestProduct.where(tag_list: /#{str}/)
+        expect(res.map(&:id)).to eq([@p4.id])
+      end
     end
 
     describe 'starts with regex' do
@@ -253,6 +259,12 @@ describe Groovy::Query do
         res = TestProduct.not(tag_list: /two & three/)
         expect(res.map(&:id)).to eq([@p2.id, @p3.id, @p4.id, @p5.id])
       end
+
+      it 'works with slashes' do
+        str = 'two / something'
+        res = TestProduct.not(tag_list: /#{str}/)
+        expect(res.map(&:id)).to eq([@p1.id, @p2.id, @p3.id, @p5.id])
+      end
     end
 
     describe 'starts with regex' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: groovy
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Tomás Pollak