kodi_client 0.5.6 → 0.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 988e821c68bbe4f1ffc3579c64aa02647814f9aea0fb5af409d619a10e82ab71
-  data.tar.gz: 1df5a3cea4ac46a7fb1fc7420f3f8a66244ceaed0a79a06673a6f9b9e3e6fcd0
+  metadata.gz: 0dd073d0e999df44e921b07f3aab1c148ee3647a584e2de13a2c070a151f7a2b
+  data.tar.gz: 00ac80c0f82b4bfcb0031e8cc2abf6e4c894ccff58515fcdfd08fbe1c3b7fb63
 SHA512:
-  metadata.gz: 4cbaa96ef989fc5c9708007f623f7c272ad465670099ac3d5251b5b2621e2f02411b23ad3aa3b5864b62b91bd4a530276cb884205b8e2f180491fce3a5c74204
-  data.tar.gz: a7aca817104f7be2f5919713cf07d40a4901f3fc6c0dc57ab248be2be0a34194b7c96f751277aaf3466561e19d83bf16ec1401c0a5765a1c0cdc51f51ec04bef
+  metadata.gz: b1a718355773fd1a1e12127f334f74a9bc1d9382ec47e9143a2dc776e1bb056157f4ac5ca0ec1232b14c27c8cc55bacacae1b37e0b831213af7472c2aeef16ec
+  data.tar.gz: e6dccd2f74a7c2f7a4790635b21f01730c88a69bfe47c6b8905b500dade3b650689506640a2428c00824ca03097658906563a7f88806aad094a3dc64d7edcf0c

data/kodi_client.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = 'kodi_client'
-  spec.version       = '0.5.6'
+  spec.version       = '0.5.7'
   spec.authors       = ['Christian Feier']
   spec.email         = ['christian.feier@gmail.com']
 

data/lib/kodi_client/Chainable.rb

@@ -24,7 +24,7 @@ module KodiClient
       client = def_client
       options = def_options
       set_command.call(options)
-      client.apply_options(options)
+      client.apply_options_to_methods(options)
       client
     end
 
@@ -43,5 +43,7 @@ module KodiClient
       end
       @options
     end
+
+    private :def_client, :def_options, :merge_options
   end
 end

data/lib/kodi_client/global_types/addon_types.rb

@@ -3,6 +3,7 @@
 require 'kodi_client/global_types/item_types'
 require 'kodi_client/util/comparable'
 require 'kodi_client/util/iterable'
+require 'kodi_client/util/creatable'
 
 module KodiClient
   module Types
@@ -10,7 +11,7 @@ module KodiClient
 
       # Addon Types https://kodi.wiki/view/JSON-RPC_API/v12#Addon.Types
       module AddonTypes
-        include Iterable
+        extend Iterable
 
         UNKNOWN = 'unknown'
         KODI_ADSP = 'kodi.adsp'
@@ -51,7 +52,8 @@ module KodiClient
 
       # Addon.Content https://kodi.wiki/view/JSON-RPC_API/v12#Addon.Content
       module AddonContent
-        include Iterable
+        extend Iterable
+
         UNKNOWN = 'unknown'
         AUDIO = 'audio'
         EXECUTABLE = 'executable'
@@ -83,33 +85,27 @@ module KodiClient
       # represents addon dependency
       class AddonDependency
         include Comparable
+        extend Creatable
 
-        attr_reader :addonid, :optional, :version
+        attr_reader :addon_id, :optional, :version
 
-        def initialize(hash)
-          @addonid = hash['addonid']
-          @optional = hash['optional']
-          @version = hash['version']
-        end
-
-        def ==(other)
-          compare(self, other)
+        def initialize(addon_id, optional, version)
+          @addon_id = addon_id
+          @optional = optional
+          @version = version
         end
       end
 
       # represents addon extra info
       class AddonExtraInfo
         include Comparable
+        extend Creatable
 
         attr_reader :key, :value
 
-        def initialize(hash)
-          @key = hash['key']
-          @value = hash['value']
-        end
-
-        def ==(other)
-          compare(self, other)
+        def initialize(key, value)
+          @key = key
+          @value = value
         end
       end
 
@@ -117,33 +113,43 @@ module KodiClient
       class AddonDetails
         include Comparable
         include Items::ItemDetailsBase
+        extend Creatable
 
         attr_reader :addon_id, :author, :broken, :dependencies, :description, :disclaimer, :enabled, :extra_info,
                     :fan_art, :installed, :name, :path, :rating, :summary, :thumbnail, :type, :version
 
-        def initialize(hash)
-          @addon_id = hash['addonid']
-          @author = hash['author']
-          @broken = hash['broken']
-          @dependencies = hash['dependencies'].nil? ? nil : hash['dependencies'].map { |it| AddonDependency.new(it) }
-          @description = hash['description']
-          @disclaimer = hash['disclaimer']
-          @enabled = hash['enabled']
-          @extra_info = hash['extrainfo'].nil? ? nil : hash['extrainfo'].map { |it| AddonExtraInfo.new(it) }
-          @fan_art = hash['fanart']
-          @installed = hash['installed']
-          @name = hash['name']
-          @path = hash['path']
-          @rating = hash['rating']
-          @summary = hash['summary']
-          @thumbnail = hash['thumbnail']
-          @type = hash['type']
-          @version = hash['version']
-          item_details_base(hash)
+        def self.create(hash)
+          return nil if hash.nil?
+
+          dependencies = AddonDependency.create_list(hash['dependencies'])
+          extra_info = AddonExtraInfo.create_list(hash['extrainfo'])
+
+          new(hash['addonid'], hash['author'], hash['broken'], dependencies, hash['description'], hash['disclaimer'],
+              hash['enabled'], extra_info, hash['fanart'], hash['installed'], hash['name'], hash['path'],
+              hash['rating'], hash['summary'], hash['thumbnail'], hash['type'], hash['version'],
+              *hash_to_arr(hash, ['label']))
         end
 
-        def ==(other)
-          compare(self, other)
+        def initialize(addon_id, author, broken, dependencies, description, disclaimer, enabled, extra_info,
+                       fan_art, installed, name, path, rating, summary, thumbnail, type, version, label)
+          @addon_id = addon_id
+          @author = author
+          @broken = broken
+          @dependencies = dependencies
+          @description = description
+          @disclaimer = disclaimer
+          @enabled = enabled
+          @extra_info = extra_info
+          @fan_art = fan_art
+          @installed = installed
+          @name = name
+          @path = path
+          @rating = rating
+          @summary = summary
+          @thumbnail = thumbnail
+          @type = type
+          @version = version
+          item_details_base(label)
         end
       end
 
@@ -153,13 +159,17 @@ module KodiClient
 
         attr_reader :addons, :limits
 
-        def initialize(hash)
-          @addons = hash['addons'].map { |it| AddonDetails.new(it) }
-          @limits = List::ListLimitsReturned.new(hash['limits'])
+        def self.create(hash)
+          return nil if hash.nil?
+
+          addons = AddonDetails.create_list(hash['addons'])
+          limits = List::ListLimitsReturned.create(hash['limits'])
+          new(addons, limits)
         end
 
-        def ==(other)
-          compare(self, other)
+        def initialize(addons, limits)
+          @addons = addons
+          @limits = limits
         end
       end
 
@@ -169,12 +179,14 @@ module KodiClient
 
         attr_reader :addon
 
-        def initialize(hash)
-          @addon = AddonDetails.new(hash['addon'])
+        def self.create(hash)
+          return nil if hash.nil?
+
+          new(AddonDetails.create(hash['addon']))
         end
 
-        def ==(other)
-          compare(self, other)
+        def initialize(addon)
+          @addon = addon
         end
       end
     end

data/lib/kodi_client/global_types/application_types.rb

@@ -2,6 +2,7 @@
 
 require 'kodi_client/util/comparable'
 require 'kodi_client/util/iterable'
+require 'kodi_client/util/creatable'
 
 module KodiClient
   module Types
@@ -22,35 +23,37 @@ module KodiClient
       # Application.Property.Value https://kodi.wiki/view/JSON-RPC_API/v12#Application.Property.Value
       class PropertyValue
         include Comparable
+        extend Creatable
 
         attr_reader :name, :version, :muted, :volume
 
-        def initialize(hash)
-          @name = hash['name']
-          @version = hash['version'].nil? ? nil : Version.new(hash['version'])
-          @muted = hash['muted']
-          @volume = hash['volume']
+        def self.create(hash)
+          return null if hash.nil?
+
+          version = Version.create(hash['version'])
+          new(hash['name'], version, hash['muted'], hash['volume'])
         end
 
-        def ==(other)
-          compare(self, other)
+        def initialize(name, version, muted, volume)
+          @name = name
+          @version = version
+          @muted = muted
+          @volume = volume
         end
       end
 
       # represent application properties version
       class Version
         include Comparable
-        attr_reader :major, :minor, :revision, :tag
+        extend Creatable
 
-        def initialize(hash)
-          @major = hash['major']
-          @minor = hash['minor']
-          @revision = hash['revision']
-          @tag = hash['tag']
-        end
+        attr_reader :major, :minor, :revision, :tag
 
-        def ==(other)
-          compare(self, other)
+        def initialize(major, minor, revision, tag)
+          @major = major
+          @minor = minor
+          @revision = revision
+          @tag = tag
         end
       end
     end

data/lib/kodi_client/global_types/audio_types.rb

@@ -3,6 +3,7 @@
 require 'kodi_client/global_types/media_types'
 require 'kodi_client/util/comparable'
 require 'kodi_client/util/iterable'
+require 'kodi_client/util/creatable'
 
 module KodiClient
   module Types
@@ -11,18 +12,15 @@ module KodiClient
       # Audio.Contributor https://kodi.wiki/view/JSON-RPC_API/v12#Audio.Contributors
       class AudioContributor
         include Comparable
+        extend Creatable
 
         attr_reader :artist_id, :name, :role, :role_id
 
-        def initialize(hash)
-          @artist_id = hash['artistid']
-          @name = hash['name']
-          @role = hash['role']
-          @role_id = hash['roleid']
-        end
-
-        def ==(other)
-          compare(self, other)
+        def initialize(artist_id, name, role, role_id)
+          @artist_id = artist_id
+          @name = name
+          @role = role
+          @role_id = role_id
         end
       end
 
@@ -40,11 +38,16 @@ module KodiClient
 
         attr_reader :art, :date_added, :genre
 
-        def audio_details_base(hash)
-          @art = Types::Media::MediaArtwork.new(hash['art'])
-          @date_added = hash['date_added']
-          @genre = hash['genre']
-          media_details_base(hash)
+        def audio_details_base_by_hash(hash)
+          audio_details_base(Types::Media::MediaArtwork.create(hash['art']), hash['date_added'], hash['genre'],
+                             *Creatable.hash_to_arr(hash, %w[fan_art thumbnail label]))
+        end
+
+        def audio_details_base(art, date_added, genre, fan_art, thumbnail, label)
+          @art = art
+          @date_added = date_added
+          @genre = genre
+          media_details_base(fan_art, thumbnail, label)
         end
       end
 
@@ -52,23 +55,32 @@ module KodiClient
       module AudioDetailsMedia
         include AudioDetailsBase
 
-        attr_reader :artist, :artist_id, :display_artist, :musicbrainz_albumartist_id, :original_date, :rating,
+        attr_reader :artist, :artist_id, :display_artist, :musicbrainz_album_artist_id, :original_date, :rating,
                     :release_date, :sort_artist, :title, :user_rating, :votes, :year
 
-        def audio_details_media(hash)
-          @artist = hash['artist']
-          @artist_id = hash['artistid']
-          @display_artist = hash['displayartist']
-          @musicbrainz_albumartist_id = hash['musicbrainzalbumartistid']
-          @original_date = hash['originaldate']
-          @rating = hash['rating']
-          @release_date = hash['releasedate']
-          @sort_artist = hash['sortartist']
-          @title = hash['title']
-          @user_rating = hash['userrating']
-          @votes = hash['votes']
-          @year = hash['year']
-          audio_details_base(hash)
+        def audio_details_media_by_hash(hash)
+          audio_details_media(hash['artist'], hash['artistid'], hash['displayartist'], hash['musicbrainzalbumartistid'],
+                              hash['originaldate'], hash['rating'], hash['releasedate'], hash['sortartist'],
+                              hash['title'], hash['userrating'], hash['votes'], hash['year'],
+                              *Creatable.hash_to_arr(hash, %w[art date_added genre fan_art thumbnail label]))
+        end
+
+        def audio_details_media(artist, artist_id, display_artist, musicbrainz_album_artist_id, original_date,
+                                rating, release_date, sort_artist, title, user_rating, votes, year,
+                                art, date_added, genre, fan_art, thumbnail, label)
+          @artist = artist
+          @artist_id = artist_id
+          @display_artist = display_artist
+          @musicbrainz_album_artist_id = musicbrainz_album_artist_id
+          @original_date = original_date
+          @rating = rating
+          @release_date = release_date
+          @sort_artist = sort_artist
+          @title = title
+          @user_rating = user_rating
+          @votes = votes
+          @year = year
+          audio_details_base(art, date_added, genre, fan_art, thumbnail, label)
         end
       end
     end

data/lib/kodi_client/global_types/favourites_types.rb

@@ -2,6 +2,7 @@
 
 require 'kodi_client/util/comparable'
 require 'kodi_client/util/iterable'
+require 'kodi_client/util/creatable'
 require 'kodi_client/global_types/list_types'
 
 module KodiClient
@@ -32,36 +33,36 @@ module KodiClient
       # Favourite.Details.Favourite https://kodi.wiki/view/JSON-RPC_API/v12#Favourite.Details.Favourite
       class DetailsFavourite
         include Comparable
+        extend Creatable
 
         attr_reader :path, :thumbnail, :title, :type, :window, :window_parameter
 
-        def initialize(hash)
-          @path = hash['path']
-          @thumbnail = hash['thumbnail']
-          @title = hash['title']
-          @type = hash['type']
-          @window = hash['window']
-          @window_parameter = hash['windowparameter']
-        end
-
-        def ==(other)
-          compare(self, other)
+        def initialize(path, thumbnail, title, type, window, window_parameter)
+          @path = path
+          @thumbnail = thumbnail
+          @title = title
+          @type = type
+          @window = window
+          @window_parameter = window_parameter
         end
       end
 
       # return type for Favourites.GetFavourites
       class GetFavouriteReturned
         include Comparable
+        extend Creatable
 
         attr_reader :favourites, :limits
 
-        def initialize(hash)
-          @favourites = hash['favourites'].map { |it| DetailsFavourite.new(it) }
-          @limits = Types::List::ListLimitsReturned.new(hash['limits'])
+        def self.create(hash)
+          favourites = DetailsFavourite.create_list(hash['favourites'])
+          limits = Types::List::ListLimitsReturned.create(hash['limits'])
+          new(favourites, limits)
         end
 
-        def ==(other)
-          compare(self, other)
+        def initialize(favourites, limits)
+          @favourites = favourites
+          @limits = limits
         end
       end
     end

data/lib/kodi_client/global_types/global_types.rb

@@ -2,6 +2,7 @@
 
 require 'kodi_client/util/comparable'
 require 'kodi_client/util/iterable'
+require 'kodi_client/util/creatable'
 
 module KodiClient
   module Types
@@ -9,7 +10,7 @@ module KodiClient
 
       # Global.Toggle https://kodi.wiki/view/JSON-RPC_API/v12#Global.Toggle
       module Toggle
-        include Iterable
+        extend Iterable
 
         TOGGLE = 'toggle'
         TRUE = true
@@ -55,48 +56,41 @@ module KodiClient
       # id/label type
       class IdLabel
         include Comparable
-        attr_reader :id, :label
+        extend Creatable
 
-        def initialize(hash)
-          @id = hash['id']
-          @label = hash['label']
-        end
+        attr_reader :id, :label
 
-        def ==(other)
-          compare(self, other)
+        def initialize(id, label)
+          @id = id
+          @label = label
         end
       end
 
       # id/name type
       class IdName
         include Comparable
-        attr_reader :id, :name
+        extend Creatable
 
-        def initialize(hash)
-          @id = hash['id']
-          @name = hash['name']
-        end
+        attr_reader :id, :name
 
-        def ==(other)
-          compare(self, other)
+        def initialize(id, name)
+          @id = id
+          @name = name
         end
       end
 
       # Global.Time https://kodi.wiki/view/JSON-RPC_API/v12#Global.Time
       class GlobalTime
         include Comparable
+        extend Creatable
 
         attr_reader :hours, :minutes, :seconds, :milliseconds
 
-        def initialize(hash)
-          @hours = hash['hours']
-          @minutes = hash['minutes']
-          @seconds = hash['seconds']
-          @milliseconds = hash['milliseconds']
-        end
-
-        def ==(other)
-          compare(self, other)
+        def initialize(hours, minutes, seconds, milliseconds)
+          @hours = hours
+          @minutes = minutes
+          @seconds = seconds
+          @milliseconds = milliseconds
         end
       end
 

data/lib/kodi_client/global_types/gui_types.rb

@@ -3,6 +3,7 @@
 require 'kodi_client/global_types/global_types'
 require 'kodi_client/util/comparable'
 require 'kodi_client/util/iterable'
+require 'kodi_client/util/creatable'
 
 module KodiClient
   module Types
@@ -10,6 +11,7 @@ module KodiClient
 
       # GUI.Window https://kodi.wiki/view/JSON-RPC_API/v12#GUI.Window
       module GUIWindow
+        extend Iterable
 
         ACCESSPOINTS = 'accesspoints'
         ADDON = 'addon'
@@ -139,6 +141,7 @@ module KodiClient
       class StereoscopyMode
         include Comparable
         include Iterable
+        extend Creatable
 
         attr_reader :label, :mode
 
@@ -152,32 +155,35 @@ module KodiClient
         ANAGLYPH_YELLOW_BLUE = 'anaglyph_yellow_blue'
         MONSCOPIC = 'monoscopic'
 
-        def initialize(hash)
-          @label = hash['label']
-          @mode = hash['mode']
-        end
-
-        def ==(other)
-          compare(self, other)
+        def initialize(label, mode)
+          @label = label
+          @mode = mode
         end
       end
 
       # GUI.Property.Value https://kodi.wiki/view/JSON-RPC_API/v12#GUI.Property.Value
       class PropertyValue
         include Comparable
+        extend Creatable
 
         attr_reader :current_control, :current_window, :fullscreen, :skin, :stereoscopic_mode
 
-        def initialize(hash)
-          @current_control = Global::IdLabel.new(hash['currentcontrol'])
-          @current_window = Global::IdLabel.new(hash['currentwindow'])
-          @fullscreen = hash['fullscreen']
-          @skin = Global::IdName.new(hash['skin'])
-          @stereoscopic_mode = StereoscopyMode.new(hash['stereoscopicmode'])
+        def self.create(hash)
+          return nil if hash.nil?
+
+          current_control = Global::IdLabel.create(hash['currentcontrol'])
+          current_window = Global::IdLabel.create(hash['currentwindow'])
+          skin = Global::IdName.create(hash['skin'])
+          stereoscopic_mode = StereoscopyMode.create(hash['stereoscopicmode'])
+          new(current_control, current_window, hash['fullscreen'], skin, stereoscopic_mode)
         end
 
-        def ==(other)
-          compare(self, other)
+        def initialize(current_control, current_window, fullscreen, skin, stereoscopic_mode)
+          @current_control = current_control
+          @current_window = current_window
+          @fullscreen = fullscreen
+          @skin = skin
+          @stereoscopic_mode = stereoscopic_mode
         end
       end
     end

data/lib/kodi_client/global_types/item_types.rb

@@ -9,8 +9,12 @@ module KodiClient
 
         attr_reader :label
 
-        def item_details_base(hash)
-          @label = hash['label']
+        def item_details_base_by_hash(hash)
+          item_details_base(hash['label'])
+        end
+
+        def item_details_base(label)
+          @label = label
         end
       end
     end