tgbot 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 662c96b10f41495f1a6aec7c80801950d22d40eb
-  data.tar.gz: ce8833bebe2c18dc1976ef330460d64cacd52d23
+  metadata.gz: d47acdf7d9efc0bbc1046ec8da783f7275bf2f47
+  data.tar.gz: f5307a153d8b7d040ac8d89f9691ce0bb5d8bba4
 SHA512:
-  metadata.gz: cba3af636ed854c1e225ae3cdbea48db5145ee3fc9422a3ff7431b60206c1e5ac3652bac64e59b2413184e871134d07df4d10a03b4acf66fe155e6b962c0af92
-  data.tar.gz: 64129d237a5b93b5cb4e7a1c7aa56321cd4704df44c99b57fac81120965b548ece3defed49057e841aee1cfadfe05b6ada9853fcab90a3a638fcbd29968edb95
+  metadata.gz: 8c89444e9d5716ce16dbd3f4789558e060fb8653d1550d18489430f713341ad43010cec7a3f5d8d050c9e1e72e4640e107a5718ffade5d8541ff4c25457c066c
+  data.tar.gz: 3f25c02feffb114ef4f20e6efa2608fdebe23706df4a0903556679b433194e14e1eff9ff15e7aa600041e033540d67c40c0764fc5cb2e5268e8af75d19bf7eea

data/README.md

@@ -1,42 +1,21 @@
 # `Tgbot`
 
+[![Gem Version](https://badge.fury.io/rb/tgbot.svg)](https://badge.fury.io/rb/tgbot)
+
 A tiny but easy-to-use wrapper of [Telegram Bot API](https://core.telegram.org/bots/api).
 
-It's still under experiment, not ready for use.
-
-## `future.rb`
-
-```ruby
-# `Tgbot.run' will start a loop until `Interrupt (Ctrl+C)' occured
-Tgbot.run TOKEN, proxy: 'https://127.0.0.1:1080' do |bot|
-  bot.start do # once
-    bot.ok "this is @#{bot.first_name}, sir."
-  end
-  bot.get 'drive' do # if message['drive']
-    bot.send_photo garage.pop rescue bot.retry(1) { |x| bot.sorry "Failed #{x} times." }
-  end                          # totally retry ^ times
-  bot.on /\-md([.^]+)\Z/m do |matched|
-    phantomjs 'md.js', matched
-    bot.send_photo 'cp.jpg' rescue bot.sorry
-  end
-  bot.finish do # rescue Interrupt
-    bot.ok 'byebye.'
-  end
-  bot.before_update do |update|
-    # do something before handling every [update]
-  end
-  bot.after_update do |update|
-    # do something after handling every [update]
-  end
-end
-```
-
-## Further future
-
-Features often needed by bots.
-
-- database
-- session
-- access control
-- dynamically add functions
-- 
+## Install
+
+    gem install tgbot
+
+## Usage
+
+See [example.rb](example.rb).
+
+## Todo
+
+- improve DSL
+
+## Contribute
+
+PRs/issues are welcome.

data/example.rb

@@ -1,24 +1,74 @@
+require 'json'
+require 'faraday'
 require './helper'
 save_pid
 require 'tgbot'
-@garage = load_data.shuffle
-
+Garage = load_data.shuffle
+Cache = {}
 TOKEN = 
 Tgbot.run TOKEN, proxy: 'https://127.0.0.1:1080' do |bot|
 
   bot.start do
-    log "this is \e[33m#{bot.name}\e[32m, master.", 2
+    log "\e[33m#{bot.name}\e[32m, at your service.", 2
   end
   bot.finish do
-    log "byebye.", 1
+    log "byebye.", 2
+  end
+
+  bot.get 'start' do
+    send_message(<<~EOF, parse_mode: 'Markdown')
+      ```
+      start : 显示此帮助信息
+      drive : 随机返回一张车库里的图
+              对该图回复 “原图” : 返回原图
+      exchange 100 CNY to JPY : 汇率转换
+      register : 添加自定义功能（会先提交给作者）
+      ```
+    EOF
   end
-  bot.get 'drive' do |x, update|
-    pic = @garage.pop
-    log ">> Sending #{File.basename(pic)} to @#{update.message.from.username} ##{update.id}", 6
-    update.reply_photo pic, caption: File.basename(pic, '.*')
+
+  bot.get 'drive' do
+    pic = Garage.pop
+    log ">> Sending #{File.basename(pic)} to @#{message.from.username} ##{id}", 6
+    bytes = File.size pic
+    size = hsize bytes
+    reply "正在发车 (#{size} #{htime(bytes / 30720)})"
+    x = reply_photo pic, caption: File.basename(pic, '.*')
+    if self.done = x['ok']
+      Cache["drive_#{x['result']['message_id']}"] = pic
+    end
+    self.done! if self.count > 1
+  end
+  bot.get '原图' do
+    x = message&.reply_to_message&.message_id
+    pic = Cache["drive_#{x}"]
+    unless pic
+      reply '没找到原图，重开'
+      next
+    end
+    log ">> Sending original #{File.basename(pic)} to @#{message.from.username} ##{id}", 6
+    reply_document pic
+  end
+
+  bot.get 'exchange' do
+    x = text&.match /([-+]?[1-9]\d*(\.\d+)?)\s*([A-Z]+)\s*to\s*([A-Z]+)/
+    unless x
+      reply 'Usage: exchange 100 CNY to JPY'
+      next
+    end
+    n, f, t = x.values_at 1, 3, 4
+    n = Float(n) rescue next
+    Cache["exchange_#{f}"] ||= JSON.parse Faraday.get("http://api.fixer.io/latest?base=#{f}").body
+    next unless Cache["exchange_#{f}"] && !Cache["exchange_#{f}"]['error']
+    next unless Cache["exchange_#{f}"]['rates'][t]
+    n *= Cache["exchange_#{f}"]['rates'][t]
+    t = Cache["exchange_#{f}"]['date']
+    reply "#{'%.2f' % n} (#{t})"
   end
+
   bot.before do |update|
-    log ">> Processing ##{update.id} #{bot.timeout}"
+    log ">> Processing ##{update.id}"
+    log "@#{update.message&.from.username}: #{update.text}", 3
   end
   bot.after do |update|
     if update.done?
@@ -28,7 +78,33 @@ Tgbot.run TOKEN, proxy: 'https://127.0.0.1:1080' do |bot|
     end
   end
 
+  bot.get 'register' do
+    e = message&.entities&.find { |e| e.type == 'pre' }
+    if e.nil?
+      send_message(<<~EOF)
+        register <功能名>
+        ```
+        get /command/ do |matched|
+          # your code here
+        end
+        ```
+      EOF
+      next
+    end
+    open 'register.rb', 'a' do |f|
+      f.puts text[e.offset, e.length]
+    end
+    reply '脚本已备分'
+  end
+
+  bot.get 'coin' do
+    send_message Array.new(text&.match(/\d+/)&.to_s.to_i || 1){ ['🌞', '🌚'].sample }.join
+  end
+  bot.get 'roll' do
+    send_message rand(text&.match(/\d+/)&.to_s.to_i || 100).to_s
+  end
+
 end
 
-save_data @garage
+save_data Garage
 delete_pid

data/lib/tgbot/dsl.rb

@@ -19,10 +19,13 @@ module Tgbot
     def after(&blk)
       @procs[:after] = blk
     end
-    def on(regex, &blk)
-      @procs[:command][regex] = blk
+    def on(*regexes, &blk)
+      regexes.each { |regex| @procs[:command][regex] = blk }
     end
     alias get on
+    def alias(ori, *args)
+      args.each { |regex| @procs[:command][regex] = @procs[:command][ori] }
+    end
     def run
       yield self if block_given?
       @procs[:start]&.call
@@ -32,14 +35,14 @@ module Tgbot
           update.done = true
           @procs[:command].each do |key, blk|
             x = update.text&.match key
-            blk.call x, update if x
+            update.instance_exec(x, &blk) if x
           end
           @procs[:after]&.call update
         end
       rescue Interrupt
         @procs[:finish]&.call
       rescue => e
-        puts $!
+        puts e
         puts e.backtrace
         retry
       end

data/lib/tgbot/update.rb

@@ -19,6 +19,12 @@ module Tgbot
     def text
       @update[@type].text
     end
+    def done!
+      @done = true
+    end
+    def retry n = 1
+      @done = false if @count < n
+    end
     def send_message(text = nil, **kwargs)
       return unless chat_id
       return unless text = text || kwargs.delete(:text)
@@ -31,6 +37,7 @@ module Tgbot
         chat_id: chat_id, text: text, 
         reply_to_message_id: @update[@type].message_id, **kwargs)
     end
+    alias reply reply_message
     %i(photo audio document video voice video_note).each do |name|
       class_eval %{
         def send_#{name}(#{name} = nil, **kwargs)

data/lib/tgbot/version.rb

@@ -1,3 +1,3 @@
 module Tgbot
-  VERSION = '0.1.0'.freeze
+  VERSION = '0.1.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tgbot
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - hyrious
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-30 00:00:00.000000000 Z
+date: 2017-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler