caboose-cms 0.4.99 → 0.4.100

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZGExNDQyODU4OTg2YmNhMDQyNDNlMThiYWIyOTY0NjAxMjU2MzkyNA==
+    NDIyN2FjM2JmNzFkZDk1ZTk0ZmVhZDI4YTE3ODI2NWFkY2I1YmIzYw==
   data.tar.gz: !binary |-
-    MjcwZThhMzJmNjkwNWM5NGIyN2U2MjIwOTAzN2ZjNDYyYmZkNTc0OA==
+    MzU4MWMwNmQ5MzdiNDZhNDJhZDA3ZTFjMTNmZWNmNWVkMjhkYjNlNQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZmQ0MWYxNzQ0Zjc5NjE3Yzk2Y2JhMTZjNDFjYmI4YTA5MTJlNWRmODY2Zjgz
-    NmFmYzViMDMwOWMyZGE5MWIxZTNkZjdiMmRhNjJhZjA3ZWNmZWQ3YmQ5ODI2
-    ZmFkMjI5ZWQ2ZDk2MWNmOTk4YjkyYjczZjIyMjMyOTVhZWFiYWM=
+    MzI1NzIyNmNiNTAxYmE3NjhhOGEyMzJiZjVhODBkY2Q1NTA4NDYzYzY2NjYy
+    MGRmZjU1YmYzZDU2ZjIzNjVkNTFhZTZiNWQyOTU4MzczMDNiN2I1MjQyNGU2
+    ZDkzYjk4ODRlNGJjYTNhMmM5MWFkOGIyNzAzMmEwODNhZjIwMjU=
   data.tar.gz: !binary |-
-    YmI2MzlhMzM0ZTJmYTgxMWMwMjIwNjVmZDY1ZDBlMjIwNjQ5YmJhNDJlOWZl
-    YmI0ZWExOGVjYTdmNDVjOTc3NjhiYTU4NGI5MjQ0NzJiYzJmOGZiYjFjMzI5
-    YjdkYjVkMzllNDUxOTE4Mzg5Y2Y4M2I2OGMxNzFjMTI0MjI3ZDE=
+    MzA1ZWQ4YTNlNDkwZjlmNTg2NWZhNDc4OTllZmE0YTZjOTcyZDcyNDZjOWJh
+    NDJmNmMwMjAwMmY5NTBmOTkwNzVjZTQwOTk3YWZmNjFmMTk2OGU0M2IxMTA2
+    NmZjMWZlOTc2OGY5N2UxOTczYjIxMGNmNzFiMzQwZDBhNmU0YWU=

data/app/models/caboose/page_bar_generator.rb

@@ -387,17 +387,17 @@ module Caboose
           v = v.kind_of?(Array) ? v.collect{ |v2| "%#{v2}%".upcase } : "%#{v}%".upcase
         elsif k.ends_with?('_null')
           col = "#{table}.#{k[0..-6]}" if col.nil?
-          sql2 = "#{col} ? null"
-          v = v == true ? 'is' : 'is not'          
+          sql2 = "#{col} #{v == true ? 'is' : 'is not'} null"
+          #v = v == true ? 'is' : 'is not'          
         else
           col = "#{table}.#{k}" if col.nil?
           sql2 = "#{col} = ?"
         end
-        
+                
         if v.kind_of?(Array)
           sql2 = "(" + v.collect{ |v2| "#{sql2}" }.join(" or ") + ")"
           v.each { |v2| values << v2 }
-        else              
+        elsif !k.ends_with?('_null')              
           values << v
         end
         sql << sql2                          

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.4.99'
+  VERSION = '0.4.100'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.4.99
+  version: 0.4.100
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-29 00:00:00.000000000 Z
+date: 2014-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails