caboose-cms 0.3.48 → 0.3.49

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjkzNjJlOTE3YjIxMGY5OTFkMGEzYzQ5ODM2M2QxYWY2NDVjMjllNQ==
+    MWZlMWQxZWMwYjBiMWI4NTFjMTA5ZGQ0NDZhYWFlY2JlZTVkMjA2OQ==
   data.tar.gz: !binary |-
-    OTM3NGFlNTQxMDQwOGQwYzNlZDI0YjY1MmYwYmUyZDFhMzc3MjI5Nw==
+    OTVmYmI0Y2ZhZjNjNDZhZGY2ZmRlYmUyMTQyZTYzY2Y1YWE0MTY4NA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MWIyZGJlMzg5YTkyNzYxM2I3MDkwNTVhMDk2M2U4ODkyNGYwNzkxNmUxOGFj
-    NGI1YmI0N2ViM2NhZTM5NmIwZTA1MmM0ODVmOGZhNjg4Mjg1YTI3Zjk0YjU2
-    ZjIwMzcwOWJlNmI5MGYwNzE3MTI3Mjc5YzU5NDhkZmQ1YzY5ODA=
+    YjQ1ZTJhMDcyZWMxZWRjMTk4N2E1M2YzMWNhZjA0MTZmYzZlYTM0Nzg1ZDMz
+    OWI2YTY3OGY4ZjNkYmRkOGQ3N2ZlY2JhODQ2NzFiNzYyYTE4ZDRlMWMzODE5
+    MThlZDg0MTAzMjdiMzVlOWM4MTExZjgyMWE1NzkzZTUyMjQ5YWY=
   data.tar.gz: !binary |-
-    NDEzNjEzNTE1MGJmYmI3MzI1OTNkMjE0YWEyNzMyNmQ1MGFlZjhhOGE4ZTM2
-    YThhNzI4ZTJlOWM3YjM2NmI5NmMzOWJjMTQ3Zjg5YzdiMGY2ZGVjYTczNWEw
-    MmZlNjJmOGIyZjAyNDFjMjRmNTYyNTMwNzQ3MjljOTZiYmEyYmY=
+    NjRmYTc5MTE1NzZlNTA5NThlNDcyNDQ4NDdmNDIzNjAzZDYwN2ZiZTZlNWRm
+    Njg4YzNmY2E1YzVjYWYzMDQ3OWExYjRlZTgzOWEzNGY4NGI4OGRmZDIzNzNl
+    MmE2YTE2ZGE5MmQ3YjkzM2VkMzQ0NzYzNjA2ZjgyYTg1YjgzYzg=

data/app/models/caboose/page_bar_generator.rb

@@ -263,19 +263,29 @@ module Caboose
           col = "#{table_name_of_association(arr[0])}.#{arr[1]}"
         end        
         if k.include?('_concat_')
-          arr = k.split('_concat_')
-          col1 = arr[0]
-          col2 = arr[1]           
+          #arr = k.split('_concat_')
+          #col1 = arr[0]
+          #col2 = arr[1]           
+          #
+          #col2 = col2[0..-5] if col2.ends_with?('_gte')
+          #col2 = col2[0..-4] if col2.ends_with?('_gt')                        
+          #col2 = col2[0..-5] if col2.ends_with?('_lte')                        
+          #col2 = col2[0..-4] if col2.ends_with?('_lt')                                  
+          #col2 = col2[0..-4] if col2.ends_with?('_bw')                                              
+          #col2 = col2[0..-4] if col2.ends_with?('_ew')
+          #col2 = col2[0..-6] if col2.ends_with?('_like')
+          #                                  
+          #col = "concat(#{col1},' ', #{col2})"
           
-          col2 = col2[0..-5] if col2.ends_with?('_gte')
-          col2 = col2[0..-4] if col2.ends_with?('_gt')                        
-          col2 = col2[0..-5] if col2.ends_with?('_lte')                        
-          col2 = col2[0..-4] if col2.ends_with?('_lt')                                  
-          col2 = col2[0..-4] if col2.ends_with?('_bw')                                              
-          col2 = col2[0..-4] if col2.ends_with?('_ew')
-          col2 = col2[0..-6] if col2.ends_with?('_like')
-                                            
-          col = "concat(#{col1}, ' ', #{col2})"                   
+          arr = k.split('_concat_')                                         
+          arr[arr.count-1] = arr[arr.count-1][0..-5] if k.ends_with?('_gte')
+          arr[arr.count-1] = arr[arr.count-1][0..-4] if k.ends_with?('_gt')                        
+          arr[arr.count-1] = arr[arr.count-1][0..-5] if k.ends_with?('_lte')                        
+          arr[arr.count-1] = arr[arr.count-1][0..-4] if k.ends_with?('_lt')                                  
+          arr[arr.count-1] = arr[arr.count-1][0..-4] if k.ends_with?('_bw')                                              
+          arr[arr.count-1] = arr[arr.count-1][0..-4] if k.ends_with?('_ew')
+          arr[arr.count-1] = arr[arr.count-1][0..-6] if k.ends_with?('_like')                                            
+          col = "concat(#{arr.join(",' ',")})"
         end
         
         sql2 = ""

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.3.48'
+  VERSION = '0.3.49'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.3.48
+  version: 0.3.49
 platform: ruby
 authors:
 - William Barry