dacpclient 0.2.6 → 0.2.9

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dacpclient
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.9
 platform: ruby
 authors:
 - Jurriaan Pruis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-28 00:00:00.000000000 Z
+date: 2014-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -52,6 +52,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.0
+- !ruby/object:Gem::Dependency
+  name: dmapparser
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.2
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.18.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.18.1
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 0.18.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 0.18.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -155,15 +183,17 @@ files:
 - bin/dacpclient
 - dacpclient.gemspec
 - lib/dacpclient.rb
+- lib/dacpclient/browser.rb
 - lib/dacpclient/client.rb
-- lib/dacpclient/dmapbuilder.rb
-- lib/dacpclient/dmapconverter.rb
-- lib/dacpclient/dmapparser.rb
+- lib/dacpclient/faraday/flatter_params_encoder.rb
+- lib/dacpclient/model.rb
+- lib/dacpclient/models/pair_info.rb
+- lib/dacpclient/models/play_queue.rb
+- lib/dacpclient/models/play_queue_item.rb
+- lib/dacpclient/models/playlist.rb
+- lib/dacpclient/models/playlists.rb
+- lib/dacpclient/models/status.rb
 - lib/dacpclient/pairingserver.rb
-- lib/dacpclient/tag.rb
-- lib/dacpclient/tag_container.rb
-- lib/dacpclient/tag_definition.rb
-- lib/dacpclient/tag_definitions.rb
 - lib/dacpclient/version.rb
 homepage: https://github.com/jurriaan/ruby-dacpclient
 licenses:
@@ -185,7 +215,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A DACP (iTunes Remote protocol) client

data/lib/dacpclient/dmapbuilder.rb

@@ -1,43 +0,0 @@
-module DACPClient
-  # This class provides a DSL to create DMAP responses
-  class DMAPBuilder
-    attr_reader :result
-
-    def initialize
-      @dmap_stack = []
-    end
-
-    def self.method_missing(method, *args, &block)
-      new.send(method, *args, &block)
-    end
-
-    def build_container(tag , &block)
-      unless tag.type == :container
-        fail "Tag #{method} is not a container type"
-      end
-      @dmap_stack << TagContainer.new(tag)
-      instance_eval(&block)
-      if @dmap_stack.length > 1
-        @dmap_stack.last.value << @dmap_stack.pop
-      else
-        return @result = @dmap_stack.pop
-      end
-    end
-
-    def method_missing(method, *args, &block)
-      tag = TagDefinition[method]
-      return super if tag.nil?
-
-      if block_given?
-        build_container(tag, &block)
-      else
-        if @dmap_stack.length > 0
-          args = args.size > 1 ? args : args.first
-          @dmap_stack.last.value << Tag.new(tag, args)
-        else
-          fail 'Cannot build DMAP without a valid container'
-        end
-      end
-    end
-  end
-end

data/lib/dacpclient/dmapconverter.rb

@@ -1,119 +0,0 @@
-module DACPClient
-  # The DMAPConverter class converts between binary and ruby formats
-  class DMAPConverter
-    class << self
-      def date_to_bin(data)
-        int_to_bin(value.to_i)
-      end
-
-      def bin_to_byte(data)
-        data.unpack('C').first
-      end
-
-      def bin_to_long(data)
-        (bin_to_int(data[0..3]) << 32) + bin_to_int(data[4..7])
-      end
-
-      def bin_to_int(data)
-        data.unpack('N').first
-      end
-
-      def bin_to_short(data)
-        data.unpack('n').first
-      end
-
-      def bin_to_bool(data)
-        data == "\x01"
-      end
-
-      def bin_to_version(data)
-        data.unpack('nCC').join '.'
-      end
-
-      def bin_to_hex(data)
-        data.bytes.reduce('') { |a, e| a + sprintf('%02X', e) }
-      end
-
-      def bin_to_date(data)
-        Time.at(bin_to_int(data))
-      end
-
-      def bool_to_bin(data)
-        (data ? 1 : 0).chr
-      end
-
-      def int_to_bin(data)
-        [data.to_i].pack 'N'
-      end
-
-      def byte_to_bin(data)
-        [data.to_i].pack 'C'
-      end
-
-      def long_to_bin(data)
-        [data >> 32, data & 0xfffffff].pack 'NN'
-      end
-
-      def short_to_bin(data)
-        [data.to_i].pack 'n'
-      end
-
-      def version_to_bin(data)
-        data.split('.').pack 'nCC'
-      end
-
-      def hex_to_bin(data)
-        [data].pack 'H*'
-      end
-
-      def decode_unknown(data)
-        if data =~ /[^\x20-\x7e]/ # non-readable characters
-          if data.bytesize == 1
-            return DMAPConverter.bin_to_byte(data)
-          elsif data.bytesize == 2
-            return DMAPConverter.bin_to_short(data)
-          elsif data.bytesize == 4
-            return DMAPConverter.bin_to_int(data)
-          elsif data.bytesize == 8
-            return DMAPConverter.bin_to_long(data)
-          end
-        end
-        data
-      end
-
-      def bin_to_string(data)
-        data
-      end
-      alias_method :string_to_bin, :bin_to_string
-
-      alias_method :uint16_to_bin, :short_to_bin
-      alias_method :uint32_to_bin, :int_to_bin
-      alias_method :uint64_to_bin, :long_to_bin
-
-      alias_method :bin_to_uint16, :bin_to_short
-      alias_method :bin_to_uint32, :bin_to_int
-      alias_method :bin_to_uint64, :bin_to_long
-      alias_method :bin_to_unknown, :decode_unknown
-
-      def decode(type, data)
-        decode_method = ('bin_to_' + type.to_s).to_sym
-        if respond_to? decode_method
-          send(decode_method, data)
-        else
-          warn "Decoder: Unknown type #{type}"
-          decode_unknown(data)
-        end
-      end
-
-      def encode(type, data)
-        encode_method = (type.to_s + '_to_bin').to_sym
-        if respond_to? encode_method
-          send(encode_method, data)
-        else
-          warn "Encoder: Unknown type #{type}"
-          data
-        end
-      end
-    end
-  end
-end

data/lib/dacpclient/dmapparser.rb

@@ -1,40 +0,0 @@
-require 'dacpclient/tag_definitions'
-require 'dacpclient/dmapconverter'
-
-require 'stringio'
-module DACPClient
-  # The DMAPParser class parses DMAP responses
-  class DMAPParser
-    def self.parse(response)
-      return nil if response.nil? || response.length < 8
-      response = StringIO.new(response)
-      ret = TagContainer.new
-      key = response.read(4)
-      ret.type = TagDefinition[key]
-      response.read(4) # ignore length for now
-      ret.value = parse_container(response)
-      ret
-    end
-
-    private
-
-    def self.parse_container(response)
-      values = []
-
-      until response.eof?
-        key = response.read(4)
-        length = DMAPConverter.bin_to_int(response.read(4))
-        data = response.read(length)
-        tag = TagDefinition[key] ||
-              TagDefinition.new(key, :unknown, "unknown (#{data.bytesize})")
-        if tag.type == :container
-          data = StringIO.new(data)
-          values << TagContainer.new(tag, parse_container(data))
-        else
-          values << Tag.new(tag, DMAPConverter.decode(tag.type, data))
-        end
-      end
-      values
-    end
-  end
-end

data/lib/dacpclient/tag.rb

@@ -1,21 +0,0 @@
-module DACPClient
-  Tag = Struct.new(:type, :value) do
-    def to_s
-      "#<#{self.class.name} #{type}>"
-    end
-
-    def inspect(level = 0)
-      "#{'  ' * level}#{type}: #{value}"
-    end
-
-    def to_dmap
-      value = self.value
-      if type.type == :container
-        value = value.reduce('') { |a, e| a + e.to_dmap }
-      else
-        value = DMAPConverter.encode(type.type, value)
-      end
-      type.tag.to_s + [value.length].pack('N') + value
-    end
-  end
-end

data/lib/dacpclient/tag_container.rb

@@ -1,51 +0,0 @@
-module DACPClient
-  # The TagContainer class is a Tag which contains other Tags
-  class TagContainer < Tag
-    def initialize(type = nil, value = [])
-      super type, value
-    end
-
-    def inspect(level = 0)
-      "#{'  ' * level}#{type}:\n" + value.reduce('') do |a, e|
-        a + e.inspect(level + 1).chomp + "\n"
-      end
-    end
-
-    def get_value(key)
-      return value[key] if key.is_a? Fixnum
-
-      key = key.to_s
-      val = value.find { |e| e.type.tag == key }
-      val = value.find { |e| e.type.name == key } if val.nil?
-
-      if val.type.type == :container
-        val
-      elsif !val.nil?
-        val.value
-      end
-    end
-
-    alias_method :[], :get_value
-
-    def has?(key)
-      key = key.to_s
-      val = value.find { |e| e.type.tag == key }
-      val = value.find { |e| e.type.name == key } if val.nil?
-      !val.nil?
-    end
-
-    def method_missing(method, *arguments, &block)
-      if method =~ /(.*)\?$/
-        has?($1)
-      elsif has?(method)
-        get_value(method)
-      else
-        super
-      end
-    end
-
-    def to_a
-      value
-    end
-  end
-end

data/lib/dacpclient/tag_definition.rb

@@ -1,29 +0,0 @@
-require 'dacpclient/tag'
-require 'dacpclient/tag_container'
-
-module DACPClient
-  # The TagDefinition class describes the tags
-  TagDefinition = Struct.new(:tag, :type, :name) do
-    def inspect
-      "#{tag} (#{name}: #{type})"
-    end
-
-    def to_s
-      "#{tag} (#{name}: #{type})"
-    end
-
-    class << self
-      def find(key)
-        @@tags[key.to_s]
-      end
-
-      def tag(*args, &block)
-        @@tags ||= Hash.new(nil)
-        definition = new(*args, &block).freeze
-        @@tags[definition.tag.to_s] = definition
-      end
-
-      alias_method :[], :find
-    end
-  end
-end

data/lib/dacpclient/tag_definitions.rb

@@ -1,167 +0,0 @@
-require 'dacpclient/tag_definition'
-module DACPClient
-  # Sources:
-  # https://github.com/chendo/dmap-ng/blob/master/lib/dmap/tag_definitions.rb
-  # https://code.google.com/p/ytrack/wiki/DMAP
-  # https://code.google.com/p/tunesremote-se/wiki/ContentCodes
-  # https://raw.github.com/mattstevens/dmap-parser/master/dmap_parser.c
-  # /content-codes
-  class TagDefinition
-    tag 'mcon', :container, 'dmap.container'
-    tag 'msrv', :container, 'dmap.serverinforesponse'
-    tag 'msml', :container, 'dmap.msml'
-    tag 'mccr', :container, 'dmap.contentcodesresponse'
-    tag 'mdcl', :container, 'dmap.dictionary'
-    tag 'mlog', :container, 'dmap.loginresponse'
-    tag 'mupd', :container, 'dmap.updateresponse'
-    tag 'avdb', :container, 'daap.serverdatabases'
-    tag 'mlcl', :container, 'dmap.listing'
-    tag 'mlit', :container, 'dmap.listingitem'
-    tag 'mbcl', :container, 'dmap.bag'
-    tag 'adbs', :container, 'daap.returndatabasesongs'
-    tag 'aply', :container, 'daap.databaseplaylists'
-    tag 'apso', :container, 'daap.playlistsongs'
-    tag 'mudl', :container, 'dmap.deletedidlisting'
-    tag 'abro', :container, 'daap.databasebrowse'
-    tag 'abal', :container, 'daap.browsealbumlisting'
-    tag 'abar', :container, 'daap.browseartistlisting'
-    tag 'abcp', :container, 'daap.browsecomposerlisting'
-    tag 'abgn', :container, 'daap.browsegenrelisting'
-    tag 'prsv', :container, 'daap.resolve'
-    tag 'arif', :container, 'daap.resolveinfo'
-    tag 'casp', :container, 'dacp.speakers'
-    tag 'caci', :container, 'dacp.controlint'
-    tag 'cmpa', :container, 'dacp.pairinganswer'
-    tag 'cacr', :container, 'dacp.cacr'
-    tag 'cmcp', :container, 'dmcp.controlprompt'
-    tag 'cmgt', :container, 'dmcp.getpropertyresponse'
-    tag 'cmst', :container, 'dmcp.status'
-    tag 'agal', :container, 'daap.albumgrouping'
-    tag 'minm', :string, 'dmap.itemname'
-    tag 'msts', :string, 'dmap.statusstring'
-    tag 'mcna', :string, 'dmap.contentcodesname'
-    tag 'asal', :string, 'daap.songalbum'
-    tag 'asaa', :string, 'daap.songalbumartist'
-    tag 'asar', :string, 'daap.songartist'
-    tag 'ascm', :string, 'daap.songcomment'
-    tag 'asfm', :string, 'daap.songformat'
-    tag 'aseq', :string, 'daap.songeqpreset'
-    tag 'asgn', :string, 'daap.songgenre'
-    tag 'asdt', :string, 'daap.songdescription'
-    tag 'asul', :string, 'daap.songdataurl'
-    tag 'ceWM', :string, 'com.apple.itunes.welcome-message'
-    tag 'ascp', :string, 'daap.songcomposer'
-    tag 'assu', :string, 'daap.sortartist'
-    tag 'assa', :string, 'daap.sortalbum'
-    tag 'agrp', :string, 'daap.songgrouping'
-    tag 'cann', :string, 'daap.nowplayingtrack'
-    tag 'cana', :string, 'daap.nowplayingartist'
-    tag 'canl', :string, 'daap.nowplayingalbum'
-    tag 'cang', :string, 'daap.nowplayinggenre'
-    tag 'cmnm', :string, 'dacp.devicename'
-    tag 'cmty', :string, 'dacp.devicetype'
-    tag 'cmpg', :hex, 'dacp.pairingguid' # hex string
-    tag 'mper', :uint64, 'dmap.persistentid'
-    tag 'canp', :uint64, 'dacp.nowplaying'
-    tag 'cmpy', :uint64, 'dacp.passguid'
-    tag 'mstt', :uint32, 'dmap.status' # http status??
-    tag 'mcnm', :uint32, 'dmap.contentcodesnumber'
-    tag 'miid', :uint32, 'dmap.itemid'
-    tag 'mcti', :uint32, 'dmap.containeritemid'
-    tag 'mpco', :uint32, 'dmap.parentcontainerid'
-    tag 'mimc', :uint32, 'dmap.itemcount'
-    tag 'mrco', :uint32, 'dmap.returnedcount'
-    tag 'mtco', :uint32, 'dmap.containercount'
-    tag 'mstm', :uint32, 'dmap.timeoutinterval'
-    tag 'msdc', :uint32, 'dmap.databasescount'
-    tag 'msma', :uint32, 'dmap.speakermachineaddress'
-    tag 'mlid', :uint32, 'dmap.sessionid'
-    tag 'assr', :uint32, 'daap.songsamplerate'
-    tag 'assz', :uint32, 'daap.songsize'
-    tag 'asst', :uint32, 'daap.songstarttime'
-    tag 'assp', :uint32, 'daap.songstoptime'
-    tag 'astm', :uint32, 'daap.songtime'
-    tag 'msto', :uint32, 'dmap.utcoffset'
-    tag 'cmsr', :uint32, 'dmcp.mediarevision'
-    tag 'caas', :uint32, 'dacp.albumshuffle'
-    tag 'caar', :uint32, 'dacp.albumrepeat'
-    tag 'cant', :uint32, 'dacp.remainingtime'
-    tag 'cmmk', :uint32, 'dmcp.mediakind'
-    tag 'cast', :uint32, 'dacp.tracklength'
-    tag 'asai', :uint32, 'daap.songalbumid'
-    tag 'aeNV', :uint32, 'com.apple.itunes.norm-volume'
-    tag 'cmvo', :uint32, 'dmcp.volume'
-    tag 'mcty', :uint16, 'dmap.contentcodestype'
-    tag 'asbt', :uint16, 'daap.songsbeatsperminute'
-    tag 'asbr', :uint16, 'daap.songbitrate'
-    tag 'asdc', :uint16, 'daap.songdisccount'
-    tag 'asdn', :uint16, 'daap.songdiscnumber'
-    tag 'astc', :uint16, 'daap.songtrackcount'
-    tag 'astn', :uint16, 'daap.songtracknumber'
-    tag 'asyr', :uint16, 'daap.songyear'
-    tag 'ated', :uint16, 'daap.supportsextradata'
-    tag 'asgr', :uint16, 'daap.supportsgroups'
-    tag 'mikd', :byte, 'dmap.itemkind'
-    tag 'casu', :byte, 'dacp.su'
-    tag 'msau', :byte, 'dmap.authenticationmethod'
-    tag 'mstu', :byte, 'dmap.updatetype'
-    tag 'asrv', :byte, 'daap.songrelativevolume'
-    tag 'asur', :byte, 'daap.songuserrating'
-    tag 'asdk', :byte, 'daap.songdatakind'
-    tag 'caps', :byte, 'dacp.playstatus'
-    tag 'cash', :byte, 'dacp.shufflestate'
-    tag 'carp', :byte, 'dacp.repeatstate'
-    tag 'muty', :byte, 'dmap.updatetype'
-    tag "f\215ch", :byte, 'dmap.haschildcontainers'
-    tag 'msas', :byte, 'dmap.authenticationschemes'
-    tag 'cavs', :bool, 'dacp.visualizer'
-    tag 'cafs', :bool, 'dacp.fullscreen'
-    tag 'ceGS', :bool, 'com.apple.itunes.genius-selectable'
-    tag 'mslr', :bool, 'dmap.loginrequired'
-    tag 'msal', :bool, 'dmap.supportsautologout'
-    tag 'msup', :bool, 'dmap.supportsupdate'
-    tag 'mspi', :bool, 'dmap.supportspersistenids'
-    tag 'msex', :bool, 'dmap.supportsextensions'
-    tag 'msbr', :bool, 'dmap.supportsbrowse'
-    tag 'msqy', :bool, 'dmap.supportsquery'
-    tag 'msix', :bool, 'dmap.supportsindex'
-    tag 'msrs', :bool, 'dmap.supportsresolve'
-    tag 'asco', :bool, 'daap.songcompliation'
-    tag 'asdb', :bool, 'daap.songdisabled'
-    tag 'abpl', :bool, 'daap.baseplaylist'
-    tag 'aeSP', :bool, 'com.apple.itunes.smart-playlist'
-    tag 'aePP', :bool, 'com.apple.itunes.is-podcast-playlist'
-    tag 'aePS', :bool, 'com.apple.itunes.special-playlist'
-    tag 'aeSG', :bool, 'com.apple.itunes.saved-genius'
-    tag 'aeFP', :bool, 'com.apple.itunes.req-fplay'
-    tag 'aeHV', :bool, 'com.apple.itunes.has-video'
-    tag 'caia', :bool, 'dacp.isavailiable'
-    tag 'caip', :bool, 'dacp.isplaying'
-    tag 'ceVO', :bool, 'com.apple.itunes.voting-enabled'
-    tag 'aeSV', :version, 'com.apple.itunes.music-sharing-version'
-    tag 'mpro', :version, 'dmap.protocolversion'
-    tag 'apro', :version, 'daap.protocolversion'
-    tag 'musr', :version, 'dmap.serverrevision'
-    tag 'mstc', :date, 'dmap.utc-time'
-    tag 'asda', :date, 'daap.songdateadded'
-    tag 'asdm', :date, 'daap.songdatemodified'
-    tag 'ceJC', :bool, 'com.apple.itunes.jukebox-client-vote'
-    tag 'ceJI', :bool, 'com.apple.itunes.jukebox-current'
-    tag 'ceJS', :uint16, 'com.apple.itunes.jukebox-score'
-    tag 'ceJV', :bool, 'com.apple.itunes.jukebox-vote'
-    tag 'ceQR', :container, 'com.apple.itunes.playqueue-contents-response'
-    tag 'ceQS', :container, 'com.apple.itunes.playqueue-contents-???'
-    tag 'ceQs', :uint64, 'com.apple.itunes.playqueue-id'
-    tag 'ceQa', :string, 'com.apple.itunes.playqueue-album'
-    tag 'ceQg', :string, 'com.apple.itunes.playqueue-genre'
-    tag 'ceQn', :string, 'com.apple.itunes.playqueue-name'
-    tag 'ceQr', :string, 'com.apple.itunes.playqueue-artist'
-    tag 'msml', :container, 'msml'
-    tag 'aeGs', :bool, 'com.apple.itunes.can-be-genius-seed'
-    tag 'aprm', :short, 'daap.playlistrepeatmode'
-    tag 'apsm', :short, 'daap.playlistshufflemode'
-    tag 'cmpr', :version, 'dmcp.protocolversion'
-    tag 'capr', :version, 'dacp.protocolversion'
-    tag 'ppro', :version, 'unknown.version'
-  end
-end