telegram_bot_ruby 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c01b6b954e0b513b8a0e29ef88b0f1554c9a50a
-  data.tar.gz: 0b0186efea939835e34f71aa34481e723a631218
+  metadata.gz: 03764fdebe0159e5f6de4e5c1bd4601f9dd2b32f
+  data.tar.gz: de4943a43fae55a0b6e9086caf2074d7f02e2e16
 SHA512:
-  metadata.gz: 45c73516b817ccb7d12d38fd7220221a31ddabf27d3398869adcd85ce47265a633e4e3b5a7718acc27ee595cc3588510a92d882595f3b17603c6839887957830
-  data.tar.gz: 0d82339b0ae3fde83a6d209416862c1bbeef5dd218bcda50ec26213b885e433a7f0b07b6081b124a9dd54cd63caf795f4778d9f581950b72f8eccd87d264cf27
+  metadata.gz: acaee895123fccc68d3f34d837183a93f3ccc8b929c3c67abc79d7b8085b46e6fe5eb766a3eb9b15b413339bcfe6dcaa661ed239236de132c480de4e2ff188ce
+  data.tar.gz: 1cb669182a42939e07f0aacf94dcfe7d4357bf94f8ef7952e4b999c3cf085dbe4e6cbdee3997b67decfd2adacace57566e72ffd8737035b5d19da0a0236c3a0f

data/lib/telegram_bot.rb

@@ -1,20 +1,20 @@
-require 'telegram_bot/version'
-require 'telegram_bot/objects'
-require 'telegram_bot/handler'
-require 'telegram_bot/request'
-require 'telegram_bot/request_methods'
-require 'telegram_bot/poll_listener'
+require_relative 'telegram_bot/version'
+require_relative 'telegram_bot/objects'
+require_relative 'telegram_bot/handler'
+require_relative 'telegram_bot/request'
+require_relative 'telegram_bot/request_methods'
+require_relative 'telegram_bot/poll_listener'
+require_relative 'telegram_bot/shorthand_methods'
+
 
 class TelegramBot
   include TelegramBot::EventHandler
   include TelegramBot::Request
   include TelegramBot::RequestMethods
 
-  attr_accessor :token, :handlers, :history
+  attr_accessor :history
 
-  def initialize(history: 50, token:)
-    @token = token
-    @handlers = []
+  def initialize(history: 50)
     @history = []
     @history_length = 50
   end
@@ -38,6 +38,8 @@ class TelegramBot
       define_method :history do
         telegram_bot.history
       end
+
+      include ShorthandMethods
     end
   end
 
@@ -47,11 +49,13 @@ class TelegramBot
   end
 
   def start!
+    listener = nil
     case @listen[:method]
     when :poll
-      PollListener.new(self, @listen[:interval])
+      listener = PollListener.new(self, @listen[:interval])
     when :webhook
       warn 'not implemented'
     end
+    listener.start!
   end
 end

data/lib/telegram_bot/audio.rb

@@ -1,6 +1,8 @@
+require_relative 'objects'
+
 class TelegramBot::Audio <
       Struct.new(:id, :duration, :mime_type, :file_size)
-  include AutoFromMethods
+  include TelegramBot::AutoFromMethods
 
   def self.hash_key_aliases
     {

data/lib/telegram_bot/auto_from_methods.rb

@@ -3,7 +3,7 @@ class TelegramBot
     module ClassMethods
       def from(id)
         case id
-        when self
+        when self, Struct
           id
         when nil
           nil
@@ -11,7 +11,7 @@ class TelegramBot
           parse(id)
         when Integer
           new(id)
-        when others
+        else
           warn "unknown stuff passed in [#{id}]"
         end
       end
@@ -26,7 +26,7 @@ class TelegramBot
 
       def parse(hsh)
         obj = new(*parse_attrs(hsh))
-        parse_extra_types
+        parse_extra_types(obj)
         obj
       end
 
@@ -44,13 +44,15 @@ class TelegramBot
         end
       end
 
-      def parse_extra_types
+      def parse_extra_types(obj)
         extra_types.each do |attr, typ|
           case typ
           when Class
             obj[attr] = typ.from(obj[attr])
           when Array
-            obj[attr] = obj[attr].map { |x| typ[0].from(x) }
+            unless obj[attr].nil?
+              obj[attr] = obj[attr].map { |x| typ[0].from(x) }
+            end
           else
             warn 'unknown type #{type}'
           end

data/lib/telegram_bot/blank_slate.rb

@@ -1,5 +1,5 @@
-module TelegramBot
-  class BlankSlate < BasicObject
+class TelegramBot
+  class BlankSlate < Object
     def extend(&block)
       self.singleton_class.class_eval(&block)
     end

data/lib/telegram_bot/chat.rb

@@ -1,20 +1,24 @@
-class Chat < Struct.new(:id)
+require_relative 'objects'
+
+class TelegramBot::Chat < Struct.new(:id)
+  include TelegramBot::AutoFromMethods
+
   def self.from(id)
     case id
     when Integer
-      Chat.new(id)
-    when GroupChat, User
+      TelegramBot::Chat.new(id)
+    when TelegramBot::GroupChat, TelegramBot::User
       id
     when Hash
       if id.has_key? 'title'
-        GroupChat.from(id)
+        TelegramBot::GroupChat.from(id)
       elsif id.has_key? 'first_name'
-        User.from(id)
+        TelegramBot::User.from(id)
       else
-        Chat.from(id['id'])
+        TelegramBot::Chat.from(id['id'])
       end
     else
-      warn 'unknown chat'
+      super
     end
   end
 end

data/lib/telegram_bot/contact.rb

@@ -1,9 +1,11 @@
+require_relative 'objects'
+
 class TelegramBot::Contact <
       Struct.new(:id,
                  :phone_number,
                  :first_name,
                  :last_name)
-  include AutoFromMethods
+  include TelegramBot::AutoFromMethods
 
   def self.hash_key_aliases
     {

data/lib/telegram_bot/date.rb

@@ -1,8 +1,15 @@
-require 'datetime'
+require_relative 'objects'
 require 'time'
 
-class TelegramBot::Date < Struct.new()
-  include AutoFromMethods
+class TelegramBot::Date
+  include TelegramBot::AutoFromMethods
+
+  def self.members
+    []
+  end
+  def members
+    self.class.members
+  end
 
   def self.from(date)
     case date

data/lib/telegram_bot/document.rb

@@ -1,6 +1,8 @@
+require_relative 'objects'
+
 class TelegramBot::Document <
       Struct.new(:id, :thumb, :file_name, :meme_type, :file_size)
-  include AutoFromMethods
+  include TelegramBot::AutoFromMethods
 
   def self.hash_key_aliases
     {

data/lib/telegram_bot/force_reply.rb

@@ -1,5 +1,7 @@
+require_relative 'objects'
+
 class TelegramBot::ForceReply <
       Struct.new(:force_reply,
                  :selective)
-  include AutoFromMethods
+  include TelegramBot::AutoFromMethods
 end

data/lib/telegram_bot/group_chat.rb

@@ -1,3 +1,5 @@
-class GroupChat < Struct.new(:id, :title)
-  include AutoFromMethods
+require_relative 'objects'
+
+class TelegramBot::GroupChat < Struct.new(:id, :title)
+  include TelegramBot::AutoFromMethods
 end

data/lib/telegram_bot/handler.rb

@@ -4,10 +4,10 @@ require 'active_support/inflector'
 require_relative 'matcher'
 require_relative 'blank_slate'
 
-module TelegramBot
+class TelegramBot
   module EventHandler
     class Handler
-      attr_accessor :type, :action, :pass
+      attr_accessor :action, :pass, :matcher
 
       def initialize(matcher, action, pass)
         @matcher = matcher
@@ -28,21 +28,23 @@ module TelegramBot
       end
     end
 
+    module PrependMethods
+      attr_accessor :handlers
 
-    def self.included(clazz)
-      clazz.send :prepend, Class.new do
-        attr_accessor :handlers
-
-        def initialize(*args, &block)
-          @handlers = []
-          super(*args, &block)
-        end
+      def initialize(*args, &block)
+        @handlers = []
+        super(*args, &block)
       end
     end
 
+    def self.included(clazz)
+      clazz.prepend PrependMethods
+    end
+
 
     def on(type, *args, pass: false, &block)
-      matcher_class = "#{type}_matcher".classify
+      matcher_class_name = "telegram_bot/#{type}_matcher".classify
+      matcher_class = matcher_class_name.constantize
       matcher = matcher_class.new(*args)
       handler = Handler.new(matcher, block, pass)
       @handlers << handler
@@ -64,8 +66,8 @@ module TelegramBot
           end
         end
 
-        env.call(handler.arguments(msg),
-                 &handler.action)
+        env.call(*hndlr.arguments(msg),
+                 &hndlr.action)
       end
     end
   end

data/lib/telegram_bot/location.rb

@@ -1,12 +1,14 @@
-class TelegramBot::Location < Field.new(:longitude, :latitude)
-  include AutoFromMethods
+require_relative 'objects'
+
+class TelegramBot::Location < Struct.new(:longitude, :latitude)
+  include TelegramBot::AutoFromMethods
 
   def self.from(hsh, lat = nil)
     case hsh
     when Integer
       new(hsh, lat)
     else
-      super
+      super(hsh)
     end
   end
 end

data/lib/telegram_bot/matcher.rb

@@ -1,4 +1,4 @@
-module TelegramBot
+class TelegramBot
   class Matcher
     def env(msg)
       msg.extend(BasicObject.new)
@@ -45,6 +45,15 @@ module TelegramBot
 
       obj
     end
+
+    def arguments(msg)
+      if Regexp === @pattern
+        md = @pattern.match(msg.text)
+        md.to_a
+      else
+        [msg.text]
+      end
+    end
   end
 
   class CommandMatcher < Matcher

data/lib/telegram_bot/message.rb

@@ -1,27 +1,30 @@
+require_relative 'objects'
+require 'forwardable'
+
 class TelegramBot::Message <
-      Struct(:id,
-             :from,
-             :date,
-             :chat,
-             :forward_from,
-             :forward_date,
-             :reply_to_message,
-             :text,
-             :audio,
-             :document,
-             :photo,
-             :sticker,
-             :video,
-             :contact,
-             :location,
-             :new_chat_participant,
-             :left_chat_participant,
-             :new_chat_title,
-             :new_chat_photo,
-             :delete_chat_photo,
-             :group_chat_created)
+      Struct.new(:id,
+                 :from,
+                 :date,
+                 :chat,
+                 :forward_from,
+                 :forward_date,
+                 :reply_to_message,
+                 :text,
+                 :audio,
+                 :document,
+                 :photo,
+                 :sticker,
+                 :video,
+                 :contact,
+                 :location,
+                 :new_chat_participant,
+                 :left_chat_participant,
+                 :new_chat_title,
+                 :new_chat_photo,
+                 :delete_chat_photo,
+                 :group_chat_created)
 
-  include AutoFromMethods
+  include TelegramBot::AutoFromMethods
 
   def self.hash_key_aliases
     {
@@ -31,21 +34,20 @@ class TelegramBot::Message <
 
   def self.extra_types
     {
-      from: User,
-      chat: Chat,
-      forward_from: User,
-      forward_date: Date,
-      reply_to_message: Message,
-      text: String,
-      audio: Audio,
-      document: Document,
-      photo: [PhotoSize],
-      sticker: Sticker,
-      video: Video,
-      contact: Contact,
-      location: Location,
-      new_chat_participant: User,
-      left_chat_participant: User
+      from:                  TelegramBot::User,
+      chat:                  TelegramBot::Chat,
+      forward_from:          TelegramBot::User,
+      forward_date:          TelegramBot::Date,
+      reply_to_message:      TelegramBot::Message,
+      audio:                 TelegramBot::Audio,
+      document:              TelegramBot::Document,
+      photo: [               TelegramBot::PhotoSize],
+      sticker:               TelegramBot::Sticker,
+      video:                 TelegramBot::Video,
+      contact:               TelegramBot::Contact,
+      location:              TelegramBot::Location,
+      new_chat_participant:  TelegramBot::User,
+      left_chat_participant: TelegramBot::User
     }
   end
 
@@ -78,13 +80,14 @@ class TelegramBot::Message <
 
   def extend_env(obj)
     msg = self
-    obj.instace_eval do
+    obj.instance_eval do
       @message = msg
     end
 
     members = self.members
 
     obj.extend do
+      extend Forwardable
       attr_reader :message
       def_delegators :@message, *members
       def_delegators :@message, :is_forward?, :is_reply?

data/lib/telegram_bot/objects.rb

@@ -1,7 +1,7 @@
 require_relative 'auto_from_methods'
 
-require_relative 'user'
 require_relative 'chat'
+require_relative 'user'
 require_relative 'group_chat'
 require_relative 'message'
 require_relative 'photo_size'
@@ -12,3 +12,4 @@ require_relative 'contact'
 require_relative 'location'
 require_relative 'update'
 require_relative 'date'
+require_relative 'sticker'

data/lib/telegram_bot/photo_size.rb

@@ -1,6 +1,8 @@
+require_relative 'objects'
+
 class TelegramBot::PhotoSize <
       Struct.new(:id, :width, :height, :file_size)
-  include AutoFromMethods
+  include TelegramBot::AutoFromMethods
 
   def hash_key_aliases
     {

data/lib/telegram_bot/poll_listener.rb

@@ -1,4 +1,4 @@
-module TelegramBot
+class TelegramBot
   class PollListener
     def initialize(client, interval)
       @client    = client
@@ -19,9 +19,10 @@ module TelegramBot
     end
 
     def get_updates
-      updates = @client.get_updates(@offset_id, 50)
+      updates = @client.get_updates(offset: @offset_id,
+                                    limit: 50)
       updates.each do |update|
-        @offset_id = update.id
+        @offset_id = update.id + 1
         message_received(update.message)
       end
     end

data/lib/telegram_bot/reply_keyboard_hide.rb

@@ -1,5 +1,5 @@
 class TelegramBot::ReplyKeyboardHide <
       Struct.new(:hide_keyboard,
                  :selective)
-  include AutoFromMethods
+  include TelegramBot::AutoFromMethods
 end

data/lib/telegram_bot/reply_keyboard_markup.rb

@@ -3,5 +3,5 @@ class TelegramBot::ReplyKeyboardMarkup <
                  :resize_keyboard,
                  :one_time_keyboard,
                  :selective)
-  include AutoFromMethods
+  include TelegramBot::AutoFromMethods
 end

data/lib/telegram_bot/request.rb

@@ -2,9 +2,9 @@ require 'rest-client'
 require 'json'
 require 'active_support/inflector'
 
-module TelegramBot
+class TelegramBot
   module Request
-    class PrependMethods
+    module PrependMethods
       attr_accessor :token
 
       def initialize(*args, token:, &block)
@@ -20,9 +20,11 @@ module TelegramBot
     end
 
     def request(method, params)
-      url  = construct_url(method)
-      resp = RestClient.post(url, params)
-      return JONS.parse(resp.body) if resp.code.to_s =~ /^2\d\d$/
+      url    = construct_url(method)
+      resp   = RestClient.post(url, params)
+      json   = JSON.parse(resp.body)
+      result = json['result']
+      return result if resp.code.to_s =~ /^2\d\d$/
       raise Exception.new(resp)
     end
 

data/lib/telegram_bot/request_methods.rb

@@ -1,4 +1,4 @@
-module TelegramBot
+class TelegramBot
   module RequestMethods
     def get_updates(offset: nil, limit: nil, timeout: nil)
       params = {
@@ -7,7 +7,7 @@ module TelegramBot
         timouet: timeout
       }.reject {|_,v| v.nil?}
 
-      request(:get_update, params).map do |update|
+      request(:get_updates, params).map do |update|
         Update.from(update)
       end
     end
@@ -20,11 +20,12 @@ module TelegramBot
                      disable_web_page_preview: nil,
                      reply_to: nil,
                      reply_markup: nil)
+      reply_to = Message.from(reply_to)
       params = {
         chat_id: Chat.from(chat).id,
         text: text,
         disable_web_page_preview: disable_web_page_preview,
-        reply_to_message_id: Chat.from(reply_to).id
+        reply_to_message_id: reply_to && reply_to.id
         # TODO:
         # reply_markup: reply_markup
       }.reject {|_,v| v.nil?}
@@ -87,6 +88,15 @@ module TelegramBot
       :set_webhook
     ]
 
+    private
+
+    def todo(*args, &block)
+      defn_at = self.method(__callee__).source_location
+      warn "#{defn_at[0]}:<#{__callee__}>: not implemented"
+    end
+
+    public
+
     METHODS.each do |method|
       is_defined = self.instance_methods(false).include?(method)
       unless is_defined
@@ -96,12 +106,5 @@ module TelegramBot
       alias_method "#{method}_raw", method
     end
 
-
-    private
-
-    def todo(*args, &block)
-      defn_at = self.method(__callee__).source_location
-      warn "#{defn_at[0]}:<#{__callee__}>: not implemented"
-    end
   end
 end

data/lib/telegram_bot/shorthand_methods.rb

@@ -0,0 +1,17 @@
+module TelegramBot::ShorthandMethods
+  def send_message(text, *args, to: message.chat)
+    bot.send_message(to, text, *args)
+  end
+
+  def reply(text, *args, to: message.chat)
+    bot.send_message(to, text, *args, reply_to: message)
+  end
+
+  def forward_message(to)
+    bot.forward_message(message, to)
+  end
+
+  def send_chat_action(action)
+    bot.send_chat_action(message.chat, action)
+  end
+end

data/lib/telegram_bot/sticker.rb

@@ -1,7 +1,9 @@
+require_relative 'objects'
+
 class TelegramBot::Sticker <
-      Struct(:id, :width, :height, :thumb, :file_size)
+      Struct.new(:id, :width, :height, :thumb, :file_size)
 
-  include AutoFromMethods
+  include TelegramBot::AutoFromMethods
 
   def self.hash_key_aliases
     {

data/lib/telegram_bot/update.rb

@@ -1,9 +1,11 @@
-class TelegramBot::Update < Strict(:id, :message)
-  include AutoFromMethods
+require_relative 'objects'
+
+class TelegramBot::Update < Struct.new(:id, :message)
+  include TelegramBot::AutoFromMethods
 
   def self.extra_types
     {
-      message: Message
+      message: TelegramBot::Message
     }
   end
 

data/lib/telegram_bot/user.rb

@@ -1,4 +1,6 @@
+require_relative 'objects'
+
 class TelegramBot::User <
       Struct.new(:id, :first_name, :last_name, :username)
-  include AutoFromMethods
+  include TelegramBot::AutoFromMethods
 end

data/lib/telegram_bot/version.rb

@@ -1,3 +1,3 @@
 class TelegramBot
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/telegram_bot/video.rb

@@ -1,3 +1,5 @@
+require_relative 'objects'
+
 class TelegramBot::Video <
       Struct.new(:id,
                  :width,
@@ -8,7 +10,7 @@ class TelegramBot::Video <
                  :file_size,
                  :caption)
 
-  include AutoFromMethods
+  include TelegramBot::AutoFromMethods
 
   def self.hash_key_aliases
     {

data/telegram_bot_ruby.gemspec

@@ -9,10 +9,11 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Shou Ya"]
   spec.email         = ["shouyatf@gmail.com"]
 
-  spec.summary       = %q{This is a bot framework that utilizes telegram's bots api}
+  spec.summary       = %q{A bot framework for Telegram Bot API}
   spec.homepage      = "https://github.com/shouya/telegram-bot"
   spec.license       = "MIT"
 
+  spec.required_ruby_version = '2.0.0'
   # Prevent pushing this gem to RubyGems.org by setting 'allowed_push_host', or
   # delete this section to allow pushing this gem to any host.
 
@@ -22,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'rest-client'
-  spec.add_dependency 'active_support'
+  spec.add_dependency 'activesupport'
 
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: telegram_bot_ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Shou Ya
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: active_support
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -100,6 +100,7 @@ files:
 - lib/telegram_bot/reply_keyboard_markup.rb
 - lib/telegram_bot/request.rb
 - lib/telegram_bot/request_methods.rb
+- lib/telegram_bot/shorthand_methods.rb
 - lib/telegram_bot/sticker.rb
 - lib/telegram_bot/update.rb
 - lib/telegram_bot/user.rb
@@ -116,9 +117,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -129,5 +130,5 @@ rubyforge_project:
 rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
-summary: This is a bot framework that utilizes telegram's bots api
+summary: A bot framework for Telegram Bot API
 test_files: []