wit 3.1.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8346c258aff676710321e7452750f3ea6eff3a56
-  data.tar.gz: 625b24dc2223fef2500303d98c409deea91b3f43
+  metadata.gz: 565021c60a45347a1b360edbcd0dc1736b03167b
+  data.tar.gz: d3b26b07d70c5796bbef81fdbf710c5f04bd10b8
 SHA512:
-  metadata.gz: fe28aba17bdb04e4a4614edc99bad441434c7c6f5056273e9c0092e6f1d38783202d74e7c040a199cc47314cfcd98fd4b8291b0395a4f7f17dd4dd98979147a4
-  data.tar.gz: d4b6ee270ca08b5f0f367bd06dae05e9e4eb3d5aa4b9d8e35cb085ab184dd9a12069e5baaeab50d9cf97f18ade9e7042cf4ee2bc501231339acce9c5a6974263
+  metadata.gz: 1183c5c974e9aec6d622311bf604db59a6fd3e6aaca8391839443f33c0cdd38c1f89ffd5aab949b9961f50b71e0f0d70d0b358e7714bbdf31f6824cdfd15bf52
+  data.tar.gz: 76953d61b404a078322520469393ac9870361e7f942a2f5f751b80b0679f27a94254c96f2bcb002c1b109ededbce80ac6ab4b290b2d4a27a9a61d19d4aac5c04

data/examples/joke.rb

@@ -30,7 +30,7 @@ actions = {
   :say => -> (session_id, msg) {
     p msg
   },
-  :merge => -> (context, entities) {
+  :merge => -> (session_id, context, entities, msg) {
     new_context = context.clone
     new_context.delete 'joke'
     new_context.delete 'ack'
@@ -40,10 +40,10 @@ actions = {
     new_context['ack'] = sentiment == 'positive' ? 'Glad you liked it.' : 'Hmm.' unless sentiment.nil?
     return new_context
   },
-  :error => -> (session_id, msg) {
+  :error => -> (session_id, context) {
     p 'Oops I don\'t know what to do.'
   },
-  :'select-joke' => -> (context) {
+  :'select-joke' => -> (session_id, context) {
     new_context = context.clone
     new_context['joke'] = all_jokes[new_context['cat'] || 'default'].sample
     return new_context

data/examples/quickstart.rb

@@ -3,7 +3,7 @@ require 'wit'
 # Quickstart example
 # See https://wit.ai/l5t/Quickstart
 
-access_token = 'YOUR_ACCESS_TOKEN'
+access_token = 'HEIIUUUJDPXL6YROX5NVLSCGLCVDN3EY'
 
 def first_entity_value(entities, entity)
   return nil unless entities.has_key? entity
@@ -16,16 +16,16 @@ actions = {
   :say => -> (session_id, msg) {
     p msg
   },
-  :merge => -> (context, entities) {
+  :merge => -> (session_id, context, entities, msg) {
     new_context = context.clone
     loc = first_entity_value entities, 'location'
     new_context['loc'] = loc unless loc.nil?
     return new_context
   },
-  :error => -> (session_id, msg) {
+  :error => -> (session_id, context) {
     p 'Oops I don\'t know what to do.'
   },
-  :'fetch-weather' => -> (context) {
+  :'fetch-weather' => -> (session_id, context) {
     new_context = context.clone
     new_context['forecast'] = 'sunny'
     return new_context

data/examples/template.rb

@@ -6,10 +6,10 @@ actions = {
   :say => -> (session_id, msg) {
     p msg
   },
-  :merge => -> (context, entities) {
+  :merge => -> (session_id, context, entities, msg) {
     return context
   },
-  :error => -> (session_id, msg) {
+  :error => -> (session_id, context) {
     p 'Oops I don\'t know what to do.'
   },
 }

data/lib/wit.rb

@@ -37,9 +37,9 @@ def validate_actions(actions)
     raise WitException.new "The '#{k}' action name should be a symbol" unless k.is_a? Symbol
     raise WitException.new "The '#{k}' action should be a lambda function" unless v.respond_to? :call and v.lambda?
     raise WitException.new "The \'say\' action should take 2 arguments: session_id, msg. #{learn_more}" if k == :say and v.arity != 2
-    raise WitException.new "The \'merge\' action should take 2 arguments: context, entities. #{learn_more}" if k == :merge and v.arity != 2
-    raise WitException.new "The \'error\' action should take 2 arguments: session_id, msg. #{learn_more}" if k == :error and v.arity != 2
-    raise WitException.new "The '#{k}' action should take 1 argument: context. #{learn_more}" if k != :say and k != :merge and k != :error and v.arity != 1
+    raise WitException.new "The \'merge\' action should take 4 arguments: session_id, context, entities, msg. #{learn_more}" if k == :merge and v.arity != 4
+    raise WitException.new "The \'error\' action should take 2 arguments: session_id, context. #{learn_more}" if k == :error and v.arity != 2
+    raise WitException.new "The '#{k}' action should take 2 arguments: session_id, context. #{learn_more}" if k != :say and k != :merge and k != :error and v.arity != 2
   end
   return actions
 end
@@ -78,7 +78,7 @@ class Wit
     req @access_token, Net::HTTP::Post, '/converse', params, context
   end
 
-  def run_actions(session_id, message, context={}, max_steps=DEFAULT_MAX_STEPS)
+  def run_actions_(session_id, message, context, max_steps, user_message)
     raise WitException.new 'max iterations reached' unless max_steps > 0
 
     rst = converse session_id, message, context
@@ -95,7 +95,7 @@ class Wit
     elsif type == 'merge'
       raise WitException.new 'unknown action: merge' unless @actions.has_key? :merge
       logger.info 'Executing merge'
-      context = @actions[:merge].call context, rst['entities']
+      context = @actions[:merge].call session_id, context, rst['entities'], user_message
       if context.nil?
         logger.warn 'missing context - did you forget to return it?'
         context = {}
@@ -104,7 +104,7 @@ class Wit
       action = rst['action'].to_sym
       raise WitException.new "unknown action: #{action}" unless @actions.has_key? action
       logger.info "Executing action #{action}"
-      context = @actions[action].call context
+      context = @actions[action].call session_id, context
       if context.nil?
         logger.warn 'missing context - did you forget to return it?'
         context = {}
@@ -112,10 +112,16 @@ class Wit
     elsif type == 'error'
       raise WitException.new 'unknown action: error' unless @actions.has_key? :error
       logger.info 'Executing error'
-      @actions[:error].call session_id, 'unknown action: error'
+      @actions[:error].call session_id, context
     else
       raise WitException.new "unknown type: #{type}"
     end
     return run_actions session_id, nil, context, max_steps - 1
   end
+
+  def run_actions(session_id, message, context={}, max_steps=DEFAULT_MAX_STEPS)
+    return run_actions_ session_id, message, context, max_steps, message
+  end
+
+  private :run_actions_
 end

data/wit.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name = 'wit'
-  s.version = '3.1.0'
-  s.date = '2014-12-05'
+  s.version = '3.2.0'
+  s.date = Date.today.to_s
   s.summary = 'Ruby SDK for Wit.ai'
   s.description = 'Ruby SDK for Wit.ai'
   s.authors = ['The Wit Team']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wit
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.0
 platform: ruby
 authors:
 - The Wit Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-05 00:00:00.000000000 Z
+date: 2016-04-15 00:00:00.000000000 Z
 dependencies: []
 description: Ruby SDK for Wit.ai
 email: help@wit.ai