playa 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f36e30ae12935612846af5c4408fdbb4deff034b
-  data.tar.gz: 663edcda3ca27598c588e62e74ea308ae0f2437a
+  metadata.gz: d88b2e0a2af60ed003e3ca5bc18d95d406be0533
+  data.tar.gz: 093d9cc23a42dd2cca5f70c2aa539f16780099e6
 SHA512:
-  metadata.gz: b96dbbc538014492715e2a53450adc15c77b250238f6d1ef987c42c8e046d528df19a3d6070b6a8eac915c9dda370f245a1ff0196d47c52aa1b66e2e2d51cf28
-  data.tar.gz: 85dff0ef33616fc43a2f1572625222c3f96d213798d1d17e4a634278e9ad61bc2f37ac6ac9d31a5cac245e525f3fad5c2354c6db5e588cd9b976905d68173d33
+  metadata.gz: 0b4b7213271270d99c25141699aef79a0b4cd4bd9960827b3aaa60821f7faa83dc8a166649bfd4c417a185e409fede898d2a1785543db5672cece17e742fb9b8
+  data.tar.gz: 982b686d92fc31bfcb8457adbc49864573a5300ec399eaf6db6ba747197d043e0049832e323519f2a1b7915e540c607caed62e26ac4133c197462ea885fee883

data/lib/playa.rb

@@ -11,7 +11,7 @@ module Playa
   class Application
     include Vedeu
 
-    interface 'playlist' do
+    playlist = interface 'playlist' do
       colour  foreground: '#afd700', background: '#000000'
       cursor  false
       width   60
@@ -19,6 +19,27 @@ module Playa
       centred true
     end
 
+    interface 'progress' do
+      colour  foreground: '#afd700', background: '#005a00'
+      cursor  false
+      width   60
+      height  1
+      y       playlist.geometry.top - 2
+      x       playlist.geometry.left
+      centred false
+      delay   0.5
+    end
+
+    interface 'status' do
+      colour  foreground: '#d70000', background: '#000000'
+      cursor  false
+      width   60
+      height  1
+      y       playlist.geometry.bottom + 1
+      x       playlist.geometry.left
+      centred false
+    end
+
     def self.start(args = [])
       Controller.new(args)
 

data/lib/playa/controller.rb

@@ -1,3 +1,7 @@
+require 'playa/playlist_view'
+require 'playa/progress_view'
+require 'playa/status_view'
+
 module Playa
   class Controller
     include Vedeu
@@ -6,7 +10,13 @@ module Playa
       @player = Player.new
 
       event :update do
-        @view = View.render(menu.view)
+        PlaylistView.render(menu)
+        StatusView.render
+      end
+
+      event :progress_update, 0.5 do
+        ProgressView.render(@player)
+        trigger(:refresh)
       end
 
       event :select do |track|
@@ -33,8 +43,13 @@ module Playa
         trigger(:update)
       end
 
-      @args = args
-      @view = View.render(menu.view)
+      @player.events.on(:position_change) { trigger(:progress_update) }
+      @player.events.on(:complete)        { trigger(:complete) }
+
+      @args          = args
+      @playlist_view = PlaylistView.render(menu)
+      @status_view   = StatusView.render
+      @progress_view = ProgressView.render(@player)
     end
 
     private

data/lib/playa/player.rb

@@ -49,13 +49,27 @@ module Playa
       player.position
     end
 
+    def progress
+      if playing?
+        counter / @track.duration
+      else
+        0
+      end
+    end
+
     def level
       player.level
     end
 
+    def events
+      player.events
+    end
+
     private
 
     def open(track)
+      @track = track
+
       player.load(track.filename)
     end
 

data/lib/playa/playlist_view.rb

@@ -0,0 +1,19 @@
+require 'playa/view'
+
+module Playa
+  class PlaylistView < View
+    private
+
+    def output
+      [ 'playlist', playlist ]
+    end
+
+    def type
+      :menu
+    end
+
+    def playlist
+      object.view.map { |sel, cur, item| [ sel, cur, item.title ] }
+    end
+  end
+end

data/lib/playa/progress_view.rb

@@ -0,0 +1,23 @@
+require 'playa/view'
+
+module Playa
+  class ProgressView < View
+    private
+
+    def output
+      { 'progress' => [ progress ] }
+    end
+
+    def type
+      :raw
+    end
+
+    def progress
+      '|' * (object.progress * view_width).ceil
+    end
+
+    def view_width
+      @_width ||= Vedeu.view('progress').width
+    end
+  end
+end

data/lib/playa/status_view.rb

@@ -0,0 +1,19 @@
+require 'playa/view'
+
+module Playa
+  class StatusView < View
+    private
+
+    def output
+      { 'status' => status }
+    end
+
+    def type
+      :raw
+    end
+
+    def status
+      [ "\u{25B2} Previous   \u{25BC} Next   \u{21B2} Select   \u{2395} Pause   Q Quit" ]
+    end
+  end
+end

data/lib/playa/view.rb

@@ -1,27 +1,27 @@
 module Playa
   class View
-    def self.render(menu)
-      new(menu).render
+    def self.render(object = nil)
+      new(object).render
     end
 
-    def initialize(menu)
-      @menu = menu
+    def initialize(object = nil)
+      @object = object
     end
 
     def render
-      Vedeu::Parser.parse([ interface, playlist ])
+      Vedeu::View.render(type, output)
     end
 
     private
 
-    attr_reader :menu
+    attr_reader :object
 
-    def playlist
-      menu.map { |sel, cur, item| [ sel, cur, item.title ] }
+    def output
+      fail NotImplemented, 'Implement #output on your subclass of Playa::View.'
     end
 
-    def interface
-      'playlist'
+    def type
+      fail NotImplemented, 'Implement #type on your subclass of Playa::View.'
     end
   end
 end

data/lib/playa/views/status.erb

@@ -0,0 +1,3 @@
+<%- colour(foreground: '#a5f500', background: '#000000') do -%>
+  <%- menu.item -%>
+<%- end -%>

data/playa.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'playa'
-  spec.version       = '0.0.6'
+  spec.version       = '0.0.7'
   spec.authors       = ['Gavin Laking']
   spec.email         = ['gavinlaking@gmail.com']
   spec.summary       = 'Plays mp3s from a directory.'
@@ -22,11 +22,12 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'guard-minitest',     '2.3.1'
   spec.add_development_dependency 'minitest',           '5.4.0'
   spec.add_development_dependency 'minitest-reporters', '1.0.5'
+  spec.add_development_dependency 'mocha',              '1.1.0'
   spec.add_development_dependency 'pry',                '0.10.0'
   spec.add_development_dependency 'rake',               '10.3.2'
   spec.add_development_dependency 'simplecov',          '0.9.0'
 
   spec.add_dependency 'audite',             '0.3.0'
   spec.add_dependency 'ruby-mp3info',       '0.8.4'
-  spec.add_dependency 'vedeu',              '0.1.0'
+  spec.add_dependency 'vedeu',              '0.1.2'
 end

data/test/lib/playa/player_test.rb

@@ -3,10 +3,70 @@ require 'playa/player'
 
 module Playa
   describe Player do
+    let(:player) { Player.new }
+    let(:track)  { stub(filename: 'test/support/parkwalk.mp3') }
+
     describe '#initialize' do
       it 'returns an instance of itself' do
         Player.new.must_be_instance_of(Player)
       end
     end
+
+    describe '#play' do
+      it 'returns an instance of Portaudio' do
+        player.play.must_be_instance_of(Portaudio)
+      end
+    end
+
+    describe '#stop' do
+      it 'returns nil when nothing is playing' do
+        player.stop.must_be_instance_of(NilClass)
+      end
+    end
+
+    describe '#rewind' do
+      it '' do
+        skip # spf
+        player.rewind.must_be_instance_of(NilClass)
+      end
+    end
+
+    describe '#forward' do
+      it '' do
+        skip # spf
+        player.forward.must_be_instance_of(NilClass)
+      end
+    end
+
+    describe '#toggle' do
+      it '' do
+        player.toggle.must_be_instance_of(Portaudio)
+      end
+    end
+
+    describe '#playing?' do
+      it 'returns false when nothing is playing' do
+        player.playing?.must_be_instance_of(FalseClass)
+      end
+
+      it 'returns true when a track is playing' do
+        skip
+        player.playing?.must_be_instance_of(TrueClass)
+      end
+    end
+
+    describe '#counter' do
+      it '' do
+        skip
+        player.counter.must_be_instance_of(NilClass)
+      end
+    end
+
+    describe '#level' do
+      it 'returns the volume level of the audio currently under ' \
+         'the play head' do
+        player.level.must_be_instance_of(Float)
+      end
+    end
   end
 end

data/test/test_helper.rb

@@ -10,6 +10,8 @@ end unless ENV['no_simplecov']
 
 require 'playa'
 
+require 'mocha/setup'
+
 GC.disable
 
 # commented out by default (makes tests slower)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: playa
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Gavin Laking
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-27 00:00:00.000000000 Z
+date: 2014-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.0.5
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -156,14 +170,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.2
 description: An example app using Vedeu.
 email:
 - gavinlaking@gmail.com
@@ -184,9 +198,14 @@ files:
 - lib/playa.rb
 - lib/playa/controller.rb
 - lib/playa/player.rb
+- lib/playa/playlist_view.rb
+- lib/playa/progress_view.rb
+- lib/playa/status_view.rb
 - lib/playa/track.rb
 - lib/playa/track_collection.rb
 - lib/playa/view.rb
+- lib/playa/views/playlist.erb
+- lib/playa/views/status.erb
 - playa.gemspec
 - test/lib/playa/controller_test.rb
 - test/lib/playa/player_test.rb