visual_condition_builder 2.2.5 → 2.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26021bfbd88d7ac0fad11a8172695a2a8da0b317
-  data.tar.gz: 5dba04e77e8fe29cea12d8d2279cc82eb8cccf2c
+  metadata.gz: 4596aae923f37f0628c5a4dd2197879b6a00260c
+  data.tar.gz: b9c1d36ecf19d852a39fd0f9f6f1756cbaec1449
 SHA512:
-  metadata.gz: d0013e13f5af265c50679ca047bc35d371cdddf3f26249c0a3d253c1dca68b2bf1de9caf432c8c9ee8b3a9c5f6d1ec22937c12a67545b031ce199cda77c4c0bd
-  data.tar.gz: 4538f3e46b1a1b87511d5f4c1e393860df48b4b1482285c32bc0e065950b241a9a3ef4cd735393f700825c52ef4c9032521c852a3ece3a045047e5c5a0994bf9
+  metadata.gz: 34035631b016918f186be5ed191f7c804dc8bd688e30b7c55941735787ed3d996dac0eae4cb1386330fd8719832e98dbdbb61d858a6a7136de170e3d52bf2c0d
+  data.tar.gz: 1ab163643a37a9ec31307d60930112de4afea8e3fc51a051986604f7a878a9bd20f6fd9d49c010cba0a02ccc4777905fe0e4add73067acad3795e6b219360bca

data/README.md

@@ -139,8 +139,9 @@ true | where a field is true | no_value: true, multiple: false
 not_true | Opposite :true  | no_value: true, multiple: false
 false | where a field is false | no_value: true, multiple: false
 not_false | Opposite :false  | no_value: true, multiple: false
-present | where a field is present (not null and not a blank string) | no_value: true, multiple: false
-blank | Opposite :present | no_value: true, multiple: false
+present | where a field is present | no_value: true, multiple: false
+not_present | where a field is not present | no_value: true, multiple: false
+blank | where a field is blank | no_value: true, multiple: false
 null | where a field is null | no_value: true, multiple: false
 not_null | Opposite :null  | no_value: true, multiple: false
 

data/config/locales/visual_condition_builder.en.yml

@@ -31,7 +31,8 @@ en:
       not_true: 'not is true'
       "false": 'is false'
       not_false: 'not is false'
-      present: 'is present '
+      present: 'is present'
+      not_present: 'not is present'
       blank: 'is blank'
       null: 'is null'
       not_null: 'not is null'

data/lib/visual_condition_builder/converter.rb

@@ -25,7 +25,8 @@ module VisualConditionBuilder
           when :next_week
             ransack_q["#{p[0]}_gteq"] = Date.today.next_week.beginning_of_week
             ransack_q["#{p[0]}_lteq"] = Date.today.next_week.end_of_week
-          when :not_null, :null, :blank, :true, :not_true, :false, :not_false, :present
+          when :not_null, :null, :blank, :true, :not_true, :false, :not_false, :present, :not_present
+            #TODO: VALIDAR ESSES OPERADORES
             ransack_q["#{p[0]}_#{p[1]}"] = '1'
           else
             ransack_q["#{p[0]}_#{p[1]}"] = p[2]
@@ -109,15 +110,17 @@ module VisualConditionBuilder
           when :true
             tmp[p[0]] = 'true'
           when :not_true
-            tmp[p[0]] = Hash["$ne", 'true']
+            tmp[p[0]] = Hash["$ne", true]
           when :false
             tmp[p[0]] = 'false'
           when :not_false
-            tmp[p[0]] = Hash["$ne", 'false']
+            tmp[p[0]] = Hash["$ne", false]
           when :present
-            tmp[p[0]] = Hash["$ne", '']
+            tmp[p[0]] = Hash["$exists", true]
+          when :not_present
+            tmp[p[0]] = Hash["$exists", false]
           when :blank
-            tmp[p[0]] = ''
+            tmp[p[0]] = Hash["$in", ['null','']]
           when :null
             tmp[p[0]] = 'null'
           when :not_null

data/lib/visual_condition_builder/dictionary.rb

@@ -63,15 +63,15 @@ module VisualConditionBuilder
         type = type.present? ? normalized_name(type) : 'string'
         operators = case type
                       when :date, :datetime
-                        [:eq, :between, :today, :yesterday, :tomorrow, :this_week, :last_week, :next_week, :present, :blank]
+                        [:eq, :between, :today, :yesterday, :tomorrow, :this_week, :last_week, :next_week, :present, :not_present, :blank]
                       when :time
-                        [:eq, :between, :present, :blank]
+                        [:eq, :between, :present, :not_present, :blank]
                       when :decimal, :integer
                         [:eq, :between]
                       when :boolean
-                        [:true, :false, :present, :blank]
+                        [:true, :false, :present, :not_present, :blank]
                       when :string
-                        [:cont, :eq, :start, :end, :present, :blank]
+                        [:cont, :not_cont, :eq, :not_eq, :start, :end, :present, :not_present, :blank]
                       else
                         [:eq]
                     end
@@ -135,6 +135,7 @@ module VisualConditionBuilder
             not_false: {no_value: true, multiple: false},
 
             present: {no_value: true, multiple: false},
+            not_present: {no_value: true, multiple: false},
             blank: {no_value: true, multiple: false},
 
             null: {no_value: true, multiple: false},

data/lib/visual_condition_builder/version.rb

@@ -1,3 +1,3 @@
 module VisualConditionBuilder
-  VERSION = "2.2.5"
+  VERSION = "2.2.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: visual_condition_builder
 version: !ruby/object:Gem::Version
-  version: 2.2.5
+  version: 2.2.6
 platform: ruby
 authors:
 - Bruno Porto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-30 00:00:00.000000000 Z
+date: 2017-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails