vk_cozy 0.2 → 0.3.8

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

data/lib/vk_cozy.rb

@@ -5,4 +5,4 @@ require 'hash_dot'
 require_relative 'vk_cozy/api/api'
 require_relative 'vk_cozy/bot'
 require_relative 'vk_cozy/user'
-require_relative 'vk_cozy\framework\labeler\filters\filters'
+require_relative 'vk_cozy/framework/labeler/filters/filters'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vk_cozy
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: 0.3.8
 platform: ruby
 authors:
 - Danil Konenko
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-10 00:00:00.000000000 Z
+date: 2022-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inum
@@ -52,7 +52,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: framework for Vk.api
+description: vk_cozy является фреймворком для vk api, имеет удобные хэндлеры и фильтры,
+  создан чтобы упростить разработку ботов для вк
 email: googloldanil@gmail.com
 executables: []
 extensions: []
@@ -62,6 +63,10 @@ files:
 - lib/vk_cozy.rb
 - lib/vk_cozy/api/api.rb
 - lib/vk_cozy/bot.rb
+- lib/vk_cozy/dev/keyboard/action.rb
+- lib/vk_cozy/dev/keyboard/button.rb
+- lib/vk_cozy/dev/keyboard/color.rb
+- lib/vk_cozy/dev/keyboard/keyboard.rb
 - lib/vk_cozy/dispatch/views/bot/event.rb
 - lib/vk_cozy/dispatch/views/user/event.rb
 - lib/vk_cozy/framework/labeler/bot.rb
@@ -84,7 +89,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -94,5 +99,5 @@ requirements: []
 rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
-summary: Vk.com API Client
+summary: vk_cozy framework for vk-api
 test_files: []