mpc 0.5 → 0.6

data/lib/mpc.rb

@@ -125,9 +125,8 @@ class Mpc
  end
 
  def ping
-   song = current_song
    unless status[:state] == "stop"
-     output = {:song_time=>song[:time],:time=>status[:time].split(":").first,:artist=>song[:artist],:title=>song[:title],:file=>song[:file],:album=>song[:album],:id=>song[:id]}
+     output = {:song_time=>current_song[:Time],:time=>status[:time].split(":").first,:artist=>current_song[:Artist],:title=>current_song[:Title],:file=>current_song[:file],:album=>current_song[:Album],:id=>current_song[:Id]}
    else
      output = {:song_time=>0,:time=>0,:artist=>nil,:title=>nil,:file=>nil,:album=>nil,:id=>nil}
    end

data/test/mpc_test.rb

@@ -146,4 +146,44 @@ class MpcTest < Test::Unit::TestCase
     expected_output << {:playlist => "nowa"}
     assert_equal(expected_output,@mpc.list_playlists)
   end
+
+  test "ping method should return hash with informations about song" do
+    @mpc.stubs(:current_song).returns({
+        :Date=> "2001",
+        :Id=> "23",
+        :Title=> "ToNieMy",
+        :file=> "Paktofonika - Kinematografia/ToNieMy.mp3",
+        :Time=> "227",
+        :Album=> "Kinematografia",
+        :Track=> "6",
+        :Pos=> "5",
+        :Genre=> "Hip-Hop",
+        :Artist=> "Paktofonika"} )
+    @mpc.stubs(:status).returns({
+             :bitrate=> "128",
+             :song=> "5",
+             :volume=> "-1",
+             :audio=> "44100:24:2",
+             :consume=> "0",
+             :repeat=> "0",
+             :nextsong=> "6",
+             :time=> "102:227",
+             :playlist=> "54",
+             :state=> "play",
+             :playlistlength=> "23",
+             :nextsongid=> "24",
+             :xfade=> "0",
+             :random=> "0",
+             :songid=> "23",
+             :single=> "0"})
+    expected_output = {
+              :title=>"ToNieMy",
+              :file=>"Paktofonika - Kinematografia/ToNieMy.mp3",
+              :artist=>"Paktofonika",
+              :album=>"Kinematografia",
+              :song_time=>"227",
+              :id=>"23",
+              :time=>"102"}
+    assert_equal(expected_output,@mpc.ping)
+  end
 end

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: mpc
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 7
   prerelease: false
   segments: 
   - 0
-  - 5
-  version: "0.5"
+  - 6
+  version: "0.6"
 platform: ruby
 authors: 
 - "Micha\xC5\x82 Krzy\xC5\xBCanowski"
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-11 00:00:00 +02:00
+date: 2010-08-12 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency