telegem 3.0.6 → 3.1.3

data/lib/core/scene.rb

@@ -1,90 +1,157 @@
-# lib/core/scene.rb - HTTPX VERSION (NO ASYNC GEM)
+
 module Telegem
   module Core
     class Scene
       attr_reader :id, :steps, :enter_callbacks, :leave_callbacks
-
+      
       def initialize(id, default_step: :start, &block)
         @id = id
         @steps = {}
         @enter_callbacks = []
         @leave_callbacks = []
         @default_step = default_step
+        @timeout = 300  # 5 minutes default timeout
+        
         instance_eval(&block) if block_given?
       end
-
+      
       def step(name, &action)
         @steps[name.to_sym] = action
         self
       end
-
+      
       def on_enter(&callback)
         @enter_callbacks << callback
         self
       end
-
+      
       def on_leave(&callback)
         @leave_callbacks << callback
         self
       end
-
-      def enter(ctx, step_name = nil)
+      
+      def timeout(seconds)
+        @timeout = seconds
+        self
+      end
+      
+  
+      def enter(ctx, step_name = nil, **initial_data)
         step_name ||= @default_step
         
-        # Store scene state in context
-        ctx.scene = { id: @id, step: step_name.to_sym }
+      
+        ctx.session[:telegem_scene] = {
+          id: @id.to_s,
+          step: step_name.to_s,
+          data: initial_data,
+          entered_at: Time.now.to_i,
+          timeout: @timeout,
+          waiting_for_response: false,
+          last_question: nil
+        }
         
-        # Run enter callbacks
+        ctx.instance_variable_set(:@current_scene, self)
+
         @enter_callbacks.each { |cb| cb.call(ctx) }
         
-        # Enter the first step
-        process_step(ctx, step_name)
-      end
 
-      def leave(ctx)
-        # Run leave callbacks
-        @leave_callbacks.each { |cb| cb.call(ctx) }
-        
-        # Clear scene from context
-        ctx.scene = nil
-        nil
+        execute_step(ctx, step_name)
       end
+      
 
-      def process_step(ctx, step_name)
-        step = @steps[step_name.to_sym]
+      def process(ctx)
+        scene_data = ctx.session[:telegem_scene]
+        return unless scene_data
         
-        unless step
-          ctx.logger.error("Unknown step #{step_name} in scene #{@id}")
-          return nil
+
+        if Time.now.to_i - scene_data[:entered_at] > scene_data[:timeout]
+          leave(ctx, :timeout)
+          return
         end
         
-        # Execute the step
-        result = step.call(ctx)
-        
-        # Update step in context (unless step changed it)
-        if ctx.scene && ctx.scene[:id] == @id
-          ctx.scene[:step] = step_name.to_sym
+        if scene_data[:waiting_for_response] && ctx.message&.text
+          process_response(ctx, scene_data)
+        else
+
+          execute_step(ctx, scene_data[:step])
         end
+      end
+
+      def leave(ctx, reason = :manual)
+        scene_data = ctx.session.delete(:telegem_scene)
+        ctx.instance_variable_set(:@current_scene, nil)
         
-        result
-      rescue => e
-        ctx.logger.error("Error processing step #{step_name} in scene #{@id}: #{e.message}")
-        ctx.logger.error(e.backtrace.join("\n")) if e.backtrace
-        nil
+
+        @leave_callbacks.each { |cb| cb.call(ctx, reason, scene_data[:data]) }
+        
+        scene_data[:data]
       end
+      
 
       def current_step(ctx)
-        return nil unless ctx.scene && ctx.scene[:id] == @id
-        ctx.scene[:step]
+        scene_data = ctx.session[:telegem_scene]
+        scene_data[:step] if scene_data
+      end
+      
+      
+      def scene_data(ctx)
+        ctx.session[:telegem_scene]&.[](:data) || {}
       end
+      
+      private
 
-      def reset(ctx)
-        ctx.scene = { id: @id, step: @default_step }
-        self
+      def execute_step(ctx, step_name)
+        action = @steps[step_name.to_sym]
+        return leave(ctx, :invalid_step) unless action
+
+        scene_data = ctx.session[:telegem_scene]
+        scene_data[:step] = step_name.to_s
+        scene_data[:waiting_for_response] = false
+        scene_data[:last_question] = nil
+        
+       
+        result = action.call(ctx, scene_data[:data])
+        
+
+        if result.is_a?(Symbol) || result.is_a?(String)
+          next_step(ctx, result)
+        end
+        
+        result
       end
+      
+      
+      def process_response(ctx, scene_data)
 
-      def to_s
-        "#<Scene #{@id}>"
+        current_step_name = scene_data[:step]
+        scene_data[:data][current_step_name] = ctx.message.text
+        
+  
+        scene_data[:waiting_for_response] = false
+        
+        next_step(ctx)
+      end
+      
+
+      def next_step(ctx, specific_step = nil)
+        scene_data = ctx.session[:telegem_scene]
+        return unless scene_data
+        
+        current_step = scene_data[:step].to_sym
+        step_names = @steps.keys
+        
+        if specific_step
+          next_step_name = specific_step.to_sym
+        else
+          current_index = step_names.index(current_step)
+          next_step_name = step_names[current_index + 1] if current_index
+        end
+        
+        if next_step_name
+          execute_step(ctx, next_step_name)
+        else
+          leave(ctx, :completed)
+        end
       end
     end
   end

data/lib/plugins/file_extract.rb

@@ -0,0 +1,97 @@
+require 'json'
+require 'pdf/reader'
+
+module Telegem
+  module Plugins
+    class FileExtractor
+      def initialize(bot, file_id, **options)
+        @bot = bot
+        @file_id = file_id
+        @options = {
+          timeout: 15,
+          auto_delete: true,
+          file_type: nil
+        }.merge(options)
+        file_path = "temp/#{@file_id}"
+        download_file(file_path)
+      end
+
+      def download_file(file_path)
+        if @options[:file_type] == :pdf
+          extract_pdf(file_path)
+        elsif @options[:file_type] == :json
+          extract_json(file_path)
+        elsif @options[:file_type] == :html
+          extract_html(file_path)
+        elsif @options[:file_type] == :txt
+          extract_text(file_path)
+        else
+          { error: "unsupported file type" }
+        end
+      end
+
+      def extract_pdf(file_path)
+        begin
+          @bot.api.download(@file_id, "#{file_path}.pdf")
+          reader = PDF::Reader.new("#{file_path}.pdf")
+          text = reader.pages.map(&:text).join("\n").strip
+
+          if text.empty?
+            { error: "pdf is empty" }
+          else
+            result = {
+              success: true,
+              content: text,
+              pages: reader.page_count,
+            }
+            File.delete("#{file_path}.pdf") if @options[:auto_delete]
+            result
+          end
+        rescue PDF::Reader::MalformedPDFError
+          { error: "malformed pdf format" }
+        rescue PDF::Reader::EncryptedPDFError
+          { error: "encrypted pdf" }
+        rescue => e
+          { error: "pdf processing failed #{e.message}" }
+        ensure
+          File.delete("#{file_path}.pdf") if @options[:auto_delete] && File.exist?("#{file_path}.pdf")
+        end
+      end
+
+      def extract_json(file_path)
+        @bot.api.download(@file_id, "#{file_path}.json")
+        json_data = JSON.parse(File.read("#{file_path}.json"))
+        if File.exist?("#{file_path}.json")
+          {
+            success: true,
+            content: json_data
+          }
+        else
+          {
+            error: "no json file"
+          }
+        end
+      end
+
+      def extract_html(file_path)
+        destination = "#{file_path}.html"
+        @bot.api.download(@file_id, destination)
+        html = File.read(destination)
+        if html.empty?
+          {
+            error: "html content is empty"
+          }
+        else
+          {
+            success: true,
+            content: html
+          }
+        end
+      rescue => e
+        {
+          error: "error #{e.message}"
+        }
+      end
+    end
+  end
+end

data/lib/session/scene_middleware.rb

@@ -0,0 +1,22 @@
+
+module Telegem
+  module Scene
+    class Middleware
+      def call(ctx, next_middleware)
+        # Check if user is in a scene
+        if ctx.session[:telegem_scene]
+          scene_data = ctx.session[:telegem_scene]
+          scene = ctx.bot.scenes[scene_data[:id].to_sym]
+          
+          if scene
+            # Let scene handle it
+            scene.process(ctx)
+          end
+        end
+        
+        # Not in scene, proceed normally
+        next_middleware.call(ctx)
+      end
+    end
+  end
+end

data/lib/telegem.rb

@@ -3,7 +3,7 @@ require 'logger'
 require 'json'
 
 module Telegem
-  VERSION = "3.0.6".freeze 
+  VERSION = "3.1.3".freeze 
 end
 
 # Load core components
@@ -17,6 +17,8 @@ require_relative 'session/middleware'
 require_relative 'session/memory_store'
 require_relative 'markup/keyboard'
 # Webhook is loaded lazily when needed
+require_relative 'plugins/file_extract'
+require_relative 'session/scene_middleware'
 
 module Telegem
   # Main entry point: Telegem.new(token)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: telegem
 version: !ruby/object:Gem::Version
-  version: 3.0.6
+  version: 3.1.3
 platform: ruby
 authors:
 - sick_phantom
@@ -13,98 +13,72 @@ dependencies:
   name: httpx
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rack
+  name: async
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: puma
+  name: pdf-reader
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: async
+  name: docx
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -119,34 +93,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.12'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.22'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.22'
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.18'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.18'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -174,6 +120,7 @@ extra_rdoc_files: []
 files:
 - ".replit"
 - CHANGELOG
+- CODE_OF_CONDUCT.md
 - Contributing.md
 - Gemfile
 - Gemfile.lock
@@ -182,26 +129,21 @@ files:
 - Starts_HallofFame.md
 - bin/.gitkeep
 - bin/telegem-ssl
-- docs-src/.gitkeep
-- docs-src/Bot-registration_.PNG
-- docs-src/bot.md
-- docs-src/context|ctx|.md
-- docs-src/ctx.md
-- docs-src/getting-started.md
-- docs-src/keyboard_inline.md
-- docs-src/scene.md
-- docs-src/webhook.md
 - examples/.gitkeep
 - lib/api/client.rb
 - lib/api/types.rb
 - lib/core/bot.rb
 - lib/core/composer.rb
 - lib/core/context.rb
+- lib/core/rate_limit.rb
 - lib/core/scene.rb
 - lib/markup/.gitkeep
 - lib/markup/keyboard.rb
+- lib/plugins/.gitkeep
+- lib/plugins/file_extract.rb
 - lib/session/memory_store.rb
 - lib/session/middleware.rb
+- lib/session/scene_middleware.rb
 - lib/telegem.rb
 - lib/webhook/.gitkeep
 - lib/webhook/server.rb
@@ -216,7 +158,7 @@ metadata:
   bug_tracker_uri: https://gitlab.com/ruby-telegem/telegem/-/issues
   documentation_uri: https://gitlab.com/ruby-telegem/telegem/-/tree/main/docs-src?ref_type=heads
   rubygems_mfa_required: 'false'
-post_install_message: "Thanks for installing Telegem 3.0.6!\n\n\U0001F4DA Documentation:
+post_install_message: "Thanks for installing Telegem 3.1.3!\n\n\U0001F4DA Documentation:
   https://gitlab.com/ruby-telegem/telegem\n\n\U0001F510 For SSL Webhooks:\nRun: telegem-ssl
   your-domain.com\nThis sets up Let's Encrypt certificates automatically.\n\n\U0001F916
   Happy bot building!\n"