kamigo 0.2.6 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc8d59418cce03e5e57afafe5d8ea1a7a8b966fadcaa45015f5019f453e7d48c
-  data.tar.gz: fd5b7a54099975c076280619c1dd8d5758659f164323f760adb6f41ba92a6803
+  metadata.gz: 3e7b37bfed45e62c0e1d58e1194c725819ee3f95553349970eeb2ca2b85365e0
+  data.tar.gz: 44a294d0412bc531a5274a2fe039d4c486f499335363ec94b39aa1423189deec
 SHA512:
-  metadata.gz: 7fc6c0a5ca1f7407faa23e2127119a9c1f5d1b69ca8c9e9aa798e00fc7cbea3d99911f321b81e78fc2a0bdeb591b22883db868ba98aa1397a8b8a342e5206183
-  data.tar.gz: 82622d9db23498669245ac69c157bd8070fddfea19f406d07e66f1fe53362e35c15a4c5c5fbf88621573db207df87b23286ba8247e730df4898af0587ecc9e94
+  metadata.gz: 9bc9e189b091e4f1db09155796ce68db4e51144a9a2c4cd9a4d928dfe15246f5023cfec052271b158005e1faa036248d0242f3334001e1b59828c6198a6f12e5
+  data.tar.gz: 5bde7f7851c7a5c18db339d26de3812a5be08d475235fd9749d5788ff4718c684c4aaf6c90900e174b91c24c372e87575e8eea367931eed128779421b9dda9c8

data/README.md

@@ -71,6 +71,8 @@ Kamigo 預設使用基本的語意理解模型，會將使用者輸入視為在
 只要和你的聊天機器人說 `/`，就能看見首頁的樣子。
 
 # 使用 kamigo 製作的聊天機器人
+- [kamigo demo](https://github.com/etrex/kamigo_demo)
+  ![](/doc/images/kamigo_demo_qrcode.png)
 - [健身紀錄機器人: Muscle-Man](https://github.com/louis70109/muscle_man)
   ![](https://camo.githubusercontent.com/c0d2233e3182c822ffc0816fe0cbb5610fe67914/68747470733a2f2f692e696d6775722e636f6d2f4f7930423257326d2e706e67)
 

data/app/controllers/line_controller.rb

@@ -5,8 +5,8 @@ class LineController < ApplicationController
   protect_from_forgery with: :null_session
 
   def entry
-    body = request.body.read
-    events = client.parse_events_from(body)
+    parser = Kamigo::EventParsers::LineEventParser.new
+    events = parser.parse_events(request)
     events.each do |event|
       process_event(event)
     end
@@ -16,17 +16,16 @@ class LineController < ApplicationController
   private
 
   def process_event(event)
-    reply_token = event['replyToken']
-    http_method, path, request_params = language_understanding(event.message['text'])
-    inject_event(event, to: request_params)
+    http_method, path, request_params = language_understanding(event.message)
     encoded_path = URI.encode(path)
     output = reserve_route(encoded_path, http_method: http_method, request_params: request_params, format: :line)
-    response = client.reply_message(reply_token, JSON.parse(output))
+    responser = Kamigo::EventResponsers::LineEventResponser.new
+    response =  responser.response_event(event, output)
     puts response.body
-
   rescue NoMethodError => e
     puts e.full_message
-    response = client.reply_message(reply_token, {
+    responser = Kamigo::EventResponsers::LineEventResponser.new
+    response =  responser.response_event(event, {
       type: "text",
       text: "404 not found"
     })
@@ -51,24 +50,4 @@ class LineController < ApplicationController
     JSON.parse(string)
   end
 
-  def client
-    @client ||= Line::Bot::Client.new do |config|
-      config.channel_secret = ENV['LINE_CHANNEL_SECRET']
-      config.channel_token = ENV['LINE_CHANNEL_TOKEN']
-    end
-  end
-
-  def validate_signature(request, body)
-    signature = request.env['HTTP_X_LINE_SIGNATURE']
-    client.validate_signature(body, signature)
-  end
-
-  def inject_event(event, to: {})
-    event_hash = JSON.parse(event.to_json, symbolize_names: true)[:src]
-    to[:event] = event_hash
-    to[:platform_type] = 'line'
-    to[:source_type] = event_hash.dig(:source, :type)
-    to[:source_group_id] = event_hash.dig(:source, :groupId) || event_hash.dig(:source, :roomId) || event_hash.dig(:source, :userId)
-    to[:source_user_id] = event_hash.dig(:source, :userId) || event_hash.dig(:source, :groupId) || event_hash.dig(:source, :roomId)
-  end
 end

data/lib/kamigo.rb

@@ -2,7 +2,11 @@ require "kamigo/engine"
 require "line-bot-api"
 require "kamiflex"
 require "kamiliff"
-
+require "kamigo/clients/line_client"
+require "kamigo/events/basic_event"
+require "kamigo/events/line_event"
+require "kamigo/event_parsers/line_event_parser"
+require "kamigo/event_responsers/line_event_responser"
 module Kamigo
   # Your code goes here...
 end

data/lib/kamigo/clients/line_client.rb

@@ -0,0 +1,17 @@
+module Kamigo
+  module Clients
+    module LineClient
+      def client
+        @client ||= Line::Bot::Client.new do |config|
+          config.channel_secret = ENV['LINE_CHANNEL_SECRET']
+          config.channel_token = ENV['LINE_CHANNEL_TOKEN']
+        end
+      end
+
+      def validate_signature(request, body)
+        signature = request.env['HTTP_X_LINE_SIGNATURE']
+        client.validate_signature(body, signature)
+      end
+    end
+  end
+end

data/lib/kamigo/event_parsers/line_event_parser.rb

@@ -0,0 +1,29 @@
+module Kamigo
+  module EventParsers
+    class LineEventParser
+      include Kamigo::Clients::LineClient
+
+      def parse_events(request)
+        body = request.body.read
+        events = client.parse_events_from(body)
+        events.map do |event|
+          parse(event)
+        end
+      end
+
+      def parse(event)
+        payload = JSON.parse(event.to_json, symbolize_names: true)[:src]
+        line_event = Kamigo::Events::LineEvent.new
+        line_event.payload = payload
+        line_event.platform_type = 'line'
+        line_event.reply_token = event['replyToken']
+        line_event.source_type = payload.dig(:source, :type)
+        line_event.source_group_id = payload.dig(:source, :groupId) || payload.dig(:source, :roomId) || payload.dig(:source, :userId)
+        line_event.source_user_id = payload.dig(:source, :userId) || payload.dig(:source, :groupId) || payload.dig(:source, :roomId)
+        line_event.message_type = payload.dig(:message, :type) || payload.dig(:type)
+        line_event.message = payload.dig(:message, :text) || payload.dig(:message, :address) || line_event.message_type
+        line_event
+      end
+    end
+  end
+end

data/lib/kamigo/event_responsers/line_event_responser.rb

@@ -0,0 +1,13 @@
+module Kamigo
+  module EventResponsers
+    class LineEventResponser
+      include Kamigo::Clients::LineClient
+
+      def response_event(event, message)
+        message = JSON.parse(message) if message.is_a? String
+        response = client.reply_message(event.reply_token, message)
+        response
+      end
+    end
+  end
+end

data/lib/kamigo/events/basic_event.rb

@@ -0,0 +1,13 @@
+module Kamigo
+  module Events
+    class BasicEvent
+      attr_accessor :platform_type
+      attr_accessor :message
+      attr_accessor :message_type
+      attr_accessor :source_type
+      attr_accessor :source_group_id
+      attr_accessor :source_user_id
+      attr_accessor :payload
+    end
+  end
+end

data/lib/kamigo/events/line_event.rb

@@ -0,0 +1,7 @@
+module Kamigo
+  module Events
+    class LineEvent < BasicEvent
+      attr_accessor :reply_token
+    end
+  end
+end

data/lib/kamigo/version.rb

@@ -1,3 +1,3 @@
 module Kamigo
-  VERSION = '0.2.6'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kamigo
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.3.0
 platform: ruby
 authors:
 - etrex
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-18 00:00:00.000000000 Z
+date: 2019-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: kamiflex
   requirement: !ruby/object:Gem::Requirement
@@ -103,7 +103,12 @@ files:
 - lib/generators/rails/scaffold_controller_generator.rb
 - lib/generators/rails/templates/controller.rb
 - lib/kamigo.rb
+- lib/kamigo/clients/line_client.rb
 - lib/kamigo/engine.rb
+- lib/kamigo/event_parsers/line_event_parser.rb
+- lib/kamigo/event_responsers/line_event_responser.rb
+- lib/kamigo/events/basic_event.rb
+- lib/kamigo/events/line_event.rb
 - lib/kamigo/railtie.rb
 - lib/kamigo/version.rb
 homepage: https://github.com/etrex/kamigo