airplay 1.0.0.beta1 → 1.0.0.beta2

data/lib/airplay/{protocol/player.rb → player.rb}

@@ -5,10 +5,13 @@ require "celluloid"
 require "cfpropertylist"
 
 require "airplay/connection"
-require "airplay/protocol/timers"
-require "airplay/protocol/playback_info"
+require "airplay/server"
+require "airplay/player/timers"
+require "airplay/player/media"
+require "airplay/player/playback_info"
+require "airplay/player/playlist"
 
-module Airplay::Protocol
+module Airplay
   # Public: The class that handles all the video playback
   #
   class Player
@@ -17,10 +20,16 @@ module Airplay::Protocol
 
     def_delegators :@machine, :state, :on
 
+    attr_reader :device
+
     def initialize(device)
       @device = device
     end
 
+    def playlist
+      @_playlist ||= Playlist.new
+    end
+
     # Public: Plays a given url or file.
     #         Creates a new persistent connection to ensure that
     #         the socket will be kept alive
@@ -28,20 +37,19 @@ module Airplay::Protocol
     #   file_or_url - The url or file to be reproduced
     #   options - Optional starting time
     #
-    def play(file_or_url, options = {})
+    def play(media_to_play = "playlist", options = {})
       start_the_machine
       check_for_playback_status
 
-      media_url = case true
-                  when File.exists?(file_or_url)
-                  when !!(file_or_url =~ URI::regexp)
-                    file_or_url
-                  else
-                    raise Errno::ENOENT, file_or_url
-                  end
+      media = case true
+              when media_to_play.is_a?(Media) then media_to_play
+              when media_to_play == "playlist" && playlist.any?
+                playlist.next
+              else Media.new(media_to_play)
+              end
 
       content = {
-        "Content-Location" => media_url,
+        "Content-Location" => media,
         "Start-Position" => options.fetch(:time, 0.0)
       }
 
@@ -65,6 +73,18 @@ module Airplay::Protocol
       end
     end
 
+    def next
+      video = playlist.next
+      play(video) if video
+      video
+    end
+
+    def previous
+      video = playlist.previous
+      play(video) if video
+      video
+    end
+
     # Public: Shows the current playback time if a video is being played.
     #
     # Returns a hash with the :duration and current :position
@@ -117,6 +137,11 @@ module Airplay::Protocol
       cleanup
     end
 
+    def cleanup
+      timers.cancel
+      persistent.close
+    end
+
     private
 
     def timers
@@ -131,11 +156,6 @@ module Airplay::Protocol
       @_persistent ||= Airplay::Connection.new(@device, keep_alive: true)
     end
 
-    def cleanup
-      timers.cancel
-      persistent.close
-    end
-
     def check_for_playback_status
       timers << every(1) do
         case true

data/lib/airplay/player/media.rb

@@ -0,0 +1,22 @@
+module Airplay
+  class Player
+    class Media
+      attr_reader :url
+
+      def initialize(file_or_url)
+        @url = case true
+               when File.exists?(file_or_url)
+                 Airplay.server.serve(File.expand_path(file_or_url))
+               when !!(file_or_url =~ URI::regexp)
+                 file_or_url
+               else
+                 raise Errno::ENOENT, file_or_url
+               end
+      end
+
+      def to_s
+        @url
+      end
+    end
+  end
+end

data/lib/airplay/player/playback_info.rb

@@ -0,0 +1,51 @@
+module Airplay
+  class Player
+    PlaybackInfo = Struct.new(:info) do
+      def uuid
+        info["uuid"]
+      end
+
+      def duration
+        info["duration"]
+      end
+
+      def position
+        info["position"]
+      end
+
+      def percent
+        return unless position && duration
+        (position * 100 / duration).floor
+      end
+
+      def likely_to_keep_up?
+        info["playbackLikelyToKeepUp"]
+      end
+
+      def stall_count
+        info["stallCount"]
+      end
+
+      def ready_to_play?
+        info["readyToPlay"]
+      end
+
+      def stopped?
+        info.empty?
+      end
+
+      def playing?
+        info.has_key?("rate") && info.fetch("rate", false) && !info["rate"].zero?
+      end
+
+      def paused?
+        !playing?
+      end
+
+      def played?
+        # This is weird. I know. Bear with me.
+        info.keys.size == 2
+      end
+    end
+  end
+end

data/lib/airplay/player/playlist.rb

@@ -0,0 +1,41 @@
+require "forwardable"
+require "airplay/player/media"
+
+module Airplay
+  class Player
+    class Playlist
+      include Enumerable
+      extend  Forwardable
+
+      def_delegators :@items, :each, :size, :empty?
+
+      def initialize
+        @items = []
+        @position = 0
+      end
+
+      def to_ary
+        @items
+      end
+
+      def <<(file_or_url)
+        @items << Media.new(file_or_url)
+      end
+
+      def next
+        return nil if @position + 1 > @items.size
+
+        item = @items[@position]
+        @position += 1
+        item
+      end
+
+      def previous
+        return nil if @position - 1 < 0
+
+        @position -= 1
+        @items[@position]
+      end
+    end
+  end
+end

data/lib/airplay/player/timers.rb

@@ -0,0 +1,27 @@
+module Airplay
+  class Player
+    class Timers
+      include Enumerable
+      extend  Forwardable
+
+      def_delegators :@timers, :each, :size, :empty?
+
+      def initialize
+        @timers = []
+      end
+
+      def <<(timer)
+        @timers << timer
+      end
+
+      def reset
+        @timers.each { |t| t.reset }
+        @timers = []
+      end
+
+      def cancel
+        @timers.each { |t| t.cancel }
+      end
+    end
+  end
+end

data/lib/airplay/server.rb

@@ -0,0 +1,56 @@
+require "rack"
+require "socket"
+require "uuid"
+
+require "airplay/logger"
+require "airplay/server/app"
+
+module Airplay
+  class Server
+    include Celluloid
+
+    def initialize
+      @port = Airplay.configuration.port
+      @logger = Airplay::Logger.new("airplay::server")
+      @server = Rack::Server.new(
+        server: :webrick,
+        Host: private_ip,
+        Port: @port,
+        Logger: @logger,
+        AccessLog: [],
+        app: App.app
+      )
+
+      start!
+    end
+
+    def serve(file)
+      sleep 0.1 until running?
+      asset_id = App.settings[:assets][file]
+
+      "http://#{private_ip}:#{@port}/assets/#{asset_id}"
+    end
+
+    def start!
+      Thread.start { @server.start }
+    end
+
+    private
+
+    def running?
+      begin
+        socket = TCPSocket.new(private_ip, @port)
+        socket.close unless socket.nil?
+        true
+      rescue Errno::ECONNREFUSED, Errno::EBADF, Errno::EADDRNOTAVAIL
+        false
+      end
+    end
+
+    def private_ip
+      @_ip ||= Socket.ip_address_list.detect do |addr|
+        addr.ipv4_private?
+      end.ip_address
+    end
+  end
+end

data/lib/airplay/server/app.rb

@@ -0,0 +1,17 @@
+require "cuba"
+
+module Airplay
+  class Server
+    class App < Cuba
+      settings[:assets] ||= Hash.new do |h, k|
+        h[k] = UUID.generate
+      end
+
+      define do
+        on "assets/:uuid" do |uuid|
+          run Rack::File.new(settings[:assets].key(uuid))
+        end
+      end
+    end
+  end
+end

data/lib/airplay/version.rb

@@ -0,0 +1,3 @@
+module Airplay
+  VERSION = "1.0.0.beta2"
+end

data/lib/airplay/viewable.rb

@@ -1,5 +1,5 @@
 require "forwardable"
-require "airplay/protocol/viewer"
+require "airplay/viewer"
 
 module Airplay
   module Viewable
@@ -10,7 +10,7 @@ module Airplay
     private
 
     def viewer
-      @_viewer ||= Airplay::Protocol::Viewer.new(self)
+      @_viewer ||= Airplay::Viewer.new(self)
     end
   end
 end

data/lib/airplay/{protocol/viewer.rb → viewer.rb}

@@ -1,6 +1,6 @@
 require "open-uri"
 
-module Airplay::Protocol
+module Airplay
   # Public: The class to handle image broadcast to a device
   #
   class Viewer
@@ -8,7 +8,7 @@ module Airplay::Protocol
 
     def initialize(device)
       @device = device
-      @logger = Airplay::Logger.new("airplay::protocol::image")
+      @logger = Airplay::Logger.new("airplay::viewer")
     end
 
     # Public: Broadcasts the content to the device

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: airplay
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta1
+  version: 1.0.0.beta2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-10 00:00:00.000000000 Z
+date: 2013-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dnssd
@@ -128,17 +128,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.10
+        version: 0.0.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.10
+        version: 0.0.12
 - !ruby/object:Gem::Dependency
   name: net-http-digest_auth
   requirement: !ruby/object:Gem::Requirement
@@ -155,38 +155,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.2.1
-- !ruby/object:Gem::Dependency
-  name: clap
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: ruby-progressbar
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -238,11 +206,12 @@ dependencies:
 description: Send image/video to an airplay enabled device
 email:
 - yo@brunoaguirre.com
-executables:
-- air
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .gitignore
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - HUGS
@@ -250,6 +219,7 @@ files:
 - README.md
 - Rakefile
 - SPEC.md
+- airplay-cli.gemspec
 - airplay.gemspec
 - bin/air
 - examples/demo.rb
@@ -258,6 +228,7 @@ files:
 - lib/airplay.rb
 - lib/airplay/browser.rb
 - lib/airplay/cli.rb
+- lib/airplay/cli/version.rb
 - lib/airplay/configuration.rb
 - lib/airplay/connection.rb
 - lib/airplay/connection/authentication.rb
@@ -266,36 +237,26 @@ files:
 - lib/airplay/device/features.rb
 - lib/airplay/device/info.rb
 - lib/airplay/devices.rb
+- lib/airplay/group.rb
+- lib/airplay/group/players.rb
 - lib/airplay/logger.rb
 - lib/airplay/playable.rb
-- lib/airplay/protocol.rb
-- lib/airplay/protocol/app.rb
-- lib/airplay/protocol/message.rb
-- lib/airplay/protocol/playback_info.rb
-- lib/airplay/protocol/player.rb
-- lib/airplay/protocol/reverse.rb
-- lib/airplay/protocol/slideshow.rb
-- lib/airplay/protocol/timers.rb
-- lib/airplay/protocol/viewer.rb
+- lib/airplay/player.rb
+- lib/airplay/player/media.rb
+- lib/airplay/player/playback_info.rb
+- lib/airplay/player/playlist.rb
+- lib/airplay/player/timers.rb
+- lib/airplay/server.rb
+- lib/airplay/server/app.rb
 - lib/airplay/structure.rb
+- lib/airplay/version.rb
 - lib/airplay/viewable.rb
-- test/fixtures/cassettes/airplay/listing_slideshow_features.yml
-- test/fixtures/cassettes/airplay/play_an_entire_video.yml
-- test/fixtures/cassettes/airplay/sending_a_video.yml
-- test/fixtures/cassettes/airplay/sending_an_image.yml
-- test/fixtures/cassettes/airplay/stop_any_transmission.yml
+- lib/airplay/viewer.rb
 - test/fixtures/files/logo.png
 - test/fixtures/files/transition_0.png
 - test/fixtures/files/transition_1.png
 - test/fixtures/files/transition_2.png
 - test/fixtures/files/transition_3.png
-- test/integration/discovery_test.rb
-- test/integration/features_test.rb
-- test/integration/send_media_test.rb
-- test/integration/slideshow_test.rb
-- test/test_helper.rb
-- test/unit/node_test.rb
-- test/unit/protocol_test.rb
 homepage: http://github.com/elcuervo/airplay
 licenses:
 - MIT
@@ -323,20 +284,8 @@ signing_key:
 specification_version: 3
 summary: Airplay client
 test_files:
-- test/fixtures/cassettes/airplay/listing_slideshow_features.yml
-- test/fixtures/cassettes/airplay/play_an_entire_video.yml
-- test/fixtures/cassettes/airplay/sending_a_video.yml
-- test/fixtures/cassettes/airplay/sending_an_image.yml
-- test/fixtures/cassettes/airplay/stop_any_transmission.yml
 - test/fixtures/files/logo.png
 - test/fixtures/files/transition_0.png
 - test/fixtures/files/transition_1.png
 - test/fixtures/files/transition_2.png
 - test/fixtures/files/transition_3.png
-- test/integration/discovery_test.rb
-- test/integration/features_test.rb
-- test/integration/send_media_test.rb
-- test/integration/slideshow_test.rb
-- test/test_helper.rb
-- test/unit/node_test.rb
-- test/unit/protocol_test.rb