caboose-cms 0.3.48 → 0.3.49

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,15 +1,15 @@
1
1
  ---
2
2
  !binary "U0hBMQ==":
3
3
  metadata.gz: !binary |-
4
- NjkzNjJlOTE3YjIxMGY5OTFkMGEzYzQ5ODM2M2QxYWY2NDVjMjllNQ==
4
+ MWZlMWQxZWMwYjBiMWI4NTFjMTA5ZGQ0NDZhYWFlY2JlZTVkMjA2OQ==
5
5
  data.tar.gz: !binary |-
6
- OTM3NGFlNTQxMDQwOGQwYzNlZDI0YjY1MmYwYmUyZDFhMzc3MjI5Nw==
6
+ OTVmYmI0Y2ZhZjNjNDZhZGY2ZmRlYmUyMTQyZTYzY2Y1YWE0MTY4NA==
7
7
  !binary "U0hBNTEy":
8
8
  metadata.gz: !binary |-
9
- MWIyZGJlMzg5YTkyNzYxM2I3MDkwNTVhMDk2M2U4ODkyNGYwNzkxNmUxOGFj
10
- NGI1YmI0N2ViM2NhZTM5NmIwZTA1MmM0ODVmOGZhNjg4Mjg1YTI3Zjk0YjU2
11
- ZjIwMzcwOWJlNmI5MGYwNzE3MTI3Mjc5YzU5NDhkZmQ1YzY5ODA=
9
+ YjQ1ZTJhMDcyZWMxZWRjMTk4N2E1M2YzMWNhZjA0MTZmYzZlYTM0Nzg1ZDMz
10
+ OWI2YTY3OGY4ZjNkYmRkOGQ3N2ZlY2JhODQ2NzFiNzYyYTE4ZDRlMWMzODE5
11
+ MThlZDg0MTAzMjdiMzVlOWM4MTExZjgyMWE1NzkzZTUyMjQ5YWY=
12
12
  data.tar.gz: !binary |-
13
- NDEzNjEzNTE1MGJmYmI3MzI1OTNkMjE0YWEyNzMyNmQ1MGFlZjhhOGE4ZTM2
14
- YThhNzI4ZTJlOWM3YjM2NmI5NmMzOWJjMTQ3Zjg5YzdiMGY2ZGVjYTczNWEw
15
- MmZlNjJmOGIyZjAyNDFjMjRmNTYyNTMwNzQ3MjljOTZiYmEyYmY=
13
+ NjRmYTc5MTE1NzZlNTA5NThlNDcyNDQ4NDdmNDIzNjAzZDYwN2ZiZTZlNWRm
14
+ Njg4YzNmY2E1YzVjYWYzMDQ3OWExYjRlZTgzOWEzNGY4NGI4OGRmZDIzNzNl
15
+ MmE2YTE2ZGE5MmQ3YjkzM2VkMzQ0NzYzNjA2ZjgyYTg1YjgzYzg=
@@ -263,19 +263,29 @@ module Caboose
263
263
  col = "#{table_name_of_association(arr[0])}.#{arr[1]}"
264
264
  end
265
265
  if k.include?('_concat_')
266
- arr = k.split('_concat_')
267
- col1 = arr[0]
268
- col2 = arr[1]
266
+ #arr = k.split('_concat_')
267
+ #col1 = arr[0]
268
+ #col2 = arr[1]
269
+ #
270
+ #col2 = col2[0..-5] if col2.ends_with?('_gte')
271
+ #col2 = col2[0..-4] if col2.ends_with?('_gt')
272
+ #col2 = col2[0..-5] if col2.ends_with?('_lte')
273
+ #col2 = col2[0..-4] if col2.ends_with?('_lt')
274
+ #col2 = col2[0..-4] if col2.ends_with?('_bw')
275
+ #col2 = col2[0..-4] if col2.ends_with?('_ew')
276
+ #col2 = col2[0..-6] if col2.ends_with?('_like')
277
+ #
278
+ #col = "concat(#{col1},' ', #{col2})"
269
279
 
270
- col2 = col2[0..-5] if col2.ends_with?('_gte')
271
- col2 = col2[0..-4] if col2.ends_with?('_gt')
272
- col2 = col2[0..-5] if col2.ends_with?('_lte')
273
- col2 = col2[0..-4] if col2.ends_with?('_lt')
274
- col2 = col2[0..-4] if col2.ends_with?('_bw')
275
- col2 = col2[0..-4] if col2.ends_with?('_ew')
276
- col2 = col2[0..-6] if col2.ends_with?('_like')
277
-
278
- col = "concat(#{col1}, ' ', #{col2})"
280
+ arr = k.split('_concat_')
281
+ arr[arr.count-1] = arr[arr.count-1][0..-5] if k.ends_with?('_gte')
282
+ arr[arr.count-1] = arr[arr.count-1][0..-4] if k.ends_with?('_gt')
283
+ arr[arr.count-1] = arr[arr.count-1][0..-5] if k.ends_with?('_lte')
284
+ arr[arr.count-1] = arr[arr.count-1][0..-4] if k.ends_with?('_lt')
285
+ arr[arr.count-1] = arr[arr.count-1][0..-4] if k.ends_with?('_bw')
286
+ arr[arr.count-1] = arr[arr.count-1][0..-4] if k.ends_with?('_ew')
287
+ arr[arr.count-1] = arr[arr.count-1][0..-6] if k.ends_with?('_like')
288
+ col = "concat(#{arr.join(",' ',")})"
279
289
  end
280
290
 
281
291
  sql2 = ""
@@ -1,3 +1,3 @@
1
1
  module Caboose
2
- VERSION = '0.3.48'
2
+ VERSION = '0.3.49'
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: caboose-cms
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.48
4
+ version: 0.3.49
5
5
  platform: ruby
6
6
  authors:
7
7
  - William Barry