telbe 0.0.4 → 0.0.5

data/lib/telbe/user.rb

@@ -1,4 +1,6 @@
 module Telbe
+  CHAT_MEMBER_STATUS = ["creator", "administrator", "member", "restricted", "left", "kicked"]
+
   class Bot
     def get_chat_administrators(chatid_descriptor)
       request(:getChatAdministrators, chatid_descriptor).collect do |member_hash|
@@ -9,13 +11,82 @@ module Telbe
     def get_chat_members_count(chatid_descriptor)
       request(:getChatMembersCount, chatid_descriptor)
     end
+
+    def get_me
+      User.new(request(:getMe))
+    end
+  end
+
+  class ChatIdDescriptor
+    include SimplifyApi
+    attribute :chat_id, Integer, mandatory: true
   end
-  
+
+  # id 	Integer 	Unique identifier for this user or bot
+  # is_bot 	Boolean 	True, if this user is a bot
+  # first_name 	String 	User‘s or bot’s first name
+  # last_name 	String 	Optional. User‘s or bot’s last name
+  # username 	String 	Optional. User‘s or bot’s username
+  # language_code 	String 	Optional. IETF language tag of the user's language
   class User
-    include InitializeFromHash
+    include SimplifyApi
+    attribute :id, Integer, mandatory: true
+    attribute :is_bot, values: [true, false], mandatory: true
+    attribute :first_name, String, mandatory: true
+    attribute :last_name, String
+    attribute :username, String
+    attribute :language_code, String
+  end
+
+  # Created to nest the arrays in UserProfilePhotos
+  class UserProfilePhoto
+    include SimplifyApi
+    attribute :photo, [PhotoSize]
+  end
+
+  # total_count 	Integer 	Total number of profile pictures the target user has
+  # photos 	Array of Array of PhotoSize 	Requested profile pictures (in up to 4 sizes each)
+  class UserProfilePhotos
+    include SimplifyApi
+    attribute :total_count, Integer
+    attribute :photos, [UserProfilePhoto]
   end
 
+  # user 	User 	Information about the user
+  # status 	String 	The member's status in the chat. Can be "creator", "administrator", "member", "restricted", "left" or "kicked"
+  # until_date 	Integer 	Optional. Restricted and kicked only. Date when restrictions will be lifted for this user, unix time
+  # can_be_edited 	Boolean 	Optional. Administrators only. True, if the bot is allowed to edit administrator privileges of that user
+  # can_change_info 	Boolean 	Optional. Administrators only. True, if the administrator can change the chat title, photo and other settings
+  # can_post_messages 	Boolean 	Optional. Administrators only. True, if the administrator can post in the channel, channels only
+  # can_edit_messages 	Boolean 	Optional. Administrators only. True, if the administrator can edit messages of other users and can pin messages, channels only
+  # can_delete_messages 	Boolean 	Optional. Administrators only. True, if the administrator can delete messages of other users
+  # can_invite_users 	Boolean 	Optional. Administrators only. True, if the administrator can invite new users to the chat
+  # can_restrict_members 	Boolean 	Optional. Administrators only. True, if the administrator can restrict, ban or unban chat members
+  # can_pin_messages 	Boolean 	Optional. Administrators only. True, if the administrator can pin messages, groups and supergroups only
+  # can_promote_members 	Boolean 	Optional. Administrators only. True, if the administrator can add new administrators with a subset of his own privileges or demote administrators that he has promoted, directly or indirectly (promoted by administrators that were appointed by the user)
+  # is_member 	Boolean 	Optional. Restricted only. True, if the user is a member of the chat at the moment of the request
+  # can_send_messages 	Boolean 	Optional. Restricted only. True, if the user can send text messages, contacts, locations and venues
+  # can_send_media_messages 	Boolean 	Optional. Restricted only. True, if the user can send audios, documents, photos, videos, video notes and voice notes, implies can_send_messages
+  # can_send_other_messages 	Boolean 	Optional. Restricted only. True, if the user can send animations, games, stickers and use inline bots, implies can_send_media_messages
+  # can_add_web_page_previews 	Boolean 	Optional. Restricted only. True, if user may add web page previews to his messages, implies can_send_media_messages
   class ChatMember
-    include InitializeFromHash
+    include SimplifyApi
+    attribute :user, User, mandatory: true
+    attribute :status, CHAT_MEMBER_STATUS, mandatory: true
+    attribute :until_date, Integer
+    attribute :can_be_edited, values: [true, false]
+    attribute :can_change_info, values: [true, false]
+    attribute :can_post_messages, values: [true, false]
+    attribute :can_edit_messages, values: [true, false]
+    attribute :can_delete_messages, values: [true, false]
+    attribute :can_invite_users, values: [true, false]
+    attribute :can_restrict_members, values: [true, false]
+    attribute :can_pin_messages, values: [true, false]
+    attribute :can_promote_members, values: [true, false]
+    attribute :is_member, values: [true, false]
+    attribute :can_send_messages, values: [true, false]
+    attribute :can_send_media_messages, values: [true, false]
+    attribute :can_send_other_messages, values: [true, false]
+    attribute :can_add_web_page_previews, values: [true, false]
   end
 end

data/lib/telbe/version.rb

@@ -1,3 +1,3 @@
 module Telbe
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/telbe/webhook.rb

@@ -13,15 +13,33 @@ module Telbe
     end
   end
   
+  # url 	String 	Webhook URL, may be empty if webhook is not set up
+  # has_custom_certificate 	Boolean 	True, if a custom certificate was provided for webhook certificate checks
+  # pending_update_count 	Integer 	Number of updates awaiting delivery
+  # last_error_date 	Integer 	Optional. Unix time for the most recent error that happened when trying to deliver an update via webhook
+  # last_error_message 	String 	Optional. Error message in human-readable format for the most recent error that happened when trying to deliver an update via webhook
+  # max_connections 	Integer 	Optional. Maximum allowed number of simultaneous HTTPS connections to the webhook for update delivery
+  # allowed_updates 	Array of String 	Optional. A list of update types the bot is subscribed to. Defaults to all update types
   class WebHookInfo
-    include InitializeFromHash
+    include SimplifyApi
+    attribute :url, String, mandatory: true
+    attribute :has_custom_certificate, values: [true, false]
+    attribute :pending_update_count, Integer, mandatory: true
+    attribute :last_error_date, Integer
+    attribute :last_error_message, String
+    attribute :max_connections, Integer
+    attribute :allowed_updates, [String]
   end
 
-  class InputFile
-    include InitializeFromHash
-  end
-  
+  # url 	String 	Yes 	HTTPS url to send updates to. Use an empty string to remove webhook integration
+  # certificate 	InputFile 	Optional 	Upload your public key certificate so that the root certificate in use can be checked. See our self-signed guide for details.
+  # max_connections 	Integer 	Optional 	Maximum allowed number of simultaneous HTTPS connections to the webhook for update delivery, 1-100. Defaults to 40. Use lower values to limit the load on your bot‘s server, and higher values to increase your bot’s throughput.
+  # allowed_updates 	Array of String 	Optional 	List the types of updates you want your bot to receive. For example, specify [“message”, “edited_channel_post”, “callback_query”] to only receive updates of these types. See Update for a complete list of available update types. Specify an empty list to receive all updates regardless of type (default). If not specified, the previous setting will be used.
   class WebHookDescriptor
-    include InitializeFromHash
+    include SimplifyApi
+    attribute :url, String, mandatory: true
+    attribute :certificate, InputFile
+    attribute :max_connections, Integer
+    attribute :allowed_updates, [String]
   end
 end

data/lib/telbe.rb

@@ -1,13 +1,15 @@
 require 'excon'
 require 'json'
+require 'simplify_api'
 
-require 'telbe/helper'
-require 'telbe/webhook'
-require 'telbe/user'
+require 'telbe/base'
 require 'telbe/contact'
 require 'telbe/keyboard'
+require 'telbe/inline'
 require 'telbe/poll'
 require 'telbe/media'
+require 'telbe/user'
 require 'telbe/sticker'
 require 'telbe/location'
+require 'telbe/webhook'
 require 'telbe/bot'

data/telbe.gemspec

@@ -17,7 +17,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "excon", ">= 0.64.0"
+  spec.add_dependency "simplify_api", "~> 0.1"
   spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "rspec"
-  spec.add_development_dependency "minitest"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: telbe
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Rodrigo Garcia Couto
@@ -25,47 +25,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.64.0
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: simplify_api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
+        version: '0.1'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: minitest
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 description: Still in development. A Telegram Bot Engine that eventually will support
   all of Telegrams features.
 email:
@@ -78,9 +64,10 @@ files:
 - Gemfile
 - README.md
 - lib/telbe.rb
+- lib/telbe/base.rb
 - lib/telbe/bot.rb
 - lib/telbe/contact.rb
-- lib/telbe/helper.rb
+- lib/telbe/inline.rb
 - lib/telbe/keyboard.rb
 - lib/telbe/location.rb
 - lib/telbe/media.rb

data/lib/telbe/helper.rb

@@ -1,66 +0,0 @@
-class String
-  def camelize
-    self.split('_').collect(&:capitalize).join
-  end
-end
-
-module Telbe
-  module InitializeFromHash
-    def initialize(opts)
-      opts.each_pair do |k, v|
-        if Telbe::const_defined?(k.to_s.camelize) then
-          case v
-          when Hash
-            v = Telbe::const_get(k.to_s.camelize).new(v)
-          when Array
-            v.collect! { |i| Telbe::const_get(k.to_s.camelize).new(i) }
-          end
-        end
-        create_and_set_instance_variable("#{k}", v)
-      end
-    end
-
-    def to_h
-      h = {}
-      instance_variables.each do |i|
-        k = /\@(.*)/.match(i.to_s)[1]
-        v = instance_variable_get(i)
-        if v.class.inspect.start_with?("Telbe") then
-          h[k] = v.to_h
-        else
-          h[k] = v
-        end
-      end
-      h
-    end
-
-    def to_json
-      self.to_h.to_json
-    end
-    
-    def method_missing(method_name, *args, &block)
-      case method_name
-      when /(.*)\=$/
-        create_and_set_instance_variable("#{$1}", args[0])
-      else
-        super(method_name, args, block)
-      end
-    end
-
-    def respond_to_missing?(method_name, *args)
-      case method_name
-      when /(.*)\=$/
-        true # always respond to assignment methods
-      else
-        super(method_name, args)
-      end
-    end
-
-    private
-    def create_and_set_instance_variable(name, value)
-      instance_variable_set("@#{name}", value)
-      define_singleton_method("#{name}=") { |arg| instance_variable_set("@#{name}", arg) }
-      define_singleton_method("#{name}") { instance_variable_get("@#{name}") }
-    end
-  end
-end