dialog_ruby 0.1.10 → 0.1.11

data/lib/dialect/codegen/erb/functional/4.1.AppEvent2Elements.erb

@@ -25,7 +25,12 @@ module Dialog
                      
           <% if args[:dialect][:constructors][Dialog.config.naming.app.to_sym][:Element2ModSend][:repack][:fFqn2tFqn].has_key?(prop[:tFqn].to_sym)%>
           args[:x][:exec][:<%=prop[:tFqn] %>] = <%= args[:dialect][:constructors][Dialog.config.naming.app.to_sym][:Element2ModSend][:repack][:fFqn2tFqn][prop[:tFqn].to_sym]  %>
-          args[:x][:exec][:<%=prop[:tFqn] %>][:text] = elementText_<%= prop[:tOID] %>
+          if args[:smsg][:parse_mode] == 'Markdown' or args[:smsg][:parse_mode].nil?
+            text = Dialog::Strings.text2md(elementText_<%= prop[:tOID] %>(args[:mmsg]))
+          else
+            text = elementText_<%= prop[:tOID] %>(args[:mmsg])
+          end
+          args[:x][:exec][:<%=prop[:tFqn] %>][:text] = text
           <% else %>
           args[:x][:exec][:<%=prop[:tFqn] %>] = {}
           args[:x][:send][:<%=prop[:tFqn] %>] = {}
@@ -60,7 +65,7 @@ module Dialog
       <% end %>
      
     <% hash_Text.each do |tOID, text| %>
-      def elementText_<%= tOID %>
+      def elementText_<%= tOID %>(mmsg)
         <<-HEREDOC
         <%= text %>
         HEREDOC

data/lib/dialect/codegen/erb/functional/5.1.Element2ModElements.erb

@@ -19,7 +19,7 @@ module Dialog
       
         base = args[:dialect][:perView][Dialog.config.naming.app.to_sym][viewId][:Element2ModElements][:repack][:atoms]
         
-        if base[:keyboards].has_key?(tOID.to_s)
+        if base.has_key?(:keyboards) and base[:keyboards].has_key?(tOID.to_s)
           base[:keyboards].each do |tOID, hash_tOID|
             a << "# #{tOID}"
             a << "def dialog__Element2ModElements__#{tOID}(args)"            

data/lib/dialect/codegen/erb/functional/7.ElementChains.erb

@@ -27,10 +27,10 @@ module Dialog
           codeGen_ElementChains2ChainsRun(args, viewId, propX, a, hash_Text, hash_tFqn, mode) if chainsRun == true
         end
         hash_Text.each do |tOID, text| 
-          a << "def elementText_#{tOID}"
+          a << "def elementText_#{tOID}(mmsg)"
           a << "  <<-HEREDOC "
           a << "  #{text}"
-          a << 'HEREDOC'
+          a << '  HEREDOC'
           a << 'end'
         end        
         return a
@@ -47,7 +47,8 @@ defName = "dialog__ElementChains__#{propX[:fOID]}"
                     
           if args[:dialect][:constructors][Dialog.config.naming.app.to_sym][:Element2ModSend][:repack][:fFqn2tFqn].has_key?(propX[:tFqn].to_sym)
             a << "  args[:x][:exec][:#{propX[:tFqn]}] = #{args[:dialect][:constructors][Dialog.config.naming.app.to_sym][:Element2ModSend][:repack][:fFqn2tFqn][propX[:tFqn].to_sym]}"
-            a << "  args[:x][:exec][:#{propX[:tFqn]}][:text] = elementText_#{propX[:tOID]}"
+            a << "  args[:smsg][:parse_mode] == 'Markdown' ? text = Dialog::Strings.text2md(elementText_#{propX[:tOID]}(args[:mmsg])) : text = elementText_#{propX[:tOID]}(args[:mmsg])"
+            a << "  args[:x][:exec][:#{propX[:tFqn]}][:text] = text"
           else
             a << "  args[:x][:exec][:#{propX[:tFqn]}] = {}"
             a << "  args[:x][:send][:#{propX[:tFqn]}] = {}"
@@ -65,7 +66,7 @@ defName = "dialog__ElementChains__#{propX[:fOID]}"
           end 
           
           args[:dialect][:perView][Dialog.config.naming.app.to_sym][viewId][:ElementChains][:repack][:chain][:order].each do |k, v| 
-            if k == propX[:fOID].to_sym
+            if k == propX[:fOID].to_sym and v.has_key?(3) # true chans
           # #{k, #{v
               a << "  dialog__ElementChains__#{propX[:tOID]}(args)"
             end
@@ -77,13 +78,13 @@ defName = "dialog__ElementChains__#{propX[:fOID]}"
     <% if args[:dialect][:perView][Dialog.config.naming.app.to_sym][viewId][:ElementChains].is_a?(Hash)
       run = args[:dialect][:perView][Dialog.config.naming.app.to_sym][viewId][:ElementChains][:repack][:fOID]
       result = codeGen_ElementChains2Chains(args, run, viewId, 'fOID') %>
-<%= result.join("\n\n") %>
+<%= result.join("\n") %>
       <% end%>       
       
     <% if args[:dialect][:perView][Dialog.config.naming.app.to_sym][viewId][:ElementChains].is_a?(Hash)
       run = args[:dialect][:perView][Dialog.config.naming.app.to_sym][viewId][:ElementChains][:repack][:tOID]
       result = codeGen_ElementChains2Chains(args, run, viewId, 'tOID') %>
-<%= result.join("\n\n") %>
+<%= result.join("\n") %>
       <% end%>       
          
     end

data/lib/dialog_ruby.rb

@@ -14,11 +14,14 @@ module Dialog
   class << self
     
     def create
+      Encoding.default_internal = Encoding::UTF_8
+      Encoding.default_external = Encoding::UTF_8
+      
       version = RUBY_VERSION.split('.').map { |x| x.to_i }
-      if (version <=> [2, 5, 0]) >= 1
+      if (version <=> [2, 4, 9]) >= 1
         require_relative './require.rb'
         _require_min
-        send("trigger_#{Dialog.config.run.scope}".to_sym)
+        Dialog::Triggers.send("trigger_#{Dialog.config.run.scope}".to_sym)
       else
         puts "Minimum required Ruby version - 2.5.0"
       end

data/lib/metamess/_run.rb

@@ -87,6 +87,7 @@ module Dialog
         args[:rmsg] = {}
         args[:perf][:metamess] = Time.now                                
         Dialog::Canvas.run(args)
+        args[:perf][:canvas] = Time.now                                
       end   
       
 

data/lib/metamess/content/content_o-contact_f.rb

@@ -0,0 +1,41 @@
+########    #######    ########    #######    ########    ########
+##     / / / /    License    \ \ \ \ 
+##    Copyleft culture, Copyright (C) is prohibited here
+##    This work is licensed under a CC BY-SA 4.0
+##    Creative Commons Attribution-ShareAlike 4.0 License
+##    Refer to the http://creativecommons.org/licenses/by-sa/4.0/
+########    #######    ########    #######    ########    ########
+##    / / / /    Code Climate    \ \ \ \ 
+##    Language = ruby
+##    Indent = space;    2 chars;
+########    #######    ########    #######    ########    ########
+module Dialog
+  module Metamess
+    class << self
+
+      def collect_EventContentContact(args)
+        metaStep(args, __method__.to_s)
+        ### BODY
+        args[:mmsg][:fqnrun][:g] = Dialog::Naming::Class::Event::Order::Content::Family::Contact::Genus.Main
+        
+        ### EOF BODY
+        return final(args)
+      end
+      
+      def collect_EventContentContactMain(args)
+        metaStep(args, __method__.to_s)
+        ### BODY
+        
+        metamessGen(args,eval2mmsg = { 
+          :from         => {f1: '[:contact]'},                  
+          :to           => {t1: '[:fqndata][:f][:contact]'},
+          :fFields      => {v1: :phone_number, v2: :first_name, v3: :last_name, v4: :user_id},
+        }) 
+        
+        ### EOF BODY
+        return final(args)
+      end    
+       
+    end
+  end
+end

data/lib/metamess/content/content_o.rb

@@ -86,15 +86,16 @@ module Dialog
       end
       
       def getChatContext(args)
-        case args[:rmsg][:chat][:type]
+        case args[:mmsg][:fqndata][:o][:chat][:type]
         when 'private'
-            args[:mmsg][:chat_context] = Naming::ChatContext.Private
-            
+          context = Naming::ChatContext.Private
+        when 'group'    
+          leaveGroup(args)          
         when 'supergroup'
-          args[:x][:redis][:region] = 'chat'
-          args[:x][:redis][:territory] = 'context'
-          args[:mmsg][:fqndata][:o][:chat][:context] = Dialog::RedisCached.pullCached(args)
+          context = Dialog::Storage::Redis.pullCached({ :type => 'chat', :key => 'context'}, args)
         end
+        
+        context.nil? ? nodata(args: args, from: 'context') : args[:mmsg][:fqndata][:o][:chat][:context] = context             
       end    
       
       ### Message

data/lib/metamess/func.rb

@@ -148,30 +148,6 @@ module Dialog
         return map
       end
       
-      
-      def getChatContext(args)
-        Dialog.clearRedis(args)
-        case args[:mmsg][:fqndata][:o][:chat][:type]
-        when 'private'
-          context = Naming::ChatContext.Private
-          
-        when 'group'    
-          leaveGroup(args)
-            
-        when 'supergroup'
-          args[:x][:redis][:region] = 'chat'
-          args[:x][:redis][:territory] = 'context'
-          context = Dialog::RedisCached.pullCached(args)
-        
-        when 'channel'
-          context = 'unknown'
-          
-        end
-        
-        #Check
-        args[:x][:metamess][:key] = 'context'
-        context.nil? ? nodata(args: args, from: 'context') : args[:mmsg][:fqndata][:o][:chat][:context] = context     
-      end    
           
       
       def leaveGroup(args)

data/lib/metamess/naming.rb

@@ -12,11 +12,11 @@
 
 module Dialog; module Naming; 
   module ChatContext
-    def ChatContext.Private; 'Private';  end  
-    def ChatContext.Noman; 'Noman';  end                
-    def ChatContext.Botman; 'Botman';  end          
-    def ChatContext.Climan; 'Climan';  end    
-    def ChatContext.Fullman; 'Fullman';  end          
+    def ChatContext.Private; 'private';  end  
+    def ChatContext.Noman; 'noman';  end                
+    def ChatContext.Botman; 'botman';  end          
+    def ChatContext.Climan; 'climan';  end    
+    def ChatContext.Fullman; 'fullman';  end          
   end
   
   module Class
@@ -57,6 +57,9 @@ module Dialog; module Naming;
           def Family.Notext; 'notext';  end              
             
           def Family.Contact; 'contact';  end
+          module Contact; module Genus     
+            def Genus.Main; 'main'; end          
+          end; end              
           def Family.Location; 'location';  end
           def Family.Invoice; 'invoice';  end                   
         end; end  

data/lib/metamess/service/service_o-inline_f.rb

@@ -28,8 +28,9 @@ module Dialog
         content_user(args)
         #location # TODO
         metamessGen(args,eval2mmsg = { 
-          :to           => {t1: '[:g][:inline]'},
-          :fFields      => {v1: :id, v2: :query, v3: :offset},
+          :to           => {t1: '[:fqndata][:g][:inline]'},
+          :fFields      => {v1: :id, v2: :query},
+          :fFieldsOpt   => {v1: :offset},                                      
         })        
         ### EOF BODY
         return final(args)
@@ -41,7 +42,7 @@ module Dialog
         ### BODY
         content_user(args)
         metamessGen(args,eval2mmsg = { 
-          :to           => {t1: '[:g][:inline]'},
+          :to           => {t1: '[:fqndata][:g][:inline]'},
           :fFields      => {v1: :result_id, v2: :query},
           :tFields      => {v1: :id, v2: :query},                                      
           :fFieldsOpt   => {v1: :inline_message_id},

data/lib/require.rb

@@ -21,12 +21,26 @@ module Dialog
       require 'socket'
       require 'fileutils'
       require 'open3'
+      require 'date'      
+      
 
-      ### DRY
+      ### GEMS
       require 'dry-configurable'
+      
+      
       require_relative './version.rb'
-      require_relative './configuration.rb'
       Dir.glob(File.join("#{File.dirname(__FILE__)}/triggers/**", "*.rb")).each{|f| require f}      
+      Dir.glob(File.join("#{File.dirname(__FILE__)}/begin/**", "*.rb")).each{|f| require f}            
+      require_relative './configuration.rb'
+    end
+    
+    def _require_background
+      require 'sidekiq'
+      require 'sidekiq/batch'   
+      require 'sidekiq/api'      
+      require 'sidekiq-status'      
+      require 'sidekiq-cron'
+      require 'sidekiq-rate-limiter'
     end
     
     
@@ -35,14 +49,19 @@ module Dialog
       require 'uri'
       require 'erb'
       require 'shellwords'
+      require 'drb'      
 
       ### GEMS
+      require 'active_support/time'       
       require 'dialect_lookup'
       require 'telegram/bot'
       require 'i18n'
       require 'redis'
       require 'concurrent'
       require 'oj'
+      require 'sidekiq'
+      require 'sidekiq/batch'                  
+      require 'sidekiq-status'      
       require 'sidekiq-cron'
       require 'sidekiq-rate-limiter'
       #lazy_object

data/lib/statistics/func.rb

@@ -0,0 +1,72 @@
+########    #######    ########    #######    ########    ########
+##     / / / /    License    \ \ \ \ 
+##    Copyleft culture, Copyright (C) is prohibited here
+##    This work is licensed under a CC BY-SA 4.0
+##    Creative Commons Attribution-ShareAlike 4.0 License
+##    Refer to the http://creativecommons.org/licenses/by-sa/4.0/
+########    #######    ########    #######    ########    ########
+##    / / / /    Code Climate    \ \ \ \ 
+##    Language = ruby
+##    Indent = space;    2 chars;
+########    #######    ########    #######    ########    ########
+
+module Dialog
+  module Statistics
+    class << self
+      
+    
+      def defHeaderUserOverall(args)
+        return {:type    => 'UserOverall', :typeKey => args[:mmsg][:fqndata][:o][:from][:id]}
+      end
+      
+      def pushStatUserOverall(args, push)
+        run = defHeaderUserOverall(args)
+        run[:key]   = push[:key]
+        run[:value] = push[:value] if push.has_key?(:value)
+        run[:redisOp] = push[:redisOp] if push.has_key?(:redisOp)
+        Dialog::Storage::Redis.pushStat(run)
+      end    
+      
+      
+      def defHeaderPerUser(args)
+        return {:type    => 'perUser', :typeKey => "#{args[:mmsg][:fqndata][:o][:from][:id]}:#{args[:mmsg][:fqndata][:o][:chat][:id]}"}
+      end      
+      
+      def pushStatPerUser(args, push)
+        run = defHeaderPerUser(args)
+        run[:key]   = push[:key]
+        run[:value] = push[:value] if push.has_key?(:value)
+        run[:redisOp] = push[:redisOp] if push.has_key?(:redisOp)
+        Dialog::Storage::Redis.pushStat(run)
+      end       
+      
+      
+      def defHeaderPerChat(args)
+        return {:type    => 'perChat', :typeKey => "#{args[:mmsg][:fqndata][:o][:chat][:id]}"}
+      end      
+      
+      def pushStatPerChat(args, push)
+        run = defHeaderPerChat(args)
+        run[:key]   = push[:key]
+        run[:value] = push[:value] if push.has_key?(:value)
+        run[:redisOp] = push[:redisOp] if push.has_key?(:redisOp)
+        Dialog::Storage::Redis.pushStat(run)
+      end        
+      
+      
+      def defHeaderFQNPerUser(args)
+        return {:type    => 'FQNPerUser', :typeKey => "#{args[:mmsg][:fqndata][:o][:from][:id]}:#{args[:mmsg][:fqn].map{|k,v| "#{v}"}.join('_')
+}"}
+      end      
+      
+      def pushStatFQNPerUser(args, push)
+        run = defHeaderFQNPerUser(args)
+        run[:key]   = push[:key]
+        run[:value] = push[:value] if push.has_key?(:value)
+        run[:redisOp] = push[:redisOp] if push.has_key?(:redisOp)
+        Dialog::Storage::Redis.pushStat(run)
+      end        
+      
+    end
+  end
+end

data/lib/statistics/general.rb

@@ -0,0 +1,44 @@
+########    #######    ########    #######    ########    ########
+##     / / / /    License    \ \ \ \ 
+##    Copyleft culture, Copyright (C) is prohibited here
+##    This work is licensed under a CC BY-SA 4.0
+##    Creative Commons Attribution-ShareAlike 4.0 License
+##    Refer to the http://creativecommons.org/licenses/by-sa/4.0/
+########    #######    ########    #######    ########    ########
+##    / / / /    Code Climate    \ \ \ \ 
+##    Language = ruby
+##    Indent = space;    2 chars;
+########    #######    ########    #######    ########    ########
+
+module Dialog
+  module Statistics
+    class << self
+    
+
+      def general(args)
+       
+        msgLast  = {:key => 'msgLast', :value => args[:mmsg][:fqndata][:o][:msg][:date]}
+        msgCount = {:key => 'msgCountOverall', :redisOp => 'inc'}
+        
+        ##UserOverall
+        pushStatUserOverall(args, msgLast)
+        pushStatUserOverall(args, msgCount)
+        
+        ##PerUser
+        pushStatPerUser(args, msgLast)
+        pushStatPerUser(args, msgCount)  
+
+        ##PerChat
+        pushStatPerChat(args, msgLast)
+        pushStatPerChat(args, msgCount)      
+        
+        ##PerFQN
+        pushStatFQNPerUser(args, msgLast)
+        pushStatFQNPerUser(args, msgCount)          
+       
+
+      end         
+      
+    end
+  end
+end

data/lib/statistics/redisDump.rb

@@ -0,0 +1,49 @@
+########    #######    ########    #######    ########    ########
+##     / / / /    License    \ \ \ \ 
+##    Copyleft culture, Copyright (C) is prohibited here
+##    This work is licensed under a CC BY-SA 4.0
+##    Creative Commons Attribution-ShareAlike 4.0 License
+##    Refer to the http://creativecommons.org/licenses/by-sa/4.0/
+########    #######    ########    #######    ########    ########
+##    / / / /    Code Climate    \ \ \ \ 
+##    Language = ruby
+##    Indent = space;    2 chars;
+########    #######    ########    #######    ########    ########
+
+module Dialog
+  module Statistics
+    class << self
+    
+      def redisDump2json
+      
+        require 'redis/dump'
+        require 'json'
+
+        stat = {}
+        redisDump = Redis::Dump.new 2, 'redis://localhost:4000'
+        dump = redisDump.dump
+
+        dump.each do |list|
+          src = JSON.parse(list)
+          preKey = src["key"].split(':')
+          keyHead = preKey[0].to_sym
+          stat[keyHead] ||= {}
+          keySecond = preKey[1].to_sym
+          stat[keyHead][keySecond] ||= {}
+          
+          preKey[2] ? keyType = preKey[2].to_sym : keyType = :main  
+          stat[keyHead][keySecond][keyType] ||= {}
+          
+          src["value"].each do |data|
+            stat[keyHead][keySecond][keyType][data[0][1..-1].to_sym] = data[1].to_i
+          end
+        end  
+
+
+        json = JSON.generate(stat)
+        return json
+      end
+
+    end
+  end
+end