teleruby 1.5.4 → 1.5.5

data/lib/api/set_apis.rb

@@ -3,7 +3,6 @@
 
 require_relative '../core_api'
 
-##
 # Solomon Boloshe(Lee Crey)
 # Friday, August 21 2020 06:35:33 PM +0300
 
@@ -14,24 +13,24 @@ module Telegram
     # in a supergroup promoted by the bot.
     def set_cutom_title(chat_id, user_id, title)
       if chat_id.to_i.negative?
-        raise BadRequestError, 'can\' set custom title for private chat'
+        fail BadRequestError, 'can\' set custom title for private chat'
       end
       hash = { chat_id: chat_id, user_id: user_id, custom_title: title }
       response = http_post('setChatAdministratorCustomTitle', hash)
       unless response.ok # rubocop:disable Style/IfUnlessModifier
-        raise PermissionError, response.description
+        fail PermissionError, response.description
       end
       response.result
     end
 
     def set_chat_permissions(chat_id, permissions)
       unless chat_id.to_i.negative?
-        raise BadRequestError, 'can\' set permissions for private chat'
+        fail BadRequestError, 'can\' set permissions for private chat'
       end
       hash = { chat_id: chat_id, permissions: permissions }
       response = http_post('setChatPermissions', hash)
       unless response.ok # rubocop:disable Style/IfUnlessModifier
-        raise PermissionError, response.description
+        fail PermissionError, response.description
       end
       response.result
     end
@@ -45,7 +44,7 @@ module Telegram
       hash = { chat_id: chat_id, photo: file }
       data = http_post('setChatPhoto', hash)
       unless data.ok # rubocop:disable Style/IfUnlessModifier
-        raise PermissionError, data.description
+        fail PermissionError, data.description
       end
       data.result
     end
@@ -54,13 +53,13 @@ module Telegram
     # Titles can't be changed for private chats.
     def set_chat_title(chat_id, title)
       unless chat_id.to_i.negative?
-        raise BadRequestError, 'can\'t set chat title for private'
+        fail BadRequestError, 'can\'t set chat title for private'
       end
 
       hash = { chat_id: chat_id, title: title.to_s }
       data = http_post('setChatTitle', hash)
       unless data.ok # rubocop:disable Style/IfUnlessModifier
-        raise PermissionError, data.description
+        throw PermissionError, data.description
       end
 
       data.result
@@ -70,13 +69,13 @@ module Telegram
     # a supergroup or a channel.
     def set_chat_description(chat_id, description)
       unless chat_id.to_i.negative?
-        raise BadRequestError, 'can\'t set description for private chat'
+        fail BadRequestError, 'can\'t set description for private chat'
       end
 
       hash = { chat_id: chat_id, description: description }
       data = http_post('setChatDescription', hash)
       unless data.ok # rubocop:disable Style/IfUnlessModifier
-        raise PermissionError, data.description
+        fail PermissionError, data.description
       end
 
       data.result
@@ -87,7 +86,7 @@ module Telegram
       hash = { chat_id: chat_id, set_name: set_name }
       data = http_post('setChatStickerSet', hash)
       unless data.ok # rubocop:disable Style/IfUnlessModifier
-        raise StandardError, data.description
+        fail StandardError, data.description
       end
       data.result
     end
@@ -97,7 +96,7 @@ module Telegram
       hash = { command: command }
       data = http_post('setMyCommand', hash)
       unless data.ok # rubocop:disable Style/IfUnlessModifier
-        raise TokenError, data.description
+        fail TokenError, data.description
       end
       data.result
     end
@@ -108,7 +107,7 @@ module Telegram
       hash = { sticker: sticker, position: position }
       data = http_post('setStickerPositionInTheSet', hash)
       unless data.ok # rubocop:disable Style/IfUnlessModifier
-        raise Error, data.description
+        fail Error, data.description
       end
       data.result
     end
@@ -118,13 +117,13 @@ module Telegram
       hash = { name: name, user_id: user_id }.merge!(params)
       data = http_post('setStickerSetThumb', hash)
       unless data.ok # rubocop:disable Style/IfUnlessModifier
-        raise Error, data.description
+        fail Error, data.description
       end
       data.result
     end
 
     def set_webhook(url, params = {})
-      raise NotImplementedError, 'not implemented'
+      fail NotImplementedError, 'not implemented'
     end
   end
 end

data/lib/core_api.rb

@@ -1,8 +1,10 @@
 #!/usr/bin/ruby
+# frozen_string_literal: true 
 
 require 'faraday'
 require 'json'
-require_relative 'objects/all'
+require 'require_all'
+require_all 'objects'
 
 module Telegram
   class Error < StandardError; end

data/lib/teleruby.rb

@@ -1,11 +1,16 @@
 #!/usr/bin/ruby
 
-require_relative 'api/all'
+require 'require_all'
+require_all 'api'
 
 module Telegram
   # Telegram CLient(bot)
   class Client
-    include AllApis
+    include DeleteApis
+    include GetApis
+    include NonStandard
+    include OtherApis
+    include SendApis SetApis
     def initialize(token: )
       @token = token
       @last_update = 0

data/teleruby.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = 'teleruby'
-  spec.version       = '1.5.4'
+  spec.version       = '1.5.5'
   spec.date          = '2020-04-16'
   spec.authors       = ['Solomon Boloshe(Gem dave)', 'NTB Bloodbath (Gem maintainer)']
   spec.email         = ['SolomonBoloshe9@gmail.com']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teleruby
 version: !ruby/object:Gem::Version
-  version: 1.5.4
+  version: 1.5.5
 platform: ruby
 authors:
 - Solomon Boloshe(Gem dave)
@@ -61,7 +61,6 @@ extra_rdoc_files: []
 files:
 - LICENSE.md
 - README.md
-- lib/api/all.rb
 - lib/api/delete_apis.rb
 - lib/api/get_apis.rb
 - lib/api/nstandard.rb
@@ -69,7 +68,6 @@ files:
 - lib/api/send_apis.rb
 - lib/api/set_apis.rb
 - lib/core_api.rb
-- lib/objects/all.rb
 - lib/objects/animation.rb
 - lib/objects/audio.rb
 - lib/objects/bot_command.rb
@@ -110,55 +108,6 @@ files:
 - lib/objects/video_note.rb
 - lib/objects/voice.rb
 - lib/teleruby.rb
-- lib/teleruby/all_apis.rb
-- lib/teleruby/api/delete_apis.rb
-- lib/teleruby/api/get_apis.rb
-- lib/teleruby/api/nstandard.rb
-- lib/teleruby/api/other_apis.rb
-- lib/teleruby/api/send_apis.rb
-- lib/teleruby/api/set_apis.rb
-- lib/teleruby/core_api.rb
-- lib/teleruby/objects/all.rb
-- lib/teleruby/objects/animation.rb
-- lib/teleruby/objects/audio.rb
-- lib/teleruby/objects/bot_command.rb
-- lib/teleruby/objects/callback_query.rb
-- lib/teleruby/objects/chat.rb
-- lib/teleruby/objects/chat_member.rb
-- lib/teleruby/objects/chat_permissions.rb
-- lib/teleruby/objects/chat_photo.rb
-- lib/teleruby/objects/chosen_inline_result.rb
-- lib/teleruby/objects/contact.rb
-- lib/teleruby/objects/dice.rb
-- lib/teleruby/objects/document.rb
-- lib/teleruby/objects/file.rb
-- lib/teleruby/objects/game.rb
-- lib/teleruby/objects/inline_query.rb
-- lib/teleruby/objects/inlinekeyboardbutton.rb
-- lib/teleruby/objects/inlinekeyboardmarkup.rb
-- lib/teleruby/objects/location.rb
-- lib/teleruby/objects/mask_position.rb
-- lib/teleruby/objects/message.rb
-- lib/teleruby/objects/message_entity.rb
-- lib/teleruby/objects/order_info.rb
-- lib/teleruby/objects/photo_size.rb
-- lib/teleruby/objects/poll.rb
-- lib/teleruby/objects/poll_answer.rb
-- lib/teleruby/objects/poll_option.rb
-- lib/teleruby/objects/pre_checkout_query.rb
-- lib/teleruby/objects/same/common.rb
-- lib/teleruby/objects/same/common_2.rb
-- lib/teleruby/objects/shipping_address.rb
-- lib/teleruby/objects/shipping_query.rb
-- lib/teleruby/objects/sticker.rb
-- lib/teleruby/objects/update.rb
-- lib/teleruby/objects/user.rb
-- lib/teleruby/objects/user_profile_photos.rb
-- lib/teleruby/objects/venue.rb
-- lib/teleruby/objects/video.rb
-- lib/teleruby/objects/video_note.rb
-- lib/teleruby/objects/voice.rb
-- lib/teleruby/version.rb
 - msg.png
 - rdoc.png
 - teleruby.gemspec
@@ -182,7 +131,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubyforge_project: 
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Simple ruby wrapper for Telegram bot

data/lib/api/all.rb

@@ -1,12 +0,0 @@
-#!/usr/bin/ruby
-
-module Telegram
-  module AllApis
-    require_relative 'delete_apis'
-    require_relative 'get_apis'
-    require_relative 'nstandard'
-    require_relative 'other_apis'
-    require_relative 'send_apis'
-    require_relative 'set_apis'
-  end
-end

data/lib/objects/all.rb

@@ -1,42 +0,0 @@
-#!/usr/bin/ruby
-# frozen_string_literal: false
-
-# :nodoc:
-
-require_relative 'poll'
-require_relative 'location'
-require_relative 'venue'
-require_relative 'chat'
-require_relative 'bot_command'
-require_relative 'chat_permissions'
-require_relative 'chat_photo'
-require_relative 'callback_query'
-require_relative 'file'
-require_relative 'user_profile_photos'
-require_relative 'poll_answer'
-require_relative 'poll_option'
-require_relative 'dice'
-require_relative 'contact'
-require_relative 'voice'
-require_relative 'video'
-require_relative 'audio'
-require_relative 'photo_size'
-require_relative 'document'
-require_relative 'video_note'
-require_relative 'user'
-require_relative 'message_entity'
-require_relative 'chat_member'
-require_relative 'update'
-require_relative 'chosen_inline_result'
-require_relative 'sticker'
-require_relative 'game'
-require_relative 'inline_query'
-require_relative 'shipping_query'
-require_relative 'mask_position'
-require_relative 'shipping_address'
-require_relative 'pre_checkout_query'
-require_relative 'order_info'
-require_relative 'message'
-require_relative 'animation'
-require_relative 'inlinekeyboardbutton'
-require_relative 'inlinekeyboardmarkup'

data/lib/teleruby/all_apis.rb

@@ -1,22 +0,0 @@
-#!/usr/bin/ruby
-# frozen_string_literal: false
-
-# APIs
-require_relative 'api/send_apis'
-require_relative 'api/set_apis'
-require_relative 'api/delete_apis'
-require_relative 'api/other_apis'
-require_relative 'api/get_apis'
-require_relative 'api/nstandard'
-
-module Telegram
-  module AllApis
-    # directory => api
-    include SendApis     # send_apis.rb
-    include SetApis      # set_apis.rb
-    include DeleteApis   # delete_apis.rb
-    include OtherApis    # other_apis.rb
-    include GetApis      # get_apis.rb
-    include NonStandard  # nstandard.rb
-  end
-end

data/lib/teleruby/api/delete_apis.rb

@@ -1,58 +0,0 @@
-#!/usr/bin/ruby
-# frozen_string_literal: true
-
-require_relative '../core_api'
-
-module Telegram
-  module DeleteApis
-    ##
-    # Use this method to delete a chat photo.
-    def delete_chat_photo(chat_id)
-      unless chat_id.to_i.negative?
-        fail BadRequestError, %{can't delete private chat photo}
-      end
-
-      hash = { chat_id: chat_id }
-      response = post('deleteChatPhoto', hash)
-      unless response.ok # rubocop:disable Style/IfUnlessModifier
-        fail PermissionError, response.description
-      end
-
-      response.result
-    end
-
-    ##
-    # Use this method to delete a group sticker set from a supergroup.
-    def delete_chat_sticker_set(chat_id)
-      unless chat_id.to_i.negative?
-        fail BadRequestError, %{can' delete sticker set of private chat}
-      end
-
-      hash = { chat_id: chat_id }
-      response = post('deleteChatStickerSet', hash)
-      unless response.ok # rubocop:disable Style/IfUnlessModifier
-        fail PermissionError, response.description
-      end
-
-      response.result
-    end
-
-    ##
-    # Use this method to delete a message, including service messages.
-    def delete_message(chat_id, message_id)
-      hash = { chat_id: chat_id, message_id: message_id }
-      response = post('deleteMessage', hash)
-      unless response.ok # rubocop:disable Style/IfUnlessModifier
-        fail TelegramError, response.description
-      end
-
-      response.result
-    end
-
-    ##
-    # Use this method to delete a sticker from a set created by the bot.
-    def delete_sticker_from_set(sticker)
-      throw NotImplementedError, 'currently not supported'
-    end
-  end
-end

data/lib/teleruby/api/get_apis.rb

@@ -1,172 +0,0 @@
-#!/usr/bin/ruby
-# frozen_string_literal: true
-
-require_relative '../core_api'
-
-##
-# Solomon Boloshe(Lee Crey)
-# Friday, August 21 2020 04:52:49 PM +0300
-
-module Telegram
-  module GetApis # rubocop:disable Metrics/ModuleLength
-    ##
-    # Use this method to receive incoming updates using long polling.
-    def get_updates(limit = 10, &block) # rubocop:disable Metrics/MethodLength
-      blok = {}
-      if block_given?
-        blok = block.call
-        unless blok.instance_of? Hash # rubocop:disable Style/IfUnlessModifier
-          fail ArgumentError, 'expected object is hash'
-        end
-      end
-
-      hash = { 'timeout': 0, 'limit': limit, 'offset': @last_update }
-      hash.merge!(blok)
-      response = get('getUpdates', hash)
-      unless response.ok # rubocop:disable Style/IfUnlessModifier
-        fail TelegramError, response.desciption
-      end
-
-      result = response.result
-      if result.instance_of? Array
-        @last_update = result.last.update_id + 1 if result.last
-      end
-
-      updates = []
-      result.each do |update|
-        updates << Update.new(update)
-      end
-      updates
-    end
-    # rubocop:enalbe Metrics/MethodLength
-
-    # A simple method for testing your bot's authentication token.
-    def get_me
-      response = get('getMe')
-      unless response.ok # rubocop:disable Style/IfUnlessModifier
-        fail TokenError, 'incorrect bot token'
-      end
-      BotUser.new(response.result)
-    end
-
-    # Use this method to get basic info about a file.
-    # Returns TFile object
-    def get_file(file_id)
-      hash = { file_id: file_id }
-      response = get('getFile', hash)
-      unless response.ok # rubocop:disable Style/IfUnlessModifier
-        fail IdError, 'incorrect file id'
-      end
-      TFile.new(response.result)
-    end
-
-    # Use this method to get a list of profile pictures for a user.
-    def get_profile_photos(user_id, params = {}) # rubocop:disable Metrics/MethodLength
-      if user_id.to_i.negative? # rubocop:disable Style/IfUnlessModifier
-        fail IdError, 'id must be private chat\'s id'
-      end
-
-      hash = { uesr_id: user_id }.merge!(params)
-      response = get('getProfilePhotos', hash)
-      unless response.ok # rubocop:disable Style/IfUnlessModifier
-        fails TelegramError, response.description
-      end
-
-      result = response.result
-      if result.instance_of? Array
-        profile = []
-        result.each do |e|
-          profile << ProfilePhoto.new(e)
-        end
-        return profile
-      end
-      ProfilePhoto.new(result)
-    end
-
-    ##
-    # Use this method to get a list of administrators in a chat.
-    def get_chat_admins(chat_id)
-      unless chat_id.to_i.negative? # rubocop:disable Style/IfUnlessModifier
-        fail IdError, 'chat id must be supergroup id'
-      end
-      hash = { chat_id: chat_id }
-      response = get('getChatAdministrators', hash)
-      unless response.ok # rubocop:disable Style/IfUnlessModifier
-        fail FatalError, 'fatal error'
-      end
-
-      result = response.result
-      users = []
-      result.each do |user|
-        users << ChatMember.new(user)
-      end
-      users
-    end
-    # rubocop:enable Metrics/MethodLength
-
-    ##
-    # Use this method to get the number of members in a chat.
-    def get_chat_members_count(chat_id)
-      hash = { chat_id: chat_id }
-      response = get('getChatMemebersCount', hash)
-      unless response.ok # rubocop:disable Style/IfUnlessModifier
-        raise IdError, %{don't use private chat id}
-      end
-      response.result
-    end
-
-    # Use this method to get information about a member of a chat.
-    def get_chat_member(chat_id, user_id)
-      hash = { chat_id: chat_id, user_id: user_id }
-      response = get('getChatMember', hash)
-      unless response.ok # rubocop:disable Style/IfUnlessModifier
-        fail FatalError, response.description
-      end
-      ChatMember.new(response.result)
-    end
-
-    # Use this method to get a sticker set.
-    def get_sticker_set_name(name)
-      hash = { name: name }
-      response = get('getStickerSetName', hash)
-      unless response.ok # rubocop:disable Style/IfUnlessModifier
-        fail Error, %{incorrect sticker set name}
-      end
-      StickerSet.new(response.result)
-    end
-
-    ##
-    # Use this method to get up to date information about the chat.
-    def get_chat(chat_id) # rubocop:disable Metrics/MethodLength
-      hash = { chat_id: chat_id }
-      response = get('getChat', hash)
-      unless response.ok # rubocop:disable Style/IfUnlessModifier
-        fail IdError, %{incorrect chat id}
-      end
-
-      if chat_id.negative?
-        return GetChat.new(response.result)
-      end
-      PrivateChat.new(response.result)
-    end
-
-    ##
-    # Use this method to get the current list of the bot's commands.
-    def get_my_commands # rubocop:disable Metrics/MethodLength
-      response = get('getMyCommands')
-      unless response.ok # rubocop:disable Style/IfUnlessModifier
-        fail TokenError, %{seems bot token error}
-      end
-
-      commands = []
-      result = response.result
-      result.each do |command|
-        commands << BotCommand.new(command)
-      end
-      commands
-    end
-  end
-  # rubocop:enable Metrics/MethodLength
-
-  # The End!
-end