ralyxa 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6aa4014123fdf96c66aafea914bbf45fc005234d
-  data.tar.gz: 9f61bfe7853045176e0b1fe46d2cb525fd5d1077
+  metadata.gz: 356706a000592a8cf4cd64652ef2f61cf2f3f257
+  data.tar.gz: 3f7dbf9429193a8d2dcfbaa254a40fe1d6c80c19
 SHA512:
-  metadata.gz: 217f26ef4be39c6e7b80d1666e6d7a9fb5361aeb41e8419e8446a92819ae5b2bd5fb1a3a3ed6f62b17a13171a24d607a810f4847464481480e8680c3528ae1ac
-  data.tar.gz: 5e40b794bd024fb2c8b8306b23bf09a423930fd72f825810bf7616443d920ef5f2120aa2a966dc84376fe85df9bb9045fa0c05286ed7dec873dfb76d2ee7575c
+  metadata.gz: f4460af9eecb7d2e4114b168c3d79f80cdccbec3a3e200e664588f7d9654b87353505aad2755955fe212cce8b38206aa93d1100b85f572cb6a28ddc0aeae3f5f
+  data.tar.gz: 0fdac2ee8f5e53bb5394b5bd06b290fafa0a95d265d74339ae90fd91aa38d21072eab9161318b2dd82766abb86b237fdb28bb1d48ec37dca4d7512866279ef48

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ralyxa (1.3.0)
+    ralyxa (1.4.0)
 
 GEM
   remote: https://rubygems.org/

data/lib/ralyxa/handler.rb

@@ -1,22 +1,22 @@
 require_relative './response_builder'
 require_relative './card'
 
+# Handler Base Class. Each Intent Handler inherits from this, and overwrites the #handle method.
 module Ralyxa
   class Handler
-    def initialize(request, intent_proc)
-      @request     = request
-      @intent_proc = intent_proc
+    def initialize(request)
+      @request = request
     end
 
     def handle
-      instance_eval &@intent_proc
+      raise NotImplementedError
     end
 
-    def respond(response_text, response_details = {}, response_builder = Ralyxa::ResponseBuilder)
+    def respond(response_text = "", response_details = {}, response_builder = Ralyxa::ResponseBuilder)
       response_builder.build(response_details.merge(response_text: response_text))
     end
 
-    def tell(response_text, response_details = {})
+    def tell(response_text = "", response_details = {})
       respond(response_text, response_details.merge(end_session: true))
     end
 

data/lib/ralyxa/register_intents.rb

@@ -33,11 +33,10 @@ module Ralyxa
 
     NO_INTENT_DECLARATIONS_FOUND = <<~HEREDOC
     \e[33m
-    WARNING: You haven't defined any intents. 
+    WARNING: You haven't defined any intent declarations. 
 
-    Please define intents inside a directory called 'intents', 
-    on the same directory level as the runfile for your server application,
-    or change the default intents directory in alexa/register_intents.rb.
+    Please define intent declarations inside a directory called 'intents', 
+    on the same directory level as the runfile for your server application.
     \e[0m
     HEREDOC
   end

data/lib/ralyxa/skill.rb

@@ -2,31 +2,53 @@ require_relative './request'
 require_relative './response'
 require_relative './handler'
 
+# Routes an incoming request to the correct Handler.
 module Ralyxa
   class Skill
-    @@intents = {}
+    @@handlers = {}
 
     def initialize(request)
       @request = request
     end
 
-    def handle(handler = Ralyxa::Handler)
-      intent_proc = self.class.registered_intents[@request.intent_name]
-      handler.new(@request, intent_proc).handle
+    def handle
+      handler = self.class.handlers[@request.intent_name]
+      handler ? handler.new(@request).handle : warn(handler_not_found)
     end
 
     class << self
-      def intent(intent_name, &block)
-        @@intents[intent_name] = block
-      end
-
-      def registered_intents
-        @@intents.dup
+      def intent(intent_name, handler_base_class = Ralyxa::Handler, &intent_block)
+        intent_handler = Class.new(handler_base_class)
+        intent_handler.send(:define_method, :handle, &intent_block)
+        @@handlers[intent_name] = intent_handler
       end
 
       def handle(request, alexa_request_wrapper = Ralyxa::Request)
         new(alexa_request_wrapper.new(request)).handle
       end
+
+      def handlers
+        @@handlers.dup
+      end
+    end
+
+    private
+
+    def handler_not_found
+      <<~HEREDOC
+      \e[33m
+      WARNING: An intent declaration for intent "#{ @request.intent_name }" was not found.
+
+      To define it, add an intent declaration inside a directory called 'intents', 
+      on the same directory level as the runfile for your server application.
+
+      You probably want something like:
+
+      intent "#{ @request.intent_name }" do
+        respond("Hello World!")
+      end
+      \e[0m
+      HEREDOC
     end
   end
 end

data/lib/ralyxa/user.rb

@@ -9,8 +9,8 @@ module Ralyxa
 
     def self.build(request)
       new(
-        id: request.dig(:session, :user, :userId),
-        access_token: request.dig(:session, :user, :accessToken)
+        id: request.dig("session", "user", "userId"),
+        access_token: request.dig("session", "user", "accessToken")
       )
     end
 

data/lib/ralyxa/version.rb

@@ -1,3 +1,3 @@
 module Ralyxa
-  VERSION = "1.4.0"
+  VERSION = "1.5.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ralyxa
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Sam Morgan