alexa_toolbox 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd37cd19bb97de4723fc60c858e3b4c2a2af637b
-  data.tar.gz: de407de0f2d6409107f4319786fd06e6ba4a228f
+  metadata.gz: a00fd16dba1c76d241e02a97c0895138f6be9190
+  data.tar.gz: 412503af815789dedb76e33df2d848ecd42c0802
 SHA512:
-  metadata.gz: c822745695ce11cff21386472fd36cd1c8e1df50142cbab6b3f3bb0b0d59d553110e931d6ee0a23b39596e87cfe824621174e9d45fc21a4cfaaa2c6ce9d88ad6
-  data.tar.gz: 17eedcdcf1e1fe44289982706ec48b75ad1069c5338de63868a4dfffbb3982f39667c7eb047feb9d01177a90b4b1001578e4171f2cb55a1e4c23c52a01aa5319
+  metadata.gz: 8f4a8a8a2120390ce592238b70b23711f379b08342572ea1fefa07d281d7e72dd4ea54b35e38ecf6ed9ce2fe0415331dd99a543df0a341666a30a9749b31aa68
+  data.tar.gz: f79f3d6cd086776372dd96e445b034108ba98fbfe45aaa5fc3706657fe8579dd485cbd19a1200fe5b171fbad42105403d0ac1ae09c0552adc7d012e68494b28a

data/lib/alexa_toolbox/audioplayer.rb

@@ -4,11 +4,10 @@ module AlexaToolbox
     attr_reader :type, :offset_in_milliseconds, :token, :current_playback_state, :error, :json
 
     def initialize (audioplayer)
-      raise ArgumentError, 'Invalid AudioPlayer' if !audioplayer.key?(:type) && audioplayer[:type][0..10] != "AudioPlayer"
-      @type = audioplayer[:type][12..-1]
-      @offset_in_milliseconds = audioplayer[:offsetInMilliseconds]
-      @token = audioplayer[:token]
-      @current_playback_state = audioplayer[:currentPlaybackState]
+      @type = audioplayer.key?(:type) ? audioplayer[:type][12..-1] : ""
+      @offset_in_milliseconds = audioplayer.key?(:offsetInMilliseconds) ? audioplayer[:offsetInMilliseconds] : nil
+      @token = audioplayer.key?(:token) ? audioplayer[:token] : ""
+      @current_playback_state = audioplayer.key?(:currentPlaybackState) ? audioplayer[:currentPlaybackState] : nil
       @json = audioplayer
     end
 

data/lib/alexa_toolbox/context.rb

@@ -5,8 +5,7 @@ module AlexaToolbox
     attr_reader :audioplayer, :system, :json
 
     def initialize (context)
-      raise ArgumentError, 'Invalid Context' if false
-      @system = context[:System]
+      @system = context.key?(:System) ? context[:System] : ""
       @audioplayer = context.key?(:AudioPlayer) ? AlexaToolbox::AudioPlayer.new(context[:AudioPlayer]) : nil
       @json = context
     end

data/lib/alexa_toolbox/request.rb

@@ -23,10 +23,10 @@ module AlexaToolbox
 
       @request_id = json_request[:request][:requestId]
       raise ArgumentError, 'Request ID not present' if @request_id.nil?
-      @version = json_request[:version]
-      @locale = json_request[:request][:locale]
-      @error = json_request[:request][:error]
-      @cause = json_request[:request][:cause]
+      @version = json_request.key?(:version) ? json_request[:version] : ""
+      @locale = json_request.key?(:request) && json_request[:request].key?(:locale) ? json_request[:request][:locale] : ""
+      @error = json_request.key?(:request) && json_request[:request].key?(:error) ? json_request[:request][:error] : ""
+      @cause = json_request.key?(:request) && json_request[:request].key?(:cause) ? json_request[:request][:cause] : ""
       @json   = json_request
       @type = json_request[:request][:type][0..10] == "AudioPlayer" ? "AudioPlayer" : json_request[:request][:type]
 

data/lib/alexa_toolbox/session.rb

@@ -4,13 +4,13 @@ module AlexaToolbox
     attr_reader :new, :session_id, :attributes, :user, :application_id, :device
 
     def initialize (session)
-      raise ArgumentError, 'Invalid Session' if session.nil? || session[:new].nil? || session[:sessionId].nil?
+      raise ArgumentError, 'Invalid Session' if session.nil? || !session.key?(:new) || !session.key?(:sessionId)
       @new = session[:new]
       @session_id = session[:sessionId]
       @attributes = session[:attributes].nil? ? Hash.new : session[:attributes]
       @user = session[:user]
       @application_id = session[:application][:applicationId]
-      @device = session[:device]
+      @device = session.key?(:device) ? session[:device] : ""
     end
 
     # Checks whether this is a new session

data/lib/alexa_toolbox/version.rb

@@ -1,3 +1,3 @@
 module AlexaToolbox
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alexa_toolbox
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Paul McMahon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-19 00:00:00.000000000 Z
+date: 2017-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler