ruboty-line 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 077b976bdc23c573e7f97c719cb313b8b35c3532
-  data.tar.gz: 3f325a187c660d9a35ec2d8fb71169c392a9e681
+SHA256:
+  metadata.gz: ff75258dba6172f970e5aacc4befa9850e662117d77fbc5ae9d16d9dfc78b4d8
+  data.tar.gz: 1b6f9cfad6d73d7e748f8f8e02df789055c2ee545d1ac45fdb5176b530636ce0
 SHA512:
-  metadata.gz: eba29af7cbaea7dc4b217ddc7473fa0999cce467970becd3c9e6534fabebf6619f3cb37f1ab04830c584dc39e7f3f8edd4ac400eaaf2bbaed0f72c240480321b
-  data.tar.gz: 8face0e1c6fe19b1a83b199c7c829d7626f4eca08f3d3e6c05830cb861c095d61a68a6c54e47c873f186d2a99f9e626bdcb6e7936cd293d6e33c6bee903a677d
+  metadata.gz: d89f1ddddbafec394d1e66b8249bac78bc96e9192d3b304b2c8bc5849d206a5bfd31fe0177ce7fb35720bda75b128be803c36cdf0aa602c4389d20d1b1e70325
+  data.tar.gz: 017f423d9bcfdc28fb6e39bf98f2d2daf90b0a6a15f2da880ce5844eb2242a80db47b9913396e07cee44b808150d641253337efa2e0105c374afd46554ee40d1

data/README.md

@@ -12,11 +12,9 @@ gem "ruboty-line"
 ## ENV
 
 ```
-RUBOTY_LINE_CHANNEL_ID     - YOUR LINE BOT Channel ID.
 RUBOTY_LINE_CHANNEL_SECRET - YOUR LINE BOT Channel Secret.
-RUBOTY_LINE_CHANNEL_MID    - YOUR LINE BOT MID'
-RUBOTY_LINE_ENDPOINT       - LINE bot endpoint(Callback URL). (e.g. '/ruboty/line'
-RUBOTY_FIXIE_URL           - Proxy URL.
+RUBOTY_LINE_CHANNEL_TOKE   - YOUR LINE BOT Channel token.
+RUBOTY_LINE_ENDPOINT       - LINE bot endpoint(Callback URL). (e.g. '/message/reply'
 LOG_LEVEL                  - Use Ruboty logger. If LOG_LEVEL=0, output debug log.
 ```
 
@@ -26,6 +24,11 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/osyo-m
 
 ## Release note
 
+#### 0.2.0
+  
+  * Support Message API
+  * Remove support LINE BOT API(Trial)
+
 #### 0.1.0
   
   * Release!

data/lib/ruboty/adapters/line.rb

@@ -2,26 +2,11 @@ require "rack"
 require 'line/bot'
 require 'rest-client'
 
-module Line
-  module Bot
-    class HTTPClient
-      def post(url, payload, header = {})
-        Ruboty.logger.debug "======= HTTPClient#post ======="
-        Ruboty.logger.debug "payload #{payload}"
-        Ruboty.logger.debug "FIXIT_URL #{ENV["RUBOTY_FIXIE_URL"]}"
-        RestClient.proxy = ENV["RUBOTY_FIXIE_URL"] if ENV["RUBOTY_FIXIE_URL"]
-        RestClient.post(url, payload, header)
-      end
-    end
-  end
-end
-
 
 module Ruboty module Adapters
 	class LINE < Base
-		env :RUBOTY_LINE_CHANNEL_ID,     "YOUR LINE BOT Channel ID"
 		env :RUBOTY_LINE_CHANNEL_SECRET, "YOUR LINE BOT Channel Secret"
-		env :RUBOTY_LINE_CHANNEL_MID,    "YOUR LINE BOT MID"
+		env :RUBOTY_LINE_CHANNEL_TOKEN,  "YOUR LINE BOT Channel token"
 		env :RUBOTY_LINE_ENDPOINT,       "LINE bot endpoint(Callback URL). (e.g. '/ruboty/line'"
 		def run
 			Ruboty.logger.info "======= LINE#run ======="
@@ -31,67 +16,80 @@ module Ruboty module Adapters
 		def say msg
 			Ruboty.logger.info "======= LINE#say ======="
 
+			Ruboty.logger.info "msg : #{msg}"
 			text = msg[:body]
 			to   = msg[:to]
 
 			Ruboty.logger.info "text : #{text}"
 			Ruboty.logger.debug "to : #{to}"
 
-			client.send_text(
-				to_mid: to,
-				text: text
-			)
+			client.reply_message(to, {
+				type: "text",
+				text: text,
+			})
 		end
 
 		private
 		def start_server
-			Rack::Handler::Thin.run(Proc.new{ |env|
+			Rack::Handler::Thin.run(proc { |env|
 				Ruboty.logger.info "======= LINE access ======="
 				Ruboty.logger.debug "env : #{env}"
 
-				request = ::Line::Bot::Receive::Request.new(env)
+				request = Rack::Request.new(env)
+				Ruboty.logger.debug "request : #{request}"
+
 				result = on_post request
 
 				[200, {"Content-Type" => "text/plain"}, [result]]
 			}, { Port: ENV["PORT"] || "8080" })
 		end
 
-		def on_post req
+		def on_post request
 			Ruboty.logger.info "======= LINE#on_post ======="
-			Ruboty.logger.debug "request : #{req}"
 
-			return "OK" unless req.post? && req.fullpath == ENV["RUBOTY_LINE_ENDPOINT"]
+			Ruboty.logger.debug "request.fullpath : #{request.fullpath}"
+			Ruboty.logger.debug "request.post? : #{request.post?}"
+			Ruboty.logger.debug "RUBOTY_LINE_ENDPOINT : #{ENV["RUBOTY_LINE_ENDPOINT"]}"
+
+			return "OK" unless request.post? && request.fullpath == ENV["RUBOTY_LINE_ENDPOINT"]
+
+			body = request.body.read
+			Ruboty.logger.debug "request.body : #{body}"
 
-			Ruboty.logger.debug "request.body : #{req.data}"
+			events = client.parse_events_from(body)
+			
 
-			req.data.each { |message|
-				case message.content
-				when ::Line::Bot::Message::Text
-					on_message message
+			events.each { |event|
+				Ruboty.logger.debug "event : #{event}"
+				case event
+				when ::Line::Bot::Event::Message
+					case event.type
+					when ::Line::Bot::Event::MessageType::Text
+						on_message event
+					end
 				end
 			}
 
 			return ""
 		end
 
-		def on_message msg
+		def on_message event
 			Ruboty.logger.info "======= LINE#on_message ======="
-			Ruboty.logger.debug "content : #{msg.content}"
 
 			Thread.start {
 				robot.receive(
-					body: msg.content[:text],
-					from: msg.from_mid,
-					to:   msg.from_mid,
-					message: msg)
+					body: event.message["text"],
+					from: event["replyToken"],
+					to:   event["replyToken"],
+					event: event
+				)
 			}
 		end
 
 		def client
 			@client ||= ::Line::Bot::Client.new { |config|
-				config.channel_id     = ENV["RUBOTY_LINE_CHANNEL_ID"]
 				config.channel_secret = ENV["RUBOTY_LINE_CHANNEL_SECRET"]
-				config.channel_mid    = ENV["RUBOTY_LINE_CHANNEL_MID"]
+				config.channel_token  = ENV["RUBOTY_LINE_CHANNEL_TOKEN"]
  			}
 		end
 	end

data/lib/ruboty/line/version.rb

@@ -1,5 +1,5 @@
 module Ruboty
   module Line
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruboty-line
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - manga_osyo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-07 00:00:00.000000000 Z
+date: 2018-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -146,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: LINE adapter for Ruboty.