swr3-nowplaying 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f73595e71b4d14aa011032291059b97d024f9962
-  data.tar.gz: 569db2c279782ed885ac2b014580e59124758efc
+  metadata.gz: 8ed5598a61317b28d773401e93ce8ef692733c80
+  data.tar.gz: 17cf8d7350e31ed4d81f282e018de573841f47f4
 SHA512:
-  metadata.gz: e14886d546be216edcdc2c565db89ee23e299f7cb04627024c5201e5415144d220810b6cc60c9825b8f143bf1cd44d491430a913884015d4ba31ec8ca6fa8b45
-  data.tar.gz: 1e0148580f5cd094455193da820394f8af35442801eee418fb162093617bba318d06e5be2ac794ec828ba48830f6cc0a213b1564819efb54c37e0063ca2ae526
+  metadata.gz: 7ef5c27884a432b4342e0613483b2b560315ec9b0a812ed00cd106220f72a931656dd2b09b1fac65c41e0f3f2c1d4ad48d6c8e240cd5c5b0149237d379aa34f0
+  data.tar.gz: 03b08cfb66adb672a2874c1cde6792e24b85744a831854bdf90f8c53e821c1ebc5c872471373223a3bc111436c799bd14cffafa0c6e1b2c8047e05294fd606eb

data/.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
 rvm:
   - 2.3.3
-  - 2.4.0
+  - 2.4.1
 before_install:
   - gem update --system --no-doc
   - gem install bundler

data/Rakefile

@@ -5,10 +5,10 @@ require 'rake/testtask'
 
 namespace :test do
   desc 'Run all specs'
-  task all: ['rubocop:auto_correct', :unit, :integration]
+  task all: ['rubocop:auto_correct', :unit, :integration, :system]
 
   desc 'Run ci'
-  task ci: [:rubocop, :unit, :integration]
+  task ci: [:rubocop, :unit, :integration, :system]
 
   Rake::TestTask.new('unit') do |test|
     test.libs << 'lib' << 'test' << 'test/unit'
@@ -19,6 +19,11 @@ namespace :test do
     test.libs << 'lib' << 'test'
     test.pattern = 'test/integration/test_*.rb'
   end
+
+  Rake::TestTask.new('system') do |test|
+    test.libs << 'lib' << 'test'
+    test.pattern = 'test/system/test_*.rb'
+  end
 end
 
 RuboCop::RakeTask.new

data/lib/swr3_now_playing/loader.rb

@@ -5,7 +5,7 @@ module SWR3
   module NowPlaying
     class Loader
       class << self
-        def load(url='http://www.swr3.de/export/json/-/id=202234/gp1=1/wi3aps/index.json')
+        def load(url='https://www.swr3.de/export/json/-/id=202234/gp1=1/wi3aps/index.json')
           open(url)
         end
       end

data/lib/swr3_now_playing/version.rb

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

data/test/fixtures/vcr/IntegrationTest_setup.yml

@@ -2,171 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: http://www.swr3.de/export/json/-/id=202234/gp1=1/wi3aps/index.json
-    body:
-      encoding: US-ASCII
-      string: ''
-    headers:
-      Accept:
-      - "*/*"
-      User-Agent:
-      - Ruby
-  response:
-    status:
-      code: 200
-      message: OK
-    headers:
-      Server:
-      - Apache-Coyote/1.1
-      Content-Type:
-      - application/json;charset=utf-8
-      Cache-Control:
-      - max-age=13
-      Expires:
-      - Sat, 02 Feb 2013 19:16:15 GMT
-      Date:
-      - Sat, 02 Feb 2013 19:16:02 GMT
-      Content-Length:
-      - '1584'
-      Connection:
-      - keep-alive
-    body:
-      encoding: US-ASCII
-      string: "{ \"detail\": {\n  \"@id\": \"202234\",\n  \"leadText\": null,\n  \"text\":
-        null,\n  \"topline\": \"SWR3 Musikrecherche\",\n  \"title\": \"Die letzten
-        13 Titel auf SWR3\",\n  \"detailImages\": [\n  ]}, \"frontmod\":  [{ \"title\"
-        : \"Red flag\"\n       , \"externalId\" : \"williams_title13552\"\n       ,
-        \"cover\" : { \"@id\": \"211180\",\n    \"alt\": \"CD-Cover Billy Talent -
-        Red flag\",\n    \"subline\": \"CD-Cover: Billy Talent - Red flag\",\n    \"copyright\":
-        \"SWR3.de\"\n    ,\"detail\": { \"src\": \"http://www.swr3.de/-/id=211180/property=detail/width=200/height=174/pubVersion=15/18p3xn3/index.jpg\",\n
-        \                  \"width\": 200,\n                   \"height\": 174}\n
-        \           \n    ,\"small\": { \"src\": \"http://www.swr3.de/-/id=211180/property=small/width=100/height=87/pubVersion=15/1mxtehu/index.jpg\",\n
-        \                  \"width\": 100,\n                   \"height\": 87}\n            \n
-        \   ,\"thumbnail\": { \"src\": \"http://www.swr3.de/-/id=211180/property=thumbnail/width=160/height=139/pubVersion=15/1p6camf/index.jpg\",\n
-        \                  \"width\": 160,\n                   \"height\": 139}\n
-        \           \n    ,\"zoom\": { \"src\": \"http://www.swr3.de/-/id=211180/property=zoom/width=500/height=435/pubVersion=15/n4isxq/index.jpg\",\n
-        \                  \"width\": 500,\n                   \"height\": 435}\n
-        \           \n    \n}\n       , \"artist\" : { \"name\" : \"Billy Talent\"\n
-        \                    , \"link\" : \"http://www.swr3.de/musik/poplexikon/Billy-Talent/-/id=927882/did=203054/14tqyuw/index.html\"\n
-        \                       , \"externalId\" : \"williams_artist5897\"                         \n
-        \                    },\n       \"playDate\" : 1359832123000\n     }\n    ]}"
-    http_version: 
-  recorded_at: Sat, 02 Feb 2013 19:16:10 GMT
-- request:
-    method: get
-    uri: http://www.swr3.de/export/json/-/id=202234/gp1=1/wi3aps/index.json
-    body:
-      encoding: US-ASCII
-      string: ''
-    headers:
-      Accept-Encoding:
-      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
-      Accept:
-      - "*/*"
-      User-Agent:
-      - Ruby
-  response:
-    status:
-      code: 200
-      message: OK
-    headers:
-      Content-Type:
-      - application/json;charset=utf-8
-      Vary:
-      - Accept-Encoding
-      Expires:
-      - Fri, 30 Dec 2016 14:42:06 GMT
-      Cache-Control:
-      - max-age=0, no-cache, no-store
-      Pragma:
-      - no-cache
-      Date:
-      - Fri, 30 Dec 2016 14:42:06 GMT
-      Content-Length:
-      - '1519'
-      Connection:
-      - keep-alive
-    body:
-      encoding: UTF-8
-      string: "{ \"detail\": {\n  \"@id\": \"202234\",\n  \"leadText\": null,\n  \"text\":
-        null,\n  \"topline\": \"SWR3 Musikrecherche\",\n  \"title\": \"Die letzten
-        13 Titel auf SWR3\",\n  \"detailImages\": [\n  ]}, \"frontmod\": [{ \"title\"
-        : \"My way\"\n       , \"externalId\" : \"williams_title27120\"\n       ,
-        \"cover\" : { \"@id\": \"4153020\",\n    \"alt\": \"CD-Cover Harris, Calvin
-        - My way\",\n    \"subline\": \"CD-Cover: Harris, Calvin - My way\",\n    \"copyright\":
-        \"SWR3.de\"\n    ,\"detail\": { \"src\": \"http://www.swr3.de/-/id=4153020/property=detail/width=200/height=200/794y3g/index.jpg\",\n
-        \                  \"width\": 200,\n                   \"height\": 200}\n
-        \           \n    ,\"small\": { \"src\": \"http://www.swr3.de/-/id=4153020/property=small/width=100/height=100/1iid4ll/index.jpg\",\n
-        \                  \"width\": 100,\n                   \"height\": 100}\n
-        \           \n    ,\"thumbnail\": { \"src\": \"http://www.swr3.de/-/id=4153020/property=thumbnail/width=160/height=160/953k3g/index.jpg\",\n
-        \                  \"width\": 160,\n                   \"height\": 160}\n
-        \           \n    ,\"zoom\": { \"src\": \"http://www.swr3.de/-/id=4153020/property=zoom/width=500/height=500/5y0d55/index.jpg\",\n
-        \                  \"width\": 500,\n                   \"height\": 500}\n
-        \           \n    \n}\n       , \"artist\" : { \"name\" : \"Harris, Calvin\"\n
-        \                    , \"link\" : \"http://www.swr3.de/musik/poplexikon/-/id=927882/did=342722/1ejk03z/index.html\"\n
-        \                       , \"externalId\" : \"williams_artist6503\"                         \n
-        \                    },\n       \"playDate\" : 1483108845000\n     }\n    ]}"
-    http_version: 
-  recorded_at: Fri, 30 Dec 2016 14:42:06 GMT
-- request:
-    method: get
-    uri: http://www.swr3.de/export/json/-/id=202234/gp1=1/wi3aps/index.json
-    body:
-      encoding: US-ASCII
-      string: ''
-    headers:
-      Accept-Encoding:
-      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
-      Accept:
-      - "*/*"
-      User-Agent:
-      - Ruby
-  response:
-    status:
-      code: 200
-      message: OK
-    headers:
-      Content-Type:
-      - application/json;charset=utf-8
-      Vary:
-      - Accept-Encoding
-      Expires:
-      - Fri, 30 Dec 2016 14:42:08 GMT
-      Cache-Control:
-      - max-age=0, no-cache, no-store
-      Pragma:
-      - no-cache
-      Date:
-      - Fri, 30 Dec 2016 14:42:08 GMT
-      Content-Length:
-      - '1519'
-      Connection:
-      - keep-alive
-    body:
-      encoding: UTF-8
-      string: "{ \"detail\": {\n  \"@id\": \"202234\",\n  \"leadText\": null,\n  \"text\":
-        null,\n  \"topline\": \"SWR3 Musikrecherche\",\n  \"title\": \"Die letzten
-        13 Titel auf SWR3\",\n  \"detailImages\": [\n  ]}, \"frontmod\": [{ \"title\"
-        : \"My way\"\n       , \"externalId\" : \"williams_title27120\"\n       ,
-        \"cover\" : { \"@id\": \"4153020\",\n    \"alt\": \"CD-Cover Harris, Calvin
-        - My way\",\n    \"subline\": \"CD-Cover: Harris, Calvin - My way\",\n    \"copyright\":
-        \"SWR3.de\"\n    ,\"detail\": { \"src\": \"http://www.swr3.de/-/id=4153020/property=detail/width=200/height=200/794y3g/index.jpg\",\n
-        \                  \"width\": 200,\n                   \"height\": 200}\n
-        \           \n    ,\"small\": { \"src\": \"http://www.swr3.de/-/id=4153020/property=small/width=100/height=100/1iid4ll/index.jpg\",\n
-        \                  \"width\": 100,\n                   \"height\": 100}\n
-        \           \n    ,\"thumbnail\": { \"src\": \"http://www.swr3.de/-/id=4153020/property=thumbnail/width=160/height=160/953k3g/index.jpg\",\n
-        \                  \"width\": 160,\n                   \"height\": 160}\n
-        \           \n    ,\"zoom\": { \"src\": \"http://www.swr3.de/-/id=4153020/property=zoom/width=500/height=500/5y0d55/index.jpg\",\n
-        \                  \"width\": 500,\n                   \"height\": 500}\n
-        \           \n    \n}\n       , \"artist\" : { \"name\" : \"Harris, Calvin\"\n
-        \                    , \"link\" : \"http://www.swr3.de/musik/poplexikon/-/id=927882/did=342722/1ejk03z/index.html\"\n
-        \                       , \"externalId\" : \"williams_artist6503\"                         \n
-        \                    },\n       \"playDate\" : 1483108845000\n     }\n    ]}"
-    http_version: 
-  recorded_at: Fri, 30 Dec 2016 14:42:08 GMT
-- request:
-    method: get
-    uri: http://www.swr3.de/export/json/-/id=202234/gp1=1/wi3aps/index.json
+    uri: https://www.swr3.de/export/json/-/id=202234/gp1=1/wi3aps/index.json
     body:
       encoding: US-ASCII
       string: ''
@@ -187,37 +23,50 @@ http_interactions:
       Vary:
       - Accept-Encoding
       Expires:
-      - Fri, 30 Dec 2016 14:42:12 GMT
+      - Thu, 13 Apr 2017 11:45:05 GMT
       Cache-Control:
       - max-age=0, no-cache, no-store
       Pragma:
       - no-cache
       Date:
-      - Fri, 30 Dec 2016 14:42:12 GMT
+      - Thu, 13 Apr 2017 11:45:05 GMT
       Content-Length:
-      - '1519'
+      - '1536'
       Connection:
       - keep-alive
+      Public-Key-Pins-Report-Only:
+      - pin-sha256="uZEfYpAZQZ0ZDHFSCdNkliD1JLHL+OQZudRMuHKKa3c="; pin-sha256="pvsOo/07kXBfe36yjJgm6H46EJRe7gurjSAeunJgFyg=";
+        pin-sha256="JbQbUG5JMJUoI6brnx0x3vZF6jilxsapbXGVfjhN8Fg="; includeSubdomains';
+        max-age=10; report-uri="https://swr3.report-uri.io/r/default/hpkp/reportOnly"
+      Content-Security-Policy-Report-Only:
+      - 'default-src ''self'' https:; script-src ''self'' ''unsafe-inline'' https:;
+        style-src ''self'' ''unsafe-inline'' https:; img-src ''self'' data: https:;
+        report-uri https://swr3.report-uri.io/r/default/csp/reportOnly;'
+      Content-Security-Policy:
+      - upgrade-insecure-requests
+      Strict-Transport-Security:
+      - max-age=31536000; preload
     body:
       encoding: UTF-8
       string: "{ \"detail\": {\n  \"@id\": \"202234\",\n  \"leadText\": null,\n  \"text\":
         null,\n  \"topline\": \"SWR3 Musikrecherche\",\n  \"title\": \"Die letzten
         13 Titel auf SWR3\",\n  \"detailImages\": [\n  ]}, \"frontmod\": [{ \"title\"
-        : \"My way\"\n       , \"externalId\" : \"williams_title27120\"\n       ,
-        \"cover\" : { \"@id\": \"4153020\",\n    \"alt\": \"CD-Cover Harris, Calvin
-        - My way\",\n    \"subline\": \"CD-Cover: Harris, Calvin - My way\",\n    \"copyright\":
-        \"SWR3.de\"\n    ,\"detail\": { \"src\": \"http://www.swr3.de/-/id=4153020/property=detail/width=200/height=200/794y3g/index.jpg\",\n
+        : \"We built this city\"\n       , \"externalId\" : \"williams_title2760\"\n
+        \      , \"cover\" : { \"@id\": \"793426\",\n    \"alt\": \"CD-Cover Starship
+        - We built this city\",\n    \"subline\": \"CD-Cover: Starship - We built
+        this city\",\n    \"copyright\": \"SWR3.de\"\n    ,\"detail\": { \"src\":
+        \"https://www.swr3.de/-/id=793426/property=detail/width=200/height=200/17upc7z/index.jpg\",\n
         \                  \"width\": 200,\n                   \"height\": 200}\n
-        \           \n    ,\"small\": { \"src\": \"http://www.swr3.de/-/id=4153020/property=small/width=100/height=100/1iid4ll/index.jpg\",\n
+        \           \n    ,\"small\": { \"src\": \"https://www.swr3.de/-/id=793426/property=small/width=100/height=100/n07kii/index.jpg\",\n
         \                  \"width\": 100,\n                   \"height\": 100}\n
-        \           \n    ,\"thumbnail\": { \"src\": \"http://www.swr3.de/-/id=4153020/property=thumbnail/width=160/height=160/953k3g/index.jpg\",\n
+        \           \n    ,\"thumbnail\": { \"src\": \"https://www.swr3.de/-/id=793426/property=thumbnail/width=160/height=160/1ssz2oa/index.jpg\",\n
         \                  \"width\": 160,\n                   \"height\": 160}\n
-        \           \n    ,\"zoom\": { \"src\": \"http://www.swr3.de/-/id=4153020/property=zoom/width=500/height=500/5y0d55/index.jpg\",\n
+        \           \n    ,\"zoom\": { \"src\": \"https://www.swr3.de/-/id=793426/property=zoom/width=500/height=500/10ii3sz/index.jpg\",\n
         \                  \"width\": 500,\n                   \"height\": 500}\n
-        \           \n    \n}\n       , \"artist\" : { \"name\" : \"Harris, Calvin\"\n
-        \                    , \"link\" : \"http://www.swr3.de/musik/poplexikon/-/id=927882/did=342722/1ejk03z/index.html\"\n
-        \                       , \"externalId\" : \"williams_artist6503\"                         \n
-        \                    },\n       \"playDate\" : 1483108845000\n     }\n    ]}"
+        \           \n    \n}\n       , \"artist\" : { \"name\" : \"Starship\"\n                     ,
+        \"link\" : \"https://www.swr3.de/musik/poplexikon/-/id=927882/did=67074/varai6/index.html\"\n
+        \                       , \"externalId\" : \"williams_artist1241\"                         \n
+        \                    },\n       \"playDate\" : 1492083718000\n     }\n    ]}"
     http_version: 
-  recorded_at: Fri, 30 Dec 2016 14:42:12 GMT
+  recorded_at: Thu, 13 Apr 2017 11:45:05 GMT
 recorded_with: VCR 3.0.3

data/test/integration/test_all.rb

@@ -23,16 +23,19 @@ class IntegrationTest < MiniTest::Test
     @song = mocked('setup') do
       SongMapper.map(Loader.load)
     end
+
+    refute_nil(@song)
+  end
+
+  def test_song
+    assert_equal('Starship: We built this city', @song.to_s)
   end
 
   def test_song_title
-    refute_nil(@song)
-    assert_equal('Red flag', @song.title)
-    assert_equal('Billy Talent: Red flag', @song.to_s)
+    assert_equal('We built this city', @song.title)
   end
 
   def test_artist
-    refute_nil(@song)
-    assert_equal('Billy Talent', @song.artist.name)
+    assert_equal('Starship', @song.artist.name)
   end
 end

data/test/system/test_all.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'helper'
+
+require 'swr3_now_playing/mapper'
+require 'swr3_now_playing/loader'
+
+class SystemTest < MiniTest::Test
+  include SWR3::NowPlaying
+
+  def setup
+    @song = SongMapper.map(Loader.load)
+    refute_nil(@song)
+  end
+
+  def test_song
+    refute_empty(@song.to_s)
+  end
+
+  def test_song_title
+    refute_empty(@song.title)
+  end
+
+  def test_artist
+    refute_nil(@song.artist)
+    refute_empty(@song.artist.name)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: swr3-nowplaying
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Nicholas E. Rabenau
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-29 00:00:00.000000000 Z
+date: 2017-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -266,6 +266,7 @@ files:
 - test/fixtures/vcr/IntegrationTest_setup.yml
 - test/helper.rb
 - test/integration/test_all.rb
+- test/system/test_all.rb
 - test/unit/test_loader.rb
 - test/unit/test_mapper.rb
 - test/unit/test_song.rb
@@ -288,7 +289,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Provides the track that is currently playing in SWR3
@@ -299,6 +300,7 @@ test_files:
 - test/fixtures/vcr/IntegrationTest_setup.yml
 - test/helper.rb
 - test/integration/test_all.rb
+- test/system/test_all.rb
 - test/unit/test_loader.rb
 - test/unit/test_mapper.rb
 - test/unit/test_song.rb