Merge pull request #16 from mulev/develop

Develop

.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
 rvm:
 - 2.1.0
-- 2.2.0
+# - 2.2.0 # build fails for unknown reason
 - 2.3.4
 - 2.4.2
 script: rake test

CHANGELOG

@@ -1,3 +1,6 @@
+[1.5.0]
+- Handle AudioPlayer state info in context section within request
+
 [1.4.5]
 - Handle different Playback requests
 - Validate signature for all except AudioPlayer

lib/alexa_ruby.rb

@@ -7,6 +7,7 @@
 require 'alexa_ruby/alexa'
 require 'alexa_ruby/request/base_request'
 require 'alexa_ruby/request/base_request/context'
+require 'alexa_ruby/request/base_request/context/audio_state'
 require 'alexa_ruby/request/base_request/context/device'
 require 'alexa_ruby/request/base_request/session'
 require 'alexa_ruby/request/base_request/validator'

lib/alexa_ruby/request/base_request/context.rb

@@ -1,7 +1,7 @@
 module AlexaRuby
   # Amazon Alexa request context - application, user and device info
   class Context
-    attr_reader :app_id, :user, :device, :api_endpoint
+    attr_reader :app_id, :user, :device, :api_endpoint, :audio_state
 
     # Initialize new Context object
     #
@@ -14,6 +14,7 @@ def initialize(context)
       @user = load_user(context[:System][:user])
       @device = load_device(context[:System][:device])
       @api_endpoint = context[:System][:apiEndpoint]
+      @audio_state = load_audio_state(context[:AudioPlayer])
     end
 
     private
@@ -41,5 +42,13 @@ def load_user(params)
     def load_device(params)
       Device.new(params)
     end
+
+    # Initialize audio player state
+    #
+    # @param params [Hash] audio player parameters
+    # @return [Object] new AudioState object instance
+    def load_audio_state(params)
+      AudioState.new(params) unless params.nil?
+    end
   end
 end

lib/alexa_ruby/request/base_request/context/audio_state.rb

@@ -0,0 +1,15 @@
+module AlexaRuby
+  # Audio state from context section in request
+  class AudioState
+    attr_reader :token, :playback_offset, :playback_state
+
+    # Setup new AudioState object
+    #
+    # @param audio_state [Hash] audio player state
+    def initialize(audio_state)
+      @token = audio_state[:token]
+      @playback_offset = audio_state[:offsetInMilliseconds]
+      @playback_state = audio_state[:playerActivity]
+    end
+  end
+end

lib/alexa_ruby/version.rb

@@ -1,3 +1,3 @@
 module AlexaRuby
-  VERSION = '1.4.5'.freeze
+  VERSION = '1.5.0'.freeze
 end

spec/request/context_spec.rb

@@ -18,6 +18,9 @@
         alexa.request.context.user.id.wont_be_nil
         alexa.request.context.device.wont_be_nil
         alexa.request.context.device.id.wont_be_nil
+        alexa.request.context.audio_state.token.must_be_nil
+        alexa.request.context.audio_state.playback_offset.wont_be_nil
+        alexa.request.context.audio_state.playback_state.wont_be_nil
       end
 
       it 'should raise ArgumentError if application ID is missing' do
@@ -40,6 +43,13 @@
         err = proc { AlexaRuby.new(req) }.must_raise ArgumentError
         err.message.must_equal 'Missing device ID'
       end
+
+      it 'should remain valid if audio player section is missing' do
+        req = Oj.load(@json, symbol_keys: true)
+        req[:context][:AudioPlayer] = nil
+        alexa = AlexaRuby.new(req)
+        alexa.request.context.audio_state.must_be_nil
+      end
     end
   end
 end