rmpd 1.0.0 → 1.0.1

data/lib/rmpd.rb

@@ -8,7 +8,7 @@ module Rmpd
   ACK_RE = /^ACK \[(\d+)@(\d+)\] \{([^}]*)\} (.*)$/
   OK_RE = /^OK.*$/
 
-  class MpdError < Exception ; end
+  class MpdError < StandardError ; end
 
   class MpdConnRefusedError < MpdError ; end
 

data/lib/rmpd/response.rb

@@ -3,8 +3,9 @@ require "delegate"
 module Rmpd
 
   KEY_VALUE_RE = /^([^:]+):\s*(.*)$/
-  KNOWN_INT_FIELDS = [:time, :pos, :id, :track, :playlistlength, :playlist,
+  KNOWN_INT_FIELDS = [:pos, :id, :track, :playlistlength, :playlist,
     :xfade, :repeat, :random, :queued, :volume, :song]
+  KNOWN_COMPLEX_FIELDS = [:time,]
 
   class Response < DelegateClass(Hash)
 
@@ -29,6 +30,7 @@ module Rmpd
     def register_key_val_pair(r)
       key, val = r[1].downcase.to_sym, r[2]
       val = val.to_i if KNOWN_INT_FIELDS.include?(key)
+      val = send("parse_complex_#{key}", val) if KNOWN_COMPLEX_FIELDS.include?(key)
       self[key] = include?(key) ? ([self[key]] << val).flatten : val
       self.class.send(:define_method, key) {self[key]}
     end
@@ -43,5 +45,14 @@ module Rmpd
       end
     end
 
+    # time can be either an integer (playlistinfo) or elapsed:total (status)
+    def parse_complex_time(value)
+      if /:/ === value
+        value.split(":", 2).map(&:to_i)
+      else
+        value.to_i
+      end
+    end
+
   end
 end

data/lib/rmpd/version.rb

@@ -1,3 +1,3 @@
 module Rmpd
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rmpd
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
+  hash: 21
+  prerelease: 
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Eric Wollesen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-12 00:00:00 -06:00
+date: 2011-06-23 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -121,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Music Player Daemon client in Ruby