evnt 3.1.4 → 3.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e0bb0645a93a6ed42052a22f21fa0e7e824deb91cbd5fd7e421243a0ced8a64
-  data.tar.gz: ec4f5f8ce047a48e29439423d5dd21b8268206af8488d871199cec128020e047
+  metadata.gz: 31e331c91b6b97338b9583587d74b8a3da99c861b9ee46b584f7029185cd25db
+  data.tar.gz: ce5fadcd4669d194b13a2840ff2e5c311da73f6149c0c7c628cb0bfe6872a641
 SHA512:
-  metadata.gz: 9df745c424d54e31d72f238c734807273894afbf901269fd915b5d1e5882e301a2810dce6ca6d1294ed0eac8b415714deabba46408892f7613d17518338f147b
-  data.tar.gz: 37831f9c0159c3888944ed1a7677a39f52c57e10c0e30c179686b974d7e95754764cef49c23ae030e5b4c176f113fcc1204949389bcd2f0f4c092a605e2cf360
+  metadata.gz: 138fcfc99e148ac1665b0f317ab4f9efe53dae0ef220774defc067e7c7f8e2f79174d19ff81cf17509a4eb1a26169237751e9b8117335d98b094fbd7abcaa0a6
+  data.tar.gz: 944820d7276892bc245167d0340ed2098f0c5bb9d70cc3b3db3e231dfb0abb39288cfae3c96b7132c1cdbed59b9dec35d10ad61d3909b66508dcdb268abc6c36

data/lib/evnt/command.rb

@@ -119,7 +119,7 @@ module Evnt
         exceptions: false,
         nullify_empty_params: false
       }
-      default_options = @_default_options || {}
+      default_options = _safe_default_options || {}
       params_options = params[:_options] || {}
       @options = initial_options.merge(default_options)
                                 .merge(params_options)
@@ -131,17 +131,16 @@ module Evnt
     # This function calls requested steps (callback) for the command.
     def _run_command_steps
       _validate_single_params
-      _normalize_params if @state[:result] && defined?(_normalize_params)
-      _validate_params if @state[:result] && defined?(_validate_params)
-      _validate_logic if @state[:result] && defined?(_validate_logic)
-      _initialize_events if @state[:result] && defined?(_initialize_events)
+      _safe_normalize_params if @state[:result]
+      _safe_validate_params if @state[:result]
+      _safe_validate_logic if @state[:result]
+      _safe_initialize_events if @state[:result]
     end
 
     # 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|
+      validations = _safe_validations
+      validations.each do |val|
         value_to_validate = _value_to_validate(val)
         validator = Evnt::Validator.new(value_to_validate, val[:options])
 
@@ -163,24 +162,60 @@ module Evnt
       params[val[:param]]
     end
 
+    # Safe defined functions:
+
+    def _safe_default_options
+      return _default_options if defined?(_default_options)
+      {}
+    end
+
+    def _safe_validations
+      return _validations if defined?(_validations)
+      []
+    end
+
+    def _safe_normalize_params
+      return _normalize_params if defined?(_normalize_params)
+      nil
+    end
+
+    def _safe_validate_params
+      return _validate_params if defined?(_validate_params)
+      nil
+    end
+
+    def _safe_validate_logic
+      return _validate_logic if defined?(_validate_logic)
+      nil
+    end
+
+    def _safe_initialize_events
+      return _initialize_events if defined?(_initialize_events)
+      nil
+    end
+
     # Class functions:
     ############################################################################
 
     # This class contain the list of settings for the command.
     class << self
 
-      attr_accessor :_default_options, :_validations
-
       # This function sets the default options that should be used by the command.
       def default_options(options)
-        instance_variable_set(:@_default_options, options)
+        @options ||= {}
+        @options.merge!(options)
+        command_options = @options
+
+        define_method('_default_options', -> { return command_options })
       end
 
       # This function sets the single validation request for a command parameter.
       def validates(param, options)
-        validations = instance_variable_get(:@_validations) || []
-        validations.push(param: param, options: options)
-        instance_variable_set(:@_validations, validations)
+        @validations ||= []
+        @validations.push(param: param, options: options)
+        command_validations = @validations
+
+        define_method('_validations', -> { return command_validations })
       end
 
       # This function sets the normalize params function for the command.

data/lib/evnt/event.rb

@@ -81,7 +81,7 @@ module Evnt
       initial_options = {
         silent: false
       }
-      default_options = @_default_options || {}
+      default_options = _safe_default_options || {}
       params_options = params[:_options] || {}
       @options = initial_options.merge(default_options)
                                 .merge(params_options)
@@ -96,8 +96,8 @@ module Evnt
       extras.each { |k, v| @extras[k[1..-1].to_sym] = v }
 
       # set other datas
-      @name = self.class._name
-      @attributes = self.class._attributes
+      @name = _safe_name
+      @attributes = _safe_attributes
     end
 
     # This function generates the complete event payload.
@@ -105,7 +105,7 @@ module Evnt
       # add evnt informations
       params[:evnt] = {
         timestamp: Time.now.to_i,
-        name: self.class._name
+        name: @name
       }
       # return payload
       params
@@ -113,55 +113,90 @@ module Evnt
 
     # This function validates all payload and check they are completed.
     def _validate_payload
-      return unless self.class._attributes
-
       # check all attributes are present
-      check_attr = (@payload.keys - [:evnt]) == self.class._attributes
+      check_attr = (@payload.keys - [:evnt]) == @attributes
       raise 'Event parameters are not correct' unless check_attr
     end
 
     # This function calls requested steps for the event.
     def _run_event_steps
-      _write_event if defined?(_write_event)
+      _safe_write_event
     end
 
     # This function notify all handlers for the event.
     def _notify_handlers
-      return unless self.class._handlers
       return if @options[:silent]
+      handlers = _safe_handlers
 
       # notify every handler
-      self.class._handlers.each do |handler|
+      handlers.each do |handler|
         handler.notify(self)
       end
     end
 
+    # Safe defined functions:
+
+    def _safe_default_options
+      return _default_options if defined?(_default_options)
+      {}
+    end
+
+    def _safe_name
+      return _name if defined?(_name)
+      ''
+    end
+
+    def _safe_attributes
+      return _attributes if defined?(_attributes)
+      []
+    end
+
+    def _safe_handlers
+      return _handlers if defined?(_handlers)
+      []
+    end
+
+    def _safe_write_event
+      return _write_event if defined?(_write_event)
+      nil
+    end
+
     # Class functions:
     ############################################################################
 
     # This class contain the list of settings for the event.
     class << self
 
-      attr_accessor :_default_options, :_name, :_attributes, :_handlers
-
       # This function sets the default options that should be used by the event.
       def default_options(options)
-        instance_variable_set(:@_default_options, options)
+        @options ||= {}
+        @options.merge!(options)
+        event_options = @options
+
+        define_method('_default_options', -> { return event_options })
       end
 
       # This function sets the name for the event.
-      def name_is(event_name)
-        instance_variable_set(:@_name, event_name)
+      def name_is(name)
+        define_method('_name', -> { return name })
       end
 
       # This function sets the list of attributes for the event.
       def attributes_are(*attributes)
-        instance_variable_set(:@_attributes, attributes)
+        @attributes ||= []
+        @attributes.concat(attributes).uniq!
+        event_attributes = @attributes
+
+        define_method('_attributes', -> { return event_attributes })
       end
 
       # This function sets the list of handlers for the event.
       def handlers_are(handlers)
-        instance_variable_set(:@_handlers, handlers)
+        @handlers ||= []
+        @handlers.concat(handlers)
+        event_handlers = @handlers
+
+        define_method('_handlers', -> { return event_handlers })
       end
 
       # This function sets the write event function for the event.

data/lib/evnt/handler.rb

@@ -36,20 +36,37 @@ module Evnt
 
     # This function calls requested steps for the handler.
     def _run_handler_steps
-      update_queries = "#{@event.name}_update_queries"
-      send(update_queries) if respond_to? update_queries
+      _safe_update_queries(@event.name)
 
       if event.reloaded?
         # manage event reloaded
-        manage_reloaded_event = "#{@event.name}_manage_reloaded_event"
-        send(manage_reloaded_event) if respond_to? manage_reloaded_event
+        _safe_manage_reloaded_event(@event.name)
       else
         # manage normal event
-        manage_event = "#{@event.name}_manage_event"
-        send(manage_event) if respond_to? manage_event
+        _safe_manage_event(@event.name)
       end
     end
 
+    # Safe defined functions:
+
+    def _safe_update_queries(event)
+      update_queries = "#{event}_update_queries"
+      return send(update_queries) if respond_to? update_queries
+      nil
+    end
+
+    def _safe_manage_reloaded_event(event)
+      manage_reloaded_event = "#{event}_manage_reloaded_event"
+      return send(manage_reloaded_event) if respond_to? manage_reloaded_event
+      nil
+    end
+
+    def _safe_manage_event(event)
+      manage_event = "#{event}_manage_event"
+      return send(manage_event) if respond_to? manage_event
+      nil
+    end
+
     # Class functions:
     ############################################################################
 

data/lib/evnt/version.rb

@@ -3,6 +3,6 @@
 # Evnt.
 module Evnt
 
-  VERSION = '3.1.4'
+  VERSION = '3.2.5'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: evnt
 version: !ruby/object:Gem::Version
-  version: 3.1.4
+  version: 3.2.5
 platform: ruby
 authors:
 - Ideonetwork