vk_cozy 0.2 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 258b9457cabc9453353250a7f51db038240ef43bb1b93b68ba4128fdfb59031d
-  data.tar.gz: c35f4cbf0564408024d238ca505f28b076fdb57b40dddfcb338707b7847d82fc
+  metadata.gz: 94754f3b2073f02952b0eba26be0504fcd4e34c3f822a5c548893110cf6d1e91
+  data.tar.gz: 4fe38641b5743238015f58bdea8bb61647af1b33a2fe008152da154ff3f73789
 SHA512:
-  metadata.gz: 8fe4888bcb9db9859ac768c5ec0ba3e5c70d2adc38a3513e535254daf942c09708e9cb461a1161099d0ed9b5470d76b9863593fccdd82856ed1361333fb3681b
-  data.tar.gz: 0dde51243767756401df2988a07befaa65e6df3ef0dfb9e11b4e3ab58a09ea15c16ddcc70d2ab6cbb6171ac196b02349a00a52a6c568d7235c6faff10bbb1e4d
+  metadata.gz: 173a242c1c7fc7482aba358be78f0c424dabd807da857cfb03036fc2b1f8cc1692ac26f252d232ffded65145fe9b53eebbd377322bc2788fbfd2f864b5793c01
+  data.tar.gz: bed49f67bfeb6bc25d85d8b7fa5ab137c03b8e4162cf433f12b76414572b9291d42648cf82af31f3329e55ae974613b96e988a6d32979ef061dc7e4b379d120c

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

@@ -4,52 +4,62 @@ require_relative 'framework/labeler/bot'
 require_relative 'polling/bot_polling'
 
 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
+            if @labeler.filter(parse_event(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/dispatch/views/bot/event.rb

@@ -1,67 +1,67 @@
 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 [] key
+      instance_variable_get("@#{key}")
+    end
 
-		def to_s
-			"BotEvent(#{@raw.to_s})"
-		end
-	end
+    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
+  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
+      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
+      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 answer(text)
-			return @api.messages_send(
-				peer_id: @message.peer_id,
-				message: text,
-				random_id: 0
-			)
-		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
+    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

data/lib/vk_cozy/framework/labeler/bot.rb

@@ -1,34 +1,39 @@
 module VkCozy
-	class BotLabeler
-		attr_reader :api
+  class BotLabeler
+    attr_reader :api
 
-		def initialize(api)
-			@api
-			@rules = []
-		end
+    def initialize(api)
+      @api = api
+      @rules = []
+    end
 
-		def filter(event)
-			for i in @rules
-				f = i[:filter]
-				check = f.check_bot(event)
-				if check
-					if check.is_a?(Hash)
-						i[:func].call(event, **check)
-					else
-						i[:func].call(event)
-					end
-				end
-			end
-		end
+    def filter(event)
+      for i in @rules
+        f = i[:filter]
+        check = f.check_bot(event)
+        if check
+          if check.is_a?(Symbol)
+            check = [Symbol]
+          elsif check.is_a?(Array)
+            i[:func].call(event, *check)
+          elsif check.is_a?(Hash)
+            i[:func].call(event, **check)
+          else
+            i[:func].call(event)
+          end
+          return true
+        end
+      end
+    end
 
-		def message_handler(filter, func)
-			if func.is_a?(Symbol)
-				func = method(func)
-			end
-			@rules << { 
-				:func => func,
-				:filter => filter
-			}
-		end
-	end
+    def message_handler(filter, func)
+      if func.is_a?(Symbol)
+        func = method(func)
+      end
+      @rules << { 
+        :func => func,
+        :filter => filter
+      }
+    end
+  end
 end

data/lib/vk_cozy/framework/labeler/filters/filters.rb

@@ -1,46 +1,84 @@
 module VkCozy
-	class BaseFilter
-		def check_user(event) # Method check for user-bot
-			raise 'Method check_user not implemented'
-		end
-
-		def check_bot(event) # Method check for group-bot
-			raise 'Method check_bot not implemented'
-		end
-	end
-
-	class Text < BaseFilter
-		def initialize(regex, **kwargs)
-			@regex = regex
-			@raw = kwargs
-		end
-
-		def check_user(event)
-			if event.type == VkCozy::UserEventType::MESSAGE_NEW
-
-				if event.from_me
-					return false
-				end
-				if event.text == @regex
-					return true
-				else
-					return false
-				end
-			else
-				return false
-			end
-		end
-
-		def check_bot(event)
-			if event.type == VkCozy::BotEventType::MESSAGE_NEW
-				if event.message.text == @regex
-					return true
-				else
-					return false
-				end
-			else
-				return false
-			end
-		end
-	end
+  class BaseFilter
+    def check_user(event) # Method check for user-bot
+      raise 'Method check_user not implemented'
+    end
+
+    def check_bot(event) # Method check for group-bot
+      raise 'Method check_bot not implemented'
+    end
+  end
+
+  class YaScan < VkCozy::BaseFilter
+    def initialize(pattern, flags: Regexp::IGNORECASE)
+      @flags = flags
+      @pattern = valid_pattern(pattern) # Pattern example: my name is <name> 
+    end
+
+    def valid_pattern(pattern)
+      arguments = pattern.scan(/<([\w_]*)>/).flatten
+      for i in arguments
+        pattern = pattern.sub("<#{i}>", "(?<#{i}>.*)")
+      end
+      return Regexp.new(pattern, @flags)
+    end
+
+    def check_text(text) # Text example: my name is Volk
+      text_match = @pattern.match(text)
+      if text_match.nil?
+        return false
+      end
+      return Hash[ text_match.names.zip( text_match.captures ) ] # Return: {'name' => 'Volk'}
+    end
+
+    def check_bot(event)
+      if event.type == VkCozy::BotEventType::MESSAGE_NEW
+        check_text(event.message.text)
+      end
+    end
+
+    def check_user(event)
+      if event.type == VkCozy::UserEventType::MESSAGE_NEW
+        if event.from_me
+          return false
+        end
+        check_text(event.text)
+      end
+    end
+  end
+
+  class Text < BaseFilter
+    def initialize(regex, **kwargs)
+      @regex = regex
+      @raw = kwargs
+    end
+
+    def check_user(event)
+      if event.type == VkCozy::UserEventType::MESSAGE_NEW
+
+        if event.from_me
+          return false
+        end
+        if event.text == @regex
+          return true
+        else
+          return false
+        end
+      else
+        return false
+      end
+    end
+
+    def check_bot(event)
+      if event.type == VkCozy::BotEventType::MESSAGE_NEW
+        if event.message.text == @regex
+          return true
+        else
+          return false
+        end
+      else
+        return false
+      end
+    end
+  end
 end

data/lib/vk_cozy/framework/labeler/user.rb

@@ -1,35 +1,40 @@
 module VkCozy
-	class UserLabeler
-		attr_reader :api
+  class UserLabeler
+    attr_reader :api
 
-		def initialize(api)
-			@api = api
-			@rules = []
-		end
+    def initialize(api)
+      @api = api
+      @rules = []
+    end
 
-		def filter(event_raw)
-			event = VkCozy::UserEvent.new(@api, event_raw)
-			for i in @rules
-				f = i[:filter]
-				check = f.check_user(event)
-				if check
-					if check.is_a?(Hash)
-						i[:func].call(event, **check)
-					else
-						i[:func].call(event)
-					end
-				end
-			end
-		end
+    def filter(event_raw)
+      event = VkCozy::UserEvent.new(@api, event_raw)
+      for i in @rules
+        f = i[:filter]
+        check = f.check_user(event)
+        if check
+          if check.is_a?(Symbol)
+            check = [Symbol]
+          elsif check.is_a?(Array)
+            i[:func].call(event, *check)
+          elsif check.is_a?(Hash)
+            i[:func].call(event, **check)
+          else
+            i[:func].call(event)
+          end
+          return true
+        end
+    	end
+    end
 
-		def message_handler(filter, func)
-			if func.is_a?(Symbol)
-				func = method(func)
-			end
-			@rules << { 
-				:func => func,
-				:filter => filter
-			}
-		end
+    def message_handler(filter, func)
+      if func.is_a?(Symbol)
+        func = method(func)
+      end
+      @rules << { 
+        :func => func,
+        :filter => filter
+      }
+    end
 	end
 end

data/lib/vk_cozy/polling/bot_polling.rb

@@ -1,40 +1,38 @@
 module VkCozy
-	class BotPolling
-		def initialize(api, group_id=nil, wait=25, rps_delay=0)
-			@api = api
-			if group_id.nil?
-				@group_id = @api.request('groups.getById', {})['response'][0]['id']
-				puts @group_id
-			else
-				@group_id = group_id
-			end
+  class BotPolling
+    def initialize(api, group_id=nil, wait=25, rps_delay=0)
+      @api = api
+      if group_id.nil?
+        @group_id = @api.request('groups.getById', {})['response'][0]['id']
+      else
+        @group_id = group_id
+      end
 
-			@rps_delay = rps_delay
-			@stop = false
-		end
+      @rps_delay = rps_delay
+      @stop = false
+    end
 
-		def get_server
-			return @api.request('groups.getLongPollServer', {:group_id => @group_id})['response']
-		end
+    def get_server
+      return @api.request('groups.getLongPollServer', {:group_id => @group_id})['response']
+    end
 
-		def get_event(server)
-			uri = URI.parse('%s?act=a_check&key=%s&ts=%s&wait=%s&rps_delay=%s' % [server['server'], server['key'], server['ts'], @wait, @rps_delay])
-			http_response = Net::HTTP.get(uri)
-			return JSON.parse(http_response)
-		end
+    def get_event(server)
+      uri = URI.parse('%s?act=a_check&key=%s&ts=%s&wait=%s&rps_delay=%s' % [server['server'], server['key'], server['ts'], @wait, @rps_delay])
+      http_response = Net::HTTP.get(uri)
+      return JSON.parse(http_response)
+    end
 
-		def listen
-			server = get_server
-			until @stop do
-				event = get_event(server)
-				if not event['ts']
-					server = get_server
-					next
-				end
-				server['ts'] = event['ts']
-				yield event
-			end
-		end
-
-	end
+    def listen
+      server = get_server
+      until @stop do
+        event = get_event(server)
+        if not event['ts']
+          server = get_server
+          next
+        end
+        server['ts'] = event['ts']
+        yield event
+      end
+    end
+  end
 end

data/lib/vk_cozy/polling/user_polling.rb

@@ -1,39 +1,39 @@
 module VkCozy
-	class UserPolling
-		def initialize(api=nil, user_id=nil, mode=234, wait=25, rps_delay=0, error_handler=nil)
-			@api = api
-			if user_id.nil?
-				@user_id = @api.request('users.get', {})['response'][0]['id']
-			else
-				@user_id = user_id
-			end
-			@mode = mode 
-			@wait = wait
-			@rps_delay = rps_delay
-			@stop = false
-		end
+  class UserPolling
+    def initialize(api=nil, user_id=nil, mode=234, wait=25, rps_delay=0, error_handler=nil)
+      @api = api
+      if user_id.nil?
+        @user_id = @api.request('users.get', {})['response'][0]['id']
+      else
+        @user_id = user_id
+      end
+      @mode = mode 
+      @wait = wait
+      @rps_delay = rps_delay
+      @stop = false
+    end
 
-		def get_event(server)
-			uri = URI.parse('https://%s?act=a_check&key=%s&ts=%s&wait=%s&mode=%s&rps_delay=%s&version=%s' % [server['server'], server['key'], server['ts'], @wait, @mode, @rps_delay, 3])
-			http_response = Net::HTTP.get(uri)
-			return JSON.parse(http_response)
-		end
+    def get_event(server)
+      uri = URI.parse('https://%s?act=a_check&key=%s&ts=%s&wait=%s&mode=%s&rps_delay=%s&version=%s' % [server['server'], server['key'], server['ts'], @wait, @mode, @rps_delay, 3])
+      http_response = Net::HTTP.get(uri)
+      return JSON.parse(http_response)
+    end
 
-		def get_server
-			return @api.request('messages.getLongPollServer', {})['response']
-		end
+    def get_server
+      return @api.request('messages.getLongPollServer', {})['response']
+    end
 
-		def listen
-			server = get_server
-			until @stop do
-				event = get_event(server)
-				if not event['ts']
-					server = get_server
-					next
-				end
-				server['ts'] = event['ts']
-				yield event
-			end
-		end
-	end
+    def listen
+      server = get_server
+      until @stop do
+        event = get_event(server)
+        if not event['ts']
+          server = get_server
+          next
+        end
+        server['ts'] = event['ts']
+        yield event
+      end
+    end
+  end
 end

data/lib/vk_cozy/types/events/bot_events.rb

@@ -1,73 +1,73 @@
 module VkCozy
-	class BotEventType
-		include Ruby::Enum
+  class BotEventType
+    include Ruby::Enum
 
-		define :MESSAGE_NEW, 'message_new'
-		define :MESSAGE_REPLY, 'message_reply'
-		define :MESSAGE_EDIT, 'message_edit'
-		define :MESSAGE_EVENT, 'message_event'
+    define :MESSAGE_NEW, 'message_new'
+    define :MESSAGE_REPLY, 'message_reply'
+    define :MESSAGE_EDIT, 'message_edit'
+    define :MESSAGE_EVENT, 'message_event'
 
-		define :MESSAGE_TYPING_STATE, 'message_typing_state'
+    define :MESSAGE_TYPING_STATE, 'message_typing_state'
 
-		define :MESSAGE_ALLOW, 'message_allow'
+    define :MESSAGE_ALLOW, 'message_allow'
 
-		define :MESSAGE_DENY, 'message_deny'
+    define :MESSAGE_DENY, 'message_deny'
 
-		define :PHOTO_NEW, 'photo_new'
+    define :PHOTO_NEW, 'photo_new'
 
-		define :PHOTO_COMMENT_NEW, 'photo_comment_new'
-		define :PHOTO_COMMENT_EDIT, 'photo_comment_edit'
-		define :PHOTO_COMMENT_RESTORE, 'photo_comment_restore'
+    define :PHOTO_COMMENT_NEW, 'photo_comment_new'
+    define :PHOTO_COMMENT_EDIT, 'photo_comment_edit'
+    define :PHOTO_COMMENT_RESTORE, 'photo_comment_restore'
 
-		define :PHOTO_COMMENT_DELETE, 'photo_comment_delete'
+    define :PHOTO_COMMENT_DELETE, 'photo_comment_delete'
 
-		define :AUDIO_NEW, 'audio_new'
+    define :AUDIO_NEW, 'audio_new'
 
-		define :VIDEO_NEW, 'video_new'
+    define :VIDEO_NEW, 'video_new'
 
-   		define :VIDEO_COMMENT_NEW, 'video_comment_new'
-		define :VIDEO_COMMENT_EDIT, 'video_comment_edit'
-		define :VIDEO_COMMENT_RESTORE, 'video_comment_restore'
+       define :VIDEO_COMMENT_NEW, 'video_comment_new'
+    define :VIDEO_COMMENT_EDIT, 'video_comment_edit'
+    define :VIDEO_COMMENT_RESTORE, 'video_comment_restore'
 
-		define :VIDEO_COMMENT_DELETE, 'video_comment_delete'
+    define :VIDEO_COMMENT_DELETE, 'video_comment_delete'
 
-		define :WALL_POST_NEW, 'wall_post_new'
-		define :WALL_REPOST, 'wall_repost'
+    define :WALL_POST_NEW, 'wall_post_new'
+    define :WALL_REPOST, 'wall_repost'
 
-		define :WALL_REPLY_NEW, 'wall_reply_new'
-		define :WALL_REPLY_EDIT, 'wall_reply_edit'
-		define :WALL_REPLY_RESTORE, 'wall_reply_restore'
+    define :WALL_REPLY_NEW, 'wall_reply_new'
+    define :WALL_REPLY_EDIT, 'wall_reply_edit'
+    define :WALL_REPLY_RESTORE, 'wall_reply_restore'
 
-		define :WALL_REPLY_DELETE, 'wall_reply_delete'
+    define :WALL_REPLY_DELETE, 'wall_reply_delete'
 
-		define :BOARD_POST_NEW, 'board_post_new'
-		define :BOARD_POST_EDIT, 'board_post_edit'
-		define :BOARD_POST_RESTORE, 'board_post_restore'
+    define :BOARD_POST_NEW, 'board_post_new'
+    define :BOARD_POST_EDIT, 'board_post_edit'
+    define :BOARD_POST_RESTORE, 'board_post_restore'
 
-		define :BOARD_POST_DELETE, 'board_post_delete'
+    define :BOARD_POST_DELETE, 'board_post_delete'
 
-		define :MARKET_COMMENT_NEW, 'market_comment_new'
-		define :MARKET_COMMENT_EDIT, 'market_comment_edit'
-		define :MARKET_COMMENT_RESTORE, 'market_comment_restore'
+    define :MARKET_COMMENT_NEW, 'market_comment_new'
+    define :MARKET_COMMENT_EDIT, 'market_comment_edit'
+    define :MARKET_COMMENT_RESTORE, 'market_comment_restore'
 
-		define :MARKET_COMMENT_DELETE, 'market_comment_delete'
+    define :MARKET_COMMENT_DELETE, 'market_comment_delete'
 
-		define :GROUP_LEAVE, 'group_leave'
+    define :GROUP_LEAVE, 'group_leave'
 
-		define :GROUP_JOIN, 'group_join'
+    define :GROUP_JOIN, 'group_join'
 
-		define :USER_BLOCK, 'user_block'
+    define :USER_BLOCK, 'user_block'
 
-		define :USER_UNBLOCK, 'user_unblock'
+    define :USER_UNBLOCK, 'user_unblock'
 
-		define :POLL_VOTE_NEW, 'poll_vote_new'
+    define :POLL_VOTE_NEW, 'poll_vote_new'
 
-		define :GROUP_OFFICERS_EDIT, 'group_officers_edit'
+    define :GROUP_OFFICERS_EDIT, 'group_officers_edit'
 
-		define :GROUP_CHANGE_SETTINGS, 'group_change_settings'
+    define :GROUP_CHANGE_SETTINGS, 'group_change_settings'
 
-		define :GROUP_CHANGE_PHOTO, 'group_change_photo'
-		
-		define :VKPAY_TRANSACTION, 'vkpay_transaction'
-	end
+    define :GROUP_CHANGE_PHOTO, 'group_change_photo'
+    
+    define :VKPAY_TRANSACTION, 'vkpay_transaction'
+  end
 end

data/lib/vk_cozy/types/events/user_events.rb

@@ -1,67 +1,67 @@
 module VkCozy
-	class UserEventType < Inum::Base
-		define :UNDEFINED_EVENT, -1
+  class UserEventType < Inum::Base
+    define :UNDEFINED_EVENT, -1
 
-		define :REPLACE_MESSAGE_FLAGS, 1
-		define :INSTALL_MESSAGE_FLAGS, 2
-		define :RESET_MESSAGE_FLAGS, 3
+    define :REPLACE_MESSAGE_FLAGS, 1
+    define :INSTALL_MESSAGE_FLAGS, 2
+    define :RESET_MESSAGE_FLAGS, 3
 
-		define :MESSAGE_NEW, 4
-		define :MESSAGE_EDIT, 5
-		define :IN_READ, 6
-		define :OUT_READ, 7
-		define :FRIEND_ONLINE, 8
-		define :FRIEND_OFFLINE, 9
-		define :RESET_DIALOG_FLAGS, 10
-		define :REPLACE_DIALOG_FLAGS, 11
-		define :INSTALL_DIALOG_FLAGS, 12
-		define :MESSAGES_DELETE, 13
-		define :MESSAGES_RESTORE, 14
+    define :MESSAGE_NEW, 4
+    define :MESSAGE_EDIT, 5
+    define :IN_READ, 6
+    define :OUT_READ, 7
+    define :FRIEND_ONLINE, 8
+    define :FRIEND_OFFLINE, 9
+    define :RESET_DIALOG_FLAGS, 10
+    define :REPLACE_DIALOG_FLAGS, 11
+    define :INSTALL_DIALOG_FLAGS, 12
+    define :MESSAGES_DELETE, 13
+    define :MESSAGES_RESTORE, 14
 
-		define :MESSAGE_CHANGE, 18
-		define :CLEAR_MESSAGE_CACHE, 19
+    define :MESSAGE_CHANGE, 18
+    define :CLEAR_MESSAGE_CACHE, 19
 
-		define :CHANGE_MAJOR_ID, 20
-		define :CHANGE_MINOR_ID, 21
+    define :CHANGE_MAJOR_ID, 20
+    define :CHANGE_MINOR_ID, 21
 
-		define :CHAT_EDIT, 51
-		define :CHAT_INFO_EDIT, 52
-		define :DIALOG_TYPING_STATE, 61
+    define :CHAT_EDIT, 51
+    define :CHAT_INFO_EDIT, 52
+    define :DIALOG_TYPING_STATE, 61
 
-		define :CHAT_TYPING_STATE, 62
-		define :USERS_TYPING_STATE, 63
-		define :CHAT_VOICE_MESSAGE_STATES, 64
-		define :PHOTO_UPLOAD_STATE, 65
-		define :VIDEO_UPLOAD_STATE, 66
-		define :FILE_UPLOAD_STAE, 67
+    define :CHAT_TYPING_STATE, 62
+    define :USERS_TYPING_STATE, 63
+    define :CHAT_VOICE_MESSAGE_STATES, 64
+    define :PHOTO_UPLOAD_STATE, 65
+    define :VIDEO_UPLOAD_STATE, 66
+    define :FILE_UPLOAD_STAE, 67
 
-		define :CALL, 70
-		define :COUNTER, 80
-		define :USER_INVISIBLE_CHANGE, 81
-		define :NOTIFICATIONS_SETTINGS_CHANGED, 114
-		define :CHAT_CALL, 115
-		define :CALLBACK_BUTTON_REPLY, 119
-	end
+    define :CALL, 70
+    define :COUNTER, 80
+    define :USER_INVISIBLE_CHANGE, 81
+    define :NOTIFICATIONS_SETTINGS_CHANGED, 114
+    define :CHAT_CALL, 115
+    define :CALLBACK_BUTTON_REPLY, 119
+  end
 
-	MESSAGE_EXTRA_FIELDS = [
-		'peer_id', 'timestamp', 'text', 'extra_values', 'attachments', 'random_id'
-	]
-	MSGID = 'message_id'
-	EVENT_ATTRS_MAPPING = {
-		VkCozy::UserEventType::REPLACE_MESSAGE_FLAGS => [MSGID, 'flags'] + MESSAGE_EXTRA_FIELDS,
-		VkCozy::UserEventType::INSTALL_MESSAGE_FLAGS => [MSGID, 'mask'] + MESSAGE_EXTRA_FIELDS,
-		VkCozy::UserEventType::RESET_MESSAGE_FLAGS => [MSGID, 'mask'] + MESSAGE_EXTRA_FIELDS,
-		VkCozy::UserEventType::MESSAGE_NEW => [MSGID, 'flags'] + MESSAGE_EXTRA_FIELDS,
-		VkCozy::UserEventType::MESSAGE_EDIT => [MSGID, 'mask'] + MESSAGE_EXTRA_FIELDS,
-		VkCozy::UserEventType::IN_READ => ['peer_id', 'local_id'],
-		VkCozy::UserEventType::OUT_READ => ['peer_id', 'local_id'],
-		VkCozy::UserEventType::FRIEND_ONLINE => ['user_id', 'extra', 'timestamp'],
-		VkCozy::UserEventType::FRIEND_OFFLINE => ['user_id', 'flags', 'timestamp'],
-		VkCozy::UserEventType::DIALOG_TYPING_STATE => ['user_id', 'flags']
-	}
-	PARSE_PEER_ID_EVENTS = EVENT_ATTRS_MAPPING.map{|k, v| if v.include?('peer_id') then k end}.select{ |i| not i.nil? }
-	PARSE_MESSAGE_FLAGS_EVENTS = [
-		VkCozy::UserEventType::REPLACE_MESSAGE_FLAGS,
-		VkCozy::UserEventType::MESSAGE_NEW
-	]
+  MESSAGE_EXTRA_FIELDS = [
+    'peer_id', 'timestamp', 'text', 'extra_values', 'attachments', 'random_id'
+  ]
+  MSGID = 'message_id'
+  EVENT_ATTRS_MAPPING = {
+    VkCozy::UserEventType::REPLACE_MESSAGE_FLAGS => [MSGID, 'flags'] + MESSAGE_EXTRA_FIELDS,
+    VkCozy::UserEventType::INSTALL_MESSAGE_FLAGS => [MSGID, 'mask'] + MESSAGE_EXTRA_FIELDS,
+    VkCozy::UserEventType::RESET_MESSAGE_FLAGS => [MSGID, 'mask'] + MESSAGE_EXTRA_FIELDS,
+    VkCozy::UserEventType::MESSAGE_NEW => [MSGID, 'flags'] + MESSAGE_EXTRA_FIELDS,
+    VkCozy::UserEventType::MESSAGE_EDIT => [MSGID, 'mask'] + MESSAGE_EXTRA_FIELDS,
+    VkCozy::UserEventType::IN_READ => ['peer_id', 'local_id'],
+    VkCozy::UserEventType::OUT_READ => ['peer_id', 'local_id'],
+    VkCozy::UserEventType::FRIEND_ONLINE => ['user_id', 'extra', 'timestamp'],
+    VkCozy::UserEventType::FRIEND_OFFLINE => ['user_id', 'flags', 'timestamp'],
+    VkCozy::UserEventType::DIALOG_TYPING_STATE => ['user_id', 'flags']
+  }
+  PARSE_PEER_ID_EVENTS = EVENT_ATTRS_MAPPING.map{|k, v| if v.include?('peer_id') then k end}.select{ |i| not i.nil? }
+  PARSE_MESSAGE_FLAGS_EVENTS = [
+    VkCozy::UserEventType::REPLACE_MESSAGE_FLAGS,
+    VkCozy::UserEventType::MESSAGE_NEW
+  ]
 end

data/lib/vk_cozy/user.rb

@@ -4,34 +4,45 @@ require_relative 'framework/labeler/user'
 require_relative 'polling/user_polling'
 
 module VkCozy
-	class User
-		attr_reader :api
+  class User
+    attr_reader :api
 
-		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::UserPolling.new(@api)
-			@labeler = VkCozy::UserLabeler.new(@api)
-		end
+    def initialize(access_token, version=5.92)
+      @access_token = access_token
+      @api = Api.new(access_token, version)
+      
+      @polling = VkCozy::UserPolling.new(@api)
+      @labeler = VkCozy::UserLabeler.new(@api)
+    end
 
-		def on
-			return @labeler
-		end
+    def on
+      return @labeler
+    end
 
-		def run_polling
-			@polling.listen do |event|
-				for update in event['updates']
-					begin
-						@labeler.filter(update)
-					rescue Exception => e 
-						raise e
-					end
-				end
-			end
-		end
-	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 update in event['updates']
+          begin
+            if @labeler.filter(update)
+              next
+            end
+          rescue Exception => e 
+            raise e
+          end
+        end
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vk_cozy
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: 0.3.1
 platform: ruby
 authors:
 - Danil Konenko
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-10 00:00:00.000000000 Z
+date: 2022-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inum