poms 1.0.1 → 1.1.0

data/spec/lib/poms/api/auth_spec.rb

@@ -0,0 +1,34 @@
+require 'poms/api/auth'
+require 'spec_helper'
+
+RSpec.describe Poms::Api::Auth do
+  describe '.encode' do
+    it 'encodes the message with the secret' do
+      expect(described_class.encode('secret', 'message'))
+        .to eq("i19IcCmVwVmMVz2x4hhmqbgl1KeU0WnXBgoDYFeWNgs=\n")
+    end
+  end
+
+  describe '.message' do
+    it 'creates a message' do
+      message = described_class.message(
+        '/v1/api/media/redirects/',
+        'http://zapp.nl',
+        Date.parse('2015-01-01').rfc822)
+      expect(message).to eq(
+        'origin:http://zapp.nl,x-npo-date:Thu, 1 Jan 2015 00:00:00 '\
+        '+0000,uri:/v1/api/media/redirects/')
+    end
+
+    it 'sorts the params' do
+      message = described_class.message(
+        '/v1/api/media/redirects/',
+        'http://zapp.nl',
+        Date.parse('2015-01-01').rfc822,
+        b: 1, a: 2)
+      expect(message).to eq(
+        'origin:http://zapp.nl,x-npo-date:Thu, 1 Jan 2015 00:00:00 '\
+        '+0000,uri:/v1/api/media/redirects/,a:2,b:1')
+    end
+  end
+end

data/spec/lib/poms/api/request_spec.rb

@@ -0,0 +1,30 @@
+require 'poms/api/request'
+require 'spec_helper'
+
+RSpec.describe Poms::Api::Request do
+  let(:subject) do
+    described_class.new(
+      'https://rs.poms.omroep.nl/v1/api/media/redirects/',
+      'key',
+      'secret',
+      'http://zapp.nl')
+  end
+
+  describe '#call' do
+    it 'makes the request' do
+      stub = stub_request(:get, 'https://rs.poms.omroep.nl/v1/api/media/redirects/')
+      subject.call
+      expect(stub).to have_been_requested
+    end
+
+    it 'sets the headers' do
+      headers = { 'Test' => 'Header' }
+      stub = stub_request(:get,
+                          'https://rs.poms.omroep.nl/v1/api/media/redirects/')
+             .with(headers: headers)
+      allow(subject).to receive(:headers).and_return(headers)
+      subject.call
+      expect(stub).to have_been_requested
+    end
+  end
+end

data/spec/lib/poms/builderless/clip_spec.rb

@@ -4,7 +4,7 @@ describe Poms::Builderless::Clip do
   let(:clip) { Poms.fetch_clip('WO_NPO_1950962') }
 
   it 'has a title' do
-    expect(clip.title).to eq 'Liedje: de wielen van de bus'
+    expect(clip.title).to eq 'De wielen van de bus'
   end
   it 'has a video url' do
     expect(clip.video_url).to eq 'http://download.omroep.nl/npo/zappelin/DWVZ_AFL_86_De_wielen_van_de_bus.mp4'
@@ -15,6 +15,6 @@ describe Poms::Builderless::Clip do
   end
 
   it 'has a position' do
-    expect(clip.position).to eq 1
+    expect(clip.position).to eq 2
   end
 end

data/spec/lib/poms/merged_series_spec.rb

@@ -1,28 +1,26 @@
 require 'spec_helper'
 
 describe Poms::MergedSeries do
-  let(:url) { described_class::API_URL }
+  let(:url) { described_class::TEST_URL }
 
   it 'turns the json into a hash' do
-    mids = subject.serie_mids
+    mids = subject.serie_mids(url)
     expect(mids.keys).to include('POMS_S_EO_097367')
     expect(mids.values).to include('VPWON_1257896')
   end
 
   it 'throws an error on a network error' do
-    FakeWeb.register_uri(:get, url, body:
-    '', status: 500)
-    expect { subject.serie_mids }.to raise_error(Poms::PomsError)
+    stub_request(:any, url).to_return(body: '{}', status: 500)
+    expect { subject.serie_mids(url) }.to raise_error(Poms::PomsError)
   end
 
   it 'throws an error on invalid json' do
-    FakeWeb.register_uri(:get, url, body:
-    'Test')
-    expect { subject.serie_mids }.to raise_error(Poms::PomsError)
+    stub_request(:any, url).to_return(body: 'Test')
+    expect { subject.serie_mids(url) }.to raise_error(Poms::PomsError)
   end
 
   it 'throws an error on timeout' do
-    allow(Timeout).to receive(:timeout).and_raise(Timeout::Error)
-    expect { subject.serie_mids }.to raise_error(Poms::PomsError)
+    stub_request(:any, url).to_timeout
+    expect { subject.serie_mids(url) }.to raise_error(Poms::PomsError)
   end
 end

data/spec/lib/poms/views_spec.rb

@@ -5,8 +5,8 @@ describe Poms::Views do
     let(:response) { File.read 'spec/fixtures/poms_broadcast.json' }
 
     it 'returns a metadata object' do
-      FakeWeb.register_uri(:get, 'http://docs.poms.omroep.nl/media/KRO_1614405',
-                           body: response)
+      stub_request(:any, 'http://docs.poms.omroep.nl/media/KRO_1614405')
+        .to_return(body: response)
       expect(subject.get('KRO_1614405')).to eq(JSON.parse response)
     end
   end

data/spec/lib/poms_spec.rb

@@ -6,8 +6,8 @@ describe Poms do
     let(:response)  { File.read 'spec/fixtures/poms_broadcast.json' }
 
     before do
-      FakeWeb.register_uri(:get, 'http://docs.poms.omroep.nl/media/KRO_1614405',
-                           body: response)
+      stub_request(:get, 'http://docs.poms.omroep.nl/media/KRO_1614405')
+        .to_return(body: response)
     end
 
     it 'fetches a broadcast' do
@@ -22,27 +22,27 @@ describe Poms do
     it 'fetches a group' do
       response = File.read 'spec/fixtures/poms_broadcast.json'
       url = 'http://docs.poms.omroep.nl/media/_design/media/_view/by-group?include_docs=true&key=%22POMS_S_NPO_823012%22&reduce=false'
-      FakeWeb.register_uri(:get, url, body: response)
+      stub_request(:get, url).to_return(body: response)
       expect(Poms.fetch_group('POMS_S_NPO_823012')).to eq(JSON.parse response)
     end
 
     it 'returns nil when a broadcast does not exits' do
-      FakeWeb.register_uri(:get, 'http://docs.poms.omroep.nl/media/BLA',
-                           status: [404, 'Not Found'])
+      stub_request(:get, 'http://docs.poms.omroep.nl/media/BLA')
+        .to_return(status: [404, 'Not Found'])
       expect(Poms.fetch('BLA')).to eq(nil)
     end
   end
 
   describe '#fetch_playlist_clips' do
     it 'creates an array of clips' do
-      expect(Poms.fetch_playlist_clips('POMS_S_NPO_818759').size).to eq(21)
+      expect(Poms.fetch_playlist_clips('POMS_S_NPO_818759').size).to eq(23)
     end
   end
 
   describe '#fetch_broadcasts_for_serie' do
     it 'returns nil when a broadcast does not exist' do
-      FakeWeb.register_uri(:get, 'http://docs.poms.omroep.nl/media/_design/media/_view/by-ancestor-and-type?reduce=false&key=[%22BLA%22,%22BROADCAST%22]&include_docs=true',
-                           status: [404, 'Not Found'])
+      stub_request(:get, 'http://docs.poms.omroep.nl/media/_design/media/_view/by-ancestor-and-type?reduce=false&key=[%22BLA%22,%22BROADCAST%22]&include_docs=true')
+        .to_return(status: [404, 'Not Found'])
       expect(Poms.fetch_broadcasts_for_serie('BLA')).to eq([])
     end
   end
@@ -54,7 +54,7 @@ describe Poms do
 
     before do
       path = 'http://docs.poms.omroep.nl/media/_design/media/_view/broadcasts-by-broadcaster-and-start?startkey=[%22Zapp%22,1369755130000]&endkey=[%22Zapp%22,1370964770000]&reduce=false&include_docs=true'
-      FakeWeb.register_uri(:get, path, body: response)
+      stub_request(:get, path).to_return(body: response)
     end
 
     it 'fetches all broadcast by zapp and parses it correctly' do
@@ -79,7 +79,7 @@ describe Poms do
     describe '#fetch_current_broadcast' do
       before do
         path = 'http://docs.poms.omroep.nl/media/_design/media/_view/broadcasts-by-channel-and-start?startkey=[%22NED3%22,1410969127000]&endkey=[%22NED3%22,1410882727000]&reduce=false&include_docs=true&descending=true&limit=1'
-        FakeWeb.register_uri(:get, path, body: response)
+        stub_request(:get, path).to_return(body: response)
       end
 
       it 'fetches the current broadcast' do
@@ -91,7 +91,7 @@ describe Poms do
     describe '#fetch_current_broadcast_and_key' do
       before do
         path = 'http://docs.poms.omroep.nl/media/_design/media/_view/broadcasts-by-channel-and-start?startkey=[%22NED3%22,1410969127000]&endkey=[%22NED3%22,1410882727000]&reduce=false&include_docs=true&descending=true&limit=1'
-        FakeWeb.register_uri(:get, path, body: response)
+        stub_request(:get, path).to_return(body: response)
       end
 
       it 'fetches the current broadcast' do
@@ -108,7 +108,7 @@ describe Poms do
     describe '#fetch_next_broadcast' do
       before do
         path = 'http://docs.poms.omroep.nl/media/_design/media/_view/broadcasts-by-channel-and-start?startkey=[%22NED3%22,1410969127000]&endkey=[%22NED3%22,1411055527000]&reduce=false&include_docs=true&limit=1'
-        FakeWeb.register_uri(:get, path, body: response)
+        stub_request(:get, path).to_return(body: response)
       end
 
       it 'fetches the next broadcast' do
@@ -120,7 +120,7 @@ describe Poms do
     describe '#fetch_next_broadcast_and_key' do
       before do
         path = 'http://docs.poms.omroep.nl/media/_design/media/_view/broadcasts-by-channel-and-start?startkey=[%22NED3%22,1410969127000]&endkey=[%22NED3%22,1411055527000]&reduce=false&include_docs=true&descending=true&limit=1'
-        FakeWeb.register_uri(:get, path, body: response)
+        stub_request(:get, path).to_return(body: response)
       end
 
       it 'fetches the current broadcast' do
@@ -130,7 +130,7 @@ describe Poms do
 
       it 'returns the key' do
         expect(Poms.fetch_next_broadcast_and_key('NED3')[:key])
-          .to eq(['NED3', 1_410_966_671_000])
+          .to eq(['NED3', 1_410_969_900_000])
       end
     end
   end

data/spec/spec_helper.rb

@@ -1,16 +1,16 @@
 require 'rubygems'
 require 'bundler/setup'
-require 'fakeweb'
+require 'webmock/rspec'
 require 'fabrication'
 require 'vcr'
 require 'timecop'
-require 'poms' # and any other gems you need
+require 'poms'
 
-FakeWeb.allow_net_connect = false
+WebMock.disable_net_connect!
 
 VCR.configure do |config|
   config.cassette_library_dir = 'spec/fixtures/vcr_cassettes'
-  config.hook_into :fakeweb
+  config.hook_into :webmock
 end
 
 RSpec.configure do |config|

metadata

@@ -1,16 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: poms
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Tom Kruijsen
-- Stijn Meurkens
-- Tijn Schuurmans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-21 00:00:00.000000000 Z
+date: 2016-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -83,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: fakeweb
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -169,8 +167,6 @@ dependencies:
 description: Interface to POMS CouchDB API
 email:
 - tom@brightin.nl
-- stijn@brightin.nl
-- tijn@brightin.nl
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -183,6 +179,8 @@ files:
 - README.md
 - Rakefile
 - lib/poms.rb
+- lib/poms/api/auth.rb
+- lib/poms/api/request.rb
 - lib/poms/base.rb
 - lib/poms/broadcast.rb
 - lib/poms/builder.rb
@@ -209,17 +207,14 @@ files:
 - spec/fixtures/poms_series.json
 - spec/fixtures/poms_single_broadcast_by_channel.json
 - spec/fixtures/poms_zapp.json
-- spec/fixtures/vcr_cassettes/poms/builderless/broadcast/has_a_position.yml
-- spec/fixtures/vcr_cassettes/poms/builderless/broadcast/has_a_title.yml
-- spec/fixtures/vcr_cassettes/poms/builderless/broadcast/has_a_video_url.yml
-- spec/fixtures/vcr_cassettes/poms/builderless/broadcast/has_an_image_id.yml
 - spec/fixtures/vcr_cassettes/poms/builderless/broadcast_starts_at/returns_a_datetime.yml
 - spec/fixtures/vcr_cassettes/poms/builderless/clip/has_a_position.yml
 - spec/fixtures/vcr_cassettes/poms/builderless/clip/has_a_title.yml
 - spec/fixtures/vcr_cassettes/poms/builderless/clip/has_a_video_url.yml
 - spec/fixtures/vcr_cassettes/poms/builderless/clip/has_an_image_id.yml
 - spec/fixtures/vcr_cassettes/poms/fetch_broadcasts_fetch_current_broadcast_fetches_the_current_broadcast.yml
-- spec/fixtures/vcr_cassettes/poms/merged_series/is_enumerable.yml
+- spec/fixtures/vcr_cassettes/poms/fetch_broadcasts_fetch_next_broadcast_and_key_fetches_the_current_broadcast.yml
+- spec/fixtures/vcr_cassettes/poms/fetch_broadcasts_fetch_next_broadcast_and_key_returns_the_key.yml
 - spec/fixtures/vcr_cassettes/poms/merged_series/turns_the_json_into_a_hash.yml
 - spec/fixtures/vcr_cassettes/poms_fetch/a_broadcast_has_scheduled_events_with_last_with_starts_at.yml
 - spec/fixtures/vcr_cassettes/poms_fetch/a_clip_has_a_title.yml
@@ -233,6 +228,8 @@ files:
 - spec/fixtures/vcr_cassettes/poms_fetch_group/has_a_child_with_a_title.yml
 - spec/fixtures/vcr_cassettes/poms_fetch_playlist_clips/creates_an_array_of_clips.yml
 - spec/integration/poms_spec.rb
+- spec/lib/poms/api/auth_spec.rb
+- spec/lib/poms/api/request_spec.rb
 - spec/lib/poms/broadcast_spec.rb
 - spec/lib/poms/builder_spec.rb
 - spec/lib/poms/builderless/broadcast_spec.rb
@@ -266,7 +263,7 @@ rubyforge_project:
 rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
-summary: Interfcae to POMS CouchDB API
+summary: Interface to POMS CouchDB API
 test_files:
 - spec/fabricators/poms_fabricator.rb
 - spec/fixtures/poms_broadcast.json
@@ -276,17 +273,14 @@ test_files:
 - spec/fixtures/poms_series.json
 - spec/fixtures/poms_single_broadcast_by_channel.json
 - spec/fixtures/poms_zapp.json
-- spec/fixtures/vcr_cassettes/poms/builderless/broadcast/has_a_position.yml
-- spec/fixtures/vcr_cassettes/poms/builderless/broadcast/has_a_title.yml
-- spec/fixtures/vcr_cassettes/poms/builderless/broadcast/has_a_video_url.yml
-- spec/fixtures/vcr_cassettes/poms/builderless/broadcast/has_an_image_id.yml
 - spec/fixtures/vcr_cassettes/poms/builderless/broadcast_starts_at/returns_a_datetime.yml
 - spec/fixtures/vcr_cassettes/poms/builderless/clip/has_a_position.yml
 - spec/fixtures/vcr_cassettes/poms/builderless/clip/has_a_title.yml
 - spec/fixtures/vcr_cassettes/poms/builderless/clip/has_a_video_url.yml
 - spec/fixtures/vcr_cassettes/poms/builderless/clip/has_an_image_id.yml
 - spec/fixtures/vcr_cassettes/poms/fetch_broadcasts_fetch_current_broadcast_fetches_the_current_broadcast.yml
-- spec/fixtures/vcr_cassettes/poms/merged_series/is_enumerable.yml
+- spec/fixtures/vcr_cassettes/poms/fetch_broadcasts_fetch_next_broadcast_and_key_fetches_the_current_broadcast.yml
+- spec/fixtures/vcr_cassettes/poms/fetch_broadcasts_fetch_next_broadcast_and_key_returns_the_key.yml
 - spec/fixtures/vcr_cassettes/poms/merged_series/turns_the_json_into_a_hash.yml
 - spec/fixtures/vcr_cassettes/poms_fetch/a_broadcast_has_scheduled_events_with_last_with_starts_at.yml
 - spec/fixtures/vcr_cassettes/poms_fetch/a_clip_has_a_title.yml
@@ -300,6 +294,8 @@ test_files:
 - spec/fixtures/vcr_cassettes/poms_fetch_group/has_a_child_with_a_title.yml
 - spec/fixtures/vcr_cassettes/poms_fetch_playlist_clips/creates_an_array_of_clips.yml
 - spec/integration/poms_spec.rb
+- spec/lib/poms/api/auth_spec.rb
+- spec/lib/poms/api/request_spec.rb
 - spec/lib/poms/broadcast_spec.rb
 - spec/lib/poms/builder_spec.rb
 - spec/lib/poms/builderless/broadcast_spec.rb

data/spec/fixtures/vcr_cassettes/poms/builderless/broadcast/has_a_position.yml

@@ -1,43 +0,0 @@
----
-http_interactions:
-- request:
-    method: get
-    uri: http://docs.poms.omroep.nl/media/WO_NPO_1950962
-    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:
-      date:
-      - Tue, 19 Jan 2016 13:04:50 GMT
-      server:
-      - CouchDB/1.6.1 (Erlang OTP/R15B01)
-      etag:
-      - '"6-a026d5befe017ec7fcef8050ee6e4bcf"'
-      content-type:
-      - text/plain; charset=utf-8
-      content-length:
-      - '1545'
-      cache-control:
-      - must-revalidate
-      x-proxyinstancename:
-      - poms1b
-      set-cookie:
-      - balancer://poms3cluster=balancer.poms1s2db; path=/;
-    body:
-      encoding: UTF-8
-      string: |
-        {"_id":"WO_NPO_1950962","_rev":"6-a026d5befe017ec7fcef8050ee6e4bcf","objectType":"program","mid":"WO_NPO_1950962","creationDate":1442490263679,"lastModified":1447947725305,"sortDate":1442490263679,"urn":"urn:vpro:media:program:62589080","embeddable":true,"broadcasters":["NPO"],"titles":[{"value":"De wielen van de bus","owner":"BROADCASTER","type":"MAIN"},{"value":"De wielen van de bus","owner":"BROADCASTER","type":"SUB"}],"descriptions":[{"value":"De wielen van de bus","owner":"BROADCASTER","type":"MAIN"}],"genres":["Jeugd"],"countries":[],"languages":[],"duration":60000,"descendantOf":[{"midRef":"POMS_S_NPO_2015412","urnRef":"urn:vpro:media:group:62589310","type":"PLAYLIST"}],"memberOf":[{"midRef":"POMS_S_NPO_2015412","urnRef":"urn:vpro:media:group:62589310","type":"PLAYLIST","index":2,"highlighted":false,"added":1442490529409}],"locations":[{"programUrl":"http://download.omroep.nl/npo/zappelin/DWVZ_AFL_86_De_wielen_van_de_bus.mp4","avAttributes":{"bitrate":1000000,"avFileFormat":"MP4"},"owner":"BROADCASTER","creationDate":1442490345785,"lastModified":1442490345864,"workflow":"PUBLISHED","urn":"urn:vpro:media:location:62589229"}],"images":[{"title":"Wielen van de bus","description":"wielen van de bus","imageUri":"urn:vpro:image:653515","height":259,"width":559,"owner":"BROADCASTER","type":"PORTRAIT","highlighted":true,"creationDate":1442491591052,"lastModified":1442491591141,"workflow":"PUBLISHED","urn":"urn:vpro:media:image:62590127"}],"publishDate":1447947869447,"workflow":"PUBLISHED","type":"CLIP","avType":"VIDEO"}
-    http_version: '1.1'
-  recorded_at: Tue, 06 Oct 2015 12:00:00 GMT
-recorded_with: VCR 2.9.3

data/spec/fixtures/vcr_cassettes/poms/builderless/broadcast/has_a_title.yml

@@ -1,43 +0,0 @@
----
-http_interactions:
-- request:
-    method: get
-    uri: http://docs.poms.omroep.nl/media/WO_NPO_1950962
-    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:
-      date:
-      - Tue, 19 Jan 2016 13:04:50 GMT
-      server:
-      - CouchDB/1.6.1 (Erlang OTP/R15B01)
-      etag:
-      - '"6-a026d5befe017ec7fcef8050ee6e4bcf"'
-      content-type:
-      - text/plain; charset=utf-8
-      content-length:
-      - '1545'
-      cache-control:
-      - must-revalidate
-      x-proxyinstancename:
-      - poms1b
-      set-cookie:
-      - balancer://poms3cluster=balancer.poms1s1db; path=/;
-    body:
-      encoding: UTF-8
-      string: |
-        {"_id":"WO_NPO_1950962","_rev":"6-a026d5befe017ec7fcef8050ee6e4bcf","objectType":"program","mid":"WO_NPO_1950962","creationDate":1442490263679,"lastModified":1447947725305,"sortDate":1442490263679,"urn":"urn:vpro:media:program:62589080","embeddable":true,"broadcasters":["NPO"],"titles":[{"value":"De wielen van de bus","owner":"BROADCASTER","type":"MAIN"},{"value":"De wielen van de bus","owner":"BROADCASTER","type":"SUB"}],"descriptions":[{"value":"De wielen van de bus","owner":"BROADCASTER","type":"MAIN"}],"genres":["Jeugd"],"countries":[],"languages":[],"duration":60000,"descendantOf":[{"midRef":"POMS_S_NPO_2015412","urnRef":"urn:vpro:media:group:62589310","type":"PLAYLIST"}],"memberOf":[{"midRef":"POMS_S_NPO_2015412","urnRef":"urn:vpro:media:group:62589310","type":"PLAYLIST","index":2,"highlighted":false,"added":1442490529409}],"locations":[{"programUrl":"http://download.omroep.nl/npo/zappelin/DWVZ_AFL_86_De_wielen_van_de_bus.mp4","avAttributes":{"bitrate":1000000,"avFileFormat":"MP4"},"owner":"BROADCASTER","creationDate":1442490345785,"lastModified":1442490345864,"workflow":"PUBLISHED","urn":"urn:vpro:media:location:62589229"}],"images":[{"title":"Wielen van de bus","description":"wielen van de bus","imageUri":"urn:vpro:image:653515","height":259,"width":559,"owner":"BROADCASTER","type":"PORTRAIT","highlighted":true,"creationDate":1442491591052,"lastModified":1442491591141,"workflow":"PUBLISHED","urn":"urn:vpro:media:image:62590127"}],"publishDate":1447947869447,"workflow":"PUBLISHED","type":"CLIP","avType":"VIDEO"}
-    http_version: '1.1'
-  recorded_at: Tue, 06 Oct 2015 12:00:00 GMT
-recorded_with: VCR 2.9.3