swr3-nowplaying 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9783529068579b670131facc8f4f5eb4d79975a9
-  data.tar.gz: f15788d6e83983c2b80092c0ede6f3177ca4b47c
+  metadata.gz: f73595e71b4d14aa011032291059b97d024f9962
+  data.tar.gz: 569db2c279782ed885ac2b014580e59124758efc
 SHA512:
-  metadata.gz: f1c36be7f2e19235e23dcfb20e90d4c17cd43ffcb7fb02a66a521971a11894df8263625fdd0d870b33806856499035877c2bcb41722fa9036f33440d6c967b97
-  data.tar.gz: 08abfd03f50519d514ece4dfe89b2281939d54e79d84dbd6241836a92a41cf1bbc99485e64469b980cd24462dfc176510fe6b0f3e8838aa915ee2a4bd6f897ab
+  metadata.gz: e14886d546be216edcdc2c565db89ee23e299f7cb04627024c5201e5415144d220810b6cc60c9825b8f143bf1cd44d491430a913884015d4ba31ec8ca6fa8b45
+  data.tar.gz: 1e0148580f5cd094455193da820394f8af35442801eee418fb162093617bba318d06e5be2ac794ec828ba48830f6cc0a213b1564819efb54c37e0063ca2ae526

data/.travis.yml

@@ -2,5 +2,8 @@ language: ruby
 rvm:
   - 2.3.3
   - 2.4.0
+before_install:
+  - gem update --system --no-doc
+  - gem install bundler
 bundler_args: --without production
 script: bundle exec rake test:ci

data/exe/swr3-nowplaying

@@ -10,8 +10,8 @@ require 'swr3_now_playing/mapper'
 json = SWR3::NowPlaying::Loader.load
 
 begin
-  song = SWR3::NowPlaying::Mapper.map(json)
-  puts "#{Time.new} - #{song}"
+  song = SWR3::NowPlaying::SongMapper.map(json)
+  puts "#{song.play_date} - #{song}"
 rescue JSON::ParserError => e
   warn "Error parsing JSON response: #{e.message}"
   warn 'Offending document is: '

data/lib/swr3_now_playing/artist.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+module SWR3
+  module NowPlaying
+    class Artist
+      attr_reader :name, :link
+      alias_method :to_s, :name
+
+      def initialize(name, link)
+        @name = name
+        @link = link
+      end
+    end
+  end
+end

data/lib/swr3_now_playing/cover.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+module SWR3
+  module NowPlaying
+    Cover = Struct.new(:small, :thumbnail, :detail, :zoom)
+  end
+end

data/lib/swr3_now_playing/mapper.rb

@@ -1,16 +1,39 @@
 # frozen_string_literal: true
 require 'json'
+require 'cgi'
 require 'swr3_now_playing/song'
+require 'swr3_now_playing/artist'
+require 'swr3_now_playing/cover'
 
 module SWR3
   module NowPlaying
+    class ArtistMapper
+      class << self
+        def map(json)
+          Artist.new(CGI.unescapeHTML(json['name']), json['link'])
+        end
+      end
+    end
+
+    class CoverMapper
+      class << self
+        def map(json)
+          Cover.new.tap do |cover|
+            %w(small thumbnail detail zoom).each do |size|
+              cover[size] = json[size]['src']
+            end
+          end
+        end
+      end
+    end
+
     class MissingNullFixer
       def fix(stream)
         stream.gsub(/{ "detail": ,/, '{ "detail": {},')
       end
     end
 
-    class Mapper
+    class SongMapper
       class << self
         def map(json)
           fixers = [MissingNullFixer.new]
@@ -27,10 +50,17 @@ module SWR3
             end
           end
 
-          artist = j['frontmod'].first['artist']['name']
-          title = j['frontmod'].first['title']
+          artist = ArtistMapper.map(j['frontmod'].first['artist'])
+          title = CGI.unescapeHTML(j['frontmod'].first['title'])
+          cover = CoverMapper.map(j['frontmod'].first['cover'])
+
+          Song.new(artist, title, cover).tap do |song|
+            time_stamp = j['frontmod'].first['playDate']
 
-          Song.new(artist, title)
+            if time_stamp
+              song.play_date = Time.at(time_stamp / 1000)
+            end
+          end
         end
       end
     end

data/lib/swr3_now_playing/song.rb

@@ -2,20 +2,17 @@
 module SWR3
   module NowPlaying
     class Song
-      attr_reader :artist, :title
+      attr_reader :artist, :title, :cover
+      attr_accessor :play_date
 
-      def initialize(artist, title)
+      def initialize(artist, title, cover=nil)
         @artist = artist
         @title = title
-      end
-
-      def ==(other)
-        return false if other.nil?
-        self.artist == other.artist && self.title == other.title
+        @cover = cover
       end
 
       def to_s
-        "#{@artist}: #{@title}"
+        "#{artist.name}: #{title}"
       end
     end
   end

data/lib/swr3_now_playing/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module SWR3
   module NowPlaying
-    VERSION = '0.0.2'
+    VERSION = '0.0.3'
   end
 end

data/test/helper.rb

@@ -1,2 +1,3 @@
 # frozen_string_literal: true
 require 'minitest/autorun'
+require 'minitest/mock'

data/test/integration/test_all.rb

@@ -21,14 +21,18 @@ class IntegrationTest < MiniTest::Test
 
   def setup
     @song = mocked('setup') do
-      Mapper.map(Loader.load)
+      SongMapper.map(Loader.load)
     end
   end
 
-  def test_song
+  def test_song_title
     refute_nil(@song)
-    assert_equal('Billy Talent', @song.artist)
     assert_equal('Red flag', @song.title)
     assert_equal('Billy Talent: Red flag', @song.to_s)
   end
+
+  def test_artist
+    refute_nil(@song)
+    assert_equal('Billy Talent', @song.artist.name)
+  end
 end

data/test/unit/test_mapper.rb

@@ -1,22 +1,68 @@
 # frozen_string_literal: true
 require 'helper'
-
 require 'swr3_now_playing/mapper'
 
 class MapperTest < MiniTest::Test
   def test_good
-    result = SWR3::NowPlaying::Mapper.map(File.new('test/fixtures/good.json'))
+    result = SWR3::NowPlaying::SongMapper.map(File.new('test/fixtures/good.json'))
+    refute_nil(result)
+  end
+
+  def test_title
+    result = SWR3::NowPlaying::SongMapper.map(File.new('test/fixtures/good.json'))
+    assert_equal('Breathing underwater', result.title)
+  end
+
+  def test_artist
+    result = SWR3::NowPlaying::SongMapper.map(File.new('test/fixtures/good.json'))
+    refute_nil(result)
+    refute_nil(result.artist)
+    artist = result.artist
+    assert_equal('Sandé, Emeli', artist.name)
+    assert_equal('http://www.swr3.de/musik/poplexikon/-/id=927882/did=1199388/cf24yn/index.html', artist.link)
+  end
+
+  def test_cover
+    result = SWR3::NowPlaying::SongMapper.map(File.new('test/fixtures/good.json'))
     refute_nil(result)
+    refute_nil(result.cover)
+
+    cover = result.cover
+    assert_equal('http://www.swr3.de/-/id=4244326/property=small/width=100/height=100/122v5mf/index.jpg', cover.small)
+    assert_equal('http://www.swr3.de/-/id=4244326/property=thumbnail/width=160/height=160/bv9ur/index.jpg', cover.thumbnail)
+    assert_equal('http://www.swr3.de/-/id=4244326/property=detail/width=200/height=200/f69z8d/index.jpg', cover.detail)
+    assert_equal('http://www.swr3.de/-/id=4244326/property=zoom/width=500/height=500/1ugkxk9/index.jpg', cover.zoom)
   end
 
   def test_fixable
-    result = SWR3::NowPlaying::Mapper.map(File.new('test/fixtures/fixable.json'))
+    result = SWR3::NowPlaying::SongMapper.map(File.new('test/fixtures/fixable.json'))
     refute_nil(result)
   end
 
   def test_unfixable
     assert_raises(JSON::ParserError) {
-      SWR3::NowPlaying::Mapper.map(File.new('test/fixtures/unfixable.json'))
+      SWR3::NowPlaying::SongMapper.map(File.new('test/fixtures/unfixable.json'))
     }
   end
+
+  def test_play_date
+    result = SWR3::NowPlaying::SongMapper.map(File.new('test/fixtures/good.json'))
+    assert_equal(Time.at(1483110825), result.play_date)
+  end
+
+  def test_html_entities_title
+    fixture = JSON.parse(File.new('test/fixtures/good.json').read)
+    fixture['frontmod'].first['title'] = 'and nothin&#39; on'
+    io = StringIO.new(JSON.dump(fixture))
+    result = SWR3::NowPlaying::SongMapper.map(io)
+    assert_equal("and nothin' on", result.title)
+  end
+
+  def test_html_entities_artist_name
+    fixture = JSON.parse(File.new('test/fixtures/good.json').read)
+    fixture['frontmod'].first['artist']['name'] = 'Rag&#39;n&#39;bone Man'
+    io = StringIO.new(JSON.dump(fixture))
+    result = SWR3::NowPlaying::SongMapper.map(io)
+    assert_equal("Rag'n'bone Man", result.artist.name)
+  end
 end

data/test/unit/test_song.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+require 'helper'
+require 'swr3_now_playing/song'
+
+class SongTest < MiniTest::Test
+  def test_to_s
+    artist = Minitest::Mock.new
+    artist.expect(:name, 'foo')
+
+    result = SWR3::NowPlaying::Song.new(artist, 'bar')
+    refute_nil(result)
+    assert_equal('foo: bar', result.to_s)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: swr3-nowplaying
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Nicholas E. Rabenau
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-06 00:00:00.000000000 Z
+date: 2017-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -253,6 +253,8 @@ files:
 - Rakefile
 - exe/swr3-nowplaying
 - lib/swr3_now_playing.rb
+- lib/swr3_now_playing/artist.rb
+- lib/swr3_now_playing/cover.rb
 - lib/swr3_now_playing/loader.rb
 - lib/swr3_now_playing/mapper.rb
 - lib/swr3_now_playing/song.rb
@@ -266,6 +268,7 @@ files:
 - test/integration/test_all.rb
 - test/unit/test_loader.rb
 - test/unit/test_mapper.rb
+- test/unit/test_song.rb
 homepage: http://github.com/nerab/swr3-nowplaying
 licenses: []
 metadata: {}
@@ -298,4 +301,4 @@ test_files:
 - test/integration/test_all.rb
 - test/unit/test_loader.rb
 - test/unit/test_mapper.rb
-has_rdoc: 
+- test/unit/test_song.rb