ruby-mpd 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9bf3cf234bf56dbec2bd466c2457668b8eb8fa32
-  data.tar.gz: fadab4800a679ef6ea76bb3ac0a8ef8490fd7517
+  metadata.gz: 65799fe0826f542ebb67a82b3041bdaf8b17aacd
+  data.tar.gz: 0416d81eaf92f7f559c9bfd969c11b5f519f9e53
 SHA512:
-  metadata.gz: 420a8bdb88f526907171f901ab09ee50427aec387b4d3895f4841af2858723891be0b662c4aafd0b303108446a28051e0570e49a0a61a00b443c213b019a59aa
-  data.tar.gz: 3f36bd23833a605f48a4b507874afff877f8130d0f1e097ebd58afbba04a6e87afd9d5e422f09c0ebdfa7bcf7db8a92f726e4190303de8ed919b586cd6e50f08
+  metadata.gz: a9bc49c2e0f69bdd15be62cd0676597ae0730b5e263c1f8ed6dbb7d27d9cbd2e60502c62ee981addc6b5386e32ab182845fe3173be00517ab9b721b34dde04db
+  data.tar.gz: f75b7368594cb02b8cfa225c57e8a27e16737562e984262059bffd8cce8740a31bcf9b33866343b89f68594790b71e5945d3972a1005eaf246e6f75bcd82a0fd

data/README.rdoc

@@ -220,7 +220,7 @@ in order to recieve those values:
 Finally, the easiest step. In order for callbacks to work, connect to the server
 with callbacks enabled:
 
-  mpd.connect true
+  mpd.connect(callbacks: true)
 
 Easy as pie. The above will connect to the server like normal, but this time it will
 create a new thread that loops until you issue a `disconnect`. This loop checks the

data/lib/ruby-mpd/parser.rb

@@ -107,7 +107,6 @@ class MPD
     # Converts the response to MPD::Song objects.
     # @return [Array<MPD::Song>] An array of songs.
     def build_songs_list(array)
-      return [] if !array.is_a?(Array)
       return array.map {|hash| Song.new(hash) }
     end
 
@@ -132,27 +131,22 @@ class MPD
     #
     # @return [Array<Hash>, Array<String>, String, Integer] Parsed response.
     def parse_response(command, string)
-      # return explicit array if needed
-      return RETURN_ARRAY.include?(command) ? [] : true if string == true
+      # return explicit array or true if the message is empty
+      return RETURN_ARRAY.include?(command) ? [] : true if string.empty?
       if command == :listall 
-        build_hash(string)
+        return build_hash(string)
       elsif command == :listallinfo
-        build_response(command, string, [:directory, :playlist])
-      else
-        build_response(command, string)
+        string = filter_lines(string, [:directory, :playlist])
       end
+
+      build_response(command, string)
     end
 
     # Parses the response into appropriate objects (either a single object,
     # or an array of objects or an array of hashes).
     #
     # @return [Array<Hash>, Array<String>, String, Integer] Parsed response.
-    def build_response(command, string, filter=nil)
-      return [] if string.nil? || !string.is_a?(String)
-
-      # filter lines if filter specified
-      string = filter_lines(string,filter) if filter
-
+    def build_response(command, string)
       chunks = make_chunks(string)
       # if there are any new lines (more than one data piece), it's a hash, else an object.
       is_hash = chunks.any? {|chunk| chunk.include? "\n"}

data/lib/ruby-mpd/version.rb

@@ -1,3 +1,3 @@
 class MPD
-  VERSION = '0.2.4'
+  VERSION = '0.2.5'
 end

data/lib/ruby-mpd.rb

@@ -136,19 +136,32 @@ class MPD
   # When called without any arguments, this will just connect to the server
   # and wait for your commands.
   #
-  # When called with true as an argument, this will enable callbacks by starting
+  # When called with +callbacks: true+ as an argument, this will enable callbacks by starting
   # a seperate polling thread, which will also automatically reconnect if disconnected
   # for whatever reason.
   #
   # @return [true] Successfully connected.
   # @raise [MPDError] If connect is called on an already connected instance.
-  def connect(callbacks = false)
+  def connect(opts = {callbacks: false})
     raise ConnectionError, 'Already connected!' if self.connected?
 
     @socket = File.exists?(@hostname) ? UNIXSocket.new(@hostname) : TCPSocket.new(@hostname, @port)
-    @version = @socket.gets.chomp.gsub('OK MPD ', '') # Read the version
 
-    callback_thread if callbacks
+    # by protocol, we need to get a 'OK MPD <version>' reply
+    # should we fail to do so, the connection was unsuccessful
+    if response = @socket.gets
+      @version = response.chomp.gsub('OK MPD ', '') # Read the version
+    else
+      reset_vars
+      raise ConnectionError, 'Unable to connect (possibly too many connections open)'
+    end
+
+    if opts == true || opts == false
+      warn "Using 'true' or 'false' as an argument to #connect has been deprecated, and will be removed in the future!"
+      opts = {callbacks: opts}
+    end
+
+    callback_thread if opts[:callbacks]
     return true
   end
 
@@ -243,7 +256,6 @@ class MPD
     end
 
     if !error
-      return true if msg.empty?
       return msg
     else
       err = error.match(/^ACK \[(?<code>\d+)\@(?<pos>\d+)\] \{(?<command>.*)\} (?<message>.+)$/)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-mpd
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Blaž Hrastnik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-29 00:00:00.000000000 Z
+date: 2013-09-23 00:00:00.000000000 Z
 dependencies: []
 description: A powerful, modern and feature complete library for the Music Player
   Daemon.