eventish 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af7a6bf91a4b7cc8af46ea2520aeef223eedcce5cedceac04b7d91cc43333936
-  data.tar.gz: 1ab3f8d60e00c982c3044cf0fc7bf7e53dd1435914238842724d6f2f211698ba
+  metadata.gz: 965405052bda0cb9903d4a447c91e5db89c8b98a868ded8428ee0399652680bd
+  data.tar.gz: 4608f89362bd42919071b404d428c8a44178d608a51ae0c0eb2aeb0b9a3d40ee
 SHA512:
-  metadata.gz: dd0f4b9d8d6ec2705bd0d6679296705b5e3838730fc3fbcaa6657490dc6c108db80886cf2399220545b0b374c904da0bd1ac19beaac3e9c7af9a3efb5c625bc9
-  data.tar.gz: e1eb63690fde2b62cbfc0d9c52bb1beea73e03205abffef5aa24de8097c4e935d6ee15c2ee67d19dc6acd46050ef11d8b85b11cbcbd5caa86e24f6199f7c5fe2
+  metadata.gz: 78839ea7b019d89e6587692faa575e345c9b72eae8355833cb374a5b7906cedd97ebcc74e4e61db1ecf9ea3c4764f5de7eeacac0a79bd6448c080f341ef33db3
+  data.tar.gz: 9b88eb7b02e330c68449cb7e978c8b40c6bc0a19cab874bd082fbf897ef61a9ec67ad3d2be866b3936d0370f777f158d423a414d3f469a4656facdfb8d201cb1

data/README.md

@@ -88,8 +88,7 @@ module Main
 
     class << self
       def event_name
-        # this is optional, if not set the event name will be inferred from the class name
-        # in this sample it would be "test" - TestEvent => underscore => remove _event suffix
+        # this is optional, if not set the class name to string will be used
         'some_event'
       end
     end

data/lib/eventish/adapters/active_support.rb

@@ -4,19 +4,27 @@ module Eventish
   class Adapters
     class ActiveSupport
       class << self
-        def publish(event_name, target = nil, options: {})
-          ::ActiveSupport::Notifications.instrument(event_name, target: target, event_options: options)
+        def publish(event, target = nil, block: nil)
+          raise ArgumentError, 'Missing event to publish' if event.nil?
+
+          options = { block: block }
+          ::ActiveSupport::Notifications.instrument(event.to_s, target: target, options: options)
         end
 
-        def subscribe(event_name, handler)
-          ::ActiveSupport::Notifications.subscribe(event_name) do |name, start, finish, id, payload|
+        def subscribe(event, handler)
+          raise ArgumentError, 'Missing event to subscribe' if event.nil?
+          raise ArgumentError, 'Missing handler for subscription' if handler.nil?
+
+          ::ActiveSupport::Notifications.subscribe(event.to_s) do |name, start, finish, id, payload|
             args = { event: name, id: id, start: start, finish: finish }
-            handler.trigger(payload[:target], args, &payload[:block])
+            handler.trigger(payload[:target], args, &payload.dig(:options, :block))
           end
         end
 
-        def unsubscribe(event_name)
-          ::ActiveSupport::Notifications.unsubscribe(event_name)
+        def unsubscribe(event)
+          raise ArgumentError, 'Missing event to unsubscribe' if event.nil?
+
+          ::ActiveSupport::Notifications.unsubscribe(event.to_s)
         end
       end
     end

data/lib/eventish/event_api.rb

@@ -7,8 +7,7 @@ module Eventish
     end
 
     def event_name
-      # If event_name is not set, infer the event from the class name
-      @event_name ||= Eventish.underscore(to_s).delete_suffix('_event')
+      @event_name ||= to_s
     end
 
     def priority

data/lib/eventish/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Eventish # :nodoc:
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

data/lib/eventish.rb

@@ -6,7 +6,7 @@ require_relative 'eventish/simple_event'
 module Eventish
   OPTIONS = %i[adapter].freeze
 
-  MissingAdapterError = Class.new(StandardError)
+  AdapterError = Class.new(StandardError)
 
   module_function
 
@@ -18,25 +18,15 @@ module Eventish
     @options ||= Struct.new(*OPTIONS).new # rubocop:disable Naming/MemoizedInstanceVariableName
   end
 
-  def publish(event_name, target = nil, &block)
-    config.adapter&.publish(event_name, target, &block)
+  def publish(event_name, target = nil, block: nil)
+    config.adapter&.publish(event_name, target, block: block)
   end
 
   def setup
     @options ||= Struct.new(*OPTIONS).new
     yield(@options) if block_given?
-    raise MissingAdapterError, 'Please specify an event adapter' unless @options.adapter
+    raise AdapterError, 'Please specify an event adapter' unless @options.adapter
 
     @options
   end
-
-  def underscore(camel_cased_word)
-    return camel_cased_word.to_s unless /[A-Z-]|::/.match?(camel_cased_word)
-
-    word = camel_cased_word.to_s.gsub(/\A.*::/, '')
-    word.gsub!(/([A-Z]+)(?=[A-Z][a-z])|([a-z\d])(?=[A-Z])/) { ($1 || $2) << "_" }
-    word.tr!("-", "_")
-    word.downcase!
-    word
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eventish
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Mattia Roccoberton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-17 00:00:00.000000000 Z
+date: 2022-05-18 00:00:00.000000000 Z
 dependencies: []
 description: A simple and composable event library
 email: mat@blocknot.es