playa 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 913d76574de3fa2c25f99ac58d03e30cf8c792d2
-  data.tar.gz: 906ce4a9acb9f163008d234fae9a23ad98fea0c0
+  metadata.gz: 4e33baff6fbf21a8320be1bdbe56eda3449c5924
+  data.tar.gz: 5282c77482a2a00d5bd78266aae920cc04e98354
 SHA512:
-  metadata.gz: 9399dc3fc05c8c3e015dabeb625d1be5ef8c3b80df97572084bca323cbedb83b2029e3f3e264a28573d15bfde05bf47564960c6d95d567f4ba3cc22d51e10c71
-  data.tar.gz: 44763a0dfed2dad5c9a97c890e7251104f8946944903f66f97576201b5237fb93f77aeefc3bc298c3e80b902fccd951c23c9a98a650f6c9dd40c48f926792e6f
+  metadata.gz: f5891878f72df393c7d047adae11057797f10c9d7f82198a2ed3a07bb6454df965e5fe34230e8abb5856dda78085cb7f93e1612472a24497d6a88d1d0f641016
+  data.tar.gz: 0183b6a9797e3293baf9674cf7405778b14bc6df0dbe620990c7cfebd2b19c56299b212a91ec4f077df1539bba75b1dc99166f15b27a066f22665e35768b574a

data/lib/playa/controller.rb

@@ -1,6 +1,6 @@
-require 'playa/playlist_view'
-require 'playa/progress_view'
-require 'playa/status_view'
+require 'playa/views/playlist_view'
+require 'playa/views/progress_view'
+require 'playa/views/status_view'
 
 module Playa
   class Controller

data/lib/playa/views/playlist_view.rb

@@ -0,0 +1,33 @@
+require 'playa/view'
+
+module Playa
+  class PlaylistView < View
+    include Vedeu
+
+    private
+
+    def type
+      :dsl
+    end
+
+    def output
+      view 'playlist' do
+        self.object.view.each do |sel, cur, item|
+          if sel && cur
+            line { text "\u{25B6}> #{item.title}" }
+
+          elsif cur
+            line { text " > #{item.title}" }
+
+          elsif sel
+            line { text "\u{25B6}  #{item.title}" }
+
+          else
+            line { text "   #{item.title}" }
+
+          end
+        end
+      end
+    end
+  end
+end

data/lib/playa/views/progress_view.rb

@@ -0,0 +1,78 @@
+require 'playa/view'
+
+module Playa
+  class ProgressView < View
+    include Vedeu
+
+    private
+
+    def type
+      :dsl
+    end
+
+    def output
+      if object.track
+        track_loaded
+
+      else
+        no_track_loaded
+
+      end
+    end
+
+    def track_loaded
+      view 'progress' do
+        line do
+          stream do
+            width progress_width
+            text  progress_bar
+          end
+
+          stream do
+            width timer_width
+            text  timer
+            align :right
+          end
+        end
+      end
+    end
+
+    def no_track_loaded
+      view 'progress' do
+        line do
+          stream do
+            width view_width
+            text  ' '
+          end
+        end
+      end
+    end
+
+    def progress_width
+      view_width - timer_width - 1
+    end
+
+    def progress_bar
+      "\u{25FC}" * (object.progress * progress_width).ceil
+    end
+
+    def timer_width
+      timer.size + 1
+    end
+
+    def timer
+      remaining = (object.track.duration - object.counter).floor
+      mm, ss    = remaining.divmod(60)
+      hh, mm    = mm.divmod(60)
+      mins      = mm.to_s.rjust(2, '0')
+      secs      = ss.to_s.rjust(2, '0')
+
+      [mins, secs].join(":")
+    end
+
+    # TODO: playa knows too much here...
+    def view_width
+      @_width ||= Vedeu.with('progress').geometry.width
+    end
+  end
+end

data/lib/playa/views/status_view.rb

@@ -0,0 +1,64 @@
+require 'playa/view'
+
+module Playa
+  class StatusView < View
+    include Vedeu
+
+    private
+
+    def type
+      :dsl
+    end
+
+    def output
+      view 'status' do
+        line do
+          stream do
+            colour foreground: '#ff0000'
+            text   "\u{25B2}"
+          end
+          stream do
+            colour foreground: '#ffffff'
+            text   ' Prev  '
+          end
+
+          stream do
+            colour foreground: '#ff0000'
+            text   "\u{25BC}"
+          end
+          stream do
+            colour foreground: '#ffffff'
+            text   ' Next  '
+          end
+
+          stream do
+            colour foreground: '#ff0000'
+            text   "\u{21B2}"
+          end
+          stream do
+            colour foreground: '#ffffff'
+            text   ' Select  '
+          end
+
+          stream do
+            colour foreground: '#ff0000'
+            text   "\u{2395}"
+          end
+          stream do
+            colour foreground: '#ffffff'
+            text   ' Pause  '
+          end
+
+          stream do
+            colour foreground: '#ff0000'
+            text   "Q"
+          end
+          stream do
+            colour foreground: '#ffffff'
+            text   ' Quit  '
+          end
+        end
+      end
+    end
+  end
+end

data/lib/playa.rb

@@ -20,14 +20,14 @@ module Playa
     end
 
     interface 'progress' do
-      colour  foreground: '#afd700', background: '#005a00'
+      colour  foreground: '#005aff', background: '#000000'
       cursor  false
       width   60
       height  1
       y       playlist.geometry.top - 2
       x       playlist.geometry.left
       centred false
-      delay   0.5
+      delay   1.0
     end
 
     interface 'status' do

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.9'
+  spec.version       = '0.0.10'
   spec.authors       = ['Gavin Laking']
   spec.email         = ['gavinlaking@gmail.com']
   spec.summary       = 'Plays mp3s from a directory.'

data/test/lib/playa/{playlist_view.rb → views/playlist_view_test.rb}

@@ -1,5 +1,5 @@
 require 'test_helper'
-require 'playa/playlist_view'
+require 'playa/views/playlist_view'
 
 module Playa
   describe PlaylistView do

data/test/lib/playa/{progress_view_test.rb → views/progress_view_test.rb}

@@ -1,5 +1,5 @@
 require 'test_helper'
-require 'playa/progress_view'
+require 'playa/views/progress_view'
 
 module Playa
   describe ProgressView do

data/test/lib/playa/{status_view_test.rb → views/status_view_test.rb}

@@ -1,5 +1,5 @@
 require 'test_helper'
-require 'playa/status_view'
+require 'playa/views/status_view'
 
 module Playa
   describe StatusView do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: playa
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Gavin Laking
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-06 00:00:00.000000000 Z
+date: 2014-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -197,25 +197,22 @@ 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
-- lib/playa/views/status_copy.erb
+- lib/playa/views/playlist_view.rb
+- lib/playa/views/progress_view.rb
+- lib/playa/views/status_view.rb
 - playa.gemspec
 - screenshot.png
 - test/lib/playa/controller_test.rb
 - test/lib/playa/player_test.rb
-- test/lib/playa/playlist_view.rb
-- test/lib/playa/progress_view_test.rb
-- test/lib/playa/status_view_test.rb
 - test/lib/playa/track_collection_test.rb
 - test/lib/playa/track_test.rb
 - test/lib/playa/view_test.rb
+- test/lib/playa/views/playlist_view_test.rb
+- test/lib/playa/views/progress_view_test.rb
+- test/lib/playa/views/status_view_test.rb
 - test/lib/playa_test.rb
 - test/support/parkwalk.mp3
 - test/test_helper.rb
@@ -246,12 +243,12 @@ summary: Plays mp3s from a directory.
 test_files:
 - test/lib/playa/controller_test.rb
 - test/lib/playa/player_test.rb
-- test/lib/playa/playlist_view.rb
-- test/lib/playa/progress_view_test.rb
-- test/lib/playa/status_view_test.rb
 - test/lib/playa/track_collection_test.rb
 - test/lib/playa/track_test.rb
 - test/lib/playa/view_test.rb
+- test/lib/playa/views/playlist_view_test.rb
+- test/lib/playa/views/progress_view_test.rb
+- test/lib/playa/views/status_view_test.rb
 - test/lib/playa_test.rb
 - test/support/parkwalk.mp3
 - test/test_helper.rb

data/lib/playa/playlist_view.rb

@@ -1,19 +0,0 @@
-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

@@ -1,49 +0,0 @@
-require 'playa/view'
-
-module Playa
-  class ProgressView < View
-    private
-
-    def output
-      { 'progress' => [ progress ] }
-    end
-
-    def type
-      :raw
-    end
-
-    def progress
-      if object.track
-        remaining = (object.track.duration - object.counter).floor
-        mm, ss    = remaining.divmod(60)
-        hh, mm    = mm.divmod(60)
-        mins      = mm.to_s.rjust(2, '0')
-        secs      = ss.to_s.rjust(2, '0')
-        time      = [mins, secs].join(":")
-        pwidth    = view_width - time.size - 1
-        pbar      = '|' * (object.progress * pwidth).ceil
-
-        {
-          streams: [
-            {
-              text:  pbar,
-              width: pwidth,
-              align: :left
-            }, {
-              text:  time,
-              width: time.size + 1,
-              align: :right
-            }
-          ]
-        }
-      else
-        { streams: [{ text: ' ', width: view_width }] }
-      end
-    end
-
-    # TODO: playa knows too much here...
-    def view_width
-      @_width ||= Vedeu.with('progress').geometry.width
-    end
-  end
-end

data/lib/playa/status_view.rb

@@ -1,31 +0,0 @@
-require 'playa/view'
-
-module Playa
-  class StatusView < View
-    # def interface
-    #   'status'
-    # end
-
-    # def path
-    #   File.expand_path('../views/status.erb', __FILE__)
-    # end
-
-    private
-
-    # def output
-    #   self
-    # end
-
-    def output
-      { 'status' => status }
-    end
-
-    def type
-      :raw
-    end
-
-    def status
-      [ "\u{25B2} Prev  \u{25BC} Next  \u{21B2} Select  \u{2395} Pause   Q Quit" ]
-    end
-  end
-end

data/lib/playa/views/status.erb

@@ -1 +0,0 @@
-<%= foreground('#ffff00') { "\u{25B2}" } -%> Prev   <%= foreground('#ffff00') { "\u{25BC}" } -%> Next  <%= foreground('#ffff00') { "\u{21B2}" } -%> Select  <%= foreground('#ffff00') { "\u{2395}" } -%> Pause  <%= foreground('#ffff00') { "Q" } -%> Quit

data/lib/playa/views/status_copy.erb

@@ -1,7 +0,0 @@
-<%- line do -%>
-  <%= foreground('#ffff00') { "\u{25B2}" } -%> Prev
-  <%= foreground('#ffff00') { "\u{25BC}" } -%> Next
-  <%= foreground('#ffff00') { "\u{21B2}" } -%> Select
-  <%= foreground('#ffff00') { "\u{2395}" } -%> Pause
-  <%= foreground('#ffff00') { "Q" } -%> Quit
-<%- end -%>