radiodan 0.0.3 → 0.0.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    radiodan (0.0.3)
+    radiodan (0.0.4)
       active_support (~> 3.0.0)
       em-http-request (~> 1.0.3)
       em-simple_telnet (~> 0.0.6)
@@ -15,7 +15,7 @@ GEM
     active_support (3.0.0)
       activesupport (= 3.0.0)
     activesupport (3.0.0)
-    addressable (2.3.4)
+    addressable (2.3.5)
     coderay (1.0.9)
     cookiejar (0.3.0)
     diff-lcs (1.2.4)
@@ -27,7 +27,7 @@ GEM
       http_parser.rb (>= 0.5.3)
     em-simple_telnet (0.0.9)
       eventmachine (>= 1.0.0)
-    em-socksify (0.2.1)
+    em-socksify (0.3.0)
       eventmachine (>= 1.0.0.beta.4)
     em-synchrony (1.0.3)
       eventmachine (>= 1.0.0.beta.1)

data/TODO

@@ -1,17 +1,10 @@
 * Player
-  - explicitly set playlist when a new event is triggered, don't attempt to sync
-  - #sync reads playlist_sync methods
-    + #errors to determine which events to trigger
-    + Know when to restart playlists that repeat
-    + Resume playlists from last position
+  - #sync determines which events to trigger under which circumstances
+  - Set random / repeat flags in MPD
+  - Resume playlists from last position / seek point
+* Search for music in library, return playlist / array of tracks
 * MPD Adapter
   - Figure out a way of testing interface with playlist object
-* PlaylistSync
-  - Attributes to sync:
-    + Position in playlist
-    + Seek position for current item in playlist
-  - Differentiate when a playlist 
-    + is new (make this match exactly) 
-    + is not (keep in bounds of acceptability)
 * Panic Mode
   - Add tests
+* Remove eventmachine?

data/lib/radiodan/adapter/mpd.rb

@@ -33,7 +33,7 @@ class MPD
     
     # register new playlist events
     @player.register_event :playlist do |playlist|
-      EM.next_tick { self.playlist = playlist }
+      self.playlist = playlist
     end
   end
 

data/lib/radiodan/adapter/mpd/playlist_parser.rb

@@ -24,8 +24,7 @@ module PlaylistParser
   end
   
   def self.parse_tracks(tracks)
-    p tracks.first.inspect
-    tracks.collect{ |t| Track.new(t) }
+    tracks.collect{ |t| Track.new(t) } rescue []
   end
 
   def self.parse_mode(attributes)

data/lib/radiodan/builder.rb

@@ -1,5 +1,6 @@
 require 'active_support'
 require 'active_support/core_ext/string'
+require 'pathname'
 
 require 'logging'
 require 'player'
@@ -45,7 +46,7 @@ class Builder
       klass_path ||= false
       raise if klass_path
       
-      # attempt to require from middleware
+      # attempt to require from given path
       klass_path = Pathname.new(File.join(File.dirname(__FILE__), klass_type, "#{klass.underscore}.rb"))
       require klass_path if klass_path.exist?
 

data/lib/radiodan/event_binding.rb

@@ -17,7 +17,7 @@ module EventBinding
     end
     
     bindings.each do |blk|
-      blk.call(data)
+      EM.next_tick { blk.call(data) }
     end
   end
   

data/lib/radiodan/middleware/panic.rb

@@ -27,12 +27,15 @@ class Panic
     
     original_state = @player.playlist
   
-    Thread.new do
-      logger.debug "panic for #{@timeout} seconds"
-      @player.playlist = @playlist
-      sleep(@timeout)
-      return_to_state original_state
-    end
+    EM.defer \
+      proc {
+        logger.debug "panic for #{@timeout} seconds"
+        @player.playlist = @playlist
+        sleep(@timeout)
+      }, 
+      proc {
+        return_to_state original_state
+      }
   
     @panic
   end

data/lib/radiodan/player.rb

@@ -1,13 +1,16 @@
+require 'forwardable'
 require 'logging'
 require 'event_binding'
 require 'playlist_sync'
 
 class Radiodan
 class Player
+  extend Forwardable
   include Logging
   include EventBinding
   
   attr_reader :adapter, :playlist
+  def_delegators :adapter, :stop
   
   def adapter=(adapter)
     @adapter = adapter

data/lib/radiodan/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: radiodan
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-29 00:00:00.000000000 Z
+date: 2013-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -228,7 +228,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1823780625906972507
+      hash: -580184109337175163
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -237,7 +237,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1823780625906972507
+      hash: -580184109337175163
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23