bot 0.0.38 → 0.0.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8aadd7727dd46fa03fdf37373bf78c7f4768d5d4
-  data.tar.gz: 27a64c56e216f3bac1df35dfc1b85632370231c1
+  metadata.gz: 951e4e152862eee4b853af458c49cee8f475b47b
+  data.tar.gz: 6bce5bdbfac1ff26fbff658ccd3c3d510a463786
 SHA512:
-  metadata.gz: a5757f2947ffa5d272a593e9b6a06c066a7a33667e2d2b67a86a3328c30d8d0bead3868f4f71cec5ddcdece6cc5c566b22a2e3966c35d2952d09ec4391eb46c1
-  data.tar.gz: 55cee88000f96f1286d8ed617affd0a552c35fa3e1510437dcc70c071a77f382ee58081845446cdaaa74aaee9e21564e6ee2ba701bb4d72546e1e78bafe0edb0
+  metadata.gz: 162074b4e8b28f632f39c886c1cd38fcc7865fb2b0c7a505335535307ff780732086e9d867b55b4eede1ee373bcc7d68533cc4b30483add087f4e96a18e06494
+  data.tar.gz: 3fdc9cde3617f0dcc512aa6216381c982061bb326f1caf198e77dc6eeb4590c473dad0ac0837fbadbb9549d7338d4b7ab8b2553c27d6dcca05f35b526ba9401c

data/lib/bot.rb

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

data/lib/bot/adapters/kik.rb

@@ -22,6 +22,7 @@ module Bot
           headers: { content_type: :json }
         })
       rescue Exception => e
+        binding.pry
         Rails.logger.error "\n\n\nError:\n"
         Rails.logger.error e.response
         Rails.logger.error "\n\n\n"

data/lib/bot/message.rb

@@ -0,0 +1,9 @@
+require "bot/messages/base"
+require "bot/messages/text"
+require "bot/messages/photo"
+require "bot/messages/card"
+
+module Bot
+  module Message
+  end
+end

data/lib/bot/messages/base.rb

@@ -0,0 +1,52 @@
+module Bot
+  module Message
+    class Base
+      attr_accessor :message
+
+      def initialize(to, options=false)
+        raise NotImplementedError
+      end
+
+      def as_json(options=nil)
+        self.message.to_h
+      end
+
+      def method_missing(m, *args, &block)
+        if m =~ /.+=/
+          args.each do |arg|
+            self.message[m.to_s.gsub('=', '')] = arg
+          end
+        else
+          self.message[m.to_s]
+        end
+      end
+
+    protected
+      def suggested_responses=(suggested_responses)
+        case suggested_responses
+        when Array
+          self.message['keyboards'] = [{
+            'type' => 'suggested',
+            'responses' => build_suggested_responses(suggested_responses)
+          }]
+        when Hash
+          self.message.merge!(suggested_responses)
+        end
+      end
+
+      def build_suggested_responses(suggested_responses)
+        suggested_responses.map do |response|
+          case response
+          when String
+            {
+              'type' => 'text',
+              'body' => response
+            }
+          when Hash
+            response
+          end
+        end
+      end
+    end
+  end
+end

data/lib/bot/messages/card.rb

@@ -0,0 +1,25 @@
+module Bot
+  module Message
+    class Card < Base
+      def initialize(to, url, text, suggested_responses=false, options={})
+        icon = options.delete("icon")
+
+        self.message = {
+          'type' => 'link',
+          'to' => to,
+          'url' => url,
+          'title' => "", # Displays over the image
+          'text' => text, # Displays under the image
+          'attribution' => {
+              'name' => text # Displays in bottom line
+          },
+        }.merge(options)
+
+        self.message['picUrl'] = icon if icon
+        self.message['attribution']['iconUrl'] = icon if icon
+
+        self.suggested_responses = suggested_responses
+      end
+    end
+  end
+end

data/lib/bot/messages/photo.rb

@@ -0,0 +1,16 @@
+module Bot
+  module Message
+    class Photo < Base
+      def initialize(to, photo_url, suggested_responses=false, options={})
+        self.message = {
+          'type'      => 'gallery',
+          'to'        => to,
+          'picUrl'    => photo_url,
+          'typeTime'  => 0,
+        }.merge(options)
+
+        self.suggested_responses = suggested_responses
+      end
+    end
+  end
+end

data/lib/bot/messages/text.rb

@@ -0,0 +1,17 @@
+module Bot
+  module Message
+    class Text < Base
+      def initialize(to, body, suggested_responses=false, options={})
+        self.message = {
+          'type'  => 'text',
+          'to'    => to,
+          'body'  => body,
+          'typeTime' => 0,
+        }.merge(options)
+
+        self.message['chatId'] = options['chatId'] if options['chatId']
+        self.suggested_responses = suggested_responses
+      end
+    end
+  end
+end

data/lib/bot/version.rb

@@ -1,3 +1,3 @@
 module Bot
-  VERSION = "0.0.38"
+  VERSION = "0.0.39"
 end

data/lib/generators/bot/install/templates/application_handler.rb

@@ -1,7 +1,7 @@
 class ApplicationHandler < Bot::Handler
   use Responders::Default
 
-  # def user_for(message)
-  #   User.find_or_create_by(username: message["from"])
-  # end
+  def user_for(message)
+    User.find_or_create_by(username: message["from"])
+  end
 end

data/test/dummy/log/test.log

@@ -3379,3 +3379,46 @@ 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 200 OK in 0ms (Views: 0.1ms | ActiveRecord: 0.0ms)
    (0.1ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.5ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (1.0ms)  CREATE TABLE "schema_migrations" ("version" varchar NOT NULL) 
+   (0.1ms)  select sqlite_version(*)
+   (0.8ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.1ms)  SELECT version FROM "schema_migrations"
+   (0.7ms)  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.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+---------------------------------------
+NavigationTest: test_notify_multi_types
+---------------------------------------
+Started POST "/bot/notify" for 127.0.0.1 at 2016-05-03 14:23:13 -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 200 OK in 0ms (Views: 0.1ms | 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-03 14:23:13 -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 200 OK in 0ms (Views: 0.1ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+---------------------------
+NavigationTest: test_notify
+---------------------------
+Started POST "/bot/notify" for 127.0.0.1 at 2016-05-03 14:23:13 -0400
+Processing by Bot::BotController#notify as HTML
+  Parameters: {"bot"=>ApplicationHandler}
+Completed 200 OK in 0ms (Views: 0.1ms | ActiveRecord: 0.0ms)
+Started POST "/bot/notify" for 127.0.0.1 at 2016-05-03 14:23:13 -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 200 OK in 0ms (Views: 0.2ms | 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.38
+  version: 0.0.39
 platform: ruby
 authors:
 - Ben Morris
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-02 00:00:00.000000000 Z
+date: 2016-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -112,6 +112,11 @@ files:
 - lib/bot/context.rb
 - lib/bot/engine.rb
 - lib/bot/handler.rb
+- lib/bot/message.rb
+- lib/bot/messages/base.rb
+- lib/bot/messages/card.rb
+- lib/bot/messages/photo.rb
+- lib/bot/messages/text.rb
 - lib/bot/responder.rb
 - lib/bot/responder_chain.rb
 - lib/bot/route_extensions.rb