evnt 2.1.3 → 2.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28c0022c15250f518920a8f8e236910a4a662b99
-  data.tar.gz: a05ee20f2363290ee092a04cbd1bb8f51891d0ea
+  metadata.gz: 5743beb843869cb039a5007f7ef2ed7787612a43
+  data.tar.gz: 12c347e20764ba89c54534b3d500504ad1622d8c
 SHA512:
-  metadata.gz: 75a4217bd3abf0e4f38282f5d754b85c63fa6f6f7491b88da2a79553e4af482eaa650d348f5a27748da054b9300ec2c5d6fda18f12499d4109a9aac57856e65f
-  data.tar.gz: 7f3136bd5757a8175fe056a321050c36afb68907eab11ce3c79434bd14bf253830604d1c052c4009f94530e09518e08aa71be3b6e87cb398d31a4215869bf7ad
+  metadata.gz: 1bf390c6af6ddd639107fc025df2e9d72ed60e6e7ce767500c0328adf3ceb7cb5aafcc034f9dd77474ea5231726f1e5d67e7498bbcd3731832d1282cced709ea
+  data.tar.gz: 4aefe2b569c630440e9cb7d8d2e911aa3fc3e524448b36cb89d9f4f115c88234a2782ce590777b31f2b2e34599556993c8dd874f790601b15c82fcf9f0d79eac

data/lib/evnt/handler.rb

@@ -21,7 +21,6 @@ module Evnt
     ##
     def notify(event)
       _init_handler_data(event)
-      _init_handler_steps
       _run_handler_steps
     end
 
@@ -35,23 +34,20 @@ module Evnt
       @event = event
     end
 
-    # This function init the handler steps.
-    def _init_handler_steps
-      self.class._events[@event.name].call
-    end
-
     # This function calls requested steps for the handler.
     def _run_handler_steps
-      _update_queries if defined?(_update_queries)
+      update_queries = "#{@event.name}_update_queries"
+      send(update_queries) if respond_to? update_queries
 
-      # manage event reloaded
       if event.reloaded?
-        _manage_reloaded_event if defined?(_manage_reloaded_event)
-        return
+        # manage event reloaded
+        manage_reloaded_event = "#{@event.name}_manage_reloaded_event"
+        send(manage_reloaded_event) if respond_to? manage_reloaded_event
+      else
+        # manage normal event
+        manage_event = "#{@event.name}_manage_event"
+        send(manage_event) if respond_to? manage_event
       end
-
-      # manage normal event
-      _manage_event if defined?(_manage_event)
     end
 
     # Class functions:
@@ -60,27 +56,25 @@ module Evnt
     # This class contain the list of settings for the handler.
     class << self
 
-      attr_accessor :_events
-
       # This function sets the blocks executed for a specific event.
       def on(event_name, &block)
-        instance_variable_set(:@_events, {}) unless @_events
-        @_events[event_name] = block
+        @_current_event_name = event_name
+        block.yield
       end
 
       # This function sets the update queries function for the event.
       def to_update_queries(&block)
-        define_method('_update_queries', &block)
+        define_method("#{@_current_event_name}_update_queries", &block)
       end
 
       # This function sets the manage event function for the event.
       def to_manage_event(&block)
-        define_method('_manage_event', &block)
+        define_method("#{@_current_event_name}_manage_event", &block)
       end
 
       # This function sets the manage reloaded event function for the event.
       def to_manage_reloaded_event(&block)
-        define_method('_manage_reloaded_event', &block)
+        define_method("#{@_current_event_name}_manage_reloaded_event", &block)
       end
 
     end

data/lib/evnt/version.rb

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

metadata

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