wowza_rest 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5832e1b90ea446b80f13a40b8e91c28a7a3a17e
-  data.tar.gz: 01e65cade305ec83ea2cf8f78f85c9a03ec7dd0b
+  metadata.gz: f37ae4846ac5b847a83ea42ac030d41d11fa3509
+  data.tar.gz: c81253f1e3ae7178cc3502a028aa18726e128629
 SHA512:
-  metadata.gz: 1ad3e763386de9a51027aefebdfe9b8312b927e7180dc088b254acdb366740a2199fd8540db57db3aa35eb96c8582a721bf7ef4aa425c6dd92e3cf074bf6af3f
-  data.tar.gz: 303108a94cb1bbb408a46b164143579ebf1fa1d3918bbae8ba38cd928c382ae84057d6f19b84ea821c8c38fa9be44b9fbf97aab64be19bd58f08cf83b9c6ad2d
+  metadata.gz: 6b3fd80dd0f150d059644a768177bbe96eddb31515398fdabb24a5784b9fbcf2506dd5b674c39f66d5c0c54b3be31500b264f3ba46c0671d86c51412a72361e6
+  data.tar.gz: 283939b6c666974a600dd701c97da58e6e2c69526608649bd7259c149bf824b7f2bc09c3af08b85995681acc49bd61fdef8c7a4c2c15ce72f713dd26b5edb0a6

data/.rubocop.yml

@@ -13,3 +13,6 @@ Documentation:
 
 RSpec/NestedGroups:
   Max: 5
+
+Metrics/AbcSize:
+  Max: 18

data/lib/wowza_rest/applications.rb

@@ -45,19 +45,22 @@ module WowzaRest
     private
 
     # rubocop:disable Metrics/LineLength
+    # rubocop:disable Metrics/MethodLength
     def apply_update_application_checks(app_name, config)
       if !app_name.is_a?(String)
         raise WowzaRest::Errors::InvalidArgumentType,
               "First argument expected to be String got #{app_name.class} instead"
-      elsif !config.is_a?(Hash)
+      elsif !config.is_a?(Hash) && !config.is_a?(WowzaRest::Data::Application)
         raise WowzaRest::Errors::InvalidArgumentType,
-              "Second argument expected to be String got #{config.class} instead"
-      elsif config.empty?
+              "Second argument expected to be Hash or WowzaRest::Data::Application instance,
+              got #{config.class} instead"
+      elsif config.is_a?(Hash) && config.empty?
         raise WowzaRest::Errors::InvalidArgument,
-              'Configuration hash must have at least one attribute'
+              'When Configuration passeed as hash it must contains at least one attribute'
       end
     end
     # rubocop:enable Metrics/LineLength
+    # rubocop:enable Metrics/MethodLength
 
     # rubocop:disable Metrics/MethodLength
     # rubocop:disable Metrics/LineLength

data/lib/wowza_rest/client.rb

@@ -1,6 +1,7 @@
 require 'wowza_rest/api'
 require 'wowza_rest/connection'
 require 'wowza_rest/errors'
+require_relative 'data/server_status'
 
 module WowzaRest
   class Client
@@ -20,7 +21,8 @@ module WowzaRest
     end
 
     def server_status
-      connection.request(:get, '/status', base_uri: server_path).parsed_response
+      response = connection.request(:get, '/status', base_uri: server_path)
+      WowzaRest::Data::ServerStatus.new(response.parsed_response)
     rescue
       nil
     end

data/lib/wowza_rest/data/application.rb

@@ -7,20 +7,22 @@ module WowzaRest
                   :drm_config, :transcoder_config, :modules
 
       def initialize(attrs = {})
-        initialize_object_attrs(attrs)
+        keys_reader :securityConfig, :streamConfig, :dvrConfig,
+                    :drmConfig, :transcoderConfig, :modules
+        initialize_object_attrs(attrs || {})
         super(attrs)
       end
 
-      class TranscoderConfig < Base
-        attr_reader :templates
-        def initialize(attrs = {})
-          @templates = map_array_objects(
-            attrs.delete('templates')['templates'], Template
-          )
-          super(attrs)
+      def to_h
+        super() do |k, arr|
+          if k == :@modules
+            {
+              moduleList: objects_array_to_hash_array(arr)
+            }
+          else
+            objects_array_to_hash_array(arr)
+          end
         end
-
-        class Template < Base; end
       end
 
       class SecurityConfig < Base; end
@@ -29,9 +31,43 @@ module WowzaRest
       class DRMConfig < Base; end
       class Module < Base; end
 
+      class TranscoderConfig < Base
+        attr_reader :templates
+
+        def initialize(attrs = {})
+          if !attrs.nil? &&  attrs['templates']
+            keys_reader :templates
+            @templates = wrap_array_objects(
+              attrs.delete('templates')['templates'], Template
+            )
+          end
+          super(attrs)
+        end
+
+        def to_h
+          super() do |k, arr|
+            if k == :@templates
+              {
+                templates: objects_array_to_hash_array(arr)
+              }
+            else
+              objects_array_to_hash_array(arr)
+            end
+          end
+        end
+
+        class Template < Base; end
+      end
+
       private
 
+      # rubocop:disable Metrics/MethodLength
       def initialize_object_attrs(attrs)
+        if attrs['modules']
+          @modules = wrap_array_objects(
+            attrs.delete('modules')['moduleList'], Module
+          )
+        end
         @security_config = SecurityConfig.new(attrs.delete('securityConfig'))
         @stream_config = StreamConfig.new(attrs.delete('streamConfig'))
         @dvr_config = DVRConfig.new(attrs.delete('dvrConfig'))
@@ -39,9 +75,6 @@ module WowzaRest
         @transcoder_config = TranscoderConfig.new(
           attrs.delete('transcoderConfig')
         )
-        @modules = map_array_objects(
-          attrs.delete('modules')['moduleList'], Module
-        )
       end
     end
   end

data/lib/wowza_rest/data/base.rb

@@ -2,14 +2,15 @@ module WowzaRest
   module Data
     class Base
       def initialize(attrs = {})
-        setup_attributes(attrs)
+        setup_attributes(attrs || {})
       end
 
       def setup_attributes(attrs)
         attrs.each do |k, v|
-          define_attribute_getter(k.underscore)
-          define_attribute_setter(k.underscore)
-          instance_variable_set("@#{k.underscore}", v)
+          define_attribute_getter(k.to_s.underscore)
+          define_attribute_setter(k.to_s.underscore)
+          define_key_getter(k.to_s)
+          instance_variable_set("@#{k.to_s.underscore}", v)
         end
       end
 
@@ -25,8 +26,56 @@ module WowzaRest
         end
       end
 
-      def map_array_objects(arr, klass)
-        arr.map { |obj| klass.new(obj) }
+      def define_key_getter(key)
+        define_singleton_method("#{key.underscore}_key") do
+          key.to_s
+        end
+      end
+
+      def keys_reader(*args)
+        args.each do |arg|
+          define_key_getter(arg.to_s)
+        end
+      end
+
+      def wrap_array_objects(arr, klass)
+        arr.map { |obj| klass.new(obj) } unless arr.nil?
+      end
+
+      def objects_array_to_hash_array(arr)
+        return if arr.nil?
+        arr.map do |obj|
+          obj.is_a?(WowzaRest::Data::Base) ? obj.to_h : obj
+        end
+      end
+
+      # rubocop:disable Metrics/MethodLength
+      def to_h
+        instance_variables.each_with_object({}) do |var, hash|
+          value = instance_variable_get(var)
+          hash[send("#{var.to_s.delete('@')}_key")] =
+            if value.is_a?(WowzaRest::Data::Base)
+              instance_variable_get(var).to_h
+            elsif value.is_a?(Array)
+              if block_given?
+                yield(var, instance_variable_get(var))
+              else
+                objects_array_to_hash_array(instance_variable_get(var))
+              end
+            else
+              instance_variable_get(var)
+            end
+        end
+      end
+      # rubocop:enable Metrics/MethodLength
+      alias to_hash to_h
+
+      def to_json
+        to_h.to_json
+      end
+
+      def include?(attr_name)
+        to_h.include?(attr_name.to_s)
       end
     end
   end

data/lib/wowza_rest/data/incoming_stream_stats.rb

@@ -6,6 +6,7 @@ module WowzaRest
       attr_reader :connection_count
 
       def initialize(attrs = {})
+        keys_reader :connectionCount
         @connection_count = ConnectionCount.new(attrs.delete('connectionCount'))
         super(attrs)
       end

data/lib/wowza_rest/data/instance.rb

@@ -8,16 +8,18 @@ module WowzaRest
 
       # rubocop:disable Metrics/MethodLength
       def initialize(attrs = {})
-        @incoming_streams = map_array_objects(
+        keys_reader :incomingStreams, :outgoingStreams,
+                    :recorders, :streamGroups
+        @incoming_streams = wrap_array_objects(
           attrs.delete('incomingStreams'), IncomingStream
         )
-        @outgoing_streams = map_array_objects(
+        @outgoing_streams = wrap_array_objects(
           attrs.delete('outgoingStreams'), OutgoingStream
         )
-        @recorders = map_array_objects(
+        @recorders = wrap_array_objects(
           attrs.delete('recorders'), Recorder
         )
-        @stream_groups = map_array_objects(
+        @stream_groups = wrap_array_objects(
           attrs.delete('streamGroups'), StreamGroup
         )
         super(attrs)

data/lib/wowza_rest/data/server_status.rb

@@ -0,0 +1,6 @@
+require_relative 'base'
+module WowzaRest
+  module Data
+    class ServerStatus < Base; end
+  end
+end

data/lib/wowza_rest/version.rb

@@ -1,3 +1,3 @@
 module WowzaRest
-  VERSION = '0.2.3'.freeze
+  VERSION = '0.2.4'.freeze
 end

data/wowza_rest.gemspec

@@ -40,6 +40,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'dotenv'
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'rubocop-rspec'
+  spec.add_development_dependency 'rspec-json_expectations'
 
   spec.add_dependency 'httparty'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wowza_rest
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Hazem Taha
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-18 00:00:00.000000000 Z
+date: 2017-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -136,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-json_expectations
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
@@ -179,6 +193,7 @@ files:
 - lib/wowza_rest/data/base.rb
 - lib/wowza_rest/data/incoming_stream_stats.rb
 - lib/wowza_rest/data/instance.rb
+- lib/wowza_rest/data/server_status.rb
 - lib/wowza_rest/errors.rb
 - lib/wowza_rest/instances.rb
 - lib/wowza_rest/publishers.rb