bot 0.0.42 → 0.0.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed6c59c83d14c69aa807260b2ba8eb2619b1aa1b
-  data.tar.gz: 466973cc8cba1858c98ce691ee38b91609b28521
+  metadata.gz: adf1928c71e4656d5f707f961b19046f86943938
+  data.tar.gz: 9f5cce89a6dfa56e5decf834e376fb4a1719087a
 SHA512:
-  metadata.gz: 320debce02c1194ae1ff072a581d0b315c7b92b3420caacb2d30f89d25ce1c7e8e994d5bed64bd3c4b2c6112f99b927e2edacf6c7653819d2a6579bf07a1265f
-  data.tar.gz: d9092f01535e0cc4549e113445a313199d5dec257625ba05778435d96eaa5c4023d9364145853854b0c9e1bd7267587e4370980ca1e5bf588b6ede77c519055b
+  metadata.gz: 1eb4fb9d161fce264825176a4a2a830055fad3b75328977cf9cc3309e33b7624a8b655c2b296fd4eafe5e86145b13029f92ea5cb4630ddbe6093b79f844fb279
+  data.tar.gz: 67a7c2bc42f97e161c3de22026fe34b9b0d805811c9f696a5cf229ad549e2b28e1e57cf7a39fd29c649b474a81badc9354bfe4e9de9d227a3c7ebe295e66d67a

data/lib/bot/context.rb

@@ -2,11 +2,11 @@ require 'redis'
 
 module Bot
   class Context
-    attr_accessor :redis_client, :user
+    attr_accessor :redis_client, :id
 
-    def initialize(user, redis_client)
+    def initialize(id, redis_client)
       @redis_client = redis_client
-      @user = user
+      @id = id
     end
 
     def method_missing(m, *args, &block)
@@ -38,7 +38,7 @@ module Bot
     end
 
     def context_key
-      "bot:context:#{user.id}"
+      "bot:context:#{id}"
     end
   end
 end

data/lib/bot/handler.rb

@@ -15,11 +15,12 @@ module Bot
     end
 
     def execute_chain(message, responses, user)
-      context = Bot::Context.new(user, Bot.configuration.redis)
       analytics = Bot::Analytics.new(user.username, Bot.configuration.mixpanel)
+      user_context = Bot::Context.new(user.id, Bot.configuration.redis)
+      chat_context = Bot::Context.new(message["chatId"].to_i, Bot.configuration.redis)
 
       responder_chain.responders.each do |responder|
-        responder = responder.new(message, user, responses, self, context, analytics)
+        responder = responder.new(message, user, responses, self, analytics, user_context, chat_context)
         if responder.can_respond_to_type?(message['type']) && responder.can_handle?
           responses << responder.handle
           break

data/lib/bot/responder.rb

@@ -5,7 +5,7 @@ module Bot
 
     class_attribute :respond_to_types
 
-    attr_reader :message, :user, :responses, :handler, :context, :analytics
+    attr_reader :message, :user, :responses, :handler, :analytics, :user_context, :chat_context
 
     def self.respond_to(*types)
       new_types = (respond_to_types || []).dup
@@ -13,13 +13,14 @@ module Bot
       self.respond_to_types = new_types.freeze
     end
 
-    def initialize(message, user, responses, handler, context, analytics)
+    def initialize(message, user, responses, handler, analytics, user_context, chat_context)
       @message = message
       @user = user
       @responses = responses
       @handler = handler
-      @context = context
       @analytics = analytics
+      @user_context = user_context
+      @chat_context = chat_context
     end
 
     def can_respond_to_type?(type)

data/lib/bot/version.rb

@@ -1,3 +1,3 @@
 module Bot
-  VERSION = "0.0.42"
+  VERSION = "0.0.43"
 end

data/test/dummy/log/test.log

@@ -3594,3 +3594,46 @@ Completed 500 Internal Server Error in 1ms (ActiveRecord: 0.0ms)
 BotTest: test_truth
 -------------------
    (0.0ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.4ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (1.6ms)  CREATE TABLE "schema_migrations" ("version" varchar NOT NULL) 
+   (0.5ms)  select sqlite_version(*)
+   (0.9ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.1ms)  SELECT version FROM "schema_migrations"
+   (0.9ms)  INSERT INTO "schema_migrations" (version) VALUES ('0')
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  begin transaction
+-------------------
+BotTest: test_truth
+-------------------
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+---------------------------------------
+NavigationTest: test_notify_multi_types
+---------------------------------------
+Started POST "/bot/notify" for 127.0.0.1 at 2016-05-05 10:54:01 -0400
+Processing by Bot::BotController#notify as HTML
+  Parameters: {"messages"=>[{"body"=>"multi", "readReceiptRequested"=>"true", "from"=>"bnmrrs", "timestamp"=>"1452785908454", "type"=>"scan-data", "id"=>"2af0d873-d157-4627-b863-8be11b0dfd86"}], "bot"=>ApplicationHandler}
+Completed 500 Internal Server Error in 2ms (ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+-----------------------------------------
+NavigationTest: test_notify_special_types
+-----------------------------------------
+Started POST "/bot/notify" for 127.0.0.1 at 2016-05-05 10:54:01 -0400
+Processing by Bot::BotController#notify as HTML
+  Parameters: {"messages"=>[{"body"=>"Hello", "readReceiptRequested"=>"true", "from"=>"bnmrrs", "timestamp"=>"1452785908454", "type"=>"scan-data", "id"=>"2af0d873-d157-4627-b863-8be11b0dfd86"}], "bot"=>ApplicationHandler}
+Completed 500 Internal Server Error in 2ms (ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+---------------------------
+NavigationTest: test_notify
+---------------------------
+Started POST "/bot/notify" for 127.0.0.1 at 2016-05-05 10:54:01 -0400
+Processing by Bot::BotController#notify as HTML
+  Parameters: {"bot"=>ApplicationHandler}
+Completed 200 OK in 0ms (Views: 0.2ms | ActiveRecord: 0.0ms)
+Started POST "/bot/notify" for 127.0.0.1 at 2016-05-05 10:54:01 -0400
+Processing by Bot::BotController#notify as HTML
+  Parameters: {"messages"=>[{"body"=>"Hello", "readReceiptRequested"=>"true", "from"=>"bnmrrs", "timestamp"=>"1452785908454", "type"=>"text", "id"=>"2af0d873-d157-4627-b863-8be11b0dfd86"}], "bot"=>ApplicationHandler}
+Completed 500 Internal Server Error in 1ms (ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bot
 version: !ruby/object:Gem::Version
-  version: 0.0.42
+  version: 0.0.43
 platform: ruby
 authors:
 - Ben Morris
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-04 00:00:00.000000000 Z
+date: 2016-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails