alexa_rubykit 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3748981d0a9bc0fc1bf4f5b717d167641dcd697a
-  data.tar.gz: 78ada1f9c255e3531fcc578ff6dd5523c8711dc5
+  metadata.gz: d3b7bcf9c3859a9434906cf1d1e1bb3123ec4277
+  data.tar.gz: e1e52a2d3116620bd2d17069f2ebb76dc4c07ddb
 SHA512:
-  metadata.gz: 2adaf509979b0c18c0db6f64de1416a63878eb87d52bfae7a84bed8db2ae5a78c3dd2b52f6f74351aefb966a15a1100a4d14bc3f2827b0e9ef03219cf2740ad8
-  data.tar.gz: 4fb73941be833903ec6dfb2337ec3aab257e3938006d51c278fc399002358094b8165768aba82554dc3be186e830f7ca75889710a1a364251134e3ef56902b93
+  metadata.gz: 6c20b3b2d6be9adc312f33154bf29cc6cc6c8883a19d8e00c560cf80dc27cd5fbbd5f1f9164ea2993c9bab8382c7ce783bd7a7f53b65ed0caa5ede0211263f70
+  data.tar.gz: d8695ccc7ea17a6884b477f2e83c7f1ba141ba672d33c4643fee71925d76f500e846fda99b1d73dff32f7c200abb8be7ac2b6f53bbc28845a9336b8c2a52dba4

data/Gemfile.lock

@@ -1,14 +1,18 @@
 PATH
   remote: .
   specs:
-    alexa_rubykit (1.0.0)
+    alexa_rubykit (0.0.12.pre.dev)
       bundler (~> 1.7)
       rake (~> 10.0)
+      sinatra (~> 1.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
     diff-lcs (1.2.5)
+    rack (1.6.1)
+    rack-protection (1.5.3)
+      rack
     rake (10.4.2)
     rspec (3.2.0)
       rspec-core (~> 3.2.0)
@@ -23,11 +27,16 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.2.0)
     rspec-support (3.2.2)
+    sinatra (1.4.6)
+      rack (~> 1.4)
+      rack-protection (~> 1.4)
+      tilt (>= 1.3, < 3)
+    tilt (2.0.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   alexa_rubykit!
-  rspec (~> 3.2, >= 3.2.0)
-  rspec-mocks (~> 3.2, >= 3.2.0)
+  rspec (~> 3.2.0)
+  rspec-mocks (~> 3.2.0)

data/README.md

@@ -78,3 +78,4 @@ To use the stable/master branch, rename 'dev' to 'master' or remove :branch all
 
 # <a name="team-members"></a>Team Members
 * "Damian Finol" <damian.finol@gmail.com>
+* "Dave Shapiro" <dss.shapiro@gmail.com>

data/lib/alexa_rubykit/intent_request.rb

@@ -1,16 +1,16 @@
 module AlexaRubykit
   class IntentRequest < Request
-    attr_accessor :request_id, :intent, :name, :slots
+    attr_accessor :intent, :name, :slots
 
     # We still don't know if all of the parameters in the request are required.
     # Checking for the presence of intent on an IntentRequest.
-    def initialize(request_id, intent)
-      raise ArgumentError, 'Intent should exist on an IntentRequest' if intent.nil?
+    def initialize(json_request)
+      super
+      @intent = json_request['request']['intent']
+      raise ArgumentError, 'Intent should exist on an IntentRequest' if @intent.nil?
       @type = 'INTENT_REQUEST'
-      @request_id = request_id
-      @intent = intent
-      @name = intent['name']
-      @slots = intent['slots']
+      @name  = @intent['name']
+      @slots = @intent['slots']
     end
 
     # Takes a Hash object.
@@ -37,7 +37,7 @@ module AlexaRubykit
 
     # Outputs the Intent Name, request Id and slot information.
     def to_s
-      "IntentRequest: #{@name} requestID: #{request_id}  Slots: #{@slots}"
+      "IntentRequest: #{name} requestID: #{request_id}  Slots: #{slots}"
     end
   end
 
@@ -54,7 +54,7 @@ module AlexaRubykit
 
     # Outputs Slot name and value.
     def to_s
-      "Slot Name: #{@name}, Value: #{value}"
+      "Slot Name: #{name}, Value: #{value}"
     end
   end
 end

data/lib/alexa_rubykit/launch_request.rb

@@ -1,18 +1,15 @@
 module AlexaRubykit
   class LaunchRequest  < Request
-    attr_accessor :request_id
-
     # We still don't know if all of the parameters in the request are required.
     # Checking for the presence of intent on an IntentRequest.
-    def initialize(request_id)
-      raise ArgumentError, 'Request ID should exist on a LaunchRequest' if request_id.nil?
+    def initialize(json_request)
+      super
       @type = 'LAUNCH_REQUEST'
-      @request_id = request_id
     end
 
     # Outputs the launch requestID.
     def to_s
-      "LaunchRequest requestID: #{@request_id}"
+      "LaunchRequest requestID: #{request_id}"
     end
   end
 end

data/lib/alexa_rubykit/request.rb

@@ -6,11 +6,18 @@ module AlexaRubykit
   class Request
     require 'json'
     require 'alexa_rubykit/session'
-    attr_accessor :version, :response, :shouldEndSession, :type, :session
+    attr_accessor :version, :type, :session, :json # global
+    attr_accessor :request_id, :locale # on request
 
-    # Adds a specific session.
-    def add_session(session)
-      @session = session
+    def initialize(json_request)
+      @request_id = json_request['request']['requestId']
+      raise ArgumentError, 'Request ID should exist on all Requests' if @request_id.nil?
+      @version = json_request['version']
+      @locale = json_request['request']['locale']
+      @json   = json_request
+
+      # TODO: We probably need better session handling.
+      @session = AlexaRubykit::Session.new(json_request['session'])
     end
   end
 
@@ -18,29 +25,23 @@ module AlexaRubykit
   def self.build_request(json_request)
     raise ArgumentError, 'Invalid Alexa Request.' unless AlexaRubykit.valid_alexa?(json_request)
     @request = nil
-    # TODO: We probably need better session handling.
-    session = AlexaRubykit::Session.new(json_request['session'])
     case json_request['request']['type']
       when /Launch/
-        @request = LaunchRequest.new(json_request['request']['requestId'])
+        @request = LaunchRequest.new(json_request)
       when /Intent/
-        @request = IntentRequest.new(json_request['request']['requestId'], json_request['request']['intent'])
+        @request = IntentRequest.new(json_request)
       when /SessionEnded/
-        @request = SessionEndedRequest.new(json_request['request']['requestId'], json_request['request']['reason'])
+        @request = SessionEndedRequest.new(json_request)
       else
         raise ArgumentError, 'Invalid Request Type.'
     end
-    @request.add_session(session)
     @request
   end
 
-  # Let's monkey patch Hash.
-  refine Hash do
-    # Take keys of hash and transform those to a symbols
-    def self.transform_keys_to_symbols(value)
-      return value if not value.is_a?(Hash)
-      hash = value.inject({}){|memo,(k,v)| memo[k.to_sym] = Hash.transform_keys_to_symbols(v); memo}
-      return hash
-    end
+  # Take keys of hash and transform those to a symbols
+  def self.transform_keys_to_symbols(value)
+    return value if not value.is_a?(Hash)
+    hash = value.inject({}){|memo,(k,v)| memo[k.to_sym] = self.transform_keys_to_symbols(v); memo}
+    return hash
   end
-end
+end

data/lib/alexa_rubykit/response.rb

@@ -33,7 +33,7 @@ module AlexaRubykit
     def add_card(type = nil, title = nil , subtitle = nil, content = nil)
       # A Card must have a type which the default is Simple.
       @card = Hash.new()
-      @card[:type] = 'Simple' if type.nil?
+      @card[:type] = type || 'Simple'
       @card[:title] = title unless title.nil?
       @card[:subtitle] = subtitle unless subtitle.nil?
       @card[:content] = content unless content.nil?

data/lib/alexa_rubykit/session.rb

@@ -12,7 +12,7 @@ module AlexaRubykit
 
     # Returns whether this is a new session or not.
     def new?
-      @new
+      !!@new
     end
 
     # Returns true if a user is defined.
@@ -22,7 +22,11 @@ module AlexaRubykit
 
     # Returns the user_id.
     def user_id
-      @user['userId'] if user_defined?
+      @user['userId'] if @user
+    end
+
+    def access_token
+      @user['accessToken'] if @user
     end
 
     # Check to see if attributes are present.

data/lib/alexa_rubykit/session_ended_request.rb

@@ -1,21 +1,20 @@
 # Session end request class.
 module AlexaRubykit
   class SessionEndedRequest < Request
-    attr_accessor :request_id, :reason, :type
+    attr_accessor :reason
 
     # TODO: Validate the reason.
     # We still don't know if all of the parameters in the request are required.
     # Checking for the presence of intent on an IntentRequest.
-    def initialize(request_id, reason)
-      raise ArgumentError, 'Request ID should exist on a Session Ended Request.' if request_id.nil?
+    def initialize(json_request)
+      super
       @type = 'SESSION_ENDED_REQUEST'
-      @request_id = request_id
-      @reason = reason
+      @reason = json_request['request']['reason']
     end
 
     # Ouputs the request_id and the reason why.
     def to_s
-      "Session Ended for requestID: #{@request_id} with reason #{@reason}"
+      "Session Ended for requestID: #{request_id} with reason #{reason}"
     end
   end
 end

data/lib/alexa_rubykit/version.rb

@@ -1,3 +1,3 @@
 module AlexaRubykit
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alexa_rubykit
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Damian Finol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-30 00:00:00.000000000 Z
+date: 2017-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,16 +28,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -118,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Alexa Ruby Kit