radiodan 0.0.4 → 1.0.0

data/lib/radiodan/middleware/web_server.rb

@@ -0,0 +1,17 @@
+require 'thin'
+
+class Radiodan
+class WebServer
+  include Logging
+  
+  def initialize(*config)
+    @klass   = config.shift
+    @options = config.shift || {}
+    @port    = @options.fetch(:port, 3000)
+  end
+  
+  def call(player)
+    Thin::Server.start @klass.new(player), '0.0.0.0', @port, :signals => false
+  end
+end
+end

data/lib/radiodan/player.rb

@@ -10,8 +10,7 @@ class Player
   include EventBinding
   
   attr_reader :adapter, :playlist
-  def_delegators :adapter, :stop
-  
+    
   def adapter=(adapter)
     @adapter = adapter
     @adapter.player = self
@@ -23,17 +22,22 @@ class Player
   
   def playlist=(new_playlist)
     @playlist = new_playlist
-    trigger_event(:playlist, @playlist)
-    # run sync to explicitly conform to new playlist?
+    
+    trigger_event(:playlist, @playlist)    
+    trigger_event(:player_state, @adapter.playlist) if @adapter
     
     @playlist
   end
   
+  def state
+    adapter.playlist
+  end
+  
 =begin
   Sync checks the current status of the player.
   Is it paused? Playing? What is it playing?
   It compares the expected to actual statuses and
-  makes changes required to keep them the same.
+  triggers events if there is a difference.
 =end
   def sync
     return false unless adapter?
@@ -41,29 +45,52 @@ class Player
     current  = adapter.playlist
     expected = playlist
 
-    state = Radiodan::PlaylistSync.new expected, current
+    sync = Radiodan::PlaylistSync.new expected, current
+    synced = sync.sync?
 
-    if state.sync?
-      true
-    else
+    unless synced
       # playback state
-      if state.errors.include? :state
-        logger.debug "Expected: #{expected.state} Got: #{current.state}"
-        trigger_event :play_state, expected.state
-      end
-      
-      if state.errors.include? :mode
-        logger.debug "Expected: #{expected.mode} Got: #{current.mode}"
-        trigger_event :play_mode, expected.mode
+      sync.errors.each do |e|
+        case e
+        when :state
+          logger.debug "Expected State: #{expected.state} Got: #{current.state}"
+          trigger_event :play_state, current.state
+        when :mode
+          logger.debug "Expected Mode: #{expected.mode} Got: #{current.mode}"
+          trigger_event :play_mode, current.mode
+        when :new_tracks
+          logger.debug "Expected: #{expected.current.inspect} Got: #{current.current.inspect}"
+          trigger_event :playlist, expected
+        when :add_tracks
+          logger.debug "Found additional tracks to enqueue"
+          trigger_event :enqueue, expected.tracks[current.tracks.size..-1]
+          trigger_event :play_pending if sync.errors.include?(:state) && current.state == :stop
+        when :volume
+          logger.debug "Expected Volume: #{expected.volume} Got: #{current.volume}"
+          trigger_event :volume, expected.volume
+        end
       end
-      
-      # playlist
-      if state.errors.include? :playlist
-        logger.debug "Expected: #{expected.current} Got: #{current.current}"
-        trigger_event :playlist, expected
-      end
-      
-      false
+    end
+    
+    trigger_event :sync, current
+    synced
+  end
+
+  def respond_to?(method)
+    if adapter.respond_to? method
+      true
+    else
+      super
+    end
+  end
+
+  private
+  
+  def method_missing(method, *args, &block)
+    if adapter.respond_to? method
+      adapter.send method, *args, &block
+    else
+      super
     end
   end
 end

data/lib/radiodan/playlist.rb

@@ -29,7 +29,8 @@ class Playlist
   STATES = [:play, :stop, :pause]
   MODES  = [:sequential, :resume, :random]
   attr_reader :state, :mode, :repeat, :tracks, :position, :seek, :volume
-  def_delegators :@tracks, :size
+  alias_method :repeat?, :repeat
+  def_delegators :@tracks, :size, :length, :empty?
 
   def initialize(options={})
     self.state    = options.fetch(:state, STATES.first)
@@ -44,7 +45,15 @@ class Playlist
   def current
     tracks[position]
   end
-
+  
+  def random?
+    self.mode == :random
+  end
+  
+  def state
+    empty? ? :stop : @state
+  end
+  
   def state=(new_state)
     state = new_state.to_sym
 
@@ -98,15 +107,27 @@ class Playlist
   end
   
   def volume=(new_volume)
+    # -1 is allowed when volume cannot be determined
     begin
       new_volume = Integer(new_volume)
       
-      raise ArgumentError if new_volume > 100 || new_volume < 0
+      raise ArgumentError if new_volume > 100 || new_volume < -1
     rescue ArgumentError
-      raise VolumeError, "#{new_volume} not an integer 0-100"
+      raise VolumeError, "#{new_volume} not an integer -1-100"
     end
     
     @volume = new_volume
   end
+  
+  def attributes
+    { :state    => state,
+      :mode     => mode,
+      :repeat   => repeat,
+      :tracks   => begin tracks.collect(&:attributes) rescue []; end,
+      :position => position,
+      :seek     => seek,
+      :volume   => volume }
+  end
+  alias_method :as_json, :attributes
 end
 end

data/lib/radiodan/playlist_sync.rb

@@ -1,5 +1,9 @@
+require 'logging'
+
 class Radiodan
 class PlaylistSync
+  include Logging
+  
   class SyncError < Exception; end
   attr_accessor :expected, :current
   attr_reader   :errors
@@ -11,37 +15,57 @@ class PlaylistSync
   end
   
   def sync?
-    prerequisites_check
-    compare_playback_state & compare_playback_mode & compare_playlist
+    if ready?
+      compare_playback_state & compare_playback_mode & compare_tracks & compare_volume
+    end
   end
   
-  private
-  def prerequisites_check
-    raise SyncError, 'No expected playlist to compare to' if expected.nil?
-    raise SyncError, 'No current playlist to compare to'  if current.nil?
+  def ready?
+    if expected.nil? || current.nil?
+      logger.warn 'Require two playlists to compare'
+      false
+    else
+      true
+    end
   end
   
+  private
   def compare_playback_state
     # add rules about when this is ok to be out of sync
     # e.g. sequential expected runs out of tracks and stops
-    compare(:state) { @expected.state == @current.state }
+    report(:state) { @expected.state != @current.state }
   end
 
   def compare_playback_mode
-    compare(:mode) { @expected.mode == @current.mode }
+    report(:mode) { @expected.mode != @current.mode }
   end
 
-  def compare_playlist
-    compare(:playlist) do
-      @expected.size == @current.size && \
-      @expected.tracks == @current.tracks
+  def compare_tracks
+    report(:add_tracks) do
+      # more tracks are added and
+      # original tracks are all in the same position in playlist
+      @expected.size > @current.size && !@current.empty? &&
+      @current.tracks.all? {|x| i=@current.tracks.index(x); @expected.tracks[i] == x }
+    end
+    
+    return false if errors.include?(:add_tracks)
+    
+    report(:new_tracks) do
+      @expected.size != @current.size ||
+      @expected.tracks != @current.tracks
+    end
+  end
+  
+  def compare_volume
+    report(:volume) do
+      @expected.volume != @current.volume
     end
   end
   
-  def compare(type, &blk)
+  def report(type, &blk)
     result = blk.call
-    errors << type unless result
-    result
+    errors << type if result
+    !result
   end
 end
 end

data/lib/radiodan/sinatra.rb

@@ -0,0 +1,13 @@
+require 'sinatra/base'
+require 'sinatra/synchrony'
+
+class Radiodan::Sinatra < Sinatra::Base
+  register Sinatra::Synchrony
+
+  attr_reader :player
+
+  def initialize(player)
+    @player = player
+    super()
+  end
+end

data/lib/radiodan/track.rb

@@ -4,15 +4,18 @@ require 'active_support/core_ext/hash/indifferent_access'
 class Radiodan
 class Track
   class NoFileError < Exception; end
-  extend  Forwardable
+  extend Forwardable
+  attr_reader :attributes
   def_delegators :@attributes, :[]
   
+  
   alias_method :eql?, :==
   
   def initialize(attributes={})
     @attributes = HashWithIndifferentAccess.new(attributes)
-    raise NoFileError, 'No file given for track' \
-      unless @attributes.include?(:file)
+    unless @attributes.has_key?(:file)
+      raise NoFileError, 'No file given for track'
+    end
   end
   
   def ==(other)

data/lib/radiodan/version.rb

@@ -1,3 +1,3 @@
 class Radiodan
-  VERSION = "0.0.4"
+  VERSION = "1.0.0"
 end

data/lib/radiodan.rb

@@ -19,14 +19,13 @@ class Radiodan
     # keep player running on schedule
     raise "no player set" unless player.adapter?
     
+    stop_player_on_exit
+    
     EM.synchrony do
       trap_signals!
+      EventMachine::Synchrony.next_tick { @builder.call_middleware! }
       
-      EM::Synchrony.next_tick do      
-        @builder.call_middleware!
-      end
-
-      EM.now_and_every(seconds: 1) do
+      EM::Synchrony.add_periodic_timer(1) do
         logger.info "SYNC!"
         player.sync if player
       end
@@ -55,17 +54,18 @@ class Radiodan
     end
   end
   
+  def stop_player_on_exit
+    at_exit do
+      logger.info 'Stopping player'
+      stop
+    end
+  end
+  
   def trap_signals!
     %w{INT TERM SIGHUP SIGINT SIGTERM}.each do |signal|
       Signal.trap(signal) do
         logger.info "Trapped #{signal}"
-        EM::Synchrony.next_tick do
-          begin
-            stop
-          ensure
-            EM.stop
-          end
-        end
+        EM.stop
       end
     end
   end

data/radiodan.gemspec

@@ -25,7 +25,10 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'eventmachine',     EM_VERSION
   gem.add_dependency 'em-synchrony',     EM_VERSION
   gem.add_dependency 'em-http-request',  EM_VERSION
-  gem.add_dependency 'em-simple_telnet', '~> 0.0.6'
-  gem.add_dependency 'active_support',   '~> 3.0.0'
-  gem.add_dependency 'i18n',             '~> 0.6.4'
+  gem.add_dependency 'em-simple_telnet',  '~> 0.0.6'
+  gem.add_dependency 'active_support',    '~> 3.0.0'
+  gem.add_dependency 'i18n',              '~> 0.6.4'
+  gem.add_dependency 'thin',              '~> 1.5.1'
+  gem.add_dependency 'sinatra',           '~> 1.4.2'
+  gem.add_dependency 'sinatra-synchrony', '~> 0.4.1'
 end

data/spec/lib/builder_spec.rb

@@ -7,10 +7,10 @@ describe Radiodan::Builder do
     Radiodan::Player.stub(:new).and_return(@player)
   end
 
-  it 'passes a playlist to the player' do
+  it 'passes a playlist to the correct middleware' do
     playlist = mock
 
-    @player.should_receive(:playlist=).with(playlist)
+    Radiodan::Builder.any_instance.should_receive(:use).with(:playlist_to_start, playlist)
 
     builder = Radiodan::Builder.new do |b|
       b.playlist playlist
@@ -30,6 +30,27 @@ describe Radiodan::Builder do
     end
   end
 
+  describe 'logger' do
+    it 'sets a log output and level' do
+      builder = Radiodan::Builder.new do |b|
+        b.log '/dev/null', :fatal
+      end
+
+      Radiodan::Logging.level.should == Logger::FATAL
+      Radiodan::Logging.output.should == '/dev/null'
+    end
+
+    it "has an optional log level" do
+      old_level = Radiodan::Logging.level
+
+      builder = Radiodan::Builder.new do |b|
+        b.log '/dev/null'
+      end
+
+      Radiodan::Logging.level.should == old_level
+    end
+  end
+
   describe 'middleware' do
     it 'creates an instance of middleware and stores internally' do
       class Radiodan::MockMiddle; end
@@ -40,7 +61,7 @@ describe Radiodan::Builder do
       builder = Radiodan::Builder.new do |b|
         b.use :mock_middle, options
       end
-      
+
       builder.middleware.size.should == 1
       builder.middleware.should include middleware
     end

data/spec/lib/logging_spec.rb

@@ -2,7 +2,12 @@ require 'spec_helper'
 require 'logging'
 
 describe Radiodan::Logging do
-  it 'exists' do
-    subject.is_a?(Class)
+  it 'sets a log level' do
+    subject.level = :warn
+    class Test
+      include Radiodan::Logging
+    end
+
+    Test.new.logger.level.should == Logger::WARN
   end
 end

data/spec/lib/player_spec.rb

@@ -19,9 +19,12 @@ describe Radiodan::Player do
 
   context 'playlist' do
     it 'triggers a new playlist event' do
-      playlist = mock
+      playlist = stub
+      adapter  = mock(:player= => nil, :playlist => playlist)
 
+      subject.adapter = adapter
       subject.should_receive(:trigger_event).with(:playlist, playlist)
+      subject.should_receive(:trigger_event).with(:player_state, playlist)
       subject.playlist = playlist
     end
   end
@@ -43,14 +46,15 @@ describe Radiodan::Player do
       subject.sync.should == true
     end
     
-    context 'sync error triggers events' do
+    context 'sync error triggers events:' do
       before :each do
         Radiodan::PlaylistSync.any_instance.stub(:sync?).and_return(false)
+        subject.should_receive(:trigger_event).with(:sync, subject.adapter.playlist)
       end
       
       it 'playback state' do
         Radiodan::PlaylistSync.any_instance.stub(:errors).and_return([:state])
-        subject.playlist.stub(:state => :playing)
+        subject.adapter.playlist.stub(:state => :playing)
       
         subject.should_receive(:trigger_event).with(:play_state, :playing)
         subject.sync.should == false
@@ -58,21 +62,21 @@ describe Radiodan::Player do
       
       it 'playback mode' do
         Radiodan::PlaylistSync.any_instance.stub(:errors).and_return([:mode])
-        subject.playlist.stub(:mode => :random)
+        subject.adapter.playlist.stub(:mode => :random)
       
         subject.should_receive(:trigger_event).with(:play_mode, :random)
         subject.sync.should == false
       end
       
       it 'playlist' do
-        Radiodan::PlaylistSync.any_instance.stub(:errors).and_return([:playlist])
+        Radiodan::PlaylistSync.any_instance.stub(:errors).and_return([:new_tracks])
         
         playlist_content = stub
         subject.playlist.stub(:content => playlist_content)
       
         subject.should_receive(:trigger_event).with(:playlist, subject.playlist)
         subject.sync.should == false
-      end      
+      end
     end
   end
 end

data/spec/lib/playlist_spec.rb

@@ -3,7 +3,12 @@ require 'playlist'
 
 describe Radiodan::Playlist do
   describe 'default attributes' do
-    it 'has a state of playing' do
+    it 'has a state of stop' do
+      subject.state.should == :stop
+    end
+    
+    it 'has a state of play if there are tracks' do
+      subject.tracks << mock
       subject.state.should == :play
     end
 
@@ -33,9 +38,22 @@ describe Radiodan::Playlist do
   end
 
   describe 'playback state' do
-    it 'can be set' do
-      subject.state = :play
-      subject.state.should == :play
+    it 'is always stop if playlist is empty' do
+      subject.empty?.should be_true
+
+      subject.state = :pause
+      subject.state.should == :stop
+      
+      subject.tracks << mock
+      
+      subject.empty?.should be_false
+      subject.state.should == :pause
+    end
+    
+    it 'can be set if tracks are present' do
+      subject.tracks << mock
+      subject.state = :pause
+      subject.state.should == :pause
     end
 
     it 'cannot be set to an unknown state' do
@@ -71,6 +89,17 @@ describe Radiodan::Playlist do
     end
   end
 
+  describe 'random mode' do
+    it 'is off by default' do
+      subject.random?.should == false
+    end
+    
+    it 'can be set' do
+      subject.mode = :random
+      subject.random?.should == true
+    end
+  end
+
   describe 'tracks' do
     it 'creates an array of tracks' do
       subject.tracks = 'x.mp3'
@@ -138,10 +167,23 @@ describe Radiodan::Playlist do
       subject.volume.should == 24
     end
     
-    it 'has a legal range of 0-100' do
+    it 'has a legal range of -1-100' do
       expect { subject.volume = '999' }.to raise_error subject.class::VolumeError
       expect { subject.volume = -29 }.to raise_error subject.class::VolumeError
       subject.volume.should == 100
     end
   end
+  
+  describe 'attributes' do
+    it 'should be well formed' do
+      expected = {:state=>:stop, :mode=>:sequential, :repeat=>false, :tracks=>[], :position=>0, :seek=>0.0, :volume=>100}
+      expect subject.attributes.should == expected
+    end
+    
+    it 'should include track attributes' do
+      subject.tracks << Radiodan::Track.new(:file => 'dan.mp3')
+      expected = {:state=>:play, :mode=>:sequential, :repeat=>false, :tracks=>[{'file' => 'dan.mp3'}], :position=>0, :seek=>0.0, :volume=>100}
+      expect subject.attributes.should == expected      
+    end
+  end
 end