vk_cozy 0.3.6 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ff934ed3de889cad7691093027e24648bd20cbc8bfcc7302c0fbcc53a34e79e
-  data.tar.gz: e824e451aa36108fb9b5fee80c7e0c289aefc65cb9c0afb65e23e9d371c79421
+  metadata.gz: 88f8d21019678635297581f40f48e83e71cc79bfe2db701cd3c6b6815df8c5d0
+  data.tar.gz: 2a3e5cfce38ec22b4d20f36b3f50e6c2d5b508a09e854186c5aeb90fa858ff80
 SHA512:
-  metadata.gz: f7b7b564065b60f8e789e56c82ed9da73600650a05c7a71bc9057d966e04262ecf683d24c2304e7570c284e94209b37fb5166c5ea94ac3e13e094e344c759510
-  data.tar.gz: b076661eaab47055f6e7ee4f705892dbbc1c1f02d9069858b06c42361cae86a38139639a61072a33736eab2f7e4a524b4b2cfa3e5d9b511d37b8e3d94279a7cc
+  metadata.gz: b02bf27e35dd324d7497ff0d2bd7f4a952b313cb94fc897c3e190b510881d870efe4e17c1c912dcdf5a596aaf2842608d94d44f6b6432c8cbae7778cb38340e9
+  data.tar.gz: f2b9dbac5adb7488dcf8db32189ab9d80c514ed8acefc20782ba9ded4275ea6214c8023747e0d5dee8bef70f9bdb804911a31c58f856d8ffce100a4d2160401e

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,76 @@
 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) + @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/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'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vk_cozy
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.8
 platform: ruby
 authors:
 - Danil Konenko
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-12 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: []
@@ -88,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:
   - - ">="
@@ -98,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: []