wit_bot 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8f635d90f3d307a4c42932fd9b1d5a12706e3de
-  data.tar.gz: 3729c86e923d5a135bf7dadfd060543b4f495738
+  metadata.gz: b3f3caa74bcc0204ca38bd033d658a6f29d7d214
+  data.tar.gz: 8d5abcd72bc96298c507448768b7e7cd71f06b55
 SHA512:
-  metadata.gz: 9ec78562804b290ece5323a1d6798319c99b1b75c69cdbf0655ab3b9ba96f88ca04068dc5ecec0a63c63bfb59735a39514cd223282a4fe9be07eadfab7bc0bfa
-  data.tar.gz: b20aebb47e2f11aeb67a3bb2c314971434d11ecb87c86cf413ce6ff955ac447a495ad88d4abe8608c4a45d1fa9e8258c45ca2ccae71a5d3097f178dfc133c942
+  metadata.gz: a40fb576433b153099d0fa3d0ec23617de5ccdc345975683872a65e173f1081f016b2add0e37b0dc6b142276f435ab95dca8f6fb696922bde1423160f6301f2a
+  data.tar.gz: ed106aafccb46edc139e9e18ccdf827b0372dcf86a179aa81481ff7d061387d3a5d3fc3217b0bad74b3bf2f00e77ebb1aefbe86cc0180e1c8bbe456e4cd35a3f

data/bin/console

@@ -14,4 +14,8 @@ def reload!
 end
 
 require "irb"
+
+require "awesome_print"
+AwesomePrint.irb!
+
 IRB.start

data/examples/bot.rb

@@ -1,13 +1,6 @@
-#require 'wit_bot'
-
-require_relative '../lib/wit_bot'
-
+require_relative 'helpers/helpers'
 require_relative 'bot/bot'
 
-WitBot.configure do |c|
-  c.token = ENV['WIT_ACCESS_TOKEN'] # Create a wit bot and set the token here
-end
-
 conversation = WitBot::Bot::Conversation::Base.new
 
 bot = Bot.new conversation

data/examples/hash.rb

@@ -0,0 +1,20 @@
+require_relative 'helpers/helpers'
+
+old = WitBot::Bot::Conversation::Base.new # Create a conversation
+
+old.send_message 'This is a cool test.' # Sent a message
+
+hash = old.as_json # Convert conversation to a hash suitable for json use.
+
+new = WitBot::Bot::Conversation::Base.from_hash hash # Recreate the conversation from the hash
+
+puts 'Hash:'
+
+ap hash # Print the hash
+
+puts "\nSize: #{hash.to_json.length.to_s :human_size}"
+
+puts "\nOld vs New:\n\n"
+
+p old # Print old and new on top of each other for comparison.
+p new

data/examples/hash_with_bot.rb

@@ -0,0 +1,25 @@
+require_relative 'helpers/helpers'
+require_relative 'bot/bot'
+
+old = WitBot::Bot::Conversation::Base.new # Create a conversation
+
+Bot.new old
+
+old.send_message 'This is a cool test.' # Sent a message
+
+hash = old.as_json # Convert conversation to a hash suitable for json use.
+
+new = WitBot::Bot::Conversation::Base.from_hash hash # Recreate the conversation from the hash
+
+Bot.new new
+
+puts 'Hash:'
+
+ap hash # Print the hash
+
+puts "\nSize: #{hash.to_json.length.to_s :human_size}"
+
+puts "\nOld vs New:\n\n"
+
+p old # Print old and new on top of each other for comparison.
+p new

data/examples/helpers/helpers.rb

@@ -0,0 +1,6 @@
+require_relative '../../lib/wit_bot'
+require 'ap'
+
+WitBot.configure do |c|
+  c.token = ENV['WIT_ACCESS_TOKEN'] # Create a wit bot and set the token here
+end

data/examples/thread.rb

@@ -1,13 +1,4 @@
-#!/usr/bin/env ruby
-
-require 'awesome_print'
-require 'wit_bot'
-
-WitBot.configure do |c|
-  c.token = ENV['WIT_ACCESS_TOKEN'] # Create a wit bot and set the token here
-end
-
-thread = WitBot.thread # Create a new thread
+require_relative 'helpers/helpers'
 
 message = thread.create_message 'This is a cool test' # Create a normal message on the thread
 

data/lib/wit_bot.rb

@@ -1,7 +1,4 @@
-require 'active_support/core_ext/hash/indifferent_access'
-require 'active_support/core_ext/module/attribute_accessors'
-require 'active_support/ordered_hash'
-require 'active_support/concern'
+require 'active_support/all'
 require 'http'
 require 'require_all'
 require 'observer'

data/lib/wit_bot/bot/conversation/base.rb

@@ -38,6 +38,21 @@ module WitBot
           notify_observers :output, message
           message
         end
+
+        def to_hash
+          {
+            thread: @thread
+          }
+        end
+
+        def from_hash(json)
+          @thread = WitBot::MessageThread.from_hash json[:thread]
+          self
+        end
+
+        def self.from_hash(json)
+          self.new.from_hash json.with_indifferent_access
+        end
       end
     end
   end

data/lib/wit_bot/bot/models/message.rb

@@ -4,6 +4,13 @@ module WitBot
       def bot?
         true
       end
+      def from_hash(json)
+        @_text = json[:_text]
+        self
+      end
+      def self.from_hash(thread, id, json)
+        self.new(thread, json[:text], id: id).from_hash json
+      end
       def send
         throw "You can't send a bot message."
       end

data/lib/wit_bot/models/context.rb

@@ -8,14 +8,14 @@ module WitBot
     end
 
     def empty?
-      as_json.empty?
+      to_hash.empty?
     end
 
     def entities
       @entities ||= ContextEntities.new
     end
 
-    def as_json
+    def to_hash
       h = {}
       h[:state] = state if state && !state.empty?
       h[:reference_time] = reference_time.iso8601 if reference_time
@@ -23,5 +23,16 @@ module WitBot
       h[:location] = location if location
       h
     end
+
+    def from_hash(h)
+      @state = Array.wrap h[:state]
+      @reference_time = Date.parse h[:reference_time] if h[:reference_time]
+      @entities = ContextEntities.from_hash h[:entities] if h[:entities]
+      @location = h[:location]
+      self
+    end
+    def self.from_hash(json)
+      self.new.from_hash json
+    end
   end
 end

data/lib/wit_bot/models/context_entities.rb

@@ -9,10 +9,19 @@ module WitBot
     def []=(entity, value, expressions=[value])
       @hash[entity] = value.is_a?(EntityValue) ? value : EntityValue.new(value, expressions)
     end
-    def as_json
+    def to_hash
       @hash.map do |id, values|
         {id: id, values: values}
       end
     end
+    def from_hash(json)
+      json.each do |object|
+        self[object[:id]] = EntityValue.new object[:values]
+      end
+      self
+    end
+    def self.from_hash(json)
+      self.new.from_hash json
+    end
   end
 end

data/lib/wit_bot/models/message.rb

@@ -15,6 +15,32 @@ module WitBot
       false
     end
 
+    def to_hash
+      {
+        text: @text,
+        _text: @_text,
+        id: @id,
+        bot: bot?,
+        sent: @sent,
+        _outcomes: @_outcomes
+      }
+    end
+
+    def from_hash(json)
+      @_text = json[:_text]
+      @sent = json[:sent]
+      @_outcomes = json[:_outcomes]
+      parse_outcomes!
+      self
+    end
+    def self.from_hash(thread, id, json)
+      return Bot::Message.from_hash thread, id, json if json[:bot]
+      self.new(thread, json[:text], id: id).from_hash json
+    end
+    def self.many_from_hash(thread, json)
+      json.inject({}) { |h, (id, message)| h[id] = self.from_hash thread, id, message; h }
+    end
+
     def params(p=nil)
       params = {
         q: text,
@@ -33,11 +59,20 @@ module WitBot
 
       @_text = response['_text']
       @_outcomes = response['outcomes']
-      @outcomes = @_outcomes.each_with_index.map { |outcome, i| Outcome.new self, outcome, i }
+
+      parse_outcomes!
 
       self
     end
 
+    def parse_outcomes(outcomes=@_outcomes)
+      outcomes.each_with_index.map { |outcome, i| Outcome.new self, outcome, i }
+    end
+
+    def parse_outcomes!(outcomes=@_outcomes)
+      @outcomes = parse_outcomes outcomes
+    end
+
     def outcome
       outcomes.first
     end

data/lib/wit_bot/models/message_thread.rb

@@ -8,6 +8,7 @@ module WitBot
       @id = id
       @messages = ActiveSupport::OrderedHash.new
       @bot_messages = ActiveSupport::OrderedHash.new
+      @metadata = nil
     end
 
     def message(id)
@@ -35,5 +36,31 @@ module WitBot
     def reset_context
       @context = Context.new
     end
+
+    def to_hash
+      {
+        id: @id,
+        context: @context,
+        messages: {
+          bot: @bot_messages,
+          user: @messages
+        },
+        metadata: @metadata
+      }
+    end
+
+    def from_hash(json)
+      m = json[:messages]
+      @messages = WitBot::Message.many_from_hash(self, m[:user])
+      @bot_messages = WitBot::Message.many_from_hash(self, m[:bot])
+
+      @context = Context.from_hash json[:context]
+      @metadata = json[:metadata]
+      self
+    end
+
+    def self.from_hash(json)
+      self.new(json[:id]).from_hash json
+    end
   end
 end

data/lib/wit_bot/models/wit/entity/entity_value.rb

@@ -16,5 +16,6 @@ module WitBot
     def to_h
       {value: value, expressions: expressions}
     end
+    alias :to_hash :to_h
   end
 end

data/lib/wit_bot/requests/message_request.rb

@@ -1,7 +1,7 @@
 module WitBot
   class MessageRequest < WitRequest
     def request(message, n)
-      super http.get '/message', params: message.params(n: n)
+      super http.get('/message', params: message.params(n: n))
     end
   end
 end

data/lib/wit_bot/requests/wit_request.rb

@@ -5,10 +5,10 @@ module WitBot
     end
 
     def request(request=http)
+      response = process_response request.parse
       if request.code.between? 200, 299
-        process_response request.parse
+        response
       else
-        response = request.parse.with_indifferent_access
         raise WitError.new(response[:status]), (response[:error] || response[:body])
       end
     end
@@ -17,7 +17,7 @@ module WitBot
     def process_response(response)
       if response.respond_to? :with_indifferent_access
         response.with_indifferent_access
-      elsif response.respond_to? :map
+      elsif response.is_a? Array
         response.map {|r| process_response r}
       else
         response

data/lib/wit_bot/version.rb

@@ -1,3 +1,3 @@
 module WitBot
-  VERSION = '0.2.2'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wit_bot
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Ben (@penne12_)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-15 00:00:00.000000000 Z
+date: 2016-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -114,6 +114,9 @@ files:
 - bin/wit
 - examples/bot.rb
 - examples/bot/bot.rb
+- examples/hash.rb
+- examples/hash_with_bot.rb
+- examples/helpers/helpers.rb
 - examples/simple.rb
 - examples/thread.rb
 - lib/wit_bot.rb