poms 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 803e21eff20cb74d25166d66205ff1670fb25b29
-  data.tar.gz: a80b6ade7269aac4a7b8dcda99b41f17c0c2da9f
+  metadata.gz: 159b27be6905d2411787cdf6e467f9740ec7fad8
+  data.tar.gz: 383b7e756c3fa5e19a9772aab2321d1f1e3beff2
 SHA512:
-  metadata.gz: 26bbcd9773cd870bf7259abd829ec7084e76827ffdb2f874619d95bd6eb91f3c0edcf34ab47a915c0f162bcb2961853a681590b84267bb4234843eb60b7d423b
-  data.tar.gz: 262cf80bd0b5960b378734e59b4a07f7814a47968685bfded8318e2ec9b1ce52192f0d63daa377f0649fceb33e702f8177b596fd96280249bda0f41021a4d32c
+  metadata.gz: 18424ff4b9cde70eb7c8fc88f327364a017546109852c9c5fd9111e2f85abe2f38c9949badcf704d261ae683c2cb88192f52fb1ef0bcb5bc42ac6a0b89aad990
+  data.tar.gz: da656995685bcd795fd4e99e149486bb05c6900e976d4151113882476f716439e563ba2be88a1a471868b31d5c51e988d891c0c2cfbc05190b35138c826ee084

data/.rubocop.yml

@@ -4,6 +4,7 @@ AllCops:
   Exclude:
     - bin/*
     - poms.gemspec
+    - vendor/**/*
 
 Style/Documentation:
   Exclude:

data/.todo.reek

@@ -1,4 +1,6 @@
 ---
+exclude_paths:
+  - vendor
 UncommunicativeVariableName:
   exclude:
   - Poms::Fields#available_until

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Poms Release notes
 
+## 2.1.0
+
+* Allow `schedule_events` to accept a block which allows you to filter the events.
+* The `scheduled_now` and `scheduled_next` functions always return the most recent and upcoming shows. They shouldn't return nil anymore, even if something is not live at the moment (during a commercial break for instance).
+
 ## 2.0.1
 
 * Fix search parameter `type`. This didn't get picked up properly before, but is now used in the search.

data/Gemfile

@@ -4,5 +4,5 @@ source 'https://rubygems.org'
 gemspec
 
 group :development, :test do
-  require 'pry'
+  gem 'pry'
 end

data/README.md

@@ -1,4 +1,4 @@
-[ ![Codeship Status for brightin/poms](https://codeship.com/projects/c2baf9b0-ea8d-0132-2258-628e55ad70cc/status?branch=master)](https://codeship.com/projects/83157)
+[![CircleCI](https://circleci.com/gh/brightin/poms.svg?style=svg)](https://circleci.com/gh/brightin/poms)
 
 # Poms
 

data/circle.yml

@@ -0,0 +1,12 @@
+machine:
+  timezone:
+    Europe/Amsterdam
+  environment:
+    POMS_KEY: key
+    POMS_ORIGIN: origin
+    POMS_SECRET: secret
+test:
+  override:
+    - bundle exec rubocop
+    - bundle exec reek
+    - bundle exec rspec

data/lib/poms.rb

@@ -87,7 +87,7 @@ module Poms
     Poms::Api::JsonClient.get(
       Poms::Api::Uris::Schedule.now(config.base_uri, channel),
       config.credentials
-    )
+    ).fetch('items').first
   end
 
   # Fetches the event for the next broadcast on a given channel
@@ -97,7 +97,7 @@ module Poms
     Poms::Api::JsonClient.get(
       Poms::Api::Uris::Schedule.next(config.base_uri, channel),
       config.credentials
-    )
+    ).fetch('items').first
   end
 
   def reset_config

data/lib/poms/api/uris/schedule.rb

@@ -10,15 +10,29 @@ module Poms
         module_function
 
         def now(base_uri, channel)
-          uri_for_path(base_uri, "/channel/#{channel}/now")
+          uri_for_path(
+            base_uri,
+            "/channel/#{channel}",
+            stop: Time.now.iso8601,
+            sort: 'desc',
+            max: 1
+          )
         end
 
         def next(base_uri, channel)
-          uri_for_path(base_uri, "/channel/#{channel}/next")
+          uri_for_path(
+            base_uri,
+            "/channel/#{channel}",
+            start: Time.now.iso8601,
+            sort: 'asc',
+            max: 1
+          )
         end
 
-        def uri_for_path(base_uri, path = nil)
-          base_uri.merge(path: "#{API_PATH}#{path}")
+        def uri_for_path(base_uri, path = nil, query = {})
+          uri = base_uri.merge(path: "#{API_PATH}#{path}")
+          uri.query_values = query
+          uri
         end
 
         private_class_method :uri_for_path

data/lib/poms/fields.rb

@@ -71,16 +71,28 @@ module Poms
       parent.first['index'] if parent.present?
     end
 
+    # Returns an array of start and end times for the  scheduled events for
+    # this item. It returns an empty array if no events are found. You can pass
+    # in a block to filter the events on data that is not returned, like
+    # channel.
+    #
+    # @param item The Poms hash
     def schedule_events(item)
       events = item.fetch('scheduleEvents', [])
-      events.map do |event|
-        {
-          'starts_at' => Timestamp.to_datetime(event['start']),
-          'ends_at' => Timestamp.to_datetime(event['start'] + event['duration'])
-        }
-      end
+      events = yield(events) if block_given?
+      events.map { |event| hash_event(event) }
     end
 
+    # Turns the event into a hash.
+    def hash_event(event)
+      {
+        'starts_at' => Timestamp.to_datetime(event.fetch('start')),
+        'ends_at' => Timestamp.to_datetime(event.fetch('start') +
+          event.fetch('duration'))
+      }
+    end
+    private_class_method :hash_event
+
     # Poms has arrays of hashes for some types that have a value and type. This
     # is a way to access those simply.
     #
@@ -98,7 +110,6 @@ module Poms
       return unless res
       res['value']
     end
-
     private_class_method :value_of_type
   end
 end

data/lib/poms/version.rb

@@ -1,4 +1,4 @@
 # The version
 module Poms
-  VERSION = '2.0.1'.freeze
+  VERSION = '2.1.0'.freeze
 end

data/poms.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rubocop-rspec'
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'simplecov'
+  spec.add_development_dependency 'timecop'
   spec.add_development_dependency 'vcr'
   spec.add_development_dependency 'webmock'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: poms
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Tom Kruijsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-30 00:00:00.000000000 Z
+date: 2016-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -150,6 +150,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: vcr
   requirement: !ruby/object:Gem::Requirement
@@ -195,11 +209,10 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/ci-run
-- bin/ci-setup
 - bin/reek
 - bin/rspec
 - bin/rubocop
+- circle.yml
 - examples/fetch.rb
 - examples/search.rb
 - lib/poms.rb

data/bin/ci-run

@@ -1,57 +0,0 @@
-#!/bin/bash --login
-#
-# Usage: bin/ci-run [--help|--job N]
-#
-# Run all tasks required for a Continuous Integration job. Also see ci-setup.
-#
-# Options:
-#
-#   --job N May be used for CI parallelisation. Use this number to do only part
-#           of the usual work, for example by invoking different test scripts.
-#   --help  Display this message.
-#
-# Examples:
-#
-#   Run all the tests for this project:
-#
-#     bin/ci-run
-#
-#   Run only part of the test suite:
-#
-#     bin/ci-run --job 1
-
-set -e
-
-# Run the actual tests for this project. The exit code of this function is
-# determines the outcome of the CI build.
-#
-# TODO adapt the Rake command invokation below into something that makes sense for
-#      your particular project.
-run_tests() {
-  # RVM is not activated in non-login shells, so we do so manually.
-  RUBY_VERSION=$(cat .ruby-version)
-  echo "Using Ruby $RUBY_VERSION"
-  source $(rvm $RUBY_VERSION do rvm env --path)
-
-  set -x
-  bundle exec rubocop
-  bundle exec reek
-  bundle exec rspec
-}
-
-# Print help for this script by printing its top comment block (without the
-# comment markers).
-show_help() {
-  awk '/^# Usage/,/^$/' $0 | cut -c 3-
-  exit 1
-}
-
-if [[ $# -ge 1 ]]
-then
-  case $1 in
-    "--job" ) run_tests $2;;
-    * )       show_help;;
-  esac
-else
-  run_tests
-fi

data/bin/ci-setup

@@ -1,46 +0,0 @@
-#!/bin/bash --login
-#
-# Usage: bin/ci-setup [--help]
-#
-# Set up a Codeship CI VM for running a test suite. Also see ci-run.
-#
-# Options:
-#
-#   --help  Display this message.
-
-set -e
-
-# Perform the steps necessary to set up the CI environment for testing. This
-# should include languages, services, package managers, environment, etc.
-setup() {
-  set -x
-  # Read the required version of Ruby from the Gemfile and use RVM to install it
-  rvm use $(cat .ruby-version) --install
-
-  # To use Node.js as Javascript runtime, uncomment the following lines.
-  # nvm install 0.12
-  # nvm use 0.12
-
-  # If the project has a package.json file and javascript dependencies, you can
-  # install them here.
-  # npm install
-
-  # Install Ruby dependencies with Bundler.
-  bundle install
-
-  set +x
-}
-
-# Print help for this script by printing its top comment block (without the
-# comment markers).
-show_help() {
-  awk '/^# Usage/,/^$/' $0 | cut -c 3-
-  exit 1
-}
-
-if [[ $# -ge 1 ]]
-then
-  show_help
-else
-  setup
-fi