telegem 1.0.6 → 2.0.0

data/lib/markup/keyboard.rb

@@ -12,37 +12,43 @@ module Telegem
         }.merge(options)
       end
 
-      # Create from array
       def self.[](*rows)
         new(rows)
       end
 
-      # Builder pattern
       def self.build(&block)
         builder = Builder.new
         builder.instance_eval(&block) if block_given?
         builder.keyboard
       end
 
-      # Add a row
       def row(*buttons)
         @buttons << buttons.flatten
         self
       end
 
-      # Add a button
       def button(text, **options)
-        last_row = @buttons.last || []
-
-        if last_row.is_a?(Array)
-          last_row << { text: text }.merge(options)
-        else
+        if @buttons.empty? || !@buttons.last.is_a?(Array)
           @buttons << [{ text: text }.merge(options)]
+        else
+          @buttons.last << { text: text }.merge(options)
         end
         self
       end
 
-      # Chainable options
+      def request_contact(text)
+        button(text, request_contact: true)
+      end
+
+      def request_location(text)
+        button(text, request_location: true)
+      end
+
+      def request_poll(text, type = nil)
+        opts = type ? { request_poll: { type: type } } : { request_poll: {} }
+        button(text, opts)
+      end
+
       def resize(resize = true)
         @options[:resize_keyboard] = resize
         self
@@ -58,7 +64,6 @@ module Telegem
         self
       end
 
-      # Convert to Telegram format
       def to_h
         {
           keyboard: @buttons.map { |row| row.is_a?(Array) ? row : [row] },
@@ -70,7 +75,6 @@ module Telegem
         to_h.to_json(*args)
       end
 
-      # Remove keyboard
       def self.remove(selective: false)
         {
           remove_keyboard: true,
@@ -78,7 +82,6 @@ module Telegem
         }
       end
 
-      # Force reply
       def self.force_reply(selective: false, input_field_placeholder: nil)
         markup = {
           force_reply: true,
@@ -96,67 +99,58 @@ module Telegem
         @buttons = buttons
       end
 
-      # Create from array
       def self.[](*rows)
         new(rows)
       end
 
-      # Builder pattern
       def self.build(&block)
         builder = InlineBuilder.new
         builder.instance_eval(&block) if block_given?
         builder.keyboard
       end
 
-      # Add a row
       def row(*buttons)
         @buttons << buttons.flatten
         self
       end
 
-      # Add a button
       def button(text, **options)
-        last_row = @buttons.last || []
-
-        if last_row.is_a?(Array)
-          last_row << { text: text }.merge(options)
-        else
+        if @buttons.empty? || !@buttons.last.is_a?(Array)
           @buttons << [{ text: text }.merge(options)]
+        else
+          @buttons.last << { text: text }.merge(options)
         end
         self
       end
 
-      # URL button
       def url(text, url)
         button(text, url: url)
       end
 
-      # Callback button
       def callback(text, data)
         button(text, callback_data: data)
       end
 
-      # Web app button
       def web_app(text, url)
         button(text, web_app: { url: url })
       end
 
-      # Login button
       def login(text, url, **options)
         button(text, login_url: { url: url, **options })
       end
 
-      # Switch inline query button
       def switch_inline(text, query = "")
         button(text, switch_inline_query: query)
       end
 
-      # Switch inline query current chat button
       def switch_inline_current(text, query = "")
         button(text, switch_inline_query_current_chat: query)
       end
 
-      # Convert to Telegram format
+      def pay(text)
+        button(text, pay: true)
+      end
+
       def to_h
         {
           inline_keyboard: @buttons.map { |row| row.is_a?(Array) ? row : [row] }
@@ -168,7 +162,6 @@ module Telegem
       end
     end
 
-    # Builder DSL for keyboards
     class Builder
       attr_reader :keyboard
 
@@ -181,8 +174,10 @@ module Telegem
           sub_builder = Builder.new
           sub_builder.instance_eval(&block)
           @keyboard.row(*sub_builder.keyboard.buttons.flatten(1))
-        else
+        elsif buttons.any?
           @keyboard.row(*buttons)
+        else
+          @keyboard.row
         end
         self
       end
@@ -192,8 +187,23 @@ module Telegem
         self
       end
 
+      def request_contact(text)
+        @keyboard.request_contact(text)
+        self
+      end
+
+      def request_location(text)
+        @keyboard.request_location(text)
+        self
+      end
+
+      def request_poll(text, type = nil)
+        @keyboard.request_poll(text, type)
+        self
+      end
+
       def method_missing(name, *args, &block)
-        if @keyboard.respond_to?(name)
+        if @keyboard && @keyboard.respond_to?(name)
           @keyboard.send(name, *args, &block)
         else
           super
@@ -201,11 +211,10 @@ module Telegem
       end
 
       def respond_to_missing?(name, include_private = false)
-        @keyboard.respond_to?(name) || super
+        @keyboard && @keyboard.respond_to?(name) || super
       end
     end
 
-    # Builder DSL for inline keyboards
     class InlineBuilder
       attr_reader :keyboard
 
@@ -218,8 +227,10 @@ module Telegem
           sub_builder = InlineBuilder.new
           sub_builder.instance_eval(&block)
           @keyboard.row(*sub_builder.keyboard.buttons.flatten(1))
-        else
+        elsif buttons.any?
           @keyboard.row(*buttons)
+        else
+          @keyboard.row
         end
         self
       end
@@ -259,8 +270,13 @@ module Telegem
         self
       end
 
+      def pay(text)
+        @keyboard.pay(text)
+        self
+      end
+
       def method_missing(name, *args, &block)
-        if @keyboard.respond_to?(name)
+        if @keyboard && @keyboard.respond_to?(name)
           @keyboard.send(name, *args, &block)
         else
           super
@@ -268,11 +284,10 @@ module Telegem
       end
 
       def respond_to_missing?(name, include_private = false)
-        @keyboard.respond_to?(name) || super
+        @keyboard && @keyboard.respond_to?(name) || super
       end
     end
 
-    # Shortcuts for common use
     class << self
       def keyboard(&block)
         Keyboard.build(&block)

data/lib/telegem.rb

@@ -1,8 +1,9 @@
 # lib/telegem.rb - MAIN ENTRY POINT
 require 'logger'
 require 'json'
+
 module Telegem
-  VERSION = "1.0.6".freeze
+  VERSION = "2.0.0".freeze
 end
 
 # Load core components
@@ -15,7 +16,7 @@ require_relative 'core/scene'
 require_relative 'session/middleware'
 require_relative 'session/memory_store'
 require_relative 'markup/keyboard'
-require_relative 'webhook/server'
+# Webhook is loaded lazily when needed
 
 module Telegem
   # Main entry point: Telegem.new(token)
@@ -47,6 +48,12 @@ module Telegem
     VERSION
   end
   
+  # Quick webhook setup
+  def self.webhook(bot, **options)
+    require_relative 'webhook/server'
+    Webhook::Server.setup(bot, **options)
+  end
+  
   # Framework information
   def self.info
     <<~INFO
@@ -61,13 +68,16 @@ module Telegem
       • Webhook and polling support
       • Built-in session management
       • Fluent keyboard DSL
+      • Cloud-ready webhook server
       
       Website: https://gitlab.com/ruby-telegem/telegem
     INFO
   end
 end
 
-# Also define a top-level shortcut for convenience
-def Telegem(token, **options)
-  Telegem.new(token, **options)
+# Optional global shortcut (enabled by env var)
+if ENV['TELEGEM_GLOBAL'] == 'true'
+  def Telegem(token, **options)
+    Telegem.new(token, **options)
+  end
 end