telbe 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df77d040b76c21d68c32b9a09310d6b315063b620d920c34daf292fb993e9de1
-  data.tar.gz: e5c76e103192f7fd4e911d289adbf4ffc055bd1aaa9baa8c82eb97d42c1ca312
+  metadata.gz: 815ab89f78ce78539b82a13b665694521330064655a963a96d3b7818c4d7831b
+  data.tar.gz: ffd119196e75361014e5ae52304a35626ccce170ccd4d6e9b8e0d6ca390bfbad
 SHA512:
-  metadata.gz: 1d81b93822df3ef7599c596ec78c980a3dd76bd7f49f6a054a2df0ceff0c4c37403a7e856081f4e064bc90642299dd72270b35535b9ecb630a46325f796faccb
-  data.tar.gz: ab48686f50a5a5f8a86d9cab02465e85c899e8f0cb6cb899a1cfcf3ce5c89c2f35276cce25ae0b0cdc4055af235d656eaf7131a2efff9fdae7787ecb42dadb90
+  metadata.gz: 60ee12ad31f8d363d441eb8aa74c36b4de8eeda9bbf2395f5424ad5ea154006aa94dc6b71f6cdec020afb0b3d0779eb299c98c4d50d468ed47c02bced49fd225
+  data.tar.gz: ed4df911617b94eeda88aba20c28e358f1262bfa67d1961ebca9ca39d3b0f3d40995a13d17caa4324bbf489a89976424f1f8e7066e00c7aa7fea5d84b2cfd795

data/.gitignore

@@ -2,4 +2,5 @@
 /Gemfile.lock
 /spec/reports/
 /tmp/
+/vendor/
 *.gem

data/lib/telbe.rb

@@ -1,7 +1,7 @@
 require 'excon'
-require 'virtus'
 require 'json'
 
+require 'telbe/helper'
 require 'telbe/webhook'
 require 'telbe/user'
 require 'telbe/contact'
@@ -11,9 +11,3 @@ require 'telbe/media'
 require 'telbe/sticker'
 require 'telbe/location'
 require 'telbe/bot'
-
-module BotEngine
-  def self.new(opts)
-    Bot.new(opts)
-  end
-end

data/lib/telbe/bot.rb

@@ -44,100 +44,27 @@ module Telbe
   end
 
   class MessageEntity
-    include Virtus.model
+    include InitializeFromHash
   end
 
   class ForceReply
-    include Virtus.model
-    attribute :force_reply, Boolean
-    attribute :selective, Boolean
+    include InitializeFromHash
   end
 
   class MessageDescriptor
-    include Virtus.model
-    attribute :chat_id, Object # Integer or String - Unique identifier for the target chat or username of the target channel (in the format @channelusername)
-    attribute :text, String 	# Text of the message to be sent
-    attribute :parse_mode, String # Optional Send Markdown or HTML, if you want Telegram apps to show bold, italic, fixed-width text or inline URLs in your bot's message.
-    attribute :disable_web_page_preview, Boolean # Optional Disables link previews for links in this message
-    attribute :disable_notification, Boolean # Optional Sends the message silently. Users will receive a notification with no sound.
-    attribute :reply_to_message_id, Integer # Optional If the message is a reply, ID of the original message
-    attribute :reply_markup, Object # InlineKeyboardMarkup or ReplyKeyboardMarkup or ReplyKeyboardRemove or ForceReply - Optional Additional interface options. A JSON-serialized object for an inline keyboard, custom reply keyboard, instructions to remove reply keyboard or to force a reply from the user.
+    include InitializeFromHash
   end
 
   class ChatPhoto
-    include Virtus.model
-    attribute :small_file_id, String
-    attribute :big_file_id, String
+    include InitializeFromHash
   end
 
   class Chat
-    include Virtus.model
-    attribute :id, Integer
-    attribute :type, String
-    attribute :title, String
-    attribute :username, String
-    attribute :first_name, String
-    attribute :last_name, String
-    attribute :all_members_are_administrators, Boolean
-    attribute :photo, ChatPhoto
-    attribute :description, String
-    attribute :invite_link, String
-    attribute :sticker_set_name, String
-    attribute :can_set_sticker_set, Boolean
+    include InitializeFromHash
   end
 
   class Message
-    include Virtus.model
-    attribute :message_id, Integer
-    alias_method :id, :message_id
-    alias_method :to_i, :id
-    attribute :from, User
-    alias_method :user, :from
-    attribute :text, String
-    attribute :date, DateTime
-    attribute :chat, Chat
-    attribute :forward_from, User
-    attribute :forward_from_chat, Chat
-    attribute :forward_from_message_id, Integer
-    attribute :forward_signature, String
-    attribute :forward_sender_name, String
-    attribute :forward_date, Integer
-    attribute :reply_to_message, Message
-    attribute :edit_date, Integer
-    attribute :media_group_id, String
-    attribute :author_signature, String
-    attribute :text, String
-    attribute :entities, Array # of MessageEntity
-    attribute :caption_entities, Array # of MessageEntity
-    attribute :audio, Audio
-    attribute :document, Document
-    attribute :animation, Animation
-    # attribute :game, Game
-    attribute :photo, Array # of PhotoSize
-    attribute :sticker, Sticker
-    attribute :video, Video
-    attribute :voice, Voice
-    attribute :video_note, VideoNote
-    attribute :caption, String
-    attribute :contact, Contact
-    attribute :location, Location
-    attribute :venue, Venue
-    attribute :poll, Poll
-    attribute :new_chat_members, Array # of User
-    attribute :left_chat_member , User
-    attribute :new_chat_title, String
-    attribute :new_chat_photo, Array # of PhotoSize
-    attribute :delete_chat_photo, Boolean
-    attribute :group_chat_created, Boolean
-    attribute :supergroup_chat_created, Boolean
-    attribute :channel_chat_created, Boolean
-    attribute :migrate_to_chat_id, Integer
-    attribute :migrate_from_chat_id, Integer
-    attribute :pinned_message, Message
-    # attribute :invoice, Invoice
-    # attribute :successful_payment, SuccessfulPayment
-    attribute :connected_website, String
-    # attribute :passport_data, PassportData 	
+    include InitializeFromHash
 
     def reply(&block)
       reply = MessageDescriptor.new(chat_id: chat.id)
@@ -150,33 +77,12 @@ module Telbe
     end
   end
 
-  class Chat
-    attribute :pinned_message, Message
-  end
-
   class Update
-    include Virtus.model
-    attribute :update_id, Integer
-    alias_method :id, :update_id
-    alias_method :to_i, :id
-    attribute :message, Message
-    alias_method :edited_message, :message
-    alias_method :channel_post, :message
-    alias_method :edited_channel_post, :message
-    # attribute :inline_query, InlineQuery
-    # attribute :chosen_inline_result, ChosenInlineResult
-    # attribute :callback_query, CallbackQuery
-    # attribute :shipping_query, ShippingQuery
-    # attribute :pre_checkout_query, PreCheckoutQuery
-    attribute :poll, Poll
+    include InitializeFromHash
   end
 
   class UpdateDescriptor
-    include Virtus.model
-    attribute :offset, Integer
-    attribute :limit, Integer
-    attribute :timeout, Integer
-    attribute :allowed_updates, Array # of String
+    include InitializeFromHash
   end
 
   class ResponseError < StandardError

data/lib/telbe/contact.rb

@@ -6,23 +6,10 @@ module Telbe
   end
 
   class Contact
-    include Virtus.model
-    attribute :phone_number, String
-    attribute :first_name, String
-    attribute :last_name, String
-    attribute :user_id, Integer
-    attribute :vcard, String
+    include InitializeFromHash
   end
 
   class ContactDescriptor
-    include Virtus.model
-    attribute :chat_id, Integer or String
-    attribute :phone_number, String
-    attribute :first_name, String
-    attribute :last_name, String
-    attribute :vcard, String
-    attribute :disable_notification, Boolean
-    attribute :reply_to_message_id, Integer
-    attribute :reply_markup, Object #InlineKeyboardMarkup or ReplyKeyboardMarkup or ReplyKeyboardRemove or ForceReply
+    include InitializeFromHash
   end
 end

data/lib/telbe/helper.rb

@@ -0,0 +1,46 @@
+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
+        instance_variable_set("@#{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 method_missing(m, *args, &block)
+      case m
+      when /(.*)\=$/
+        instance_variable_set("@#{$1}", args[0])
+      else
+        instance_variable_get("@#{m}")
+      end
+    end
+  end
+end

data/lib/telbe/keyboard.rb

@@ -1,38 +1,21 @@
 module Telbe
   class KeyboardButton
-    include Virtus.model
-    attribute :text, String
-    attribute :request_contact, Boolean
-    attribute :request_location, Boolean
+    include InitializeFromHash
   end
 
   class ReplyKeyboardRemove
-    include Virtus.model
-    attribute :remove_keyboard, Boolean
-    attribute :selective, Boolean
+    include InitializeFromHash
   end
 
   class ReplyKeyboardMarkup
-    include Virtus.model
-    attribute :keyboard, Array # of Array of KeyboardButton
-    attribute :resize_keyboard, Boolean
-    attribute :one_time_keyboard, Boolean
-    attribute :selective, Boolean
+    include InitializeFromHash
   end
 
   class InlineKeyboardMarkup
-    include Virtus.model
-    attribute :inline_keyboard, Array # of Array of InlineKeyboardButton
+    include InitializeFromHash
   end
 
   class InlineKeyboardButton
-    include Virtus.model
-    attribute :text, String
-    attribute :url, String
-    attribute :callback_data, String
-    attribute :switch_inline_query, String
-    attribute :switch_inline_query_current_chat, String
-    # attribute :callback_game, CallbackGame
-    # attribute :pay, Boolean
+    include InitializeFromHash
   end
 end

data/lib/telbe/location.rb

@@ -1,16 +1,9 @@
 module Telbe
   class Location
-    include Virtus.model
-    attribute :longitude, Float
-    attribute :latitude, Float
+    include InitializeFromHash
   end
 
   class Venue
-    include Virtus.model
-    attribute :location, Location
-    attribute :address, String
-    attribute :title, String
-    attribute :foursquare_id, String
-    attribute :foursquare_type, String
+    include InitializeFromHash
   end
 end

data/lib/telbe/media.rb

@@ -1,108 +1,48 @@
 module Telbe
   class PhotoSize
-    include Virtus.model
-    attribute :file_id, String
-    attribute :width, Integer
-    attribute :height, Integer
-    attribute :file_size, Integer
+    include InitializeFromHash
   end
 
   class Animation
-    include Virtus.model
-    attribute :file_id, String
-    attribute :width, Integer
-    attribute :height, Integer
-    attribute :duration, Integer
-    attribute :thumb, PhotoSize
-    attribute :file_name, String
-    attribute :mime_type, String
-    attribute :file_size, Integer
+    include InitializeFromHash
   end
 
   class Document
-    include Virtus.model
-    attribute :file_id, String
-    attribute :thumb, PhotoSize
-    attribute :file_name, String
-    attribute :mime_type, String
-    attribute :file_size, Integer
+    include InitializeFromHash
   end
 
   class Audio
-    include Virtus.model
-    attribute :file_id, String
-    attribute :duration, Integer
-    attribute :performer, String
-    attribute :title, String
-    attribute :mime_type, String
-    attribute :file_size, Integer
-    attribute :thumb, PhotoSize
+    include InitializeFromHash
   end
 
   class Video
-    include Virtus.model
-    attribute :file_id, String
-    attribute :width, Integer
-    attribute :height, Integer
-    attribute :duration, Integer
-    attribute :thumb, PhotoSize
-    attribute :mime_type, String
-    attribute :file_size, Integer
+    include InitializeFromHash
   end
 
   class Voice
-    include Virtus.model
-    attribute :file_id, String
-    attribute :duration, Integer
-    attribute :mime_type, String
-    attribute :file_size, Integer
+    include InitializeFromHash
   end
 
   class VideoNote
-    include Virtus.model
-    attribute :file_id, String
-    attribute :length, Integer
-    attribute :duration, Integer
-    attribute :thumb, PhotoSize
-    attribute :file_size, Integer
+    include InitializeFromHash
   end
 
   class InputMedia
-    include Virtus.model
-    attribute :type, String
-    attribute :media, String
-    attribute :caption, String
-    attribute :parse_mode, String
+    include InitializeFromHash
   end
     
   class InputMediaAnimation < InputMedia
-    attribute :thumb, Object
-    attribute :width, Integer
-    attribute :height, Integer
-    attribute :duration, Integer
   end
 
   class InputMediaDocument < InputMedia
-    include Virtus.model
-    attribute :thumb, Object
   end
 
   class InputMediaAudio < InputMedia
-    include Virtus.model
-    attribute :thumb, Object
-    attribute :duration, Integer
-    attribute :performer, String
-    attribute :title, String
   end
 
   class InputMediaPhoto < InputMedia
   end
 
   class InputMediaVideo < InputMedia
-    attribute :thumb, Object
-    attribute :width, Integer
-    attribute :height, Integer
-    attribute :duration, Integer
-    attribute :supports_streaming, Boolean
   end
 end

data/lib/telbe/poll.rb

@@ -3,16 +3,10 @@ module Telbe
   end
 
   class PollOption
-    include Virtus.model
-    attribute :text, String
-    attribute :voter_count, Integer
+    include InitializeFromHash
   end
 
   class Poll
-    include Virtus.model
-    attribute :id, String
-    attribute :question, String
-    attribute :options, Array # of PollOption
-    attribute :is_closed, Boolean
+    include InitializeFromHash
   end
 end

data/lib/telbe/sticker.rb

@@ -3,30 +3,14 @@ module Telbe
   end
 
   class MaskPosition
-    include Virtus.model
-    attribute :point, String
-    attribute :x_shift, Float
-    attribute :y_shift, Float
-    attribute :scale, Float
+    include InitializeFromHash
   end
 
   class Sticker
-    include Virtus.model
-    attribute :file_id, String
-    attribute :width, Integer
-    attribute :height, Integer
-    attribute :thumb, PhotoSize
-    attribute :emoji, String
-    attribute :set_name, String
-    attribute :mask_position, MaskPosition
-    attribute :file_size, Integer
+    include InitializeFromHash
   end
 
   class StickerSet
-    include Virtus.model
-    attribute :name, String
-    attribute :title, String
-    attribute :contains_masks, Boolean
-    attribute :stickers, Array # of Sticker
+    include InitializeFromHash
   end
 end

data/lib/telbe/user.rb

@@ -12,34 +12,10 @@ module Telbe
   end
   
   class User
-    include Virtus.model
-    attribute :id, Integer #Unique identifier for this user or bot
-    alias_method :to_i, :id
-    attribute :is_bot, Boolean
-    attribute :first_name, String #User‘s or bot’s first name
-    attribute :last_name, String
-    attribute :username, String
-    attribute :language_code, String
+    include InitializeFromHash
   end
 
   class ChatMember
-    include Virtus.model
-    attribute :user, User
-    attribute :status, String
-    attribute :until_date, Integer
-    attribute :can_be_edited, Boolean
-    attribute :can_change_info, Boolean
-    attribute :can_post_messages, Boolean
-    attribute :can_edit_messages, Boolean
-    attribute :can_delete_messages, Boolean
-    attribute :can_invite_users, Boolean
-    attribute :can_restrict_members, Boolean
-    attribute :can_pin_messages, Boolean
-    attribute :can_promote_members, Boolean
-    attribute :is_member, Boolean
-    attribute :can_send_messages, Boolean
-    attribute :can_send_media_messages, Boolean
-    attribute :can_send_other_messages, Boolean
-    attribute :can_add_web_page_previews, Boolean
+    include InitializeFromHash
   end
 end

data/lib/telbe/version.rb

@@ -1,3 +1,3 @@
 module Telbe
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/telbe/webhook.rb

@@ -14,24 +14,14 @@ module Telbe
   end
   
   class WebHookInfo
-    include Virtus.model
-    attribute :url, String
-    attribute :has_custom_certificate, Boolean
-    attribute :pending_update_count, Integer
-    attribute :last_error_date, Integer
-    attribute :last_error_message, String
-    attribute :max_connections, Integer
-    attribute :allowed_updates, Array # of String
+    include InitializeFromHash
   end
 
   class InputFile
+    include InitializeFromHash
   end
   
   class WebHookDescriptor
-    include Virtus.model
-    attribute :url, String
-    attribute :certificate, InputFile
-    attribute :max_connections, Integer
-    attribute :allowed_updates, Array # of String
+    include InitializeFromHash
   end
 end

data/telbe.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "excon", ">= 0.64.0"
-  spec.add_dependency "virtus", ">= 1.0.5"
   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.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Rodrigo Garcia Couto
@@ -25,35 +25,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.64.0
 - !ruby/object:Gem::Dependency
-  name: virtus
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.5
-  type: :runtime
+        version: '2.0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -80,6 +80,7 @@ files:
 - lib/telbe.rb
 - lib/telbe/bot.rb
 - lib/telbe/contact.rb
+- lib/telbe/helper.rb
 - lib/telbe/keyboard.rb
 - lib/telbe/location.rb
 - lib/telbe/media.rb