ruby-mpd 0.1.8 → 0.2.0

data/README.rdoc

@@ -266,7 +266,4 @@ for a controlled environment needs to be written.
 
 * MPD::Song, MPD::Directory.
 * Make stickers a mixin for Playlist, Song, Directory...
-* Namespace queue
-* Make parsing per-command (because playlist is an integer in the :status command and
-  a string in :listplaylists, and :time is an array in status and integer in songs)
-* Per command parsing should also skip :directory and :playlist keys inside #songs command.
+* Namespace queue

data/lib/ruby-mpd/parser.rb

@@ -2,6 +2,12 @@ require 'time' # required for Time.iso8601
 
 class MPD
   # Parser module, being able to parse messages to and from the MPD daemon format.
+  # @todo There are several parser hacks. Time is an array in status and a normal
+  #   string in MPD::Song, so we do`@time = options.delete(:time) { [nil] }.first`
+  #   to hack the array return. Playlist names are strings, whilst in status it's 
+  #   and int, so we parse it as an int if it's parsed as non-zero (if it's 0 it's a string)
+  #   and to fix numeric name playlists (123.m3u), we convert the name to_s inside
+  #   MPD::Playlist too.
   module Parser
     private
 
@@ -46,7 +52,7 @@ class MPD
       :decoders, :listplaylistinfo]
 
     # Parses key-value pairs into correct class.
-    def parse_key key, value
+    def parse_key(key, value)
       if INT_KEYS.include? key
         value.to_i
       elsif FLOAT_KEYS.include? key
@@ -58,7 +64,6 @@ class MPD
       elsif key == :playlist && !value.to_i.zero?
         # doc states it's an unsigned int, meaning if we get 0,
         # then it's a name string.
-        # @todo HAXX! what if playlist name is '123'?
         value.to_i
       elsif key == :db_update
         Time.at(value.to_i)

data/lib/ruby-mpd/playlist.rb

@@ -14,7 +14,7 @@ class MPD
     attr_accessor :name
 
     def initialize(mpd, options)
-      @name = options.is_a?(Hash) ? options[:playlist] : options.to_s
+      @name = options.is_a?(Hash) ? options[:playlist].to_s : options.to_s # convert to_s in case the parser converted to int
       @mpd = mpd
       #@last_modified = options[:'last-modified']
     end

data/lib/ruby-mpd/song.rb

@@ -9,7 +9,7 @@ class MPD::Song
 
   def initialize(options)
     @data = {} # allowed fields are @types + :file
-    @time = options.delete(:time).first #HAXX for array return
+    @time = options.delete(:time) { [nil] }.first #HAXX for array return
     @file = options.delete(:file)
     @title = options.delete(:title)
     @artist = options.delete(:artist)
@@ -25,7 +25,11 @@ class MPD::Song
 
   # @return [String] A formatted representation of the song length ("1:02")
   def length
-    return "#{(@time / 60)}:#{"%02d" % (@time % 60)}"
+    if @time.nil?
+      '--:--'
+    else
+      "#{(@time / 60)}:#{"%02d" % (@time % 60)}"
+    end
   end
 
   # Pass any unknown calls over to the data hash.

data/ruby-mpd.gemspec

@@ -3,7 +3,7 @@
 Gem::Specification.new do |s|
   s.platform      = Gem::Platform::RUBY
   s.name          = 'ruby-mpd'
-  s.version       = '0.1.8'
+  s.version       = '0.2.0'
   s.homepage      = 'https://github.com/archSeer/ruby-mpd'
   s.authors       = ["Blaž Hrastnik"]
   s.email         = ['speed.the.bboy@gmail.com']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-mpd
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-27 00:00:00.000000000 Z
+date: 2013-01-29 00:00:00.000000000 Z
 dependencies: []
 description: A powerful, modern and feature complete library for the Music Player
   Daemon.