poms 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e3aa1829a203b60720b24083855ffb8a9f41621
-  data.tar.gz: 60ddc33138bde526bf72892201877abce90dbc29
+  metadata.gz: a3549380a845d97e5c0cd2428afa06b7ccf2e1ef
+  data.tar.gz: 93d6400f2a0aaaecbd8a9b8ebf7dc9466be12256
 SHA512:
-  metadata.gz: 755e683ca19d2c23d29555426309d3618bfe2b0dcb30651341053c9332b8c61db00e0968dea06a1105ec9bf55b1c85ba71a867eeef1e7c7b29e3edf70480c3cb
-  data.tar.gz: 8f4e26864b024263e36f830cad01cd56a915c438d979c0ef3304b2d0217661f41d21f0fddb606029eec76ebf70e9b7aadfebb2549d699154d46a93393759bad7
+  metadata.gz: 1b2e9bddc91940ea7659b3e4f812bb6870cb5f8eb670ded228be422e972e973f5deef9a35f441c381c16ae0e670c33113edf26020cbb6a397759954db6b44679
+  data.tar.gz: 5357169c1f04967e947821c0af4c0c676cf6a513ef87c2e2487b76eae9535556f3f40632317a2e9b74f2ee24f99636bb07ae873a399bff6f52f140920f15ba7d

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    poms (0.0.3)
+    poms (0.0.4)
       activesupport
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.1.5)
+    activesupport (4.1.6)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -62,6 +62,7 @@ GEM
     slop (3.6.0)
     thor (0.19.1)
     thread_safe (0.3.4)
+    timecop (0.7.1)
     timers (1.1.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
@@ -78,3 +79,4 @@ DEPENDENCIES
   poms!
   rake
   rspec
+  timecop

data/lib/poms.rb

@@ -64,17 +64,23 @@ module Poms
   end
 
   def fetch_current_broadcast(channel)
-    uri = [CHANNEL_AND_START_PATH, channel_params(channel, Time.now, 1.day.ago), '&descending=true&limit=1' ].join
-    hash = get_json(uri)
-    rows = hash['rows']
-    Poms::Builder.process_hash(rows.empty? ? {} : rows.first['doc'])
+    hash = get_json(channel_and_start_uri(channel, Time.now, 1.day.ago, {limit: 1, descending: true}))
+    get_first_broadcast(hash)
+  end
+
+  def fetch_current_broadcast_and_key(channel)
+    hash = get_json(channel_and_start_uri(channel, Time.now, 1.day.ago, {limit: 1, descending: true}))
+    {key: get_first_key(hash), broadcast: get_first_broadcast(hash)}
   end
 
   def fetch_next_broadcast(channel)
-    uri = [CHANNEL_AND_START_PATH, channel_params(channel, Time.now, 1.day.from_now), '&limit=1' ].join
-    hash = get_json(uri)
-    rows = hash['rows']
-    Poms::Builder.process_hash(rows.empty? ? {} : rows.first['doc'])
+    hash = get_json(channel_and_start_uri(channel, Time.now, 1.day.from_now, {limit: 1}))
+    get_first_broadcast(hash)
+  end
+
+  def fetch_next_broadcast_and_key(channel)
+    hash = get_json(channel_and_start_uri(channel, Time.now, 1.day.from_now, {limit: 1}))
+    {key: get_first_key(hash), broadcast: get_first_broadcast(hash)}
   end
 
   # private
@@ -107,4 +113,21 @@ module Poms
     end
   end
 
+  private
+
+  def channel_and_start_uri(channel, start_time, end_time, options={})
+    query_options = options.blank? ? '' : "&#{options.to_query}"
+    [CHANNEL_AND_START_PATH, channel_params(channel, start_time, end_time), query_options ].join
+  end
+
+  def get_first_broadcast(hash)
+    rows = hash['rows']
+    Poms::Builder.process_hash(rows.empty? ? {} : rows.first['doc'])
+  end
+
+  def get_first_key(hash)
+    rows = hash['rows']
+    rows.empty? ? [] : rows.first['key']
+  end
+
 end

data/lib/poms/version.rb

@@ -1,3 +1,3 @@
 module Poms
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/fixtures/poms_single_broadcast_by_channel.json

@@ -0,0 +1,136 @@
+{
+  "total_rows": 654832,
+  "offset": 235162,
+  "rows": [
+    {
+      "id": "AT_2023343",
+      "key": [
+        "NED3",
+        1410966671000
+      ],
+      "value": null,
+      "doc": {
+        "_id": "AT_2023343",
+        "_rev": "55-d3eee0573e81d0c059eb1127fbc5abeb",
+        "objectType": "program",
+        "mid": "AT_2023343",
+        "creationDate": 1408855689977,
+        "lastModified": 1410964631410,
+        "sortDate": 1410966671000,
+        "urn": "urn:vpro:media:program:44386090",
+        "embeddable": true,
+        "episodeOf": [
+          {
+            "midRef": "AT_2011551",
+            "urnRef": "urn:vpro:media:group:43525293",
+            "type": "SEASON",
+            "index": 30,
+            "highlighted": false,
+            "added": 1408855690158
+          }
+        ],
+        "broadcasters": [
+          "AVROTROS"
+        ],
+        "titles": [
+          {
+            "value": "Junior Songfestival 2014",
+            "owner": "MIS",
+            "type": "MAIN"
+          },
+          {
+            "value": "1e Halve Finale LIVE",
+            "owner": "WHATS_ON",
+            "type": "MAIN"
+          },
+          {
+            "value": "1e Halve Finale LIVE",
+            "owner": "MIS",
+            "type": "SUB"
+          }
+        ],
+        "descriptions": [
+          {
+            "value": "In de eerste halve finale van het Junior Songfestival strijden Bobby & Ella, Chelsea, Sem en Suze tegen elkaar. Een professionele vakjury bepaalt samen met de kinderjury en de kijkers thuis wie er door mag naar die allesbeslissende finale.  Presentatie is in handen van Jan Smit.",
+            "owner": "WHATS_ON",
+            "type": "MAIN"
+          },
+          {
+            "value": "In de eerste halve finale strijden Bobby & Ella, Chelsea, Sem en Suze tegen elkaar. Een professionele vakjury bepaalt samen met de kinderjury en de kijkers thuis wie er door mag naar de finale.",
+            "owner": "MIS",
+            "type": "SHORT"
+          },
+          {
+            "value": "In de eerste halve finale strijden Bobby & Ella, Chelsea, Sem en Suze tegen elkaar.",
+            "owner": "MIS",
+            "type": "KICKER"
+          },
+          {
+            "value": "In de eerste halve finale van het Junior Songfestival strijden Bobby & Ella, Chelsea, Sem en Suze tegen elkaar. Een professionele vakjury bepaalt samen met de kinderjury en de kijkers thuis wie er door mag naar die allesbeslissende finale.",
+            "owner": "MIS",
+            "type": "EPISODE"
+          }
+        ],
+        "genres": [
+          "Jeugd",
+          "Muziek"
+        ],
+        "countries": [
+          "NL"
+        ],
+        "languages": [
+          "NL"
+        ],
+        "avAttributes": {
+          "videoAttributes": {
+            "color": "BLACK_AND_WHITE_AND_COLOR",
+            "aspectRatio": "16:9"
+          },
+          "audioAttributes": {
+            "numberOfChannels": 2
+          }
+        },
+        "releaseYear": 2014,
+        "duration": 3300000,
+        "credits": [
+          {
+            "givenName": "Jan",
+            "familyName": "Smit",
+            "role": "PRESENTER"
+          }
+        ],
+        "descendantOf": [
+          {
+            "midRef": "POMS_S_AVRO_096666",
+            "urnRef": "urn:vpro:media:group:3731025",
+            "type": "SERIES"
+          },
+          {
+            "midRef": "AT_2011551",
+            "urnRef": "urn:vpro:media:group:43525293",
+            "type": "SEASON"
+          }
+        ],
+        "predictions": [
+          {
+            "state": "ANNOUNCED",
+            "platform": "INTERNETVOD"
+          }
+        ],
+        "scheduleEvents": [
+          {
+            "start": 1410966671000,
+            "duration": 3016000,
+            "poProgID": "AT_2023343",
+            "channel": "NED3",
+            "urnRef": "urn:vpro:media:program:44386090",
+            "midRef": "AT_2023343"
+          }
+        ],
+        "workflow": "PUBLISHED",
+        "type": "BROADCAST",
+        "avType": "VIDEO"
+      }
+    }
+  ]
+}

data/spec/lib/poms_spec.rb

@@ -1,3 +1,4 @@
+require 'timecop'
 require 'spec_helper'
 
 describe Poms do
@@ -26,7 +27,7 @@ describe Poms do
   end
 
   describe '#fetch_broadcasts_for_serie' do
-    it 'returns nil when a broadcast does not exits' 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"])
       expect(Poms.fetch_broadcasts_for_serie('BLA')).to eq([])
     end
@@ -54,4 +55,72 @@ describe Poms do
     end
   end
 
+  describe 'fetch broadcasts' do
+    let(:response)    { File.read 'spec/fixtures/poms_single_broadcast_by_channel.json' }
+
+    before do
+      Timecop.freeze(DateTime.strptime("1410969127",'%s'))
+    end
+
+    after do
+      Timecop.return
+    end
+
+    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)
+      end
+
+      it "fetches the current broadcast" do
+        expect(Poms::Builder).to receive(:process_hash).exactly(1).times
+        Poms.fetch_current_broadcast('NED3')
+      end
+    end
+
+    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)
+      end
+
+      it "fetches the current broadcast" do
+        expect(Poms::Builder).to receive(:process_hash).exactly(1).times
+        Poms.fetch_current_broadcast_and_key('NED3')
+      end
+
+      it "returns the key" do
+        expect(Poms.fetch_current_broadcast_and_key('NED3')[:key]).to eq(["NED3",1410966671000])
+      end
+    end
+
+    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)
+      end
+
+      it "fetches the next broadcast" do
+        expect(Poms::Builder).to receive(:process_hash).exactly(1).times
+        Poms.fetch_next_broadcast('NED3')
+      end
+    end
+
+    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)
+      end
+
+      it "fetches the current broadcast" do
+        expect(Poms::Builder).to receive(:process_hash).exactly(1).times
+        Poms.fetch_next_broadcast_and_key('NED3')
+      end
+
+      it "returns the key" do
+        expect(Poms.fetch_next_broadcast_and_key('NED3')[:key]).to eq(["NED3",1410966671000])
+      end
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: poms
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Tom Kruijsen
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-08 00:00:00.000000000 Z
+date: 2014-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -110,6 +110,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -154,6 +168,7 @@ files:
 - spec/fixtures/poms_broadcast_multiple_schedule_events.json
 - spec/fixtures/poms_broadcast_pippi.json
 - spec/fixtures/poms_series.json
+- spec/fixtures/poms_single_broadcast_by_channel.json
 - spec/fixtures/poms_zapp.json
 - spec/lib/poms/broadcast_spec.rb
 - spec/lib/poms/buider_spec.rb
@@ -190,6 +205,7 @@ test_files:
 - spec/fixtures/poms_broadcast_multiple_schedule_events.json
 - spec/fixtures/poms_broadcast_pippi.json
 - spec/fixtures/poms_series.json
+- spec/fixtures/poms_single_broadcast_by_channel.json
 - spec/fixtures/poms_zapp.json
 - spec/lib/poms/broadcast_spec.rb
 - spec/lib/poms/buider_spec.rb