now using String refinement

Events Director module renamed

patch bump

lib/obsws/event.rb

@@ -28,8 +28,8 @@ module OBSWS
       ALL = LOW_VOLUME | HIGH_VOLUME
     end
 
-    module EventDirector
+    module Director
-      include Util::String
+      using Util::CoreExtensions
 
       def observers
         @observers ||= {}
@@ -50,13 +50,13 @@ module OBSWS
       end
 
       def fire(event, data)
-        observers[snakecase(event).to_sym]&.each { |block| data.empty? ? block.call : block.call(data) }
+        observers[event.snakecase.to_sym]&.each { |block| data.empty? ? block.call : block.call(data) }
       end
     end
 
     class Client
       include Logging
-      include EventDirector
+      include Events::Director
       include Mixin::TearDown
       include Mixin::OPCodes
 

lib/obsws/mixin.rb

@@ -1,16 +1,17 @@
 module OBSWS
   module Mixin
     module Meta
-      include Util::String
+      using Util::CoreExtensions
 
       def make_field_methods(*params)
         params.each do |param|
-          define_singleton_method(snakecase(param.to_s)) { @resp[param] }
+          define_singleton_method(param.to_s.snakecase) { @resp[param] }
         end
       end
     end
 
     class MetaObject
+      using Util::CoreExtensions
       include Mixin::Meta
 
       def initialize(resp, fields)
@@ -21,7 +22,7 @@ module OBSWS
 
       def empty? = @fields.empty?
 
-      def attrs = @fields.map { |f| snakecase(f.to_s) }
+      def attrs = @fields.map { |f| f.to_s.snakecase }
     end
 
     # Represents a request response object

lib/obsws/util.rb

@@ -1,15 +1,16 @@
 module OBSWS
   module Util
-    module String
+    module CoreExtensions
-      def camelcase(s)
+      refine String do
-        s.split("_").map(&:capitalize).join
+        def camelcase
-      end
+          split("_").map(&:capitalize).join
+        end
 
-      def snakecase(s)
+        def snakecase
-        s
+          gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
-          .gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
+            .gsub(/([a-z\d])([A-Z])/, '\1_\2')
-          .gsub(/([a-z\d])([A-Z])/, '\1_\2')
+            .downcase
-          .downcase
+        end
       end
     end
   end

lib/obsws/version.rb

@@ -11,7 +11,7 @@ module OBSWS
     end
 
     def patch
-      1
+      2
     end
 
     def to_a