bot 0.0.41 → 0.0.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 256f465a977ac0b8191f2de366c0069d88c4a422
-  data.tar.gz: 71cbfa8bd5e3fb372b738619af833f6d5bd56e4c
+  metadata.gz: ed6c59c83d14c69aa807260b2ba8eb2619b1aa1b
+  data.tar.gz: 466973cc8cba1858c98ce691ee38b91609b28521
 SHA512:
-  metadata.gz: 59501bb0d5e001597a84fcc8f904273966d0cc6c8f6ed5b9394adfaea45c404646187362e136fb48c41c38bb05be16dbd5ce2c62b40f6285661adf1a3f3e39be
-  data.tar.gz: 6072f277f05bd5c6ce5e22c944553514e4f395a990c44eff238adb8d817fc25585f1785d7e3dcd0d6b774cee67871f1fffc80dea23dfbea2b4c5a3692f3cad5d
+  metadata.gz: 320debce02c1194ae1ff072a581d0b315c7b92b3420caacb2d30f89d25ce1c7e8e994d5bed64bd3c4b2c6112f99b927e2edacf6c7653819d2a6579bf07a1265f
+  data.tar.gz: d9092f01535e0cc4549e113445a313199d5dec257625ba05778435d96eaa5c4023d9364145853854b0c9e1bd7267587e4370980ca1e5bf588b6ede77c519055b

data/app/controllers/bot/bot_controller.rb

@@ -1,5 +1,5 @@
 class Bot::BotController < ActionController::Base
-  before_action :verify_signature
+  before_action :verify_request
 
   def notify
     @responses = bot_handler.handle(messages).compact
@@ -9,8 +9,8 @@ class Bot::BotController < ActionController::Base
 
   private
 
-  def verify_signature
-    unless adapter.verify_signature(request.headers["HTTP_X_KIK_SIGNATURE"], request.raw_post, bot_username)
+  def verify_request
+    unless adapter.verify_request(request)
       head :forbidden
     end
   end

data/lib/bot.rb

@@ -5,6 +5,7 @@ require "bot/route_extensions"
 require "bot/adapter"
 require "bot/configuration"
 require "bot/context"
+require "bot/analytics"
 require "bot/message"
 require "bot/responder_chain"
 require "bot/rspec.rb"

data/lib/bot/adapters/base.rb

@@ -13,7 +13,7 @@ module Bot
         raise NotImplementedError
       end
 
-      def verify_signature(signature, body, from)
+      def verify_request(request)
         raise NotImplementedError
       end
     end

data/lib/bot/adapters/kik.rb

@@ -33,10 +33,10 @@ module Bot
         profile['profilePicUrl'] || ''
       end
 
-      def verify_signature(signature, body, from)
+      def verify_request(request)
         digest = OpenSSL::Digest.new('sha1')
-        key = config(from)[:bot_token]
-        signature == OpenSSL::HMAC.hexdigest(digest, key, body).upcase
+        key = config(request.headers["HTTP_X_KIK_USERNAME"])[:bot_token]
+        request.headers["HTTP_X_KIK_SIGNATURE"] == OpenSSL::HMAC.hexdigest(digest, key, request.raw_post).upcase
       end
 
     protected

data/lib/bot/adapters/test.rb

@@ -19,7 +19,7 @@ module Bot
         @@sent_messages = []
       end
 
-      def verify_signature(signature, body, from)
+      def verify_request(request)
         true
       end
     end

data/lib/bot/analytics.rb

@@ -0,0 +1,16 @@
+require 'redis'
+
+module Bot
+  class Analytics
+    attr_accessor :mixpanel, :user_key
+
+    def initialize(user_key, mixpanel=false)
+      @mixpanel = mixpanel
+      @user_key = user_key
+    end
+
+    def track(event, options={})
+      mixpanel.track(user_key, event, options) if mixpanel
+    end
+  end
+end

data/lib/bot/configuration.rb

@@ -16,6 +16,6 @@ module Bot
   end
 
   class Configuration
-    attr_accessor :adapter, :redis
+    attr_accessor :adapter, :redis, :mixpanel
   end
 end

data/lib/bot/handler.rb

@@ -16,8 +16,10 @@ module Bot
 
     def execute_chain(message, responses, user)
       context = Bot::Context.new(user, Bot.configuration.redis)
+      analytics = Bot::Analytics.new(user.username, Bot.configuration.mixpanel)
+
       responder_chain.responders.each do |responder|
-        responder = responder.new(message, user, responses, self, context)
+        responder = responder.new(message, user, responses, self, context, analytics)
         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
+    attr_reader :message, :user, :responses, :handler, :context, :analytics
 
     def self.respond_to(*types)
       new_types = (respond_to_types || []).dup
@@ -13,12 +13,13 @@ module Bot
       self.respond_to_types = new_types.freeze
     end
 
-    def initialize(message, user, responses, handler, context)
+    def initialize(message, user, responses, handler, context, analytics)
       @message = message
       @user = user
       @responses = responses
       @handler = handler
       @context = context
+      @analytics = analytics
     end
 
     def can_respond_to_type?(type)

data/lib/bot/version.rb

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

data/test/dummy/log/test.log

@@ -3549,5 +3549,48 @@ Completed 200 OK in 0ms (Views: 0.1ms | ActiveRecord: 0.0ms)
    (0.0ms)  begin transaction
 -------------------
 BotTest: test_truth
+-------------------
+   (0.0ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.4ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (1.0ms)  CREATE TABLE "schema_migrations" ("version" varchar NOT NULL) 
+   (0.1ms)  select sqlite_version(*)
+   (1.0ms)  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
+---------------------------
+NavigationTest: test_notify
+---------------------------
+Started POST "/bot/notify" for 127.0.0.1 at 2016-05-04 15:20:52 -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-04 15:20:52 -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
+   (0.0ms)  begin transaction
+---------------------------------------
+NavigationTest: test_notify_multi_types
+---------------------------------------
+Started POST "/bot/notify" for 127.0.0.1 at 2016-05-04 15:20:52 -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 1ms (ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+-----------------------------------------
+NavigationTest: test_notify_special_types
+-----------------------------------------
+Started POST "/bot/notify" for 127.0.0.1 at 2016-05-04 15:20:52 -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 1ms (ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+-------------------
+BotTest: test_truth
 -------------------
    (0.0ms)  rollback transaction

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bot
 version: !ruby/object:Gem::Version
-  version: 0.0.41
+  version: 0.0.42
 platform: ruby
 authors:
 - Ben Morris
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-03 00:00:00.000000000 Z
+date: 2016-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -108,6 +108,7 @@ files:
 - lib/bot/adapters/base.rb
 - lib/bot/adapters/kik.rb
 - lib/bot/adapters/test.rb
+- lib/bot/analytics.rb
 - lib/bot/configuration.rb
 - lib/bot/context.rb
 - lib/bot/engine.rb