obsws 0.3.1 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ddfcc82f3a8213d04134762ce838d20cfef23f61fd12bfcdb8d414ca381aaae4
-  data.tar.gz: 572f30bae6af2264b9a208eb567ceea95e95b65d6311831d7155f052147ce81f
+  metadata.gz: a79951b0215195512bd8972528425795f3893a3c9605009803f5583b36e54618
+  data.tar.gz: 4515b14d0bab1934e3eb1a8e5b626660a970ae1c6358c5ba2f47a6320562845b
 SHA512:
-  metadata.gz: c4a6aa4c301fd4f0a339b1f6b06a629d1051499b0cba82485ccbb93428318066515f51cdfda61b0f09c7ebd7a6c3b7a601e08d9d91f95f9111f3166235484e6c
-  data.tar.gz: 1b94ca2cf66e810b0a195fbe501518e6c87b0a26844c69303196a0f8cbe41770994d38e8613c3a7a612f723de7736b5e14afd2808fa6a70ef7dd3bfb7e5aff08
+  metadata.gz: b43b242dc256207ebf7f5ebe78e720416a68a4e9dcfc665de3a880b9a027e859db1ae805aeb9e363bb5a3f62487fb0e19ee8cda2ff2d871cec24ff82e4e7fda6
+  data.tar.gz: d13c2e1bfdd1931f251f52d42b2851040bb352ba7991ea5ec678dae5631349125440201b65e64a6c01d1d61f2419cac7911f2f64abd1765fab9870a5224bafab

data/lib/obsws/base.rb

@@ -10,7 +10,7 @@ require_relative "mixin"
 module OBSWS
   class Base
     include Logging
-    include Driver
+    include Driver::Director
     include Mixin::OPCodes
 
     attr_reader :closed

data/lib/obsws/driver.rb

@@ -16,36 +16,38 @@ module OBSWS
       end
     end
 
-    def setup_driver(host, port)
-      @socket = TCPSocket.new(host, port)
-      @driver =
-        WebSocket::Driver.client(Socket.new("ws://#{host}:#{port}", @socket))
-      @driver.on :open do |msg|
-        logger.debug("driver socket open")
-      end
-      @driver.on :close do |msg|
-        logger.debug("driver socket closed")
-        @closed = true
-      end
-      @driver.on :message do |msg|
-        msg_handler(JSON.parse(msg.data, symbolize_names: true))
+    module Director
+      def setup_driver(host, port)
+        @socket = TCPSocket.new(host, port)
+        @driver =
+          WebSocket::Driver.client(Socket.new("ws://#{host}:#{port}", @socket))
+        @driver.on :open do |msg|
+          logger.debug("driver socket open")
+        end
+        @driver.on :close do |msg|
+          logger.debug("driver socket closed")
+          @closed = true
+        end
+        @driver.on :message do |msg|
+          msg_handler(JSON.parse(msg.data, symbolize_names: true))
+        end
       end
-    end
 
-    private def start_driver
-      Thread.new do
-        @driver.start
+      private def start_driver
+        Thread.new do
+          @driver.start
 
-        loop do
-          @driver.parse(@socket.readpartial(4096))
-        rescue EOFError
-          break
+          loop do
+            @driver.parse(@socket.readpartial(4096))
+          rescue EOFError
+            break
+          end
         end
       end
-    end
 
-    public def stop_driver
-      @driver.close
+      public def stop_driver
+        @driver.close
+      end
     end
   end
 end

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
-      1
+      3
     end
 
     def to_a

metadata

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