evnt 2.1.5 → 3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0db0ec5e816f260aec22fafce15157c977a7049e
-  data.tar.gz: 11724ef2038b70663bd77f75082f45ebca3fbde6
+  metadata.gz: ef2fa95d09eb421d9912263783747d85451a4d5e
+  data.tar.gz: af36eef1ef9d3c940e68c2eb6ee0b35b3212964c
 SHA512:
-  metadata.gz: 3d04d6350a5c1ae9a25884ec74b0f101a47ef94cb30c2c786a770d2ce21b20598267fd180899069b41c04f2379bf80d18e5e7fa801c6dec6410df8bf6008e763
-  data.tar.gz: 3d327824989463e5aec34a10833cf6683dcdbd89c098cfd97434b0bb38ea0aa95d3b4b51ee4f988616b281532a5b59a66bdc982b6dd83d971513de8670b3c2bd
+  metadata.gz: d40c2f8c4e51b0d505911f3059da2b2f4d4ade398131f20c38797da2e1f4ad370858b9dcf3843521ae91529ed0331cdf4a47fd6a6b2137a3751a5cd486bb5d61
+  data.tar.gz: ada5ce42640430d0f38c4773461be4edb5a012c64b20253e6a12a76cd3b0d5d47835100078e2645cfb2fd98d37c620e172cf44a53da1a3abdbddbffdea0d1728

data/lib/evnt/command.rb

@@ -118,7 +118,7 @@ module Evnt
       }
 
       # set other data
-      @params = params.freeze
+      @params = params
     end
 
     # This function calls requested steps (callback) for the command.
@@ -132,13 +132,19 @@ module Evnt
     # This function validates the single parameters sets with the "validates" method.
     def _validate_single_params
       return if self.class._validations.nil? || self.class._validations.empty?
+
       self.class._validations.each do |val|
         result = Evnt::Validator.validates(params[val[:param]], val[:options])
-        unless result
+
+        if result == :ERROR
           err "#{val[:param].capitalize} value not accepted"
           break
+        else
+          @params[val[:param]] = result
         end
       end
+
+      @params.freeze
     end
 
     # Class functions:

data/lib/evnt/validator.rb

@@ -27,14 +27,16 @@ module Evnt
       # * +presence+ - Boolean value used to tells if the presence is required.
       ##
       def validates(param, options)
+        result = param
         options.each do |key, value|
-          return false unless validate_option(param, key, value)
+          result = validate_option(result, key, value)
+          break if result == :ERROR
         end
 
-        true
+        result
       rescue StandardError => e
         puts e
-        false
+        :ERROR
       end
 
       ##
@@ -54,14 +56,12 @@ module Evnt
           validate_presence(param, option_value)
         when :blank
           validate_blank(param, option_value)
-        when :numeric
-          validate_numeric(param, option_value)
         else
           raise 'Validator option not accepted'
         end
       rescue StandardError => e
         puts e
-        false
+        :ERROR
       end
 
       ##
@@ -73,7 +73,7 @@ module Evnt
       # * +value+ - The value of the type option that should be used.
       ##
       def validate_type(param, value)
-        return true if param.nil?
+        return param if param.nil?
 
         if value.instance_of?(Symbol)
           validate_type_general(param, value)
@@ -84,7 +84,7 @@ module Evnt
         end
       rescue StandardError => e
         puts e
-        false
+        :ERROR
       end
 
       ##
@@ -98,10 +98,13 @@ module Evnt
       ##
       def validate_presence(param, value)
         is_nil = param.nil?
-        value ? !is_nil : is_nil
+        result = value ? !is_nil : is_nil
+        return param if result
+
+        :ERROR
       rescue StandardError => e
         puts e
-        false
+        :ERROR
       end
 
       ##
@@ -115,25 +118,13 @@ module Evnt
       ##
       def validate_blank(param, value)
         blank = (!param || param.empty?)
-        value ? blank : !blank
-      rescue StandardError => e
-        puts e
-        false
-      end
+        result = value ? blank : !blank
+        return param if result
 
-      ##
-      # This function validates some numeric options for the parameter.
-      #
-      # ==== Attributes
-      #
-      # * +param+ - The parameter to be validated.
-      # * +value+ - The value object with validation specs.
-      ##
-      def validate_numeric(param, value)
-        # TODO: Continue
+        :ERROR
       rescue StandardError => e
         puts e
-        false
+        :ERROR
       end
 
       # Private functions:
@@ -163,6 +154,8 @@ module Evnt
           validates_type_array(param)
         when :date
           validates_type_date(param)
+        when :datetime
+          validates_type_datetime(param)
         else
           raise 'Validator type option not accepted'
         end
@@ -170,39 +163,75 @@ module Evnt
 
       # This function validates a param type for custom types.
       def validate_type_custom(param, value)
-        param.instance_of?(Object.const_get(value))
+        return param if param.instance_of?(Object.const_get(value))
+        :ERROR
       end
 
-      def validate_type_boolean(param)
-        param.instance_of?(TrueClass) || param.instance_of?(FalseClass)
+      def validate_type_symbol(param)
+        return param if param.instance_of?(Symbol)
+        :ERROR
       end
 
-      def validate_type_string(param)
-        param.instance_of?(String)
+      def validate_type_boolean(param)
+        return param if param.instance_of?(TrueClass) || param.instance_of?(FalseClass)
+        return true if [1, 'true'].include? param
+        return false if [0, 'false'].include? param
+        :ERROR
       end
 
       def validate_type_integer(param)
-        param.instance_of?(Integer)
+        return param if param.instance_of?(Integer)
+        begin
+          return param.to_i
+        rescue StandardError
+          return :ERROR
+        end
       end
 
-      def validate_type_symbol(param)
-        param.instance_of?(Symbol)
+      def validates_type_float(param)
+        return param if param.instance_of?(Float)
+        begin
+          return param.to_f
+        rescue StandardError
+          return :ERROR
+        end
       end
 
-      def validates_type_float(param)
-        param.instance_of?(Float)
+      def validate_type_string(param)
+        return param if param.instance_of?(String)
+        begin
+          return param.to_s
+        rescue StandardError
+          return :ERROR
+        end
       end
 
-      def validates_type_hash(param)
-        param.instance_of?(Hash)
+      def validates_type_date(param)
+        return param if param.instance_of?(Date)
+        begin
+          return Date.parse(param)
+        rescue StandardError
+          return :ERROR
+        end
       end
 
-      def validates_type_array(param)
-        param.instance_of?(Array)
+      def validates_type_datetime(param)
+        return param if param.instance_of?(DateTime)
+        begin
+          return DateTime.parse(param)
+        rescue StandardError
+          return :ERROR
+        end
       end
 
-      def validates_type_date(param)
-        param.instance_of?(Date)
+      def validates_type_hash(param)
+        return param if param.instance_of?(Hash)
+        :ERROR
+      end
+
+      def validates_type_array(param)
+        return param if param.instance_of?(Array)
+        :ERROR
       end
 
     end

data/lib/evnt/version.rb

@@ -5,6 +5,6 @@ module Evnt
   ##
   # Constant containing the current gem version.
   ##
-  VERSION = '2.1.5'
+  VERSION = '3.0'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evnt
 version: !ruby/object:Gem::Version
-  version: 2.1.5
+  version: '3.0'
 platform: ruby
 authors:
 - Ideonetwork
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-14 00:00:00.000000000 Z
+date: 2017-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler