airplay 0.2.0 → 0.2.1

data/.gitignore

@@ -1 +1,2 @@
 /pkg
+Gemfile.lock

data/Gemfile

@@ -0,0 +1,3 @@
+source "http://rubygems.org"
+
+gemspec

data/README.md

@@ -29,6 +29,16 @@ airplay.password "password"
 airplay.send_image("lolcatz.jpg")
 ```
 
+## Player
+
+```ruby
+require 'airplay'
+
+airplay = Airplay::Client.new
+player = airplay.send_video("http://www.yo-yo.org/mp4/yu2.mp4")
+player.stop
+```
+
 ## Useful methods
 
 ```ruby

data/airplay.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name              = "airplay"
-  s.version           = "0.2.0"
+  s.version           = "0.2.1"
   s.summary           = "Airplay client"
   s.description       = "Send image/video to an airplay enabled device"
   s.authors           = ["elcuervo"]
@@ -13,7 +13,6 @@ Gem::Specification.new do |s|
   s.add_dependency("net-http-digest_auth")
 
   s.add_development_dependency("cutest")
-  s.add_development_dependency("mocha")
   s.add_development_dependency("capybara")
   s.add_development_dependency("fakeweb")
   s.add_development_dependency("vcr")

data/lib/airplay.rb

@@ -4,9 +4,13 @@ require 'net/http/digest_auth'
 require 'uri'
 
 module Airplay; end;
+require 'airplay/server'
+require 'airplay/server/browser'
+require 'airplay/server/node'
+
 require 'airplay/protocol'
 require 'airplay/protocol/image'
-require 'airplay/protocol/video'
+require 'airplay/protocol/media'
 require 'airplay/protocol/scrub'
-require 'airplay/node'
+
 require 'airplay/client'

data/lib/airplay/client.rb

@@ -1,13 +1,14 @@
 class Airplay::Client
   attr_reader :servers, :active_server, :password
 
-  def initialize(server = false)
+  def initialize(server = false, server_browser = Airplay::Server::Browser)
+    @server_browser = server_browser
     browse unless server
-    use servers.first if servers.any?
+    use servers.first if !@servers.nil?
   end
 
   def use(server)
-    @active_server = server.is_a?(Airplay::Node) ? server : find_by_name(server)
+    @active_server = server.is_a?(Airplay::Server::Node) ? server : @server_browser.find_by_name(server)
   end
 
   def password(password)
@@ -15,29 +16,11 @@ class Airplay::Client
   end
 
   def find_by_name(name)
-    found_server =  @servers.detect do |server|
-      server if server.name == name
-    end
-    raise Airplay::Client::ServerNotFoundError unless found_server
-    found_server
+    @server_browser.find_by_name(name)
   end
 
   def browse
-    @servers = []
-    DNSSD.browse!(Airplay::Protocol::SEARCH) do |reply|
-      resolver = DNSSD::Service.new
-      target, port = nil
-      resolver.resolve(reply) do |resolved|
-        port = resolved.port
-        target = resolved.target
-        break unless resolved.flags.more_coming?
-      end
-      info = Socket.getaddrinfo(target, nil, Socket::AF_INET)
-      ip_address = info[0][2]
-      @servers << Airplay::Node.new(reply.name, reply.domain, ip_address, port)
-      break unless reply.flags.more_coming?
-    end
-    @servers
+    @servers = @server_browser.browse
   end
 
   def handler
@@ -49,7 +32,11 @@ class Airplay::Client
   end
 
   def send_video(video, position = 0)
-    Airplay::Protocol::Video.new(handler).send(video, position)
+    Airplay::Protocol::Media.new(handler).send(video, position)
+  end
+
+  def send_audio(audio, position = 0)
+    Airplay::Protocol::Media.new(handler).send(audio, position)
   end
 
   def scrub

data/lib/airplay/protocol/{video.rb → media.rb}

@@ -1,4 +1,4 @@
-class Airplay::Protocol::Video
+class Airplay::Protocol::Media
 
   def initialize(protocol_handler)
     @http = protocol_handler
@@ -8,28 +8,31 @@ class Airplay::Protocol::Video
     "/play"
   end
 
-  def position_body(position = 0)
-    "Start-Position: #{position}\n"
+  def stop_resource
+    "/stop"
   end
 
-  def location_body(video)
-    "Content-Location: #{video}\n"
+  def position_body(position = 0)
+    "Start-Position: #{position}\n"
   end
 
-  def send(video, position = 0)
-    body  = location_body(video)
-    body += position_body(position.to_s)
-    @http.post(resource, body)
+  def location_body(media)
+    "Content-Location: #{media}\n"
   end
 
-  def play
+  def send(media, position = 0)
+    play(media, position)
+    self
   end
 
-  def pause
-    # TODO: know how to pause video
+  def play(media, position = 0)
+    body  = location_body(media)
+    body += position_body(position.to_s)
+    @http.post(resource, body)
   end
 
   def stop
+    @http.post(stop_resource)
   end
 
 end

data/lib/airplay/server.rb

@@ -0,0 +1,2 @@
+class Airplay::Server
+end

data/lib/airplay/server/browser.rb

@@ -0,0 +1,30 @@
+module Airplay::Server::Browser
+  attr_reader :servers
+
+  def self.find_by_name(name)
+    found_server = @servers.detect do |server|
+      server if server.name == name
+    end
+    raise Airplay::Client::ServerNotFoundError unless found_server
+    found_server
+  end
+
+  def self.browse
+    @servers = []
+    DNSSD.browse!(Airplay::Protocol::SEARCH) do |reply|
+      resolver = DNSSD::Service.new
+      target, port = nil
+      resolver.resolve(reply) do |resolved|
+        port = resolved.port
+        target = resolved.target
+        break unless resolved.flags.more_coming?
+      end
+      info = Socket.getaddrinfo(target, nil, Socket::AF_INET)
+      ip_address = info[0][2]
+      @servers << Airplay::Server::Node.new(reply.name, reply.domain, ip_address, port)
+      break unless reply.flags.more_coming?
+    end
+    @servers
+  end
+
+end

data/lib/airplay/{node.rb → server/node.rb}

@@ -1,4 +1,4 @@
-class Airplay::Node
+class Airplay::Server::Node
   attr_reader :name, :domain, :ip, :port
 
   def initialize(name, domain, ip, port)

data/test/authentication.rb

@@ -1,17 +1,13 @@
 require File.expand_path("helper", File.dirname(__FILE__))
 
 scope do
-  setup do
-    @airplay = Airplay::Client.new
-  end
-
   test "connect to an authenticated source" do
     VCR.use_cassette("authenticate all the things!") do
-      @airplay.use("Apple TV")
-      @airplay.password("password")
+      airplay = Airplay::Client.new(false, MockedBrowser)
+      airplay.password("password")
 
-      assert @airplay.scrub.has_key?("duration")
-      assert @airplay.scrub.has_key?("position")
+      assert airplay.scrub.has_key?("duration")
+      assert airplay.scrub.has_key?("position")
     end
   end
 end

data/test/discovery.rb

@@ -3,7 +3,7 @@ require File.expand_path("helper", File.dirname(__FILE__))
 scope do
 
   setup do
-    @airplay = Airplay::Client.new
+    @airplay = Airplay::Client.new(false, MockedBrowser)
   end
 
   test "browse for available airplay servers" do
@@ -11,8 +11,7 @@ scope do
   end
 
   test "find servers by name" do
-    airplay = Airplay::Client.new
-    assert @airplay.find_by_name("Apple TV").is_a?(Airplay::Node)
+    assert @airplay.find_by_name("Mock TV").is_a?(Airplay::Server::Node)
   end
 
   test "raise on not found" do
@@ -22,7 +21,7 @@ scope do
   end
 
   test "autoselect if only one server available" do
-    assert_equal "Apple TV", @airplay.active_server.name
+    assert_equal "Mock TV", @airplay.active_server.name
   end
 
 end

data/test/fixtures/cassettes/airplay/send_audio_to_apple_tv.yml

@@ -0,0 +1,25 @@
+---
+- !ruby/struct:VCR::HTTPInteraction
+  request: !ruby/struct:VCR::Request
+    method: :post
+    uri: http://10.1.0.220:7000/play
+    body: ! 'Content-Location: http://www.robtowns.com/music/blind_willie.mp3
+
+      Start-Position: 0
+
+'
+    headers:
+      user-agent:
+      - MediaControl/1.0
+  response: !ruby/struct:VCR::Response
+    status: !ruby/struct:VCR::ResponseStatus
+      code: 200
+      message: OK
+    headers:
+      date:
+      - Wed, 14 Sep 2011 13:12:35 GMT
+      content-length:
+      - '0'
+    body: !!null 
+    http_version: '1.1'
+  ignored: false

data/test/fixtures/cassettes/airplay/send_video_to_apple_tv.yml

@@ -17,7 +17,27 @@
       message: OK
     headers:
       date:
-      - Wed, 31 Aug 2011 14:36:39 GMT
+      - Thu, 15 Sep 2011 14:55:22 GMT
+      content-length:
+      - '0'
+    body: !!null 
+    http_version: '1.1'
+  ignored: false
+- !ruby/struct:VCR::HTTPInteraction
+  request: !ruby/struct:VCR::Request
+    method: :post
+    uri: http://10.1.0.220:7000/stop
+    body: !!null 
+    headers:
+      user-agent:
+      - MediaControl/1.0
+  response: !ruby/struct:VCR::Response
+    status: !ruby/struct:VCR::ResponseStatus
+      code: 200
+      message: OK
+    headers:
+      date:
+      - Thu, 15 Sep 2011 14:55:22 GMT
       content-length:
       - '0'
     body: !!null 

data/test/helper.rb

@@ -2,9 +2,25 @@ $:.unshift(File.expand_path("../lib", File.dirname(__FILE__)))
 
 require "airplay"
 require 'vcr'
-require 'mocha'
 require "cutest"
 
+module MockedBrowser
+  attr_reader :servers
+
+  def self.browse
+    @servers = [Airplay::Server::Node.new("Mock TV", ".local", "10.1.0.220", 7000)]
+  end
+
+  def self.find_by_name(name)
+    if name == "Mock TV"
+      @servers.first
+    else
+      raise Airplay::Client::ServerNotFoundError
+    end
+  end
+
+end
+
 VCR.config do |c|
   c.cassette_library_dir = 'test/fixtures/cassettes/airplay'
   c.default_cassette_options = { :record => :once }

data/test/images.rb

@@ -9,12 +9,11 @@ end
 
 scope do
   setup do
-    @airplay = Airplay::Client.new
+    @airplay = Airplay::Client.new(false, MockedBrowser)
   end
 
   test "send an image to the server" do
     VCR.use_cassette("send image to apple tv") do
-      @airplay.use("Apple TV")
       file_path = "./test/fixtures/image2.gif"
       assert @airplay.send_image(file_path).kind_of?(String)
       assert @airplay.send_image(File.open(file_path)).kind_of?(String)
@@ -23,7 +22,6 @@ scope do
 
   test "send an image to the server doing a dissolve" do
     VCR.use_cassette("send image to apple tv") do
-      @airplay.use("Apple TV")
       assert @airplay.send_image("./test/fixtures/image.gif", :dissolve).kind_of?(String)
     end
   end

data/test/media.rb

@@ -0,0 +1,28 @@
+require File.expand_path("helper", File.dirname(__FILE__))
+
+scope do
+  test "check media protocol class" do
+    image_protocol = Airplay::Protocol::Media.new("127.0.0.1")
+    assert_equal "/play", image_protocol.resource
+  end
+end
+
+scope do
+  setup do
+    @airplay = Airplay::Client.new(false, MockedBrowser)
+  end
+
+  test "send a video to the server" do
+    VCR.use_cassette("send video to apple tv") do
+      player = @airplay.send_video("http://www.yo-yo.org/mp4/yu.mp4")
+      assert player
+      assert player.stop.kind_of?(String)
+    end
+  end
+
+  test "send audio to the server" do
+    VCR.use_cassette("send audio to apple tv") do
+      assert @airplay.send_audio("http://www.robtowns.com/music/blind_willie.mp3")
+    end
+  end
+end

data/test/scrub.rb

@@ -9,12 +9,11 @@ end
 
 scope do
   setup do
-    @airplay = Airplay::Client.new
+    @airplay = Airplay::Client.new(false, MockedBrowser)
   end
 
   test "check scrub status" do
     VCR.use_cassette("get current scrub from apple tv") do
-      @airplay.use("Apple TV")
       assert @airplay.scrub.has_key?("duration")
       assert @airplay.scrub.has_key?("position")
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: airplay
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-13 00:00:00.000000000 -03:00
+date: 2011-09-15 00:00:00.000000000 -03:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dnssd
-  requirement: &70245624906500 !ruby/object:Gem::Requirement
+  requirement: &70210208536140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70245624906500
+  version_requirements: *70210208536140
 - !ruby/object:Gem::Dependency
   name: net-http-digest_auth
-  requirement: &70245624906060 !ruby/object:Gem::Requirement
+  requirement: &70210208535700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70245624906060
+  version_requirements: *70210208535700
 - !ruby/object:Gem::Dependency
   name: cutest
-  requirement: &70245624905640 !ruby/object:Gem::Requirement
+  requirement: &70210208535280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,21 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70245624905640
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: &70245624905220 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70245624905220
+  version_requirements: *70210208535280
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70245624904800 !ruby/object:Gem::Requirement
+  requirement: &70210208534860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70245624904800
+  version_requirements: *70210208534860
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70245624904380 !ruby/object:Gem::Requirement
+  requirement: &70210208534440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70245624904380
+  version_requirements: *70210208534440
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &70245624903960 !ruby/object:Gem::Requirement
+  requirement: &70210208534020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,7 +77,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70245624903960
+  version_requirements: *70210208534020
 description: Send image/video to an airplay enabled device
 email:
 - yo@brunoaguirre.com
@@ -97,28 +86,32 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- Gemfile
 - README.md
 - Rakefile
 - airplay.gemspec
 - lib/airplay.rb
 - lib/airplay/client.rb
-- lib/airplay/node.rb
 - lib/airplay/protocol.rb
 - lib/airplay/protocol/image.rb
+- lib/airplay/protocol/media.rb
 - lib/airplay/protocol/scrub.rb
-- lib/airplay/protocol/video.rb
+- lib/airplay/server.rb
+- lib/airplay/server/browser.rb
+- lib/airplay/server/node.rb
 - test/authentication.rb
 - test/discovery.rb
 - test/fixtures/cassettes/airplay/authenticate_all_the_things_.yml
 - test/fixtures/cassettes/airplay/get_current_scrub_from_apple_tv.yml
+- test/fixtures/cassettes/airplay/send_audio_to_apple_tv.yml
 - test/fixtures/cassettes/airplay/send_image_to_apple_tv.yml
 - test/fixtures/cassettes/airplay/send_video_to_apple_tv.yml
 - test/fixtures/image.gif
 - test/fixtures/image2.gif
 - test/helper.rb
 - test/images.rb
+- test/media.rb
 - test/scrub.rb
-- test/video.rb
 has_rdoc: true
 homepage: http://github.com/elcuervo/airplay
 licenses: []

data/test/video.rb

@@ -1,21 +0,0 @@
-require File.expand_path("helper", File.dirname(__FILE__))
-
-scope do
-  test "check video protocol class" do
-    image_protocol = Airplay::Protocol::Video.new("127.0.0.1")
-    assert_equal "/play", image_protocol.resource
-  end
-end
-
-scope do
-  setup do
-    @airplay = Airplay::Client.new
-  end
-
-  test "send a video to the server" do
-    VCR.use_cassette("send video to apple tv") do
-      @airplay.use("Apple TV")
-      assert @airplay.send_video("http://www.yo-yo.org/mp4/yu.mp4").kind_of?(String)
-    end
-  end
-end