play 0.0.4 → 0.0.5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    play (0.0.3)
+    play (0.0.4)
       SystemTimer
       activerecord
       mustache
@@ -42,16 +42,16 @@ GEM
     mocha (0.9.12)
     mp4info (1.7.3)
     multi_json (1.0.1)
+    multi_xml (0.2.2)
     multipart-post (1.1.0)
     mustache (0.99.3)
     mysql2 (0.2.7)
-    nokogiri (1.4.4)
-    oa-core (0.2.4)
-    oa-oauth (0.2.4)
+    oa-core (0.2.5)
+    oa-oauth (0.2.5)
       faraday (~> 0.6.1)
-      multi_json (>= 0.0.5)
-      nokogiri (~> 1.4.2)
-      oa-core (= 0.2.4)
+      multi_json (~> 1.0.0)
+      multi_xml (~> 0.2.2)
+      oa-core (= 0.2.5)
       oauth (~> 0.4.0)
       oauth2 (~> 0.4.1)
     oauth (0.4.4)

data/README.md

@@ -109,6 +109,13 @@ unique identifier to associate back to Play's user accounts. In this example,
 I'd log into my account and change my `office_string` to be "holman" so I could
 match up. It could be anything, though; we actually use MAC addresses here.
 
+## API
+
+Play has a full API that you can use to do tons of fun stuff. In fact, the API
+is more feature-packed than the web UI. Because we're programmers. And baller.
+
+Check out the [API docs on the wiki](https://github.com/holman/play/wiki/API).
+
 ## Local development
 
 If you're going to hack on this locally, you can use the normal process for

data/lib/play.rb

@@ -26,7 +26,7 @@ require 'play/vote'
 
 module Play
   
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 
   # The path to your music library. All of the music underneath this directory
   # will be added to the internal library.

data/lib/play/app/api.rb

@@ -5,6 +5,11 @@ module Play
       music_response(song)
     end
 
+    get "/api/say" do
+      Play::Client.say(params[:message])
+      { :success => "Okay." }.to_json
+    end
+
     post "/api/user/add_alias" do
       user = User.find_by_login(params[:login])
       if user
@@ -79,7 +84,7 @@ module Play
     end
 
     post "/api/volume" do
-      if Play::Client.volume(params[:level].to_i)
+      if Play::Client.volume(params[:level])
         { :success => 'true' }.to_json
       else
         error "There's a problem adjusting the volume."

data/lib/play/client.rb

@@ -54,6 +54,13 @@ module Play
       `kill \`ps ax | grep "play -d" | cut -d ' ' -f 1\``
     end
 
+    # Say things over the speakers, lol.
+    #
+    # Returns nothing.
+    def self.say(msg)
+      system "say #{msg}"
+    end
+
     # Set the volume level of the client.
     #
     #   number - The Integer volume level. This should be a number between 0

data/play.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'play'
-  s.version           = '0.0.4'
-  s.date              = '2011-05-07'
+  s.version           = '0.0.5'
+  s.date              = '2011-05-27'
   s.rubyforge_project = 'play'
 
   ## Make sure your summary is short. The description may be as long

data/test/test_api.rb

@@ -24,6 +24,13 @@ context "Api" do
     assert_equal @album.name,  now_playing[:album_name]
   end
 
+  test "/api/say" do
+    Play::Client.expects(:say).with("Holman is sexy").returns(true)
+    get "/api/say", { :message => "Holman is sexy" }
+    resp = parse_json(last_response.body.strip)
+    assert_equal "Okay.", resp[:success]
+  end
+
   test "/api requires user_login" do
     post "/api/add_song", {}
     user = parse_json(last_response.body.strip)
@@ -111,8 +118,15 @@ context "Api" do
   end
 
   test "/api/volume" do
-    Play::Client.expects(:volume).with(3).returns(true)
-    post "/api/volume", {:level => '3'}
+    Play::Client.expects(:volume).with('3').returns(true)
+    post "/api/volume", {:level => 3}
+    resp = parse_json(last_response.body.strip)
+    assert_equal 'true', resp[:success]
+  end
+
+  test "/api/volume with a float" do
+    Play::Client.expects(:volume).with("2.5").returns(true)
+    post "/api/volume", {:level => '2.5'}
     resp = parse_json(last_response.body.strip)
     assert_equal 'true', resp[:success]
   end

data/test/test_client.rb

@@ -8,4 +8,9 @@ context "Client" do
     Client.stubs(:system).returns(true)
     Client.volume(1)
   end
+
+  test "say" do
+    Client.stubs(:system).returns(true)
+    Client.say("trololol")
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: play
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Zach Holman
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-07 00:00:00 -07:00
+date: 2011-05-27 00:00:00 -07:00
 default_executable: play
 dependencies: 
 - !ruby/object:Gem::Dependency