aws-lex-conversation 4.3.0 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69743533fc27787f0b8ac0f5d2a002496a118c92949c57b90ab1738439a7618d
-  data.tar.gz: 98d688962a53a164c398436a9f9101cfedd50dc0238598a3c71e387e6f271f89
+  metadata.gz: 8722262608a479a7c20069ac72e1e15c70e417fe92ffcbc4eaaab6b54defc792
+  data.tar.gz: ee77736e7e9c313a3de59b6c651253d226cfb5c0def75e52f50082489e514cd0
 SHA512:
-  metadata.gz: 336228d5bebb36f2f275a78decf3459ce34c48bdaf4c73d48b2f3c15634d414fbf4f3036bb1603b0996b8026cb49605b11d20ef1d5f0b30bc993638aaa549eb2
-  data.tar.gz: 7d7147e2c8c65dfa93424f5bb366206b825d9c88c2831f3a140294002ebd6805da384ead59538e964c2934b33a11fb9c80b22c915ece0007382532ef0bb87691
+  metadata.gz: c0c8edafbb942dd0e692908db397887c5fea54e2fef7be71369ed72be2debd62054cb4c31593f0d38598d895758c9bd5b0ce678f3e3ec05ec807354a230b51a6
+  data.tar.gz: 360558203dbc323968b841e8caf1f37cd3ee14afa43f308fa254d5edfee471321916527fd7806382614f19386f50c3753f8f7f403866d052c592dcdeccaf34e1

data/lib/aws/lex/conversation/slot/elicitation.rb

@@ -5,39 +5,32 @@ module Aws
     class Conversation
       module Slot
         class Elicitation
-          attr_accessor :name, :elicit, :message, :follow_up_message,
-                        :content_type, :fallback, :maximum_elicitations,
-                        :conversation
+          attr_accessor :name, :elicit, :messages, :follow_up_messages,
+                        :fallback, :maximum_elicitations, :conversation
 
           def initialize(opts = {})
             self.name = opts.fetch(:name)
             self.elicit = opts.fetch(:elicit) { ->(_c) { true } }
-            self.message = opts.fetch(:message)
-            self.follow_up_message = opts.fetch(:follow_up_message) { opts.fetch(:message) }
-            self.content_type = opts.fetch(:content_type) do
-              Aws::Lex::Conversation::Type::Message::ContentType.new('PlainText')
-            end
-            self.fallback = opts.fetch(:fallback) { ->(_c) {} }
+            self.messages = opts.fetch(:messages)
+            self.follow_up_messages = opts.fetch(:follow_up_messages) { opts.fetch(:messages) }
+            self.fallback = opts[:fallback]
             self.maximum_elicitations = opts.fetch(:maximum_elicitations) { 0 }
           end
 
           def elicit!
+            return false unless elicit?
             return fallback.call(conversation) if maximum_elicitations?
 
             increment_slot_elicitations!
             conversation.elicit_slot(
               slot_to_elicit: name,
-              messages: [
-                elicitation_message
-              ]
+              messages: elicitation_messages
             )
           end
 
-          def message_content_type
-            content_type.is_a?(Proc) ? content_type.call(conversation) : content_type
-          end
-
           def elicit?
+            return false if maximum_elicitations? && fallback.nil?
+
             elicit.call(conversation) && !slot.filled?
           end
 
@@ -47,21 +40,12 @@ module Aws
             conversation.slots[name.to_sym]
           end
 
-          def elicitation_message
-            first_elicitation? ? compose_message(message) : compose_message(follow_up_message)
+          def elicitation_messages
+            first_elicitation? ? compose_messages(messages) : compose_messages(follow_up_messages)
           end
 
-          def compose_message(msg)
-            content = msg.is_a?(Proc) ? msg.call(conversation) : msg
-
-            if content.is_a?(Aws::Lex::Conversation::Type::Message)
-              content
-            else
-              {
-                content: content,
-                contentType: message_content_type
-              }
-            end
+          def compose_messages(msg)
+            msg.is_a?(Proc) ? msg.call(conversation) : msg
           end
 
           def increment_slot_elicitations!

data/lib/aws/lex/conversation/version.rb

@@ -3,7 +3,7 @@
 module Aws
   module Lex
     class Conversation
-      VERSION = '4.3.0'
+      VERSION = '5.0.0'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aws-lex-conversation
 version: !ruby/object:Gem::Version
-  version: 4.3.0
+  version: 5.0.0
 platform: ruby
 authors:
 - Jesse Doyle
@@ -9,10 +9,10 @@ authors:
 - Darko Dosenovic
 - Zoie Carnegie
 - Carlos Mejia Castelo
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-26 00:00:00.000000000 Z
+date: 2021-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shrink_wrap
@@ -107,7 +107,7 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://github.com/amaabca/aws-lex-conversation
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -123,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: AWS Lex Conversation Dialog Management
 test_files: []