qtunes 0.0.5 → 0.0.6

data/.gitignore

@@ -3,3 +3,4 @@
 Gemfile.lock
 pkg/*
 .rvmrc
+.sass-cache

data/lib/qtunes/server.rb

@@ -4,6 +4,8 @@ require 'rack-flash'
 require 'digest/sha2'
 require 'audioinfo'
 require 'qtunes/paginatable'
+require 'compass'
+require 'susy'
 
 module Qtunes
   class Server < Sinatra::Base
@@ -17,7 +19,13 @@ module Qtunes
     set :static, true
 
     before do
-      @current = self.class.song_to_hash(player.file) rescue {}
+      @current = self.class.song_to_hash(player.file)
+    end
+
+    get '/screen.css' do
+      require 'susy'
+      content_type 'text/css', :charset => 'utf-8'
+      scss :screen
     end
 
     get '/' do
@@ -27,8 +35,10 @@ module Qtunes
     end
     
     get '/library' do
-      @page = params[:page] ? params[:page].to_i : 1
-      @songs = library.values.extend(Qtunes::Paginatable).page(@page)
+      #@page = params[:page] ? params[:page].to_i : 1
+      @page = params[:page] || 'a'
+      #@songs = library.values.extend(Qtunes::Paginatable).page(@page)
+      @songs = library_by_first_letter_of_artist[@page] || []
 
       erb :songs
     end
@@ -68,6 +78,21 @@ module Qtunes
       self.class.queue
     end
 
+    def self.library_by_first_letter_of_artist
+      @library_by_first_letter_of_artist ||= begin
+        result = Hash.new{|h,k| h[k] = Array.new }
+        library.values.inject(result) do |res,song| 
+          key = song['artist'] ? string_to_ascii(song['artist']).downcase[0,1] : ''
+          res[key] << song
+          res
+        end
+      end
+    end
+
+    def library_by_first_letter_of_artist
+      self.class.library_by_first_letter_of_artist
+    end
+
     def self.library
       @library ||= begin
         print "Loading library..."
@@ -81,6 +106,15 @@ module Qtunes
       self.class.library
     end
 
+    def self.string_to_ascii(s)
+      require 'unicode'
+      Unicode::normalize_KD(s).gsub(/[^A-Za-z0-9\s_-]+/,'')
+    end
+
+    def string_to_ascii(s)
+      self.class.string_to_ascii(s)
+    end
+
     helpers do
       include Rack::Utils
       alias_method :h, :escape_html
@@ -98,8 +132,22 @@ module Qtunes
         Digest::SHA256.hexdigest(path)[0,10]
       end
 
+
+      # Get the information for a song.
+      #
+      # path  - String representing location of song
+      #
+      # Examples
+      #
+      #   song_to_hash '~/Music/song2.mp3'
+      #   # => {'path' => '~/Music/song2.mp3', 'id' => '12345', ...}
+      #
+      # Returns Hash with info of song or empty Hash in case path is nil.
       def self.song_to_hash(path)
         result = {}
+
+        return result if not path
+
         begin
           result.merge!(AudioInfo.open(path).to_h)
         rescue AudioInfoError
@@ -121,6 +169,12 @@ module Qtunes
     configure do
       puts "Configure"
 
+      Compass.configuration do |config|
+        config.project_path = dir
+        config.sass_dir = "#{dir}/server/views"
+      end
+      set :scss, Compass.sass_engine_options
+
       Qtunes::Server.library
     end
   end

data/lib/qtunes/server/views/_base.scss

@@ -0,0 +1,12 @@
+// Imports -------------------------------------------------------------------
+
+@import "susy";
+
+// Grid ----------------------------------------------------------------------
+
+$total-cols             : 12;
+$col-width              : 6em;
+$gutter-width           : 1em;
+$side-gutter-width      : $gutter-width;
+
+$show-grid-backgrounds  : true;

data/lib/qtunes/server/views/_paginate_artists.erb

@@ -0,0 +1,9 @@
+<div class='pagination'>
+<% ('a'..'z').each do |e| %>
+  <% if library_by_first_letter_of_artist.has_key?(e) %>
+    <a href="?page=<%= e %>"><%= e %></a>
+  <% else %>
+    <span><%= e %></span>
+  <% end %>
+<% end %>
+</div>

data/lib/qtunes/server/views/_song.erb

@@ -3,15 +3,12 @@
 %>
 <div class="<%= klasses.join(' ') %>">
   <% if not defined?(current) %>
-    <span class="controls">
-      <% if queue[song['id']] %>
-        <a href="/remove/<%= song['id'] %>" title="remove from queue">-</a>
-      <% else %>
-        <a href="/add/<%= song['id'] %>" title="add to queue">+</a>
-      <% end %>
-    </span>
+    <% if queue[song['id']] %>
+      <a href="/remove/<%= song['id'] %>" title="remove from queue">--</a>
+    <% else %>
+      <a href="/add/<%= song['id'] %>" title="add to queue">+</a>
+    <% end %>
   <% end %>
-
   <span class="artist"><%= song['artist'] && !song['artist'].empty? ? song['artist'] : song['path'] %></span>
   <span class="title"><%= song['title'] %></span>
   <span class="album"><%= song['album'] %></span>

data/lib/qtunes/server/views/layout.erb

@@ -2,24 +2,34 @@
 <html>
 <head>
   <title>Qtunes</title>
-  <link rel="stylesheet" href="/base.css" type="text/css" />
+  <link rel="stylesheet" href="/screen.css" type="text/css" />
 </head>
 
 <body>
-  <h1><a href='/'>Qtunes</a></h1>
+  <div class='container'>
+    <div class='header'>
+      <h1><a href='/'>Qtunes</a></h1>
 
-  <div class="navigation">
-    <a href="/">Queue</a>
-    <a href="/library">Library</a>
-  </div>
+      <ul class="nav">
+        <li>
+          <a href="/">Queue (<%= queue.size %>)</a>
+        </li>
+        <li>
+          <a href="/library">Library</a>
+        </li>
+      </ul>
+    </div>
 
-  <% if flash[:notice] %>
-    <p class="notice"><%= flash[:notice] %></p>
-  <% end %>
-  <% if flash[:error] %>
-    <p class="error"><%= flash[:error] %></p>
-  <% end %>
+    <div class='main'>
+      <% if flash[:notice] %>
+        <p class="flash notice"><%= flash[:notice] %></p>
+      <% end %>
+      <% if flash[:error] %>
+        <p class="flash error"><%= flash[:error] %></p>
+      <% end %>
 
-  <%= yield %>
+      <%= yield %>
+    </div>
+  </div>
 </body>
 </html>

data/lib/qtunes/server/views/screen.scss

@@ -0,0 +1,116 @@
+// Imports -------------------------------------------------------------------
+
+@import "base";
+@import "compass/reset";
+@import "compass/typography/lists/horizontal-list";
+
+
+html { 
+  font-family: Helmet, Freesans, sans-serif;
+}
+
+body { 
+  color: #5E7894;
+}
+
+a { 
+  color: #5E7894;
+  text-decoration: none;
+  &:hover {
+    color: #000;
+  }
+}
+
+.flash { 
+  font-weight: bold;
+  text-align: center;
+  border: 1px solid #485460;
+  padding: 10px;
+}
+
+
+h1 { 
+  padding: 0;
+  letter-spacing: -3px;
+  color: #000;
+  font-size: 4em;
+  font-weight: bold;
+  a {
+    display: block;
+  }
+}
+
+/* Layout ------------------------------------------------------------------*/
+.container {
+  @include container;
+  //@include susy-grid-background;
+  width:100%;
+}
+
+.header { 
+  @include full;
+
+  .nav { 
+    @include horizontal-list;
+    margin: 10px 0px;
+    font-weight: bold;
+    font-size: 1.5em;
+    li { 
+      padding-right: 30px;
+    }
+  }
+}
+
+.main { 
+  @include full;
+}
+
+.pagination {
+  a { 
+    font-size: 3em;
+    font-weight: bold;
+    text-transform: uppercase;
+    padding: 0px 4px;
+  }
+}
+
+.song {
+  letter-spacing: -1px;
+  background-color: #D0E4FA;
+  border-top: 2px solid #fff;
+  padding: .5em 0px .5em 10px;
+  font-size: 1.25em;
+  font-weight: bold;
+  font-size: 2.2em;
+
+  &.current, &.current * { 
+    background-color: #485460;
+    color: #FFF !important;
+  }
+
+  .artist { 
+    letter-spacing: -2px;
+    color: #485460;
+    font-size: 150%;
+  }
+
+  .title { 
+    padding-left: 10px;
+    font-size: 120%;
+  }
+
+  .album { 
+    margin-left: 10px;
+    letter-spacing: -2px;
+    font-size: 110%;
+    color: grey;
+  }
+
+  a {
+    float: right;
+    font-size: 130%;
+    font-family: Arial black;
+    letter-spacing: -5px;
+    padding-right: 10px;
+  }
+}

data/lib/qtunes/server/views/songs.erb

@@ -1,22 +1,15 @@
 <%= erb :_song, {}, {:song => @current, :current => true} %>
 
-<% if @page %>
-  <a href="?page=<%= @page - 1 %>">Previous</a>
-  <a href="?page=<%= @page + 1 %>">Next</a>
-<% end %>
+<% if @songs.any? %>
+  <%= erb :_paginate_artists if @page %>
 
-<% @songs.each_with_index do |song,ix| %>
-  <%= erb :_song, {}, {:song => song} %>
-<% end %>
+  <% @songs.each_with_index do |song,ix| %>
+    <%= erb :_song, {}, {:song => song} %>
+  <% end %>
 
-<% if @songs.empty? %>
+  <%= erb :_paginate_artists if @page %>
+<% else %>
   <div class="content">
     No more songs found!
   </div>
 <% end %>
-
-<% if @page %>
-  <a href="?page=<%= @page - 1 %>">Previous</a>
-  <a href="?page=<%= @page + 1 %>">Next</a>
-<% end %>
-

data/lib/qtunes/version.rb

@@ -1,3 +1,3 @@
 module Qtunes
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/qtunes.gemspec

@@ -19,10 +19,13 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_development_dependency "shotgun"
+  s.add_development_dependency "compass"
+  s.add_development_dependency "compass-susy-plugin"
 
   s.add_runtime_dependency "sinatra", "~> 1.2.6"
   s.add_runtime_dependency "rack-flash", "~> 0.1.2"
   s.add_runtime_dependency "thor", "~> 0.14.6"
   s.add_runtime_dependency "cocaine", "~> 0.2.0"
   s.add_runtime_dependency "ruby-audioinfo", "~> 0.1.7"
+  s.add_runtime_dependency "unicode", "~> 0.4.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qtunes
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-31 00:00:00.000000000 +02:00
+date: 2011-09-02 00:00:00.000000000 +02:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shotgun
-  requirement: &21068820 !ruby/object:Gem::Requirement
+  requirement: &14671020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,32 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21068820
+  version_requirements: *14671020
+- !ruby/object:Gem::Dependency
+  name: compass
+  requirement: &14670600 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *14670600
+- !ruby/object:Gem::Dependency
+  name: compass-susy-plugin
+  requirement: &14670180 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *14670180
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &21068320 !ruby/object:Gem::Requirement
+  requirement: &14669680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +55,10 @@ dependencies:
         version: 1.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *21068320
+  version_requirements: *14669680
 - !ruby/object:Gem::Dependency
   name: rack-flash
-  requirement: &21067820 !ruby/object:Gem::Requirement
+  requirement: &14669180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +66,10 @@ dependencies:
         version: 0.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *21067820
+  version_requirements: *14669180
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &21067360 !ruby/object:Gem::Requirement
+  requirement: &14668720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +77,10 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *21067360
+  version_requirements: *14668720
 - !ruby/object:Gem::Dependency
   name: cocaine
-  requirement: &21066900 !ruby/object:Gem::Requirement
+  requirement: &14668260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +88,10 @@ dependencies:
         version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *21066900
+  version_requirements: *14668260
 - !ruby/object:Gem::Dependency
   name: ruby-audioinfo
-  requirement: &21066440 !ruby/object:Gem::Requirement
+  requirement: &14667800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,7 +99,18 @@ dependencies:
         version: 0.1.7
   type: :runtime
   prerelease: false
-  version_requirements: *21066440
+  version_requirements: *14667800
+- !ruby/object:Gem::Dependency
+  name: unicode
+  requirement: &14667340 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *14667340
 description: add songs to queue, let cmus eat it
 email:
 - gert@thinkcreate.nl
@@ -96,9 +129,11 @@ files:
 - lib/qtunes/paginatable.rb
 - lib/qtunes/player.rb
 - lib/qtunes/server.rb
-- lib/qtunes/server/public/base.css
+- lib/qtunes/server/views/_base.scss
+- lib/qtunes/server/views/_paginate_artists.erb
 - lib/qtunes/server/views/_song.erb
 - lib/qtunes/server/views/layout.erb
+- lib/qtunes/server/views/screen.scss
 - lib/qtunes/server/views/songs.erb
 - lib/qtunes/version.rb
 - qtunes.gemspec

data/lib/qtunes/server/public/base.css

@@ -1,133 +0,0 @@
-/*
-
- dark: 485460
-       3D72AA
-       5E7894
-       438FDF
-       D0E4FA
-*/
-
-html{
-  font-family: Helvetica;
-}
-body{
-  margin: 0;
-  padding: 0;
-  color: #5E7894;
-}
-h1{
-  margin: 1em 10px 0 10px;
-  padding: 0;
-  letter-spacing: -3px;
-  color: #000;
-}
-a{
-  color: #5E7894;
-  text-decoration: none;
-}
-a:hover{
-  color: #000;
-}
-
-.navigation{
-  text-align: left;
-  padding: 2px 10px;
-  font-weight: bold;
-  letter-spacing: -1px;
-  font-size: 1.4em;
-}
-.navigation a{
-  color: #485460;
-  padding-left: 10px;
-  text-decoration: none;
-}
-.navigation form{
-  display: inline;
-}
-.navigation input{
-  vertical-align: top;
-  width: 250px;
-}
-.content{
-  padding: 10px;
-  background-color: #D0E4FA;
-}
-.gravatar{
-  -webkit-border-radius: 5px;
-}
-
-/*
- * SONGS
- */
-.songs{
-
-}
-.song{
-  letter-spacing: -1px;
-  background-color: #D0E4FA;
-  border-top: 2px solid #fff;
-  padding: .5em 10px;
-  font-size: 1.25em;
-  font-weight: bold;
-}
-.song.current, .song.current * {
-  background-color: #485460;
-  color: #FFF !important;
-}
-.song a:hover{
-  color: #000 !important;
-}
-.song .artist{
-  font-size: 3em;
-  letter-spacing: -5px;
-  color: #485460;
-}
-.song .artist a{
-}
-.song .title{
-  padding-left: 10px;
-  font-size: 2.2em;
-  letter-spacing: -4px;
-}
-.song .album{
-  margin-left: 10px;
-  font-size: 1.1em;
-  letter-spacing: -2px;
-}
-.song .album a{
-  color: #438FDF;
-}
-.song .controls{
-  float: right;
-  font-size: 6em;
-  margin: -.5em -5px;
-  text-transform: uppercase;
-}
-.votes{
-  background-color: #485460;
-  padding: 5px 5px 0px 5px;
-}
-.votes img{
-  border: 1px solid #5E7894;
-}
-.votes img:hover{
-  border: 1px solid #D0E4FA;
-}
-
-/*
- * PROFILE
- */
-.profile_box{
-  margin-right: 10px;
-  float: left;
-  font-size: 1.1em;
-}
-.bio{
-  padding: 15px 0;
-}
-.favorite_artists{
-  margin: 0 15px;
-}
-.favorite_artists h2{
-  color: #485460;
-}