undecided 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dbf2d5252cd33de5b703d08dd879a7f99b9d1be5
-  data.tar.gz: cd17bf2515f89c98102218aefa04090fa7a577ee
+  metadata.gz: f0921e8f07d72d816404d7118a28e8252d2ce03f
+  data.tar.gz: 0fd855b2d7604a99be72a60e219112afce8ff07a
 SHA512:
-  metadata.gz: 09abe8948a11ebe1fd9fe628b8f6d9e035a36ba98cf11885adabdc371e0890b69422e1dec6f5fe66805b177fe8718543643c1ee57e5f8fd4972aa900f86143b4
-  data.tar.gz: b24c21e86b44dc7160bae52f5a2919d86e42d24fb193ddeb0d75d08089bdc0e201973196df7f125f802b15778deb72b2f2ac15456301c4ae40bb064f268845e0
+  metadata.gz: 36fe0ac3f7e4047357990f6bc012778f801ed3823fb054096a0bbb0db42af46ef3a270b9263636f58dbf2198c0208f9c2d0cd75351b461610af08dc857503655
+  data.tar.gz: a0f35e57f48b3003ab73d2effb182151723deac8a7ccf9d470a70249c3a05e871c217d6e21e84176e68645a79b4442c12683efd973e73b6c670a95d4e1848e91

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    undecided (0.1.0)
+    undecided (0.1.1)
 
 GEM
   remote: https://rubygems.org/

data/lib/undecided/converter.rb

@@ -28,10 +28,15 @@ class Converter
     # if boolean return value
     return value if Undecided::Evaluator.bool?(value)
     # transform integer value to boolean
+    error(value) unless [0, 1].include? value
     !value.to_i.zero?
   rescue => e
     puts e.message
-    raise "#{value} Is not a correct value, " \
+    error value
+  end
+
+  def self.error(value)
+    raise Undecided::DeciderError, "#{value} Is not a correct value, " \
           'insert (1 or 0) or (true or false)'
   end
 

data/lib/undecided/decider.rb

@@ -4,8 +4,8 @@ module Undecided
   # Evaluate boolean expression
   class Decider
     # Given a boolean expression and data to replace, return result
-    def decide(rule, values)
-      error unless Undecided::Evaluator.valid?(rule, values)
+    def decide(rule, values, strict = true)
+      error unless Undecided::Evaluator.valid?(rule, values, strict)
       # Sanitize data
       # Eval rules and values after process it, with safe data
       final_expression = Converter.replacing_variables(rule, values)

data/lib/undecided/evaluator.rb

@@ -4,15 +4,25 @@ module Undecided
     # REGEX that match operators
     VARIABLE_REGEX = /\&|\||\(|\)|!/
     # Check if rule and values are valid to evaluate
-    def self.valid?(rule, values)
+    def self.valid?(rule, values, strict = true)
       # Extract variables from rule
       variables = extract_variables(rule)
 
       return false if variables.empty?
+
+      # if validation is not strict, add missing values
+      fill_values(variables, values) unless strict
+
       # Check if rule's variable and values's keys are the same
       (variables - Converter.to_symbol(values.keys)).empty?
     end
 
+    # If there are more variables than values, then added as false
+    def self.fill_values(variables, values)
+      extras = variables - Converter.to_symbol(values.keys)
+      extras.each { |e| values[Converter.to_symbol(e)] = false }
+    end
+
     # Check if value is a boolean type
     def self.bool?(value)
       [true, false].include? value

data/lib/undecided/version.rb

@@ -1,3 +1,3 @@
 module Undecided
-  VERSION = '0.1.0'.freeze
+  VERSION = '0.1.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: undecided
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - jotase
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-08 00:00:00.000000000 Z
+date: 2016-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler