obsws 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5e9cb2c558346b12dde7736519342ede8d4e0a366b1bd8b6e6d16df3009cafc
-  data.tar.gz: bbafa4a7fdd292d4469d8ff368dbc42e97da22cd2551da2c57728928d19d70ce
+  metadata.gz: a79951b0215195512bd8972528425795f3893a3c9605009803f5583b36e54618
+  data.tar.gz: 4515b14d0bab1934e3eb1a8e5b626660a970ae1c6358c5ba2f47a6320562845b
 SHA512:
-  metadata.gz: 05abfc47adc6b94e75acc55277fc78856f4cf9c003c358c16e447323d779435c1bb1f11654bde7665afdb67c6a063ec510e147a085b41a540af6e2881e4efaf9
-  data.tar.gz: 3472fa88a6704b2c91e016b8edc9aade0d47e43b42997c9647b2306fea627d79cbb240193731abb374d9798cca08c76e69fc1a0061fdf4b0ab8dceec1b6a9ae5
+  metadata.gz: b43b242dc256207ebf7f5ebe78e720416a68a4e9dcfc665de3a880b9a027e859db1ae805aeb9e363bb5a3f62487fb0e19ee8cda2ff2d871cec24ff82e4e7fda6
+  data.tar.gz: d13c2e1bfdd1931f251f52d42b2851040bb352ba7991ea5ec678dae5631349125440201b65e64a6c01d1d61f2419cac7911f2f64abd1765fab9870a5224bafab

data/lib/obsws/event.rb

@@ -35,27 +35,28 @@ module OBSWS
     end
 
     module Callbacks
-      include Util
+      include Util::String
+
+      def observers
+        @observers ||= []
+      end
 
       def add_observer(observer)
-        @observers = [] unless defined?(@observers)
         observer = [observer] if !observer.respond_to? :each
-        observer.each { |o| @observers.append(o) }
+        observer.each { |o| observers << o }
       end
 
       def remove_observer(observer)
-        @observers.delete(observer)
+        observers.delete(observer)
       end
 
       def notify_observers(event, data)
-        if defined?(@observers)
-          @observers.each do |o|
-            if o.respond_to? "on_#{event.to_snake}"
-              if data.empty?
-                o.send("on_#{event.to_snake}")
-              else
-                o.send("on_#{event.to_snake}", data)
-              end
+        observers.each do |o|
+          if o.respond_to? "on_#{snakecase(event)}"
+            if data.empty?
+              o.send("on_#{snakecase(event)}")
+            else
+              o.send("on_#{snakecase(event)}", data)
             end
           end
         end

data/lib/obsws/mixin.rb

@@ -3,11 +3,11 @@ require_relative "util"
 module OBSWS
   module Mixin
     module Meta
-      include Util
+      include Util::String
 
       def make_field_methods(*params)
         params.each do |param|
-          define_singleton_method(param.to_s.to_snake) { @resp[param] }
+          define_singleton_method(snakecase(param.to_s)) { @resp[param] }
         end
       end
     end
@@ -23,7 +23,7 @@ module OBSWS
 
       def empty? = @fields.empty?
 
-      def attrs = @fields.map { |f| f.to_s.to_snake }
+      def attrs = @fields.map { |f| snakecase(f.to_s) }
     end
 
     class Response < MetaObject

data/lib/obsws/util.rb

@@ -1,12 +1,13 @@
 module OBSWS
   module Util
-    class ::String
-      def to_camel
-        split("_").map(&:capitalize).join
+    module String
+      def camelcase(s)
+        s.split("_").map(&:capitalize).join
       end
 
-      def to_snake
-        gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
+      def snakecase(s)
+        s
+          .gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
           .gsub(/([a-z\d])([A-Z])/, '\1_\2')
           .downcase
       end

data/lib/obsws/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: obsws
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - onyx_online