ruby-mpd 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65799fe0826f542ebb67a82b3041bdaf8b17aacd
-  data.tar.gz: 0416d81eaf92f7f559c9bfd969c11b5f519f9e53
+  metadata.gz: ea50c78be2957c3c8baa9a4f5dfb7fde0f789c16
+  data.tar.gz: 4f42a33ba182a33ebfeeeb1b969c03510051fb38
 SHA512:
-  metadata.gz: a9bc49c2e0f69bdd15be62cd0676597ae0730b5e263c1f8ed6dbb7d27d9cbd2e60502c62ee981addc6b5386e32ab182845fe3173be00517ab9b721b34dde04db
-  data.tar.gz: f75b7368594cb02b8cfa225c57e8a27e16737562e984262059bffd8cce8740a31bcf9b33866343b89f68594790b71e5945d3972a1005eaf246e6f75bcd82a0fd
+  metadata.gz: 394b4830f32257749942a3a01faf8b41a2ef69dd3292430883956f34ff39d4f1298c78262c1039f7a45c5dc941a0d7ffbb8ab9780af37dfedd06fb63aebb5e4d
+  data.tar.gz: 02c228eec5ab7e2d1ce4014c761a1e3fdeca8ae12051f4457d68e9c7d777dc4ee6abf2993f1c8b4fa9e27ff3a105426ef3a7bb76aae0fa2562abc16e1b9260c8

data/lib/ruby-mpd/parser.rb

@@ -46,7 +46,7 @@ class MPD
 
 
     # Commands, where it makes sense to always explicitly return an array.
-    RETURN_ARRAY = [:channels, :outputs, :readmessages, :list, :listall,
+    RETURN_ARRAY = [:channels, :outputs, :readmessages, :list,
       :listallinfo, :find, :search, :listplaylists, :listplaylist, :playlistfind,
       :playlistsearch, :plchanges, :tagtypes, :commands, :notcommands, :urlhandlers,
       :decoders, :listplaylistinfo, :playlistinfo]
@@ -131,14 +131,15 @@ class MPD
     #
     # @return [Array<Hash>, Array<String>, String, Integer] Parsed response.
     def parse_response(command, string)
-      # return explicit array or true if the message is empty
-      return RETURN_ARRAY.include?(command) ? [] : true if string.empty?
-      if command == :listall 
+      if command == :listall # Explicitly handle :listall (#files) -> always return a Hash
         return build_hash(string)
       elsif command == :listallinfo
         string = filter_lines(string, [:directory, :playlist])
       end
 
+      # return explicit array or true if the message is empty
+      return RETURN_ARRAY.include?(command) ? [] : true if string.empty?
+
       build_response(command, string)
     end
 

data/lib/ruby-mpd/plugins/database.rb

@@ -87,8 +87,7 @@ class MPD
       #
       # @return [Array<String>] Array of directory names
       def directories(path = nil)
-        response = send_command(:listall, path)
-        return response[:directory]
+        return files[:directory]
       end
 
       # Lists all of the albums in the database.

data/lib/ruby-mpd/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-mpd
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Blaž Hrastnik