airplay 0.2.6 → 0.2.8

data/.travis.yml

@@ -1,5 +1,6 @@
+before_install: sudo apt-get install -y libavahi-compat-libdnssd-dev
 rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
-before_script: sudo apt-get install -y libavahi-compat-libdnssd-dev && bundle install
+  - jruby

data/README.md

@@ -2,7 +2,7 @@
 
 ![Travis](https://secure.travis-ci.org/elcuervo/airplay.png)
 
-![Ruby Airplay](https://github.com/elcuervo/elcuervo.github.com/raw/master/images/posts/airplay/ruby_airplay.png)
+![Ruby Airplay](http://elcuervo.co/images/posts/airplay/ruby_airplay.png?1)
 
 A client (and someday a server) of the superfancy http content stream technique
 that Apple uses in its products.

data/airplay.gemspec

@@ -1,20 +1,20 @@
 Gem::Specification.new do |s|
   s.name              = "airplay"
-  s.version           = "0.2.6"
+  s.version           = "0.2.8"
   s.summary           = "Airplay client"
   s.description       = "Send image/video to an airplay enabled device"
   s.authors           = ["elcuervo"]
   s.email             = ["yo@brunoaguirre.com"]
   s.homepage          = "http://github.com/elcuervo/airplay"
   s.files             = `git ls-files`.split("\n")
-  s.test_files        = `git ls-files spec`.split("\n")
+  s.test_files        = `git ls-files test`.split("\n")
 
-  s.add_dependency("dnssd")
-  s.add_dependency("net-http-persistent")
-  s.add_dependency("net-http-digest_auth")
+  s.add_dependency("dnssd", "~> 2.0")
+  s.add_dependency("net-http-persistent", "~> 2.5")
+  s.add_dependency("net-http-digest_auth", "~> 1.2")
 
-  s.add_development_dependency("cutest")
-  s.add_development_dependency("capybara")
-  s.add_development_dependency("fakeweb")
-  s.add_development_dependency("vcr")
+  s.add_development_dependency("cutest", "~> 1.1")
+  s.add_development_dependency("capybara", "~> 1.0")
+  s.add_development_dependency("fakeweb", "~> 1.3")
+  s.add_development_dependency("vcr", "~> 2.0")
 end

data/lib/airplay/client.rb

@@ -1,5 +1,5 @@
 class Airplay::Client
-  attr_reader :servers, :active_server, :password
+  attr_reader :servers, :active, :password
 
   def initialize(server = false, server_browser = Airplay::Server::Browser)
     @server_browser = server_browser
@@ -8,7 +8,11 @@ class Airplay::Client
   end
 
   def use(server)
-    @active_server = server.is_a?(Airplay::Server::Node) ? server : @server_browser.find_by_name(server)
+    @active = if server.is_a?(Airplay::Server::Node)
+                       server
+                     else
+                       @server_browser.find_by_name(server)
+                     end
   end
 
   def password(password)
@@ -24,7 +28,7 @@ class Airplay::Client
   end
 
   def handler
-    Airplay::Protocol.new(@active_server.ip, @active_server.port, @password)
+    @_handler ||= Airplay::Protocol.new(@active.ip, @active.port, @password)
   end
 
   def send_image(image, transition = :none)

data/lib/airplay/protocol.rb

@@ -8,45 +8,65 @@ class Airplay::Protocol
   def initialize(host, port, password)
     @device = { :host => host, :port => port }
     @password = password
+    @authentications = {}
     @http = Net::HTTP::Persistent.new
+    @http.idle_timeout = 900 # until nil works
     @http.debug_output = $stdout if ENV.has_key?('HTTP_DEBUG')
   end
 
-  def make_request(request)
-    uri = URI.parse "http://#{@device.fetch(:host)}:#{@device.fetch(:port)}#{request.path}"
-    uri.user = "Airplay"
-    uri.password = @password
+  def put(resource, body = nil, headers = {})
+    @request = Net::HTTP::Put.new resource
+    @request.body = body
+    @request.initialize_http_header DEFAULT_HEADERS.merge(headers)
+    make_request
+  end
 
-    response = @http.request(uri, request) {}
-    if response['www-authenticate']
-      digest_auth = Net::HTTP::DigestAuth.new
-      authentication = digest_auth.auth_header uri, response['www-authenticate'], request.method
-      request.add_field 'Authorization', authentication
-      response = @http.request(uri, request) {}
-    end
+ def post(resource, body = nil, headers = {})
+    @request = Net::HTTP::Post.new resource
+    @request.body = body
+    @request.initialize_http_header DEFAULT_HEADERS.merge(headers)
+    make_request
+  end
+
+  def get(resource, headers = {})
+    @request = Net::HTTP::Get.new resource
+    @request.initialize_http_header DEFAULT_HEADERS.merge(headers)
+    make_request
+  end
+
+  private
+
+  def make_request
+    path = "http://#{@device[:host]}:#{@device[:port]}#{@request.path}"
+    @uri = URI.parse(path)
+    @uri.user = "Airplay"
+    @uri.password = @password
+
+    add_auth_if_needed
+
+    response = @http.request(@uri, @request) {}
 
     raise Airplay::Protocol::InvalidRequestError if response.code == "404"
     response.body
   end
 
-  def put(resource, body = nil, headers = {})
-    request = Net::HTTP::Put.new resource
-    request.body = body
-    request.initialize_http_header DEFAULT_HEADERS.merge(headers)
-    make_request(request)
+  def add_auth_if_needed
+    if @password
+      authenticate
+      @request.add_field('Authorization', @authentications[@uri.path])
+    end
   end
 
- def post(resource, body = nil, headers = {})
-    request = Net::HTTP::Post.new resource
-    request.body = body
-    request.initialize_http_header DEFAULT_HEADERS.merge(headers)
-    make_request(request)
+  def authenticate
+    response = @http.request(@uri, @request) {}
+    auth = response['www-authenticate']
+    digest_authentication(auth) if auth
   end
 
-  def get(resource, headers = {})
-    request = Net::HTTP::Get.new resource
-    request.initialize_http_header DEFAULT_HEADERS.merge(headers)
-    make_request(request)
+  def digest_authentication(auth)
+    digest = Net::HTTP::DigestAuth.new
+    @authentications[@uri.path] ||=
+      digest.auth_header(@uri, auth, @request.method)
   end
 
 end

data/lib/airplay/protocol/image.rb

@@ -22,18 +22,17 @@ class Airplay::Protocol::Image
   end
 
   def send(image, transition = :none)
-    image = URI.parse(image) if !(image =~ URI::regexp).nil?
+    image = URI.parse(image) if !!(image =~ URI::regexp)
     content = case image
               when String
-                if File.exists?(image)
-                  File.read(image)
+                File.exists?(image) ? File.read(image) : image
+              when URI::HTTP then Net::HTTP.get(image)
+              else
+                if image.respond_to?(:read)
+                  image.read
                 else
-                  image
+                  throw Airplay::Protocol::InvalidMediaError
                 end
-              when File
-                image.read
-              when URI::HTTP
-                Net::HTTP.get(image)
               end
 
     @http.put(resource, content, transition_header(transition))

data/lib/airplay/server/browser.rb

@@ -12,18 +12,18 @@ module Airplay::Server::Browser
   def self.browse
     @servers = []
     timeout 3 do
-      DNSSD.browse!(Airplay::Protocol::SEARCH) do |reply|
+      DNSSD.browse!(Airplay::Protocol::SEARCH) do |node|
         resolver = DNSSD::Service.new
         target, port = nil
-        resolver.resolve(reply) do |resolved|
+        resolver.resolve(node) 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?
+        ip = info[0][2]
+        @servers << Airplay::Server::Node.new(node.name, node.domain, ip, port)
+        break unless node.flags.more_coming?
       end
     end
   rescue Timeout::Error

data/test/authentication.rb

@@ -2,7 +2,7 @@ require File.expand_path("helper", File.dirname(__FILE__))
 
 scope do
   test "connect to an authenticated source" do
-    VCR.use_cassette("authenticate all the things!") do
+    with_cassette("authenticate all the things!") do
       airplay = Airplay::Client.new(false, MockedBrowser)
       airplay.password("password")
 

data/test/discovery.rb

@@ -21,7 +21,7 @@ scope do
   end
 
   test "autoselect if only one server available" do
-    assert_equal "Mock TV", @airplay.active_server.name
+    assert_equal "Mock TV", @airplay.active.name
   end
 
 end

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

@@ -1,135 +1,139 @@
----
-- !ruby/struct:VCR::HTTPInteraction
-  request: !ruby/struct:VCR::Request
-    method: :get
+--- 
+http_interactions: 
+- request: 
+    method: get
     uri: http://mocktv.local:7000/scrub
-    body: !!null 
-    headers:
-      user-agent:
+    body: 
+      encoding: US-ASCII
+      base64_string: ""
+    headers: 
+      user-agent: 
       - MediaControl/1.0
-      content-type:
+      content-type: 
       - text/x-apple-plist+xml
-      connection:
+      connection: 
       - keep-alive
-      keep-alive:
+      keep-alive: 
       - 30
-  response: !ruby/struct:VCR::Response
-    status: !ruby/struct:VCR::ResponseStatus
+  response: 
+    status: 
       code: 401
       message: Unauthorized
-    headers:
-      date:
-      - Thu, 13 Oct 2011 12:22:53 GMT
-      content-length:
-      - '0'
-      www-authenticate:
-      - Digest realm="AirPlay", nonce="MTMxODUwODU3MyAnPHQuK0fHAbH43SnwM2zd"
-    body: !!null 
-    http_version: '1.1'
-  ignored: false
-- !ruby/struct:VCR::HTTPInteraction
-  request: !ruby/struct:VCR::Request
-    method: :get
+    headers: 
+      date: 
+      - Fri, 23 Mar 2012 22:10:30 GMT
+      content-length: 
+      - "0"
+      www-authenticate: 
+      - Digest realm="AirPlay", nonce="MTMzMjU0MDYzMCArTzzIA84dWO8ijTtj5Rhw"
+    body: 
+      encoding: US-ASCII
+      base64_string: ""
+    http_version: "1.1"
+  recorded_at: Fri, 23 Mar 2012 22:10:30 GMT
+- request: 
+    method: get
     uri: http://mocktv.local:7000/scrub
-    body: !!null 
-    headers:
-      user-agent:
+    body: 
+      encoding: US-ASCII
+      base64_string: ""
+    headers: 
+      user-agent: 
       - MediaControl/1.0
-      content-type:
+      content-type: 
       - text/x-apple-plist+xml
-      connection:
+      connection: 
       - keep-alive
-      - keep-alive
-      keep-alive:
-      - 30
+      keep-alive: 
       - 30
-      host:
+      host: 
       - mocktv.local:7000
-      authorization:
-      - Digest username="Airplay", realm="AirPlay", uri="/scrub", nonce="MTMxODUwODU3MyAnPHQuK0fHAbH43SnwM2zd",
-        nc=00000000, cnonce="c2fc089b2e65ab801efe19f6c0748545", response="f90f23f345d03fb5e4ec4bd3e054731a"
-  response: !ruby/struct:VCR::Response
-    status: !ruby/struct:VCR::ResponseStatus
+      authorization: 
+      - Digest username="Airplay", realm="AirPlay", uri="/scrub", nonce="MTMzMjU0MDYzMCArTzzIA84dWO8ijTtj5Rhw", nc=00000000, cnonce="0f55c9413ac973d5963a73572df0805b", response="e6458b63b53f22522a23138c94a5b02b"
+  response: 
+    status: 
       code: 200
       message: OK
-    headers:
-      date:
-      - Thu, 13 Oct 2011 12:22:58 GMT
-      content-type:
+    headers: 
+      date: 
+      - Fri, 23 Mar 2012 22:10:35 GMT
+      content-type: 
       - text/parameters
-      content-length:
-      - '38'
-    body: ! 'duration: 0.000000
-
-      position: 0.000000
+      content-length: 
+      - "38"
+    body: 
+      encoding: US-ASCII
+      base64_string: |
+        ZHVyYXRpb246IDAuMDAwMDAwCnBvc2l0aW9uOiAwLjAwMDAwMAo=
 
-'
-    http_version: '1.1'
-  ignored: false
-- !ruby/struct:VCR::HTTPInteraction
-  request: !ruby/struct:VCR::Request
-    method: :get
+    http_version: "1.1"
+  recorded_at: Fri, 23 Mar 2012 22:10:35 GMT
+- request: 
+    method: get
     uri: http://mocktv.local:7000/scrub
-    body: !!null 
-    headers:
-      user-agent:
+    body: 
+      encoding: US-ASCII
+      base64_string: ""
+    headers: 
+      user-agent: 
       - MediaControl/1.0
-      content-type:
+      content-type: 
       - text/x-apple-plist+xml
-      connection:
+      connection: 
       - keep-alive
-      keep-alive:
+      keep-alive: 
       - 30
-  response: !ruby/struct:VCR::Response
-    status: !ruby/struct:VCR::ResponseStatus
+  response: 
+    status: 
       code: 401
       message: Unauthorized
-    headers:
-      date:
-      - Thu, 13 Oct 2011 12:23:03 GMT
-      content-length:
-      - '0'
-      www-authenticate:
-      - Digest realm="AirPlay", nonce="MTMxODUwODU4MyAx+UiV/7xCkP81VM4Y1S/G"
-    body: !!null 
-    http_version: '1.1'
-  ignored: false
-- !ruby/struct:VCR::HTTPInteraction
-  request: !ruby/struct:VCR::Request
-    method: :get
+    headers: 
+      date: 
+      - Fri, 23 Mar 2012 22:10:40 GMT
+      content-length: 
+      - "0"
+      www-authenticate: 
+      - Digest realm="AirPlay", nonce="MTMzMjU0MDY0MCCM+VRd9bJqrocG4oDxuVOU"
+    body: 
+      encoding: US-ASCII
+      base64_string: ""
+    http_version: "1.1"
+  recorded_at: Fri, 23 Mar 2012 22:10:40 GMT
+- request: 
+    method: get
     uri: http://mocktv.local:7000/scrub
-    body: !!null 
-    headers:
-      user-agent:
+    body: 
+      encoding: US-ASCII
+      base64_string: ""
+    headers: 
+      user-agent: 
       - MediaControl/1.0
-      content-type:
+      content-type: 
       - text/x-apple-plist+xml
-      connection:
+      connection: 
       - keep-alive
-      - keep-alive
-      keep-alive:
-      - 30
+      keep-alive: 
       - 30
-      host:
+      host: 
       - mocktv.local:7000
-      authorization:
-      - Digest username="Airplay", realm="AirPlay", uri="/scrub", nonce="MTMxODUwODU4MyAx+UiV/7xCkP81VM4Y1S/G",
-        nc=00000000, cnonce="03d64d4bfe4b68f371eef278bea6efd1", response="de139d04d199649e1d4e9e9d96ec3f80"
-  response: !ruby/struct:VCR::Response
-    status: !ruby/struct:VCR::ResponseStatus
+      authorization: 
+      - Digest username="Airplay", realm="AirPlay", uri="/scrub", nonce="MTMzMjU0MDYzMCArTzzIA84dWO8ijTtj5Rhw", nc=00000000, cnonce="0f55c9413ac973d5963a73572df0805b", response="e6458b63b53f22522a23138c94a5b02b"
+  response: 
+    status: 
       code: 200
       message: OK
-    headers:
-      date:
-      - Thu, 13 Oct 2011 12:23:08 GMT
-      content-type:
+    headers: 
+      date: 
+      - Fri, 23 Mar 2012 22:10:45 GMT
+      content-type: 
       - text/parameters
-      content-length:
-      - '38'
-    body: ! 'duration: 0.000000
-
-      position: 0.000000
+      content-length: 
+      - "38"
+    body: 
+      encoding: US-ASCII
+      base64_string: |
+        ZHVyYXRpb246IDAuMDAwMDAwCnBvc2l0aW9uOiAwLjAwMDAwMAo=
 
-'
-    http_version: '1.1'
-  ignored: false
+    http_version: "1.1"
+  recorded_at: Fri, 23 Mar 2012 22:10:45 GMT
+recorded_with: VCR 2.0.0