airplay 0.1.5 → 0.1.6

data/airplay.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name              = "airplay"
-  s.version           = "0.1.5"
+  s.version           = "0.1.6"
   s.summary           = "Airplay client"
   s.description       = "Send image/video to an airplay enabled device"
   s.authors           = ["elcuervo"]

data/lib/airplay.rb

@@ -6,5 +6,6 @@ module Airplay; end;
 require 'airplay/protocol'
 require 'airplay/protocol/image'
 require 'airplay/protocol/video'
+require 'airplay/protocol/scrub'
 require 'airplay/node'
 require 'airplay/client'

data/lib/airplay/client.rb

@@ -22,21 +22,30 @@ class Airplay::Client
     @servers = []
     DNSSD.browse!(Airplay::Protocol::SEARCH) do |reply|
       resolver = DNSSD::Service.new
-      target = nil
+      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)
+      @servers << Airplay::Node.new(reply.name, reply.domain, ip_address, port)
       break unless reply.flags.more_coming?
     end
     @servers
   end
 
   def send_image(image, transition = :none)
-    Airplay::Protocol::Image.new(@active_server.ip).send(image, transition)
+    Airplay::Protocol::Image.new(@active_server.ip, @active_server.port).send(image, transition)
+  end
+
+  def send_video(video, position = 0)
+    Airplay::Protocol::Video.new(@active_server.ip, @active_server.port).send(video, position)
+  end
+
+  def scrub
+    Airplay::Protocol::Scrub.new(@active_server.ip, @active_server.port).send
   end
 
 end

data/lib/airplay/node.rb

@@ -1,7 +1,7 @@
 class Airplay::Node
-  attr_reader :name, :domain, :ip
+  attr_reader :name, :domain, :ip, :port
 
-  def initialize(name, domain, ip)
-    @name, @domain, @ip = name, domain, ip
+  def initialize(name, domain, ip, port)
+    @name, @domain, @ip, @port = name, domain, ip, port
   end
 end

data/lib/airplay/protocol.rb

@@ -11,11 +11,9 @@ class Airplay::Protocol
   end
 
   def make_request(request)
-    Thread.new do |t|
-      response = @http.request(request)
-      raise Airplay::Protocol::InvalidRequestError if response.code == "404"
-    end
-    true
+    response = @http.request(request)
+    raise Airplay::Protocol::InvalidRequestError if response.code == "404"
+    response.body
   end
 
   def put(resource, body = nil, headers = {})
@@ -25,6 +23,13 @@ class Airplay::Protocol
     make_request(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(request)
+  end
+
   def get(resource, headers = {})
     request = Net::HTTP::Get.new resource
     request.initialize_http_header DEFAULT_HEADERS.merge(headers)

data/lib/airplay/protocol/image.rb

@@ -7,7 +7,7 @@ class Airplay::Protocol::Image < Airplay::Protocol
   def transitions
     {
       :none => "None",
-      :dissolve =>  "Dissolve"
+      :dissolve => "Dissolve"
     }
   end
 

data/lib/airplay/protocol/scrub.rb

@@ -0,0 +1,19 @@
+class Airplay::Protocol::Scrub < Airplay::Protocol
+  def resource
+    "/scrub"
+  end
+
+  def plist_headers
+    {'Content-Type' => 'text/x-apple-plist+xml'}
+  end
+
+  def send
+    response = get(resource, plist_headers)
+    result = {}
+    response.delete(":").split.each_slice(2) do |key, value|
+      result[key] = value
+    end
+    result
+  end
+
+end

data/lib/airplay/protocol/video.rb

@@ -4,8 +4,18 @@ class Airplay::Protocol::Video < Airplay::Protocol
     "/play"
   end
 
-  def send(video)
-    # TODO: serve local file
+  def position_body(position = 0)
+    "Start-Position: #{position}\n"
+  end
+
+  def location_body(video)
+    "Content-Location: #{video}\n"
+  end
+
+  def send(video, position = 0)
+    body  = location_body(video)
+    body += position_body(position.to_s)
+    post(resource, body)
   end
 
   def play

data/test/discovery.rb

@@ -12,7 +12,7 @@ scope do
 
   test "find servers by name" do
     airplay = Airplay::Client.new
-    assert @airplay.find_by_name("elCuervo").is_a?(Airplay::Node)
+    assert @airplay.find_by_name("Apple TV").is_a?(Airplay::Node)
   end
 
   test "raise on not found" do
@@ -22,7 +22,7 @@ scope do
   end
 
   test "autoselect if only one server available" do
-    assert_equal "elCuervo", @airplay.active_server.name
+    assert_equal "Apple TV", @airplay.active_server.name
   end
 
 end

data/test/images.rb

@@ -13,12 +13,12 @@ scope do
   end
 
   test "send an image to the server" do
-    @airplay.use("elCuervo")
-    assert_equal true, @airplay.send_image("./test/fixtures/image.gif")
+    @airplay.use("Apple TV")
+    assert @airplay.send_image("./test/fixtures/image2.gif").kind_of?(String)
   end
 
   test "send an image to the server doing a dissolve" do
-    @airplay.use("elCuervo")
-    assert_equal true, @airplay.send_image("../test/fixtures/image.gif", :dissolve)
+    @airplay.use("Apple TV")
+    assert @airplay.send_image("./test/fixtures/image.gif", :dissolve).kind_of?(String)
   end
 end

data/test/scrub.rb

@@ -0,0 +1,20 @@
+require File.expand_path("helper", File.dirname(__FILE__))
+
+scope do
+  test "check image protocol class" do
+    scrub_protocol = Airplay::Protocol::Scrub.new("127.0.0.1")
+    assert_equal "/scrub", scrub_protocol.resource
+  end
+end
+
+scope do
+  setup do
+    @airplay = Airplay::Client.new
+  end
+
+  test "check scrub status" do
+    @airplay.use("Apple TV")
+    assert @airplay.scrub.has_key?("duration")
+    assert @airplay.scrub.has_key?("position")
+  end
+end

data/test/video.rb

@@ -8,4 +8,13 @@ scope do
 end
 
 scope do
+  setup do
+    @airplay = Airplay::Client.new
+  end
+
+  test "send a video to the server" do
+    @airplay.use("Apple TV")
+    assert @airplay.send_video("http://www.yo-yo.org/mp4/yu.mp4").kind_of?(String)
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: airplay
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-23 00:00:00.000000000 -03:00
+date: 2011-08-30 00:00:00.000000000 -03:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dnssd
-  requirement: &70361332932440 !ruby/object:Gem::Requirement
+  requirement: &70190462401180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70361332932440
+  version_requirements: *70190462401180
 - !ruby/object:Gem::Dependency
   name: cutest
-  requirement: &70361332931920 !ruby/object:Gem::Requirement
+  requirement: &70190462400740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70361332931920
+  version_requirements: *70190462400740
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70361332931460 !ruby/object:Gem::Requirement
+  requirement: &70190462400320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +44,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70361332931460
+  version_requirements: *70190462400320
 description: Send image/video to an airplay enabled device
 email:
 - yo@brunoaguirre.com
@@ -61,11 +61,14 @@ files:
 - lib/airplay/node.rb
 - lib/airplay/protocol.rb
 - lib/airplay/protocol/image.rb
+- lib/airplay/protocol/scrub.rb
 - lib/airplay/protocol/video.rb
 - test/discovery.rb
 - test/fixtures/image.gif
+- test/fixtures/image2.gif
 - test/helper.rb
 - test/images.rb
+- test/scrub.rb
 - test/video.rb
 has_rdoc: true
 homepage: http://github.com/elcuervo/airplay