vk_cozy 0.2 → 0.3.8

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

@@ -1,34 +1,76 @@
 module VkCozy
-	class BotLabeler
-		attr_reader :api
-
-		def initialize(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 message_handler(filter, func)
-			if func.is_a?(Symbol)
-				func = method(func)
-			end
-			@rules << { 
-				:func => func,
-				:filter => filter
-			}
-		end
-	end
+
+  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
+      @handlers = {'*' => []} # * - обрабатывает события в не зависимости от их типа.
+    end
+
+    def get_handlers(type)
+      if @handlers[type].nil?
+        return []
+      else
+        return @handlers[type]
+      end
+    end
+
+    def filter(event)
+      for handler in get_handlers(event.type) + @handlers['*']
+        if handler.check(event)
+          return true
+        end
+      end
+    end
+
+    def add_handler(filter, func, type: '*')
+      if func.is_a?(Symbol)
+        func = method(func)
+      end
+      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,46 +1,89 @@
-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
+module Filter
+  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 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> 
+    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)
+      check_text(event.message.text)
+    end
+
+    def check_user(event)
+      if event.from_me
+        return false
+      end
+      check_text(event.text)
+    end
+  end
+
+  class Text < BaseFilter
+    def initialize(regex)
+      @regex = regex
+    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