kanal 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a651f7ffee3a091afafa59e96d5c4e90d3f15ebd8fe5c0991ef0f3d25559cb5
-  data.tar.gz: 80a337f6047a542982f5167a1a15c73a9df90ffa95d6d24dc07bba881a4f575e
+  metadata.gz: b0a793b05b3b6a5848b173907c41e64b0fd40c1a68b7b992c784923dbd34c1df
+  data.tar.gz: 01cab2e1b68b1c0d7559208a47883caccfd7a7c1019f4e740c12bdb28129e329
 SHA512:
-  metadata.gz: 69b67d9f7886722abe0cc0b8ba27e30daecde925a275e3147b38c5b80bb1b9d041d1acdd33151be97c8e4a668888fbcf1819192dceb763e52104bfaa97a56ce4
-  data.tar.gz: fb12441c0c5797397cbc40e4517cc23c6a70c6604a0314961d4c9b203c02130464baefda7c6671cd31733112d4f131076de3d92482d695f10b7898c7b5c7b2c8
+  metadata.gz: dca772528cfca7d06de8f48c2a3da90fc99615d1ad06b2dd0b6d6254e68e989937fb22b884aef9219a3a9d139dc2dc7a8d8e786e999dd52e81209739fc6d2d28
+  data.tar.gz: 7d8c3a80d26ceb6245154b694cafc8ca08fd742468cbf3fb6c332a3f064eee84ec20539a973d77494483f2a716d768a0c25fd80d06d9afba27d6d529f1d87882

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## [Unreleased]
 
+## [0.4.3] 2023-03-30
+- New condition for button pressed
+- Input property button_pressed
+
 ## [0.4.2] 2023-03-22
 - Adding any number of loggers can be now done with core.add_logger(l) - where l is logger that have same methods as default ruby logger (debug, warn, fatal, etc)
 - To get logger into your class you can include Kanal::Core::Logging::Logger - this will give you method .logger to get logger

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kanal (0.4.2)
+    kanal (0.4.3)
 
 GEM
   remote: https://rubygems.org/
@@ -105,4 +105,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   2.3.19
+   2.4.5

data/lib/kanal/core/helpers/parameter_finder_with_method_missing_mixin.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative "../logging/composite_logger"
+
 module Kanal
   module Core
     module Helpers
@@ -8,22 +10,32 @@ module Kanal
       # get(name)
       # transforms unknown methods to setters/getters for parameters
       module ParameterFinderWithMethodMissingMixin
-        def method_missing(symbol, *args)
+        include Logging::Logger
+
+        def method_missing(symbol, *args, &block)
+          if block && !args.first.nil?
+            logger.error "Block and arg given simultaneously. Parameter name: '#{symbol.to_s}, arg: #{args.first}'"
+
+            raise "Block and arg given simultaneously for parameter #{symbol.to_s}"
+          end
+
           parameter_name = symbol.to_s
           parameter_name.sub! "=", ""
 
           parameter_name = parameter_name.to_sym
 
+          value = block_given? ? block : args.first
+
           # standard workflow with settings properties with
           # input.prop = 123
           if symbol.to_s.include? "="
-            @parameter_bag.set parameter_name, args.first
-          elsif !args.empty?
+            @parameter_bag.set parameter_name, value
+          elsif !args.empty? || block_given?
             # this approach can be used also in dsl
             # like that
             # setters: prop value
             # getters: prop
-            @parameter_bag.set parameter_name, args.first
+            @parameter_bag.set parameter_name, value
           # means it is used as setter in dsl,
           # method call with argument
           else

data/lib/kanal/plugins/batteries/attachments/attachment.rb

@@ -15,76 +15,25 @@ module Kanal
             @url = url
           end
 
-          def audio?
-            mp3? || wav? || ogg?
-          end
-
-          def mp3?
-            extension == "mp3"
-          end
-
-          def wav?
-            extension == "wav"
-          end
-
-          def ogg?
-            extension == "ogg"
-          end
-
-          def document?
-            doc? || docx? || odf?
-          end
-
-          def doc?
-            extension == "doc"
-          end
-
-          def docx?
-            extension == "docx"
-          end
-
-          def odf?
-            extension == "odf"
+          # Extension checks like jpg?, mp3?, mp4?, doc? etc. fall here
+          def method_missing(method)
+            extension == method.to_s.delete("?")
           end
 
           def image?
-            jpg? || jpeg? || png? || bpm? || gif?
-          end
-
-          def jpg?
-            extension == "jpg"
-          end
-
-          def jpeg?
-            extension == "jpeg"
-          end
-
-          def png?
-            extension == "png"
+            [jpg?, jpeg?, png?, bmp?, gif?].any?
           end
 
-          def bpm?
-            extension == "bpm"
-          end
-
-          def gif?
-            extension == "gif"
+          def audio?
+            [mp3?, wav?, ogg?].any?
           end
 
           def video?
-            mp4? || mov? || mkv?
-          end
-
-          def mp4?
-            extension == "mp4"
+            [mp4?, mov?, mkv?].any?
           end
 
-          def mov?
-            extension == "mov"
-          end
-
-          def mkv?
-            extension == "mkv"
+          def document?
+            [doc?, docx?, odf?].any?
           end
 
           #

data/lib/kanal/plugins/batteries/batteries_plugin.rb

@@ -9,6 +9,8 @@ module Kanal
     module Batteries
       # Plugin with some batteries like .body property etc
       class BatteriesPlugin < Core::Plugins::Plugin
+
+
         def name
           :batteries
         end
@@ -19,6 +21,8 @@ module Kanal
           flow_batteries core
           attachments_batteries core
           keyboard_batteries core
+          username_batteries core
+          button_batteries core
         end
 
         def flow_batteries(core)
@@ -117,11 +121,95 @@ module Kanal
         def attachments_batteries(core)
           core.register_input_parameter :image
           core.register_input_parameter :audio
-          core.register_input_parameter :file
+          core.register_input_parameter :video
+          core.register_input_parameter :document
 
           core.register_output_parameter :image
           core.register_output_parameter :audio
-          core.register_output_parameter :file
+          core.register_output_parameter :video
+          core.register_output_parameter :document
+
+          _this = self
+
+          core.add_condition_pack :image do
+            add_condition :exists do
+              met? do |input, _core, _argument|
+                !input.image.nil?
+              end
+            end
+
+            add_condition :is do
+              with_argument
+
+              met? do |input, _, argument|
+                if input.image.image? && input.image.send((argument.to_s + "?").to_sym)
+                  true
+                else
+                  false
+                end
+              end
+            end
+          end
+
+          core.add_condition_pack :audio do
+            add_condition :exists do
+              met? do |input, _core, _argument|
+                !input.audio.nil?
+              end
+            end
+
+            add_condition :is do
+              with_argument
+
+              met? do |input, _, argument|
+                if input.audio.audio? && input.audio.send((argument.to_s + "?").to_sym)
+                  true
+                else
+                  false
+                end
+              end
+            end
+          end
+
+          core.add_condition_pack :video do
+            add_condition :exists do
+              met? do |input, _core, _argument|
+                !input.video.nil?
+              end
+            end
+
+            add_condition :is do
+              with_argument
+
+              met? do |input, _, argument|
+                if input.video.video? && input.video.send((argument.to_s + "?").to_sym)
+                  true
+                else
+                  false
+                end
+              end
+            end
+          end
+
+          core.add_condition_pack :document do
+            add_condition :exists do
+              met? do |input, _core, _argument|
+                !input.document.nil?
+              end
+            end
+
+            add_condition :is do
+              with_argument
+
+              met? do |input, _, argument|
+                if input.document.document? && input.document.send((argument.to_s + "?").to_sym)
+                  true
+                else
+                  false
+                end
+              end
+            end
+          end
         end
 
         def keyboard_batteries(core)
@@ -131,6 +219,24 @@ module Kanal
             output.keyboard = Keyboard.new
           end
         end
+
+        def username_batteries(core)
+          core.register_input_parameter :username
+        end
+
+        def button_batteries(core)
+          core.register_input_parameter :button_pressed
+
+          core.add_condition_pack :button do
+            add_condition :pressed do
+              with_argument
+
+              met? do |input, _, argument|
+                input.button_pressed == argument
+              end
+            end
+          end
+        end
       end
     end
   end

data/lib/kanal/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Kanal
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

data/lib/kanal.rb

@@ -3,6 +3,7 @@
 require_relative "kanal/version"
 require_relative "kanal/core/core"
 require_relative "kanal/core/plugins/plugin"
+require_relative "shortcuts"
 
 # This module used as a main entry point into kanal-core library
 module Kanal

data/lib/shortcuts.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require_relative "./kanal/core/logging/logger"
+
+module Kanal
+  module Logger
+    include Kanal::Core::Logging::Logger
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kanal
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - idchlife
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-03-22 00:00:00.000000000 Z
+date: 2023-03-30 00:00:00.000000000 Z
 dependencies: []
 description: Thanks to the core library, ecosystem of Kanal tools can be extendted
   to use with input-output bot-like behaviour, with routing
@@ -63,6 +63,7 @@ files:
 - lib/kanal/plugins/batteries/batteries_plugin.rb
 - lib/kanal/plugins/batteries/keyboard.rb
 - lib/kanal/version.rb
+- lib/shortcuts.rb
 - sig/kanal.rbs
 - sig/kanal/core/conditions/condition_pack.rbs
 - sig/kanal/core/conditions/condition_storage.rbs