vk_cozy 0.3.1 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94754f3b2073f02952b0eba26be0504fcd4e34c3f822a5c548893110cf6d1e91
-  data.tar.gz: 4fe38641b5743238015f58bdea8bb61647af1b33a2fe008152da154ff3f73789
+  metadata.gz: 3f3e335ff0f9eb232d5a3f259a79592723ee5d5cb785bfb619cd4eb81be11f5a
+  data.tar.gz: 6c95df5ab9e7c6bd4ae7dd672786526bbfa4d8aa974ecea4cf564caa6859f627
 SHA512:
-  metadata.gz: 173a242c1c7fc7482aba358be78f0c424dabd807da857cfb03036fc2b1f8cc1692ac26f252d232ffded65145fe9b53eebbd377322bc2788fbfd2f864b5793c01
-  data.tar.gz: bed49f67bfeb6bc25d85d8b7fa5ab137c03b8e4162cf433f12b76414572b9291d42648cf82af31f3329e55ae974613b96e988a6d32979ef061dc7e4b379d120c
+  metadata.gz: b7305aa9a7a4da1fb754d4115d6087274e11e7139b56a4028cb557fbc9a98e89b5fc78aad0ab55522094cba6125c18a9865a72728b6509891e3324227b5a9cc3
+  data.tar.gz: e3b6b8a3ce259097d50c3fce526474f6564dae1c74c25803903b68759643b12a81669ffc6c5fd5ac6e89bbfc8ebbc1517632743f632434b95b36067ff9562905

data/lib/vk_cozy/bot.rb

@@ -2,6 +2,7 @@ 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
@@ -42,7 +43,8 @@ module VkCozy
       @polling.listen do |event|
         for event_raw in event['updates']
           begin
-            if @labeler.filter(parse_event(event_raw))
+            event_raw = parse_event(event_raw)
+            if @labeler.filter(event_raw)
               next
             end
           rescue Exception => e 

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

@@ -19,6 +19,14 @@ module VkCozy
       
     end
 
+    def answer(text)
+      return @api.messages_send(
+        peer_id: @obj.peer_id,
+        message: text,
+        random_id: 0
+      )
+    end
+
     def [] key
       instance_variable_get("@#{key}")
     end

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

@@ -1,39 +1,78 @@
 module VkCozy
+
+  class Bothandler
+    attr_reader :stop
+
+    def initialize(filter, func, stop: true)
+      @stop = stop
+      @filter = filter
+      @func = func
+    end
+
+    def check(event)
+      check_bot = @filter.check_bot(event)
+      if check_bot
+        if check_bot.is_a?(Symbol)
+          return true
+        elsif check_bot.is_a?(Hash)
+          @func.call(event, check_bot)
+        else
+          @func.call(event)
+        end
+        if @stop
+          return true
+        end
+      end
+    end
+  end
+
+
   class BotLabeler
     attr_reader :api
 
     def initialize(api)
       @api = api
-      @rules = []
+      @handlers = {'*' => []} # * - обрабатывает события в не зависимости от их типа.
+    end
+
+    def get_handlers(type)
+      if @handlers[type].nil?
+        return []
+      else
+        return @handlers[type]
+      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
+      for handler in get_handlers(event.type) + get_handlers('*')
+        if handler.check(event)
           return true
         end
       end
     end
 
-    def message_handler(filter, func)
+    def add_handler(filter, func, type: '*')
       if func.is_a?(Symbol)
         func = method(func)
       end
-      @rules << { 
-        :func => func,
-        :filter => filter
-      }
+
+      if @handlers[type].nil?
+        @handlers[type] = []
+      end
+
+      @handlers[type] << Bothandler.new(filter, func)
+    end
+
+    def event_handler(filter, func)
+      add_handler(filter, func, type: 'message_event')
+    end
+
+    def message_handler(filter, func)
+      add_handler(filter, func, type: 'message_new')
+    end
+
+    def handler(filter, func)
+      add_handler(filter, func)
     end
   end
 end

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

@@ -1,4 +1,4 @@
-module VkCozy
+module Filter
   class BaseFilter
     def check_user(event) # Method check for user-bot
       raise 'Method check_user not implemented'
@@ -9,7 +9,17 @@ module VkCozy
     end
   end
 
-  class YaScan < VkCozy::BaseFilter
+  class MockedFilter < BaseFilter
+    def check_bot(event)
+      return true
+    end
+
+    def user_bot(event)
+      return true
+    end
+  end
+
+  class YaScan < BaseFilter
     def initialize(pattern, flags: Regexp::IGNORECASE)
       @flags = flags
       @pattern = valid_pattern(pattern) # Pattern example: my name is <name> 
@@ -32,25 +42,20 @@ module VkCozy
     end
 
     def check_bot(event)
-      if event.type == VkCozy::BotEventType::MESSAGE_NEW
-        check_text(event.message.text)
-      end
+      check_text(event.message.text)
     end
 
     def check_user(event)
-      if event.type == VkCozy::UserEventType::MESSAGE_NEW
-        if event.from_me
-          return false
-        end
-        check_text(event.text)
+      if event.from_me
+        return false
       end
+      check_text(event.text)
     end
   end
 
   class Text < BaseFilter
-    def initialize(regex, **kwargs)
+    def initialize(regex)
       @regex = regex
-      @raw = kwargs
     end
 
     def check_user(event)

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

@@ -1,40 +1,74 @@
 module VkCozy
+
+  class UserHandler
+    def initialize(filter, func, stop: true)
+      @filter = filter
+      @func = func
+      @stop = stop
+    end
+
+    def check(event)
+      check_user = @filter.check_user(event)
+      if check_user
+        if check_user.is_a?(Symbol)
+          return true
+        elsif check_user.is_a?(Hash)
+          @func.call(event, check_user)
+        else
+          @func.call(event)
+        end
+
+        if @stop
+          return true
+        end
+      end
+    end
+  end
+
   class UserLabeler
     attr_reader :api
 
     def initialize(api)
       @api = api
-      @rules = []
+      @handlers = {'*' => []}
+    end
+
+    def get_handlers(type)
+      if @handlers[type].nil?
+        return []
+      else
+        return @handlers[type]
+      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
+      puts event
+      for handler in get_handlers(event.type) + get_handlers('*')
+        if handler.check(event)
           return true
         end
     	end
     end
 
-    def message_handler(filter, func)
+    def add_handler(filter, func, type: '*')
       if func.is_a?(Symbol)
         func = method(func)
       end
-      @rules << { 
-        :func => func,
-        :filter => filter
-      }
+
+      if @handlers[type].nil?
+        @handlers[type] = []
+      end
+
+      @handlers[type] << UserHandler.new(filter, func)
+    end
+
+    def message_handler(filter, func)
+      add_handler(filter, func, type: VkCozy::UserEventType::MESSAGE_NEW)
+    end
+
+    def handler(filter, func)
+      add_handler(filter, func)
     end
 	end
 end

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

@@ -25,7 +25,7 @@ module VkCozy
 
     define :VIDEO_NEW, 'video_new'
 
-       define :VIDEO_COMMENT_NEW, 'video_comment_new'
+    define :VIDEO_COMMENT_NEW, 'video_comment_new'
     define :VIDEO_COMMENT_EDIT, 'video_comment_edit'
     define :VIDEO_COMMENT_RESTORE, 'video_comment_restore'
 

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

@@ -53,12 +53,22 @@ module VkCozy
     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']
+
+    VkCozy::UserEventType::CHAT_EDIT => ['chat_id', 'self'],
+    VkCozy::UserEventType::CHAT_INFO_EDIT => ['type_id', 'peer_id', 'info'],
+
+    VkCozy::UserEventType::DIALOG_TYPING_STATE => ['user_id', 'flags'],
+    VkCozy::UserEventType::CHAT_TYPING_STATE => ['user_id', 'chat_id'],
+
+    VkCozy::UserEventType::COUNTER => ['count']
   }
+
   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,

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.3.1
+  version: 0.3.9
 platform: ruby
 authors:
 - Danil Konenko
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-11 00:00:00.000000000 Z
+date: 2022-06-14 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: []