meuh 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b44ec11d67812a0c48cc12d2f009feb64204a23d
-  data.tar.gz: c4546c3e69de0f00f31a6637feecc09056b7b4d9
+  metadata.gz: 12129f88831e373a1c718dbd93b7244b3ac7b22b
+  data.tar.gz: 6a5193cfdc69968d92c36bdd1344083317fbca49
 SHA512:
-  metadata.gz: d32dc7a0d0cb279d99dfd58db1b43f632a4eba9a94273e10770482adfe45ad6244ed441e348dc31e90f6dfc8b48b4965c702d202ed9ea4343c964a19eae71cea
-  data.tar.gz: 5398d7f3eb4502b715b1b1a64c0149b5253caabf221edc67012a67c1f77da3b3ed406521a011c2b8800539957f6aee92d151a97fb4199bf4db1e723b129e9f47
+  metadata.gz: 88ef7bca9c01debbc8cefa08ba00d8dfc0c0dec2435f0968dd6f63e7b4f876212a1c2f13ab7d899c5ad515a6d7085b88921d812694c5658a9d497f40ba29f1a6
+  data.tar.gz: 86b50d7811ef7db789159dbacdac443e0b1eaa27d5a484ea179d87a1b17975c27437c49eb4d685c6d40d65cc8d08e04125bc0fc31452f8cb05933588221a080c

data/bin/meuh

@@ -22,6 +22,6 @@ end
 
 opts[:color] = !opts[:no_format]
 
-t = Meuh.tracks(opts)
+t = Meuh.tracks
 puts Meuh.format_results(t, opts[:color])
 

data/lib/meuh.rb

@@ -11,13 +11,17 @@ module Meuh
   class << self
 
     def version
-      '0.1.1'
+      '0.1.2'
     end
 
     def url
       'http://www.radiomeuh.com/meuh/playlist/index.php'
     end
 
+    def user_agent
+      "Meuh/#{version} +github.com/bfontaine/meuh"
+    end
+
     # Get the text of an element. This is an helper for internal usage.
     def text(el)
       el.text.strip.gsub(/\r/, "\n")
@@ -38,11 +42,11 @@ module Meuh
     #   :remaining => "...", <-- remaining time
     #   :time => "..." <-- time for previous tracks
     # }
-    def tracks(*opts)
-      opts = opts[0] || {}
+    def tracks
       tracks = { :previous => [], :current => nil, :next => [] }
 
-      doc = Nokogiri::HTML(open(url))
+      html = open(url, 'User-Agent' => user_agent).read.encode!(Encoding::UTF_8)
+      doc = Nokogiri::HTML(html)
 
       def parse_track t
         lines = t.inner_html.split(/<br\/?\s*>/).map do |l|
@@ -56,12 +60,14 @@ module Meuh
           artist = nil
         end
 
+        time = lines[0].strip
+
         {
           :artist => artist,
           :album => lines[2].strip,
           :title => title,
           :remaining => t.css('font').text.gsub(/^:\s+/, ''),
-          :time => lines[0].strip
+          :time => time == '...' ? '' : time
         }
       end
 
@@ -76,7 +82,7 @@ module Meuh
             tracks[:next] << parse_track(td)
           end
         else
-          tracks[:previous] << parse_track(td)
+          tracks[:previous] << parse_track(td) unless td.text =~ /\(jingle\)/i
         end
       end
 

data/lib/meuh/formatting.rb

@@ -14,10 +14,10 @@ module Meuh
         s = []
 
         def track_text(t, style, color) # :previous, :next, :curr
-          title    = t[:title]
-          artist   = t[:artist]
-          album    = t[:album]
-          time     = style == :previous ? "[#{t[:time]}] " : ''
+          title  = t[:title] || ''
+          artist = t[:artist]
+          album  = t[:album]
+          time   = style == :previous ? "[#{t[:time]}] " : ''
 
           title.strip!
 

data/tests/formatting_tests.rb

@@ -0,0 +1,60 @@
+# -*- coding: UTF-8 -*-
+
+class Meuh_formatting_test < Test::Unit::TestCase
+
+  def setup
+    @tracks = {
+      :previous => [
+        {
+          :artist => 'Artist1',
+          :album =>  'Album1',
+          :title =>  'Track1',
+          :time =>   '00:01:01',
+        },
+        {
+          :artist => 'Artist2',
+          :album =>  'Album2',
+          :title =>  'Track2',
+          :time =>   '00:01:00',
+        },
+        {
+          :artist => 'Artist3',
+          :album =>  'Album3',
+          :title =>  'Track3',
+          :time =>   '00:00:45',
+        }
+      ],
+      :current => {
+        :artist => nil,
+        :album => 'CurrBar',
+        :title => 'Current Track',
+        :time => '00:01:02'
+      },
+      :next => [
+        {
+          :artist => 'Foo',
+          :album  => 'FooBar',
+          :title  => 'Bar',
+          :time   => ''
+        }
+      ]
+    }
+  end
+
+  def test_general_format_no_color
+    r = /^.+\n\nPreviously:\n(?:\* \[.*?\] .*\n)+\nNext:\n\* .+/
+    assert_not_nil(Meuh::Formatting.text(@tracks, false) =~ r)
+    assert_not_nil(Meuh::Formatting.text(@tracks, true) =~ r)
+  end
+
+  def test_general_format_color
+    r = /^.+\n\nPreviously:\n(?:\* \[.*?\] .*\n)+\nNext:\n\* .+/
+    assert_not_nil(Meuh::Formatting.text(@tracks, true) =~ r)
+  end
+
+  def test_color_reset
+    assert_equal(nil, Meuh::Formatting.text(@tracks, false).index("\e[0m"))
+    assert_not_nil(Meuh::Formatting.text(@tracks, true).index "\e[0m")
+  end
+
+end

data/tests/query_tests.rb

@@ -0,0 +1,88 @@
+# -*- coding: UTF-8 -*-
+
+require File.dirname(__FILE__) + '/fake_responses'
+
+class Meuh_query_test < Test::Unit::TestCase
+
+  def setup
+    @url = Meuh.url
+  end
+
+  def test_keys
+    t = Meuh.tracks
+
+    assert(t.has_key?(:previous))
+    assert(t.has_key?(:current))
+    assert(t.has_key?(:next))
+  end
+
+  def test_next_track
+    next_ary = Meuh.tracks[:next]
+
+    assert_equal(1, next_ary.count)
+    nextt = next_ary.first
+
+    assert(nextt.is_a?(Hash))
+    assert(nextt.has_key?(:artist))
+    assert(nextt.has_key?(:album))
+    assert(nextt.has_key?(:title))
+    assert(nextt.has_key?(:time))
+
+    assert_equal('Foo',    nextt[:artist])
+    assert_equal('FooBar', nextt[:album])
+    assert_equal('Bar',    nextt[:title])
+    assert_equal('',       nextt[:time])
+
+  end
+
+  def test_current_track
+    curr = Meuh.tracks[:current]
+
+    assert(curr.is_a?(Hash))
+    assert(curr.has_key?(:artist))
+    assert(curr.has_key?(:album))
+    assert(curr.has_key?(:title))
+    assert(curr.has_key?(:time))
+
+    assert_equal(nil,             curr[:artist])
+    assert_equal('CurrBar',       curr[:album])
+    assert_equal('Current Track', curr[:title])
+    assert_equal('00:01:02',      curr[:time])
+  end
+
+  def test_previous_tracks
+    prev_ary = Meuh.tracks[:previous]
+
+    assert_equal(3, prev_ary.count)
+
+    assert(prev_ary[0].is_a?(Hash))
+    assert(prev_ary[1].is_a?(Hash))
+    assert(prev_ary[2].is_a?(Hash))
+
+    prev1 = prev_ary[0]
+
+    assert(prev1.is_a?(Hash))
+    assert(prev1.has_key?(:artist))
+    assert(prev1.has_key?(:album))
+    assert(prev1.has_key?(:title))
+    assert(prev1.has_key?(:time))
+
+    assert_equal('Artist1',  prev1[:artist])
+    assert_equal('Album1',   prev1[:album])
+    assert_equal('Track1',   prev1[:title])
+    assert_equal('00:01:01', prev1[:time])
+
+    prev2 = prev_ary[1]
+    assert_equal('Artist2',  prev2[:artist])
+    assert_equal('Album2',   prev2[:album])
+    assert_equal('Track2',   prev2[:title])
+    assert_equal('00:01:00', prev2[:time])
+
+    prev3 = prev_ary[2]
+    assert_equal('Artist3',  prev3[:artist])
+    assert_equal('Album3',   prev3[:album])
+    assert_equal('Track3',   prev3[:title])
+    assert_equal('00:00:45', prev3[:time])
+  end
+
+end

data/tests/tests.rb

@@ -14,6 +14,13 @@ for t in Dir.glob( File.join( test_dir,  '*_tests.rb' ) )
   require t
 end
 
+class FakeHTMLElement
+  attr_reader :text
+  def initialize(text)
+    @text = text
+  end
+end
+
 class MeuhTests < Test::Unit::TestCase
 
   # == Meuh#version == #
@@ -22,6 +29,60 @@ class MeuhTests < Test::Unit::TestCase
     assert(Meuh.version =~ /^\d+\.\d+\.\d+/)
   end
 
+  # == Meuh#url == #
+  def test_meuh_url
+    assert(Meuh.url =~ /^https?:\/\//)
+  end
+
+  # == Meuh#user_agent == #
+
+  def test_meuh_ua
+    assert(Meuh.user_agent =~ /^Meuh\/\d+\.\d+\.\d+/)
+  end
+
+  # == Meuh#text == #
+
+  def test_meuh_text_empty
+    e = FakeHTMLElement.new ''
+    assert_equal('', Meuh.text(e))
+  end
+
+  def test_meuh_text_spaces
+    e = FakeHTMLElement.new '   '
+    assert_equal('', Meuh.text(e))
+  end
+
+  def test_meuh_text_strip
+    txt = ' foobar  '
+    e = FakeHTMLElement.new txt
+    assert_equal(txt.strip, Meuh.text(e))
+  end
+
+  def test_meuh_text_newlines1
+    txt = "foo\rbar"
+    e = FakeHTMLElement.new txt
+    assert_equal(txt.sub(/\r/, "\n"), Meuh.text(e))
+  end
+
+  def test_meuh_text_newlines2
+    txt = "foo\nbar"
+    e = FakeHTMLElement.new txt
+    assert_equal(txt, Meuh.text(e))
+  end
+
+  def test_meuh_text
+    txt = 'foobar'
+    e = FakeHTMLElement.new txt
+    assert_equal(txt, Meuh.text(e))
+  end
+
+  def test_meuh_text_wrong_element
+    assert_equal('', Meuh.text(nil))
+    assert_equal('', Meuh.text([]))
+    assert_equal('', Meuh.text({}))
+    assert_equal('', Meuh.text('foo'))
+  end
+
 end
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: meuh
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Baptiste Fontaine
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-03 00:00:00.000000000 Z
+date: 2014-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -118,6 +118,8 @@ extra_rdoc_files: []
 files:
 - lib/meuh.rb
 - lib/meuh/formatting.rb
+- tests/formatting_tests.rb
+- tests/query_tests.rb
 - tests/tests.rb
 - bin/meuh
 homepage: https://github.com/bfontaine/meuh-cli
@@ -145,4 +147,6 @@ signing_key:
 specification_version: 4
 summary: scrapper for radiomeuh.com's current playlist
 test_files:
+- tests/formatting_tests.rb
+- tests/query_tests.rb
 - tests/tests.rb