vk_cozy 0.2 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 258b9457cabc9453353250a7f51db038240ef43bb1b93b68ba4128fdfb59031d
-  data.tar.gz: c35f4cbf0564408024d238ca505f28b076fdb57b40dddfcb338707b7847d82fc
+  metadata.gz: 88f8d21019678635297581f40f48e83e71cc79bfe2db701cd3c6b6815df8c5d0
+  data.tar.gz: 2a3e5cfce38ec22b4d20f36b3f50e6c2d5b508a09e854186c5aeb90fa858ff80
 SHA512:
-  metadata.gz: 8fe4888bcb9db9859ac768c5ec0ba3e5c70d2adc38a3513e535254daf942c09708e9cb461a1161099d0ed9b5470d76b9863593fccdd82856ed1361333fb3681b
-  data.tar.gz: 0dde51243767756401df2988a07befaa65e6df3ef0dfb9e11b4e3ab58a09ea15c16ddcc70d2ab6cbb6171ac196b02349a00a52a6c568d7235c6faff10bbb1e4d
+  metadata.gz: b02bf27e35dd324d7497ff0d2bd7f4a952b313cb94fc897c3e190b510881d870efe4e17c1c912dcdf5a596aaf2842608d94d44f6b6432c8cbae7778cb38340e9
+  data.tar.gz: f2b9dbac5adb7488dcf8db32189ab9d80c514ed8acefc20782ba9ded4275ea6214c8023747e0d5dee8bef70f9bdb804911a31c58f856d8ffce100a4d2160401e

data/Gemfile

@@ -2,4 +2,8 @@
 
 source 'http://rubygems.org'
 
+gem 'hash_dot', '~> 2.5'
+gem 'inum', '~> 5.2'
+gem 'ruby-enum', '~> 0.9.0'
+
 gemspec

data/lib/vk_cozy/api/api.rb

@@ -4,47 +4,46 @@ require 'net/http'
 require "resolv-replace"
 
 class Api
-	attr_accessor :access_token, :version
+  attr_accessor :access_token, :version
 
-	SCHEME = 'https'
-	HOST = 'api.vk.com'
-	PATH = '/method/'
-	PORT = 443
+  SCHEME = 'https'
+  HOST = 'api.vk.com'
+  PATH = '/method/'
+  PORT = 443
 
-	def initialize(access_token, version=5.92)
-		@access_token = access_token
-		@version = version
-	end
+  def initialize(access_token, version=5.92)
+    @access_token = access_token
+    @version = version
+  end
 
-	def request_thr(method_vk, data)
-		thr = Thread.new {
-			request(method_vk, data)
-		}
-		thr.run
-		# thr.value
-	end
+  def request_thr(method_vk, data)
+    thr = Thread.new {
+      request(method_vk, data)
+    }
+    thr.run
+  end
 
-	def request(method_vk, data)
-		data = data.to_hash
-		data = data.merge(v: version)
-		data = data.merge(access_token: access_token)
-		data.each do |argument, value|
-			data[argument] = value.join(',') if value.is_a?(Array)
-		end
-		http_response = Net::HTTP.post_form(url_for_method(method_vk), data).body
-		# return unless http_response.present?
-		json_response = JSON.parse(http_response)
-		if json_response['error']
-			raise json_response['error']['error_msg']
-		end
-		json_response
-	end
+  def request(method_vk, data)
+    data = data.to_hash
+    data = data.merge(v: version)
+    data = data.merge(access_token: access_token)
+    data.each do |argument, value|
+      data[argument] = value.join(',') if value.is_a?(Array)
+    end
+    http_response = Net::HTTP.post_form(url_for_method(method_vk), data).body
+    # return unless http_response.present?
+    json_response = JSON.parse(http_response)
+    if json_response['error']
+      raise json_response['error']['error_msg']
+    end
+    json_response
+  end
 
-	def url_for_method(method_vk)
-		URI.parse("#{SCHEME}://#{HOST}#{PATH}#{method_vk}")
-	end
+  def url_for_method(method_vk)
+    URI.parse("#{SCHEME}://#{HOST}#{PATH}#{method_vk}")
+  end
 
-	def method_missing name, **kwargs
-		return request(name.to_s.sub('_', '.'), kwargs)['response']
-	end
+  def method_missing name, **kwargs
+    return request(name.to_s.sub('_', '.'), kwargs)['response']
+  end
 end

data/lib/vk_cozy/bot.rb

@@ -2,54 +2,66 @@ require_relative 'types/events/bot_events'
 require_relative 'dispatch/views/bot/event'
 require_relative 'framework/labeler/bot'
 require_relative 'polling/bot_polling'
+require_relative 'dev/keyboard/keyboard'
 
 module VkCozy
-	class Bot
-		attr_reader :api
-
-		CLASS_BY_EVENT_TYPE = {
-			BotEventType::MESSAGE_NEW => BotMessageEvent,
-			BotEventType::MESSAGE_REPLY => BotMessageEvent,
-			BotEventType::MESSAGE_EDIT => BotMessageEvent
-		}
-
-		DEFAULT_EVENT_CLASS = BotEvent
-
-		def initialize(access_token, version=5.92, api=nil)
-			@access_token = access_token
-			if api.nil?
-				@api = Api.new(access_token, version)
-			else
-				@api = api
-			end
-			@polling = VkCozy::BotPolling.new(@api)
-			@labeler = VkCozy::BotLabeler.new(@api)
-		end
-
-		def on
-			return @labeler
-		end
-
-		def run_polling
-			@polling.listen do |event|
-				for event_raw in event['updates']
-					begin
-						@labeler.filter(parse_event(event_raw))
-					rescue Exception => e 
-						raise e
-					end
-				end
-			end
-		end
-
-		private
-
-		def parse_event(event_raw)
-			event_class = CLASS_BY_EVENT_TYPE.fetch(
-				event_raw['type'],
-				DEFAULT_EVENT_CLASS
-			)
-			return event_class.new(@api, event_raw)
-		end
-	end
+  class Bot
+    attr_reader :api
+
+    CLASS_BY_EVENT_TYPE = {
+      BotEventType::MESSAGE_NEW => BotMessageEvent,
+      BotEventType::MESSAGE_REPLY => BotMessageEvent,
+      BotEventType::MESSAGE_EDIT => BotMessageEvent
+    }
+
+    DEFAULT_EVENT_CLASS = BotEvent
+
+    def initialize(access_token, version=5.92)
+      @access_token = access_token
+      @api = Api.new(access_token, version)
+      
+      @polling = VkCozy::BotPolling.new(@api)
+      @labeler = VkCozy::BotLabeler.new(@api)
+    end
+
+    def on
+      return @labeler
+    end
+
+    def on_startup
+      puts 'Run polling'
+    end
+
+    def run_polling(startup=nil)
+      if startup.nil?
+        on_startup
+      elsif startup.is_a?(Proc)
+        startup.call
+      else
+        startup
+      end
+      @polling.listen do |event|
+        for event_raw in event['updates']
+          begin
+            event_raw = parse_event(event_raw)
+            if @labeler.filter(event_raw)
+              next
+            end
+          rescue Exception => e 
+            raise e
+          end
+        end
+      end
+    end
+
+    private
+
+    def parse_event(event_raw)
+      event_class = CLASS_BY_EVENT_TYPE.fetch(
+        event_raw['type'],
+        DEFAULT_EVENT_CLASS
+      )
+      return event_class.new(@api, event_raw)
+    end
+  end
 end

data/lib/vk_cozy/dev/keyboard/action.rb

@@ -0,0 +1,72 @@
+module Keyboard
+  class BaseAction
+    attr_reader :type
+    
+    def get_data
+      instance_variables.each_with_object({}) do |k, h|
+        var = instance_variable_get("#{k}")
+        if not var.nil?
+          h[k.to_s.gsub('@', '')] = var
+        end
+      end
+    end
+  end
+
+  class Text < BaseAction
+    def initialize(label, payload: nil)
+      @type = 'text'
+
+      @label = label
+      @payload = payload
+    end
+  end
+
+  class OpenLink < BaseAction
+    def initialize(label, link, payload: nil)
+      @type = 'open_link'
+
+      @label = label
+      @link = link
+      @payload = payload
+    end
+  end
+
+  class Location < BaseAction
+    def initialize(payload: nil)
+      @type = 'location'
+
+      @payload = payload
+    end
+  end
+
+  class VkPay < BaseAction
+    def initialize(payload: nil, hash: nil)
+      @type = 'vkpay'
+
+      @payload = payload
+      @hash = hash
+    end
+  end
+
+  class VkApps < BaseAction
+    def initialize(app_id, owner_id, payload: nil, label: nil, hash: nil)
+      @type = 'open_app'
+
+      @app_id = app_id
+      @owner_id = owner_id
+      @payload = payload
+      @label = label
+      @hash = hash
+    end
+  end
+
+
+  class Callback < BaseAction
+    def initialize(label, payload)
+      @type = 'callback'
+
+      @label = label
+      @payload = payload
+    end
+  end
+end

data/lib/vk_cozy/dev/keyboard/button.rb

@@ -0,0 +1,34 @@
+module Keyboard
+  class KeyboardButton
+    def initialize(action, color: nil, data: nil)
+      @action = action
+      @color = color
+      @data = data
+    end
+
+    def self.from_typed(action, color: nil)
+      return self.new(action, color: color, data: nil)
+    end
+
+    def self.from_hash(data)
+      color = data.key('color')
+      keyboard_data = {'action' => data}
+      if color.nil?
+        keyboard_data['action'].delete('color')
+        keyboard_data['color'] = color
+      end
+      return self.new(self.action, self.color, keyboard_data)
+    end
+
+    def get_data
+      if not @data.nil?
+        return @data
+      end
+      data = {'action' => @action.get_data()}
+      if ['text', 'callback'].include?(@action.type) and not @color.nil?
+        data['color'] = @color
+      end
+      return data
+    end
+  end
+end

data/lib/vk_cozy/dev/keyboard/color.rb

@@ -0,0 +1,10 @@
+module Keyboard
+  class Color
+    include Ruby::Enum
+
+		define :PRIMARY, 'primary'
+    define :SECONDARY, 'secondary'
+    define :NEGATIVE, 'negative'
+    define :POSITIVE, 'positive'
+  end
+end

data/lib/vk_cozy/dev/keyboard/keyboard.rb

@@ -0,0 +1,48 @@
+require_relative 'action'
+require_relative 'button'
+require_relative 'color'
+
+module Keyboard
+  class Keyboard
+    def initialize(one_time: false, inline: false)
+      @one_time = one_time
+      @inline = inline
+      @buttons = []
+    end
+
+    def row()
+      @buttons << []
+      return self
+    end
+
+    def add(action, color=nil)
+      if @buttons.length == 0
+        row()
+      end
+      button = KeyboardButton.from_typed(action, color: color)
+      @buttons[-1] << button
+      return self
+    end
+
+    def get_json()
+      _buttons = []
+      for row in @buttons
+        buttons = []
+        for button in row
+          buttons << button.get_data()
+        end
+        _buttons << buttons
+      end
+      data = {
+        'one_time' => @one_time,
+        'inline' => @inline,
+        'buttons' => _buttons
+      }
+      return data
+    end
+
+    def to_s
+      return JSON.generate(get_json())
+    end
+  end
+end

data/lib/vk_cozy/dispatch/views/bot/event.rb

@@ -1,67 +1,75 @@
 module VkCozy
-	class BotEvent
-		attr_reader :api, :raw, :t, :type, :obj, :object, :client_info, :message, :group_id
-		def initialize(api, event_raw)
-			@api = api
-			@raw = event_raw
+  class BotEvent
+    attr_reader :api, :raw, :t, :type, :obj, :object, :client_info, :message, :group_id
+    def initialize(api, event_raw)
+      @api = api
+      @raw = event_raw
 
-			@type = event_raw['type']
-			@t = @type 
+      @type = event_raw['type']
+      @t = @type 
 
-			@object = event_raw['object'].to_dot
-			@obj = @object
+      @object = event_raw['object'].to_dot
+      @obj = @object
 
-			@message = @obj['message']
+      @message = @obj['message']
 
-			@client_info = @obj['client_info']
+      @client_info = @obj['client_info']
 
-			@group_id = @raw['group_id']
-			
-		end
+      @group_id = @raw['group_id']
+      
+    end
 
-		def [] key
-			instance_variable_get("@#{key}")
-		end
+    def answer(text)
+      return @api.messages_send(
+        peer_id: @obj.peer_id,
+        message: text,
+        random_id: 0
+      )
+    end
 
-		def to_s
-			"BotEvent(#{@raw.to_s})"
-		end
-	end
+    def [] key
+      instance_variable_get("@#{key}")
+    end
 
-	class BotMessageEvent < BotEvent
-		attr_reader :from_user, :from_chat, :from_group, :chat_id
-		def initialize(api, event_raw)
-			super(api, event_raw)
-			@from_user = false
-			@from_chat = false
-			@from_group = false
+    def to_s
+      "BotEvent(#{@raw.to_s})"
+    end
+  end
 
+  class BotMessageEvent < BotEvent
+    attr_reader :from_user, :from_chat, :from_group, :chat_id
+    def initialize(api, event_raw)
+      super(api, event_raw)
+      @from_user = false
+      @from_chat = false
+      @from_group = false
 
-			peer_id = @raw['object']['peer_id']
-			if peer_id.nil?
-				peer_id = @raw['object']['message']['peer_id']
-			end
 
-			if peer_id < 0
-				@from_group = true
-			elsif peer_id < 2e9
-				@from_user = true
-			else
-				from_user = true
-				@chat_id = peer_id - 2e9
-			end
-		end
+      peer_id = @raw['object']['peer_id']
+      if peer_id.nil?
+        peer_id = @raw['object']['message']['peer_id']
+      end
 
-		def answer(text)
-			return @api.messages_send(
-				peer_id: @message.peer_id,
-				message: text,
-				random_id: 0
-			)
-		end
+      if peer_id < 0
+        @from_group = true
+      elsif peer_id < 2e9
+        @from_user = true
+      else
+        from_user = true
+        @chat_id = peer_id - 2e9
+      end
+    end
 
-		def to_s
-			"BotMessageEvent(#{@raw.to_s})"
-		end
-	end
+    def answer(text)
+      return @api.messages_send(
+        peer_id: @message.peer_id,
+        message: text,
+        random_id: 0
+      )
+    end
+
+    def to_s
+      "BotMessageEvent(#{@raw.to_s})"
+    end
+  end
 end

data/lib/vk_cozy/dispatch/views/user/event.rb

@@ -1,80 +1,81 @@
 module VkCozy
-	class UserEvent
-		attr_accessor :api, :raw, :type,
-					:from_user, :from_chat, :from_group, :from_me, :to_me, 
-					:attachments, :message_data,
-					:message_id, :timestamp, :text, :peer_id, :flags, :extra, :extra_values, :type_id
+  class UserEvent
+    attr_accessor :api, :raw, :type,
+          :from_user, :from_chat, :from_group, :from_me, :to_me, 
+          :attachments, :message_data,
+          :message_id, :timestamp, :text, :peer_id, :flags, :extra, :extra_values, :type_id
 
-		def initialize(api, raw_event)
-			@api = api
-			@raw = raw_event
+    def initialize(api, raw_event)
+      @api = api
+      @raw = raw_event
 
-			@from_user = false
-			@from_chat = false
-			@from_group = false
-			@from_me = false
-			@to_me = false
+      @from_user = false
+      @from_chat = false
+      @from_group = false
+      @from_me = false
+      @to_me = false
 
-			begin
-				@type = UserEventType.parse(@raw[0])
-				list_to_attr(@raw[1, @raw.length], EVENT_ATTRS_MAPPING[@type])
-			rescue StandardError => e
-				@type = @raw[0]
-			end
+      begin
+        @type = UserEventType.parse(@raw[0])
+        list_to_attr(@raw[1, @raw.length], EVENT_ATTRS_MAPPING[@type])
+      rescue StandardError => e
+        @type = @raw[0]
+      end
 
-			if VkCozy::PARSE_PEER_ID_EVENTS.include?(@type)
-				parse_peer_id()
-			end
+      if VkCozy::PARSE_PEER_ID_EVENTS.include?(@type)
+        parse_peer_id()
+      end
 
-			if VkCozy::PARSE_MESSAGE_FLAGS_EVENTS
-				parse_message()
-			end
-		end
+      if VkCozy::PARSE_MESSAGE_FLAGS_EVENTS
+        parse_message()
+      end
+    end
 
-		def to_s
-			instance_variables.each_with_object({}) do |k, h|
-				h[k] = instance_variable_get("#{k}")
-			end.to_json
-		end
+    def to_s
+      instance_variables.each_with_object({}) do |k, h|
+        h[k] = instance_variable_get("#{k}")
+      end.to_json
+    end
 
-		def answer(text)
-			return @api.messages_send(
-				peer_id: @peer_id,
-				message: text,
-				random_id: 0
-			)
-		end
+    def answer(text)
+      return @api.messages_send(
+        peer_id: @peer_id,
+        message: text,
+        random_id: 0
+      )
+    end
 
-		private
+    private
 
-		def list_to_attr(raw, attrs)
-			for i in (0..[raw.length, attrs.length].min)
-				instance_variable_set("@#{attrs[i]}", raw[i]) if respond_to? "#{attrs[i]}="
-			end
-		end
+    def list_to_attr(raw, attrs)
+      for i in (0..[raw.length, attrs.length].min)
+        instance_variable_set("@#{attrs[i]}", raw[i]) if respond_to? "#{attrs[i]}="
+      end
+    end
 
-		def parse_peer_id
-			if @peer_id < 0
-				@from_group = true
-				@group_id = peer_id
+    def parse_peer_id
+      if @peer_id < 0
+        @from_group = true
+        @group_id = peer_id
 
-			elsif @peer_id > 2e9
-				@from_chat = true 
-				@chat_id = @peer_id-2e9
+      elsif @peer_id > 2e9
+        @from_chat = true 
+        @chat_id = @peer_id-2e9
 
-				if @extra_values and @extra_values.include?('from')
-					@user_id = @extra_values['from'].to_i
-				end
-			else
-				@from_user = true 
-				@user_id = @peer_id
-			end
-		end
+        if @extra_values and @extra_values.include?('from')
+          @user_id = @extra_values['from'].to_i
+        end
+      else
+        @from_user = true 
+        @user_id = @peer_id
+      end
+      
+    end
 
-		def parse_message
-			if @type == UserEventType::MESSAGE_NEW
+    def parse_message
+      if @type == UserEventType::MESSAGE_NEW
 
-			end
-		end
-	end
+      end
+    end
+  end
 end