google_assistant 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b154ca654d07f2cd12c6f443bbf7046ef54d1f3
-  data.tar.gz: dbc77bed224fd5bd86dd95c829ee0b885f1c97fb
+  metadata.gz: 3ec771654a969d6e004c2da5c88350943facf8f4
+  data.tar.gz: 08c5f4e0f7c3440ad6d05a7ba3e5859cbbdad37c
 SHA512:
-  metadata.gz: f80e5e558716bc7b6a5c51d7fcbf66f4a56e07965f7a7a66dc02c9fe766d789a2aacb0c269e76c8c347fe3bb1b72c0a2c66efb42494820e5976d321f97e95fab
-  data.tar.gz: 8cb7380fe2917dfd782a39c2b16e7e97413f46d88e9f9cfcf1af8978f767d7023930c6a1d12163065c463ae48a0521f6500927da6187963e63b280ea8d1dcf4a
+  metadata.gz: 5ac7fab096ea512ea289a5cfde7004d064dfa9cb8e7843fcc0dd76bbb87a2c1b5f6ae8465d1b5bd2081e5c42334a74c2fb72bd4c09ccda5d1f09256af196f309
+  data.tar.gz: e016e2b76126a8f283f5b1b05887ffc9d74fc5173cb2e5b3fb7b849e0aeb61a73e14a59b1fd066295bca1baaf1f870bb4e735951522cca024ad0a3bb12641248

data/lib/google_assistant.rb

@@ -6,8 +6,6 @@ class GoogleAssistant
   attr_reader :params
   attr_reader :response
 
-  INPUTS_MAX = 2
-
   def initialize(params, response)
     @params = params
     @response = response
@@ -47,7 +45,7 @@ class GoogleAssistant
     build_response(nil, false, nil, final_response)
   end
 
-  def ask(input_prompt, dialog_state = nil)
+  def ask(input_prompt)
     if input_prompt.nil?
       return handle_error("Invalid input prompt")
     end
@@ -56,23 +54,22 @@ class GoogleAssistant
       input_prompt = build_input_prompt(is_ssml(input_prompt), input_prompt)
     end
 
-    if dialog_state.nil?
-      dialog_state = { state: nil, data: {} }.to_json
-    elsif dialog_state.is_a?(Array)
-      return handle_error("Invalid dialog state")
-    end
-
     expected_intent = build_expected_intent(StandardIntents::TEXT)
 
-    build_ask(input_prompt, [expected_intent], dialog_state)
+    expected_inputs = [{
+      input_prompt: input_prompt,
+      possible_intents: [expected_intent]
+    }]
+
+    build_response(
+      conversation.dialog_state,
+      true,
+      expected_inputs,
+      nil
+    )
   end
 
   def build_input_prompt(is_ssml, initial_prompt, no_inputs = [])
-    if no_inputs&.size > INPUTS_MAX
-      handle_error("Invalid number of no inputs")
-      return nil
-    end
-
     if is_ssml
       initial_prompts = [
         { ssml: initial_prompt }
@@ -104,45 +101,19 @@ class GoogleAssistant
 
   private
 
-  def build_response(conversation_token, expect_user_response, expected_input, final_response)
+  def build_response(dialog_state, expect_user_response, expected_input, final_response)
     response = {}
 
-    response[:conversation_token] = conversation_token if conversation_token
+    response[:conversation_token] = dialog_state.to_json if dialog_state
     response[:expect_user_response] = expect_user_response
     response[:expected_inputs] = expected_input if expected_input
     response[:final_response] = final_response if !expect_user_response && final_response
 
     {
-      json: response.as_json
+      json: response
     }
   end
 
-  def build_ask(input_prompt, possible_intents, dialog_state = nil)
-    if input_prompt.nil? || input_prompt.empty?
-      return handle_error("Invalid input prompt")
-    end
-
-    if input_prompt.is_a?(String)
-      input_prompt = build_input_prompt(is_ssml(input_prompt), input_prompt)
-    end
-
-    if dialog_state.nil?
-      dialog_state = { state: nil, data: {} }.to_json
-    end
-
-    expected_inputs = [{
-      input_prompt: input_prompt,
-      possible_intents: possible_intents
-    }]
-
-    build_response(
-      dialog_state,
-      true,
-      expected_inputs,
-      nil
-    )
-  end
-
   def build_expected_intent(intent)
     if intent.nil? || intent == ""
       return handle_error("Invalid intent")

data/lib/google_assistant/conversation.rb

@@ -10,36 +10,28 @@ class GoogleAssistant
       ARCHIVED = 4
     end
 
-    attr_reader :id, :type, :token
+    attr_reader :id, :type, :dialog_state
 
     def initialize(opts)
       @id = opts["conversation_id"]
       @type = opts["type"]
-      @token = parse_token(opts["conversation_token"])
+      @dialog_state = DialogState.new(opts["conversation_token"])
     end
 
-    def data
-      if token.is_a?(Hash)
-        token["data"]
-      else
-        token
-      end
+    def state
+      dialog_state.state
     end
 
-    def state
-      if token.is_a?(Hash)
-        token["state"]
-      else
-        token
-      end
+    def state=(state)
+      dialog_state.state = state
     end
 
-    private
+    def data
+      dialog_state.data
+    end
 
-    def parse_token(token)
-      JSON.parse(token)
-    rescue JSON::ParserError, TypeError
-      token
+    def data=(data)
+      dialog_state.data = data
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google_assistant
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Aaron Milam