dacpclient 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 851490abf8148566e8348090625db3b72d2d6328
-  data.tar.gz: c845ff13c853f52927eea02ead5465469a461f1e
+  metadata.gz: 1a91f6ef4321ce83e0cabc85493552ebf7961756
+  data.tar.gz: c032e8102b42801e7fa220861ecefb5b306f0550
 SHA512:
-  metadata.gz: 528948172ba3b6bd76e0cb3cc4ccf15508df58a86267035e65a07b2e489fa53cbcfe57cc868f4641bb18d3921878a04edb61b523f1fc9b01761cca563cc0320b
-  data.tar.gz: 1530e1c99b1d139467fd9638c617fa1fd95f4793abff03a89cad81a07052fa014a7ced470df0a12328663e3d5fd2d96aacbeaedf71123a75fabaa7a1d41a71f9
+  metadata.gz: 352cf3561c859d1bf52deb7a3fb33d036245282e6610e72871f11863055afebd3fb41ff630fdb887c3f52573bf3ead3fbcf9fc7163ca0b6882391d9addf65ec6
+  data.tar.gz: e78e5bad668a556c7d583702c23798a75b2df288bfb8358c9e750047685963bfbbc3380f9c2df6c12fb9236a3b5c2bb65f9b8bd5ebc6950a9c3801754cac72f6

data/.gitignore

@@ -0,0 +1,15 @@
+Gemfile.lock
+*.gem
+*.rbc
+.bundle
+.config
+coverage
+InstalledFiles
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp
+.DS_Store

data/.rubocop.yml

@@ -1,5 +1,7 @@
 # Avoid methods longer than 10 lines of code
 MethodLength:
   Enabled: false
-LineLength:
+Documentation:
+  Enabled: false
+ConstantName:
   Enabled: false

data/Gemfile

@@ -1,4 +1,4 @@
-ruby '2.0.0'
+# ruby '2.0.0'
 gemspec
 
 source 'https://rubygems.org'
@@ -6,9 +6,8 @@ source 'https://rubygems.org'
 group :test do
   gem 'pry'
   gem 'minitest', '~> 5.0.6'
-  #gem 'coveralls', require: false
+  # gem 'coveralls', require: false
   gem 'rake'
-  gem 'rubocop', github: 'bbatsov/rubocop', ref: '68b73d5c38a' #'~> 0.12.0'
-  gem 'simplecov', require: false
-  #gem 'simple_mock'
+  gem 'rubocop', '~> 0.11.1'
+  gem 'simplecov', :require => false
 end

data/README.md

@@ -1,3 +1,48 @@
-A DACP (iTunes Remote protocol) client written in the wonderful Ruby language
+#DACPClient
 
-Look at the remoteclient.rb file for an example client.
+[![Gem Version](https://badge.fury.io/rb/dacpclient.png)](http://badge.fury.io/rb/dacpclient) [![Dependency Status](https://gemnasium.com/jurriaan/ruby-dacpclient.png)](https://gemnasium.com/jurriaan/ruby-dacpclient)
+
+A DACP (iTunes Remote protocol) client written in the wonderful Ruby language.
+You can use this for controlling iTunes. It uses the same protocol as the iTunes remote iOS app.
+
+Look at the [bin/dacpclient](https://github.com/jurriaan/ruby-dacpclient/blob/master/bin/dacpclient) file for an example client.
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+    gem 'dacpclient'
+
+And then execute:
+
+    bundle
+
+Or install it yourself using:
+
+    gem install dacpclient
+
+## Usage
+
+See [bin/dacpclient](https://github.com/jurriaan/ruby-dacpclient/blob/master/bin/dacpclient)
+
+## Todo
+
+- Add tests
+- Add more tagdefinitions
+- Documentation
+
+## Contributing
+
+1. Fork it
+2. Create your feature branch (`git checkout -tb my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request
+
+## Contributors
+
+- [Jurriaan Pruis](https://github.com/jurriaan)
+
+## Thanks
+
+- [edc1591](https://github.com/edc1591) - for some of the 'Up Next' code

data/{remoteclient.rb → bin/dacpclient}

@@ -1,8 +1,10 @@
-$LOAD_PATH.unshift __dir__
-require File.expand_path('lib/dacpclient.rb', __dir__)
+#!/usr/bin/env ruby
+
+require 'dacpclient'
 require 'english'
 require 'socket'
-include DACPClient
+
+# This is the CLI DACP Client. Normally installed as `dacpclient`
 class CLIClient
   def initialize
     @client = DACPClient::Client.new("CLIClient (#{Socket.gethostname})", 'localhost', 3689)
@@ -13,7 +15,7 @@ class CLIClient
     if arguments.length > 0 && !([:parse_arguments].include?(arguments.first.to_sym)) && self.class.instance_methods(false).include?(arguments.first.to_sym)
       method = arguments.first.to_sym
       send method
-      status unless %i{help usage}.include?(method)
+      status unless [:help, :usage, :status, :status_ticker].include?(method)
     else
       usage
     end
@@ -28,11 +30,37 @@ class CLIClient
       name = status.cann
       artist = status.cana
       album = status.canl
-      playstatus = status.caps != 4 ? 'paused' : 'playing'
+      playstatus = status.caps != 4 ? '❙❙' : '▶ '
       remaining = status.cant
       total = status.cast
       current = total - remaining
-      puts "[#{playstatus.upcase} (#{format_time(current)}/#{format_time(total)})] #{name} - #{artist} (#{album})"
+      puts "[#{format_time(current)}/#{format_time(total)}] #{playstatus} #{name} - #{artist} (#{album})"
+    end
+  end
+
+  def status_ticker
+    login
+    status = nil
+    status_time = 0
+    repeat_every(1) do
+      unless status.nil?
+        if status.caps == 2
+          print "\r\033[K[STOPPED]"
+        else
+          name = status.cann
+          artist = status.cana
+          album = status.canl
+          playstatus = status.caps != 4 ? '❙❙' : '▶ '
+          total = status.cast
+          remaining = status.cant
+          current = total - remaining + [((Time.now.to_f * 1000.0) - status_time), 0].max
+          print "\r\033[K[#{format_time(current)}/#{format_time(total)}] #{playstatus} #{name} - #{artist} (#{album})"
+        end
+      end
+    end
+    loop do
+      status = @client.status true
+      status_time = Time.now.to_f * 1000.0
     end
   end
 
@@ -86,6 +114,11 @@ class CLIClient
     puts
   end
 
+  def stop
+    login
+    @client.stop
+  end
+
   def debug
     login
     require 'pry'
@@ -94,6 +127,7 @@ class CLIClient
 
   def usage
     puts "Usage: #{$PROGRAM_NAME} [command]"
+    puts "(c) #{Time.now.year} Jurriaan Pruis <email@jurriaanpruis.nl>"
     puts
     puts 'Where command is one of the following:'
 
@@ -120,6 +154,17 @@ class CLIClient
       sprintf('%02d:%02d:%02d', hours, minutes, seconds)
     end
   end
+
+  def repeat_every(interval)
+    Thread.new do
+      loop do
+        start_time = Time.now
+        yield
+        elapsed = Time.now - start_time
+        sleep([interval - elapsed, 0].max)
+      end
+    end
+  end
 end
 
 cli = CLIClient.new

data/dacpclient.gemspec

@@ -7,8 +7,8 @@ Gem::Specification.new do |spec|
   spec.version       = DACPClient::VERSION
   spec.authors       = ['Jurriaan Pruis']
   spec.email         = ['email@jurriaanpruis.nl']
-  spec.description   = 'A DACP (iTunes Remote protocol) client written in the wonderful Ruby language'
-  spec.summary       = 'A DACP (iTunes Remote protocol) client written in the wonderful Ruby language'
+  spec.description   = 'A DACP (iTunes Remote protocol) client'
+  spec.summary       = 'A DACP (iTunes Remote protocol) client'
   spec.homepage      = 'https://github.com/jurriaan/ruby-dacpclient'
   spec.license       = 'MIT'
   spec.platform      = Gem::Platform::RUBY
@@ -24,5 +24,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'yard'
   spec.add_development_dependency 'redcarpet'
   spec.add_development_dependency 'github-markup'
-  spec.required_ruby_version = '>= 2.0.0'
+
+  spec.required_ruby_version = '>= 1.9.3'
 end

data/lib/dacpclient/client.rb

@@ -1,15 +1,16 @@
-$LOAD_PATH.unshift __dir__
 require 'rubygems'
-require 'bundler/setup'
+require 'bundler'
+Bundler.setup(:default)
 require 'digest'
 require 'net/http'
-require_relative 'pairingserver'
-require_relative 'dmapparser'
-require_relative 'dmapbuilder'
+require 'dacpclient/pairingserver'
+require 'dacpclient/dmapparser'
+require 'dacpclient/dmapbuilder'
 require 'uri'
 require 'cgi'
 
 module DACPClient
+  # The Client class handles communication with the server
   class Client
 
     def initialize(name, host = 'localhost', port = 3689)
@@ -22,9 +23,9 @@ module DACPClient
       @mediarevision = 1
     end
 
-    def pair(pin = nil)
+    def pair(pin)
       pairingserver = PairingServer.new(@name, '0.0.0.0', 1024)
-      pairingserver.pin = pin unless pin.nil?
+      pairingserver.pin = pin
       pairingserver.start
     end
 
@@ -38,12 +39,14 @@ module DACPClient
     end
 
     def login(pin = nil)
-      response = do_action(:login, { 'pairing-guid' => '0x' + Client.get_guid(@name) })
+      pairing_guid = '0x' + Client.get_guid(@name)
+      response = do_action(:login, { 'pairing-guid' => pairing_guid })
       @session_id = response[:mlid]
       response
     rescue DACPForbiddenError => e
-      puts "#{e.result.message} error: Cannot login, starting pairing process"
       pin = 4.times.map { Random.rand(10) } if pin.nil?
+      warn "#{e.result.message} error: Cannot login, starting pairing process"
+      warn "Pincode: #{pin}"
       pair(pin)
       retry
     end
@@ -77,6 +80,12 @@ module DACPClient
       result = do_action(:playstatusupdate, 'revision-number' => revision)
       @mediarevision = result[:cmsr]
       result
+    rescue Net::ReadTimeout => e
+      if wait
+        retry
+      else
+        raise e
+      end
     end
 
     def next
@@ -123,40 +132,66 @@ module DACPClient
     end
 
     def queue(id)
-      do_action 'playqueue-edit', { command: 'add', query: "\'dmap.itemid:#{id}\'" }
+      do_action('playqueue-edit', { command: 'add',
+                                    query: "\'dmap.itemid:#{id}\'" })
     end
 
     def clear_queue
-      do_action 'playqueue-edit', { command: 'clear' }
+      do_action('playqueue-edit', { command: 'clear' })
     end
 
     def list_queue
-      do_action 'playqueue-contents', {}
+      do_action('playqueue-contents', {})
     end
 
     def databases
-      do_action 'databases', {}, true
+      do_action('databases', {}, true)
     end
 
     def playlists(db)
-      do_action "databases/#{db}/containers", {}, true
+      do_action("databases/#{db}/containers", {}, true)
     end
 
-    def artwork(database, id, width = 320, height = 320)
-      do_action "databases/#{database}/items/#{id}/extra_data/artwork", { mw: width, mh: height }, true
+    def default_db
+      databases[:mlcl].to_a.find {|item| item.mdbk == 1}
     end
 
-    def now_playing_artwork(width = 320, height = 320)
-      do_action :nowplayingartwork, { mw: width, mh: height }
+    def default_playlist(db)
+      @client.playlists(72).mlcl.to_a.find { |item| item.abpl }
     end
 
-    def search(db, container, search)
-      words = search.split
+    def artwork(database, id, width = 320, height = 320)
+      url = "databases/#{database}/items/#{id}/extra_data/artwork"
+      do_action(url, { mw: width, mh: height }, true)
+    end
+
+    def now_playing_artwork(width = 320, height = 320)
+      do_action(:nowplayingartwork, { mw: width, mh: height })
+    end
+
+    def search(db, container, search, type = nil)
+      search = URI.escape(search)
+      types = {
+        title: 'dmap.itemname',
+        artist: 'daap.songartist',
+        album: 'daap.songalbum',
+        genre: 'daap.songgenre',
+        composer: 'daap.songcomposer'
+      }
       queries = []
-      queries.push(words.map { |v| "\'dmap.itemname:*#{v}*\'" }.join('+'))
+      type = types.keys if type.nil?
+      Array(type).each do  |t|
+        queries << "'#{types[t]}:#{search}'"
+      end
+      # @http.get("/databases/1/containers/1/items?query='daap.songartist:#{escaped_pattern}','daap.songalbum:#{escaped_pattern}','dmap.itemname:#{escaped_pattern}','daap.songgenre:#{escaped_pattern}','daap.songcomposer:#{escaped_pattern}'").body
+      #queries.push(words.map { |v| "\'dmap.itemname:*#{v}*\'" }.join('+'))
       # queries.push(words.map{|v| "\'daap.songartist:*#{v}*\'"}.join('+'))
-      query = '(' + queries.map { |q| "(#{q})" }.join(',') + ')'
-      do_action "databases/#{db}/containers/#{container}/items", { type: 'music', sort: 'album', meta: 'dmap.itemid,dmap.itemname,daap.songartist,daap.songalbum', query: query }, true
+      q = queries.join(',')
+      meta = 'dmap.itemname,dmap.itemid,daap.songartist,daap.songalbumartist,daap.songalbum,com.apple.itunes.cloud-id,dmap.containeritemid,com.apple.itunes.has-video,com.apple.itunes.itms-songid,com.apple.itunes.extended-media-kind,dmap.downloadstatus,daap.songdisabled'
+
+      url = "databases/#{db}/containers/#{container}/items"
+      do_action(url, { type: 'music', sort: 'album', query: q, meta: meta},
+                true)
     end
 
     private
@@ -167,26 +202,34 @@ module DACPClient
         params['session-id'] = @session_id
         action = '/ctrl-int/1' + action unless cleanurl
       end
-      params = params.map { |k, v| "#{CGI.escape(k.to_s)}=#{CGI.escape(v.to_s)}" }.join '&'
-      uri = URI::HTTP.build({ host: @host, port: @port, path: action, query: params })
+      params = params.map { |k,v| "#{k}=#{v}" }.join('&')
+      uri = URI::HTTP.build({ host: @host, port: @port, path: action,
+                              query: params })
       req = Net::HTTP::Get.new(uri.request_uri)
       req.add_field('Viewer-Only-Client', '1')
-      res = Net::HTTP.new(uri.host, uri.port).start { |http| http.request(req) }
-      if res.kind_of?(Net::HTTPServiceUnavailable) || res.kind_of?(Net::HTTPForbidden)
+      res = Net::HTTP.new(uri.host, uri.port).start do |http|
+        http.read_timeout = 1000
+        http.request(req)
+      end
+      if res.kind_of?(Net::HTTPServiceUnavailable) ||
+         res.kind_of?(Net::HTTPForbidden)
         raise DACPForbiddenError.new(res)
       elsif !res.kind_of?(Net::HTTPSuccess)
-        p res
+        warn 'No succes!'
+        warn res
         return nil
       end
 
       if res['Content-Type'] == 'application/x-dmap-tagged'
-        DMAPParser.parse(res.body)
+        DMAPParser::Parser.parse(res.body)
       else
         res.body
       end
     end
   end
 
+  # This error is raised if the DACP resource returns forbidden or
+  # service unavailable
   class DACPForbiddenError < StandardError
     attr_reader :result
     def initialize(res)

data/lib/dacpclient/dmapbuilder.rb

@@ -1,4 +1,5 @@
 module DACPClient
+  # This class provides a DSL to create DMAP responses
   class DMAPBuilder
     attr_reader :result
 
@@ -7,11 +8,14 @@ module DACPClient
     end
 
     def self.method_missing(method, *args, &block)
-      self.new.send(method, *args, &block)
+      new.send(method, *args, &block)
     end
 
     def method_missing(method, *args, &block)
-      return super if method.to_s.length != 4 || (tag = DMAPParser::Types.find { |a| a.tag.to_s == method.to_s }).nil?
+      if method.to_s.length != 4 ||
+        (tag = DMAPParser::Types.find { |a| a.tag.to_s == method.to_s }).nil?
+        return super
+      end
       if block_given?
         if tag.type == :container
           @dmap_stack << DMAPParser::TagContainer.new(tag)
@@ -26,7 +30,8 @@ module DACPClient
         end
       else
         if @dmap_stack.length > 0
-          @dmap_stack.last.value << DMAPParser::Tag.new(tag, args.size > 1 ? args : args.first)
+          args = args.size > 1 ? args : args.first
+          @dmap_stack.last.value << DMAPParser::Tag.new(tag, args)
         else
           raise 'Cannot build DMAP without a valid container'
         end

data/lib/dacpclient/dmapconverter.rb

@@ -1,4 +1,5 @@
 module DACPClient
+  # The DMAPConverter class converts between binary and ruby formats
   class DMAPConverter
     class << self
       def bin_to_byte(data)

data/lib/dacpclient/dmapparser.rb

@@ -1,82 +1,86 @@
-require_relative 'tagdefinitions'
-require_relative 'dmapconverter'
+require 'dacpclient/tagdefinitions'
+require 'dacpclient/dmapconverter'
 
 require 'stringio'
 module DACPClient
-  class DMAPParser
+  module DMAPParser
+    # The DMAPParser class parses DMAP responses
+    class Parser
 
-    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 = Types.find { |a| a.tag == key }
-      response.read(4) # ignore length for now
-      ret.value = parse_container(response)
-      ret
-    end
+      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 = Types.find { |a| a.tag == key }
+        response.read(4) # ignore length for now
+        ret.value = parse_container(response)
+        ret
+      end
 
-    private
+      private
 
-    def self.parse_container(response)
-      values = []
+      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 = Types.find { |a| a.tag.to_s == key }
-        # puts "#{key} (#{length}): #{data.inspect}"
-        p data if !tag.nil? && tag.tag.to_s == 'msas'
-        values << if !tag.nil?
-          case tag.type
-          when :container
-            TagContainer.new(tag, parse_container(StringIO.new(data)))
-          when :byte
-            Tag.new(tag, DMAPConverter.bin_to_byte(data))
-          when :uint16, :short
-            Tag.new(tag, DMAPConverter.bin_to_short(data))
-          when :uint32
-            Tag.new(tag, DMAPConverter.bin_to_int(data))
-          when :uint64
-            Tag.new(tag, DMAPConverter.bin_to_long(data))
-          when :bool
-            Tag.new(tag, DMAPConverter.bin_to_bool(data))
-          when :hex
-            Tag.new(tag, DMAPConverter.bin_to_hex(data))
-          when :string
-            Tag.new(tag, data)
-          when :date
-            Tag.new tag, Time.at(DMAPConverter.bin_to_int(data))
-          when :version
-            Tag.new tag, DMAPConverter.bin_to_version(data)
-          else
-            puts "Unknown type #{tag.type}"
-            Tag.new(tag, parseunknown(data))
-          end
-        else
-          # puts "Unknown key #{key}"
-          Tag.new(TagDefinition.new(key, :unknown, "unknown (#{data.bytesize})"), parseunknown(data))
+        until response.eof?
+          key = response.read(4)
+          length = DMAPConverter.bin_to_int(response.read(4))
+          data = response.read(length)
+          tag = Types.find { |a| a.tag.to_s == key }
+          # puts "#{key} (#{length}): #{data.inspect}"
+          p data if !tag.nil? && tag.tag.to_s == 'msas'
+          values << if !tag.nil?
+                      case tag.type
+                      when :container
+                        data = StringIO.new(data)
+                        TagContainer.new(tag, parse_container(data))
+                      when :byte
+                        Tag.new(tag, DMAPConverter.bin_to_byte(data))
+                      when :uint16, :short
+                        Tag.new(tag, DMAPConverter.bin_to_short(data))
+                      when :uint32
+                        Tag.new(tag, DMAPConverter.bin_to_int(data))
+                      when :uint64
+                        Tag.new(tag, DMAPConverter.bin_to_long(data))
+                      when :bool
+                        Tag.new(tag, DMAPConverter.bin_to_bool(data))
+                      when :hex
+                        Tag.new(tag, DMAPConverter.bin_to_hex(data))
+                      when :string
+                        Tag.new(tag, data)
+                      when :date
+                        Tag.new tag, Time.at(DMAPConverter.bin_to_int(data))
+                      when :version
+                        Tag.new tag, DMAPConverter.bin_to_version(data)
+                      else
+                        warn "Unknown type #{tag.type}"
+                        Tag.new(tag, parseunknown(data))
+                      end
+                    else
+                      # puts "Unknown key #{key}"
+                      tag = TagDefinition.new(key, :unknown,
+                                              "unknown (#{data.bytesize})")
+                      Tag.new(tag, parseunknown(data))
+                    end
         end
+        values
       end
-      values
-    end
 
-    def self.parseunknown(data)
-      if data =~ /[^\x20-\x7e]/
-        if data.bytesize == 1
-          DMAPConverter.bin_to_byte(data)
-        elsif data.bytesize == 4
-          DMAPConverter.bin_to_int(data)
-        elsif data.bytesize == 8
-          DMAPConverter.bin_to_long(data)
-        else
-          data
+      def self.parseunknown(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
-      else
         data
       end
     end
-
   end
 end

data/lib/dacpclient/pairingserver.rb

@@ -2,6 +2,7 @@ require 'socket'
 require 'dnssd'
 require 'digest'
 module DACPClient
+  # The pairingserver handles pairing with iTunes
   class PairingServer
     attr_accessor :pin, :device_type
     def initialize(name, host, port = 1024)
@@ -14,40 +15,29 @@ module DACPClient
     end
 
     def start
-      name = @name
-      pair  = @pair
-      device_type = @device_type
-      puts "Pairing started (pincode=#{@pin.join})"
-      txtrecord = DNSSD::TextRecord.new({
-        'DvNm' => @name,
-        'Revm' => '10000',
-        'DvTy' => @device_type,
-        'RemN' => 'Remote',
-        'txtvers' => '1',
-        'Pair' => @pair
-      })
+      # puts "Pairing started (pincode=#{@pin.join})"
 
-      pairingstring = DMAPBuilder.cmpa do
-        cmpg pair
-        cmnm name
-        cmty device_type
-      end.to_dmap
+      pairing_string = generate_pairing_string(@pair, @name, @device_type)
 
       expected = PairingServer.generate_pin_challenge(@pair, @pin)
       server = TCPServer.open(@host, @port)
-      @service = DNSSD.register!(@name, '_touch-remote._tcp', 'local', @port,  txtrecord)
+      type = '_touch-remote._tcp'
+      @service = DNSSD.register!(@name, type, 'local', @port, text_record)
 
       while (client = server.accept)
         get = client.gets
         code = get.match(/pairingcode=([^&]*)/)[1]
 
         if code == expected
-          client.print "HTTP/1.1 200 OK\r\nContent-Length: #{pairingstring.length}\r\n\r\n#{pairingstring}"
-          puts 'Pairing succeeded :)'
+          client.print "HTTP/1.1 200 OK\r\n"
+          client.print "Content-Length: #{pairing_string.length}\r\n\r\n"
+          client.print pairing_string
+          # puts 'Pairing succeeded :)'
           client.close
+          @service.stop
           break
         else
-          puts 'Wrong pincode entered'
+          # puts 'Wrong pincode entered'
           client.print "HTTP/1.1 404 Not Found\r\nContent-Length: 0\r\n\r\n"
         end
         client.close
@@ -62,5 +52,25 @@ module DACPClient
       Digest::MD5.hexdigest(pair + pin_string).upcase
     end
 
+    private
+
+    def text_record
+      DNSSD::TextRecord.new({
+        'DvNm' => @name,
+        'Revm' => '10000',
+        'DvTy' => @device_type,
+        'RemN' => 'Remote',
+        'txtvers' => '1',
+        'Pair' => @pair
+      })
+    end
+
+    def generate_pairing_string(pair, name, device_type)
+      DMAPBuilder.cmpa do
+        cmpg pair
+        cmnm name
+        cmty device_type
+      end.to_dmap
+    end
   end
 end

data/lib/dacpclient/tagdefinitions.rb

@@ -1,7 +1,5 @@
-# encoding: UTF-8
-
 module DACPClient
-  class DMAPParser
+  module DMAPParser
 
     Tag = Struct.new(:type, :value) do
       def inspect(level = 0)
@@ -32,7 +30,7 @@ module DACPClient
                 when :version
                   DMAPConverter.version_to_bin value.to_i
                 else
-                  puts "Unknown type #{tag.type}"
+                  warn "Unknown type #{tag.type}"
                   # Tag.new tag, parseunknown(data)
                   value
                 end
@@ -40,23 +38,29 @@ module DACPClient
       end
     end
 
+    # 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('') { |a, e| a + e.inspect(level + 1).chomp + "\n" }
+        "#{'  ' * level}#{type}:\n" + value.reduce('') do |a, e|
+          a + e.inspect(level + 1).chomp + "\n"
+        end
       end
 
       def get_value(key)
+        if key.is_a? Fixnum
+          return value[key]
+        end
         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
-        else
+        elsif !val.nil?
           val.value
         end
       end
@@ -71,10 +75,11 @@ module DACPClient
       end
 
       def method_missing(method, *arguments, &block)
-        value.each do |dmap|
-          return dmap.value if dmap.type.tag.to_s == method.to_s
-        end
-        super
+        get_value(method.to_s)
+      end
+
+      def to_a
+        value
       end
     end
 
@@ -92,6 +97,7 @@ module DACPClient
     # 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
     Types = [
       TagDefinition.new('mcon', :container, 'dmap.container'),
@@ -136,7 +142,7 @@ module DACPClient
       TagDefinition.new('asgn', :string, 'daap.songgenre'),
       TagDefinition.new('asdt', :string, 'daap.songdescription'),
       TagDefinition.new('asul', :string, 'daap.songdataurl'),
-      TagDefinition.new('ceWM', :string, 'com.apple.itunes.welcome-message'), # not a official name?
+      TagDefinition.new('ceWM', :string, 'com.apple.itunes.welcome-message'),
       TagDefinition.new('ascp', :string, 'daap.songcomposer'),
       TagDefinition.new('assu', :string, 'daap.sortartist'),
       TagDefinition.new('assa', :string, 'daap.sortalbum'),
@@ -201,7 +207,7 @@ module DACPClient
       TagDefinition.new('muty', :byte, 'dmap.updatetype'),
       TagDefinition.new("f\215ch", :byte, 'dmap.haschildcontainers'),
       TagDefinition.new('msas', :byte, 'dmap.authenticationschemes'),
-      TagDefinition.new('cavs', :bool, 'dacp.visualizer'), # Source: https://code.google.com/p/tunesremote-plus/source/browse/trunk/src/org/tunesremote/daap/Status.java
+      TagDefinition.new('cavs', :bool, 'dacp.visualizer'),
       TagDefinition.new('cafs', :bool, 'dacp.fullscreen'),
       TagDefinition.new('ceGS', :bool, 'com.apple.itunes.genius-selectable'),
       TagDefinition.new('mslr', :bool, 'dmap.loginrequired'),
@@ -223,8 +229,9 @@ module DACPClient
       TagDefinition.new('aeFP', :bool, 'com.apple.itunes.req-fplay'),
       TagDefinition.new('aeHV', :bool, 'com.apple.itunes.has-video'),
       TagDefinition.new('caia', :bool, 'dacp.isavailiable'),
-      TagDefinition.new('ceVO', :bool, 'com.apple.itunes.voting-enabled'), # not an official name
-      TagDefinition.new('aeSV', :version, 'com.apple.itunes.music-sharing-version'),
+      TagDefinition.new('ceVO', :bool, 'com.apple.itunes.voting-enabled'),
+      TagDefinition.new('aeSV', :version,
+                        'com.apple.itunes.music-sharing-version'),
       TagDefinition.new('mpro', :version, 'dmap.protocolversion'),
       TagDefinition.new('apro', :version, 'daap.protocolversion'),
       TagDefinition.new('musr', :version, 'dmap.serverrevision'),
@@ -235,9 +242,11 @@ module DACPClient
       TagDefinition.new('ceJI', :bool, 'com.apple.itunes.jukebox-current'),
       TagDefinition.new('ceJS', :uint16, 'com.apple.itunes.jukebox-score'),
       TagDefinition.new('ceJV', :bool, 'com.apple.itunes.jukebox-vote'),
-      TagDefinition.new('ceQR', :container, 'com.apple.itunes.playqueue-contents-response'),
-      TagDefinition.new('ceQS', :container, 'com.apple.itunes.playqueue-contents-???'),
-      TagDefinition.new('ceQs', :uint64, 'com.apple.itunes.playqueue-id'), # non-official name
+      TagDefinition.new('ceQR', :container,
+                        'com.apple.itunes.playqueue-contents-response'),
+      TagDefinition.new('ceQS', :container,
+                        'com.apple.itunes.playqueue-contents-???'),
+      TagDefinition.new('ceQs', :uint64, 'com.apple.itunes.playqueue-id'),
       TagDefinition.new('ceQa', :string, 'com.apple.itunes.playqueue-album'),
       TagDefinition.new('ceQg', :string, 'com.apple.itunes.playqueue-genre'),
       TagDefinition.new('ceQn', :string, 'com.apple.itunes.playqueue-name'),
@@ -246,6 +255,9 @@ module DACPClient
       TagDefinition.new('aeGs', :bool, 'com.apple.itunes.can-be-genius-seed'),
       TagDefinition.new('aprm', :short, 'daap.playlistrepeatmode'),
       TagDefinition.new('apsm', :short, 'daap.playlistshufflemode'),
+      TagDefinition.new('cmpr', :version, 'dmcp.protocolversion'),
+      TagDefinition.new('capr', :version, 'dacp.protocolversion'),
+      TagDefinition.new('ppro', :version, 'unknown.version'),
 
     ].freeze
   end

data/lib/dacpclient/version.rb

@@ -1,3 +1,4 @@
+# The DACPClient module
 module DACPClient
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/lib/dacpclient.rb

@@ -1,2 +1 @@
-$LOAD_PATH.unshift __dir__
 require 'dacpclient/client'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dacpclient
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Jurriaan Pruis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-12 00:00:00.000000000 Z
+date: 2013-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dnssd
@@ -66,23 +66,23 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: A DACP (iTunes Remote protocol) client written in the wonderful Ruby
-  language
+description: A DACP (iTunes Remote protocol) client
 email:
 - email@jurriaanpruis.nl
-executables: []
+executables:
+- dacpclient
 extensions: []
 extra_rdoc_files:
 - README.md
 - LICENSE
 files:
+- .gitignore
 - .rubocop.yml
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
-- TODO
+- bin/dacpclient
 - dacpclient.gemspec
 - lib/dacpclient.rb
 - lib/dacpclient/client.rb
@@ -92,7 +92,6 @@ files:
 - lib/dacpclient/pairingserver.rb
 - lib/dacpclient/tagdefinitions.rb
 - lib/dacpclient/version.rb
-- remoteclient.rb
 homepage: https://github.com/jurriaan/ruby-dacpclient
 licenses:
 - MIT
@@ -105,7 +104,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
@@ -116,6 +115,6 @@ rubyforge_project:
 rubygems_version: 2.0.5
 signing_key: 
 specification_version: 4
-summary: A DACP (iTunes Remote protocol) client written in the wonderful Ruby language
+summary: A DACP (iTunes Remote protocol) client
 test_files: []
 has_rdoc: 

data/Gemfile.lock

@@ -1,59 +0,0 @@
-GIT
-  remote: git://github.com/bbatsov/rubocop.git
-  revision: 68b73d5c38ad86f8702302d440437dbd77f677c0
-  ref: 68b73d5c38a
-  specs:
-    rubocop (0.11.0)
-      backports (~> 3.3.3)
-      parser (~> 2.0.0.pre6)
-      powerpack (= 0.0.1)
-      rainbow (>= 1.1.4)
-
-PATH
-  remote: .
-  specs:
-    dacpclient (0.1.0)
-      dnssd (~> 2.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    ast (1.1.0)
-    backports (3.3.3)
-    coderay (1.0.9)
-    dnssd (2.0)
-    github-markup (0.7.5)
-    method_source (0.8.2)
-    minitest (5.0.6)
-    multi_json (1.7.8)
-    parser (2.0.0.pre6)
-      ast (~> 1.1)
-      slop (~> 3.4, >= 3.4.5)
-    powerpack (0.0.1)
-    pry (0.9.12.2)
-      coderay (~> 1.0.5)
-      method_source (~> 0.8)
-      slop (~> 3.4)
-    rainbow (1.1.4)
-    rake (10.1.0)
-    redcarpet (3.0.0)
-    simplecov (0.7.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
-    slop (3.4.6)
-    yard (0.8.7)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  dacpclient!
-  github-markup
-  minitest (~> 5.0.6)
-  pry
-  rake
-  redcarpet
-  rubocop!
-  simplecov
-  yard

data/TODO

@@ -1,3 +0,0 @@
-- Add tests (DMAPBuilder)
-- Add more tagdefinitions
-- Documentation :)