flow_chat 0.4.1 → 0.4.2

data/lib/flow_chat/whatsapp/configuration.rb

@@ -2,7 +2,7 @@ module FlowChat
   module Whatsapp
     class Configuration
       attr_accessor :access_token, :phone_number_id, :verify_token, :app_id, :app_secret,
-                    :webhook_url, :webhook_verify_token, :business_account_id, :name
+        :webhook_url, :webhook_verify_token, :business_account_id, :name
 
       # Class-level storage for named configurations
       @@configurations = {}
@@ -24,7 +24,7 @@ module FlowChat
       # Load configuration from Rails credentials or environment variables
       def self.from_credentials
         config = new(nil)
-        
+
         if defined?(Rails) && Rails.application.credentials.whatsapp
           credentials = Rails.application.credentials.whatsapp
           config.access_token = credentials[:access_token]
@@ -36,13 +36,13 @@ module FlowChat
           config.business_account_id = credentials[:business_account_id]
         else
           # Fallback to environment variables
-          config.access_token = ENV['WHATSAPP_ACCESS_TOKEN']
-          config.phone_number_id = ENV['WHATSAPP_PHONE_NUMBER_ID']
-          config.verify_token = ENV['WHATSAPP_VERIFY_TOKEN']
-          config.app_id = ENV['WHATSAPP_APP_ID']
-          config.app_secret = ENV['WHATSAPP_APP_SECRET']
-          config.webhook_url = ENV['WHATSAPP_WEBHOOK_URL']
-          config.business_account_id = ENV['WHATSAPP_BUSINESS_ACCOUNT_ID']
+          config.access_token = ENV["WHATSAPP_ACCESS_TOKEN"]
+          config.phone_number_id = ENV["WHATSAPP_PHONE_NUMBER_ID"]
+          config.verify_token = ENV["WHATSAPP_VERIFY_TOKEN"]
+          config.app_id = ENV["WHATSAPP_APP_ID"]
+          config.app_secret = ENV["WHATSAPP_APP_SECRET"]
+          config.webhook_url = ENV["WHATSAPP_WEBHOOK_URL"]
+          config.business_account_id = ENV["WHATSAPP_BUSINESS_ACCOUNT_ID"]
         end
 
         config
@@ -110,4 +110,4 @@ module FlowChat
       end
     end
   end
-end 
+end

data/lib/flow_chat/whatsapp/gateway/cloud_api.rb

@@ -32,9 +32,7 @@ module FlowChat
         end
 
         # Expose client for out-of-band messaging
-        def client
-          @client
-        end
+        attr_reader :client
 
         private
 
@@ -53,7 +51,7 @@ module FlowChat
           params = controller.request.params
 
           verify_token = @config.verify_token
-          
+
           if params["hub.verify_token"] == verify_token
             controller.render plain: params["hub.challenge"]
           else
@@ -159,7 +157,7 @@ module FlowChat
         def handle_message_background(context, controller)
           # Process the flow synchronously (maintaining controller context)
           response = @app.call(context)
-          
+
           if response
             # Queue only the response delivery asynchronously
             send_data = {
@@ -170,7 +168,7 @@ module FlowChat
 
             # Get job class from configuration
             job_class_name = FlowChat::Config.whatsapp.background_job_class
-            
+
             # Enqueue background job for sending only
             begin
               job_class = job_class_name.constantize
@@ -186,12 +184,12 @@ module FlowChat
 
         def handle_message_simulator(context, controller)
           response = @app.call(context)
-          
+
           if response
             # For simulator mode, return the response data in the HTTP response
             # instead of actually sending via WhatsApp API
             message_payload = @client.build_message_payload(response, context["request.msisdn"])
-            
+
             simulator_response = {
               mode: "simulator",
               webhook_processed: true,
@@ -204,10 +202,10 @@ module FlowChat
             }
 
             controller.render json: simulator_response
-            return
+            nil
           end
         end
       end
     end
   end
-end 
+end

data/lib/flow_chat/whatsapp/middleware/executor.rb

@@ -27,4 +27,4 @@ module FlowChat
       end
     end
   end
-end 
+end

data/lib/flow_chat/whatsapp/processor.rb

@@ -23,4 +23,4 @@ module FlowChat
       end
     end
   end
-end 
+end

data/lib/flow_chat/whatsapp/prompt.rb

@@ -57,10 +57,10 @@ module FlowChat
         end
 
         buttons = [
-          { id: "yes", title: "Yes" },
-          { id: "no", title: "No" }
+          {id: "yes", title: "Yes"},
+          {id: "no", title: "No"}
         ]
-        raise FlowChat::Interrupt::Prompt.new([:interactive_buttons, message, { buttons: buttons }])
+        raise FlowChat::Interrupt::Prompt.new([:interactive_buttons, message, {buttons: buttons}])
       end
 
       private
@@ -72,15 +72,15 @@ module FlowChat
 
         case media_type.to_sym
         when :image
-          [:media_image, "", { url: url, caption: message }]
+          [:media_image, "", {url: url, caption: message}]
         when :document
-          [:media_document, "", { url: url, caption: message, filename: filename }]
+          [:media_document, "", {url: url, caption: message, filename: filename}]
         when :audio
-          [:media_audio, "", { url: url, caption: message }]
+          [:media_audio, "", {url: url, caption: message}]
         when :video
-          [:media_video, "", { url: url, caption: message }]
+          [:media_video, "", {url: url, caption: message}]
         when :sticker
-          [:media_sticker, "", { url: url }] # Stickers don't support captions
+          [:media_sticker, "", {url: url}] # Stickers don't support captions
         else
           raise ArgumentError, "Unsupported media type: #{media_type}"
         end
@@ -113,21 +113,19 @@ module FlowChat
           }
         end
 
-        [:interactive_buttons, message, { buttons: buttons }]
+        [:interactive_buttons, message, {buttons: buttons}]
       end
 
       def build_list_prompt(message, choices)
         items = choices.map do |key, value|
           original_text = value.to_s
           truncated_title = truncate_text(original_text, 24)
-          
+
           # If title was truncated, put full text in description (up to 72 chars)
           description = if original_text.length > 24
-                         truncate_text(original_text, 72)
-                       else
-                         nil
-                       end
-          
+            truncate_text(original_text, 72)
+          end
+
           {
             id: key.to_s,
             title: truncated_title,
@@ -136,8 +134,8 @@ module FlowChat
         end
 
         # If 10 or fewer items, use single section
-        if items.length <= 10
-          sections = [
+        sections = if items.length <= 10
+          [
             {
               title: "Options",
               rows: items
@@ -145,10 +143,10 @@ module FlowChat
           ]
         else
           # Paginate into multiple sections (max 10 items per section)
-          sections = items.each_slice(10).with_index.map do |section_items, index|
+          items.each_slice(10).with_index.map do |section_items, index|
             start_num = (index * 10) + 1
             end_num = start_num + section_items.length - 1
-            
+
             {
               title: "#{start_num}-#{end_num}",
               rows: section_items
@@ -156,7 +154,7 @@ module FlowChat
           end
         end
 
-        [:interactive_list, message, { sections: sections }]
+        [:interactive_list, message, {sections: sections}]
       end
 
       def process_input(input, transform, validate, convert)
@@ -178,8 +176,8 @@ module FlowChat
       end
 
       def process_selection(input, choices, transform, validate, convert)
-        choice_hash = choices.is_a?(Array) ? 
-          choices.each_with_index.to_h { |choice, index| [index.to_s, choice] } : 
+        choice_hash = choices.is_a?(Array) ?
+          choices.each_with_index.to_h { |choice, index| [index.to_s, choice] } :
           choices
 
         # Check if input matches a valid choice
@@ -199,13 +197,11 @@ module FlowChat
 
       def process_boolean(input, transform, validate, convert)
         boolean_value = case input.to_s.downcase
-                       when "yes", "y", "1", "true"
-                         true
-                       when "no", "n", "0", "false"
-                         false
-                       else
-                         nil
-                       end
+        when "yes", "y", "1", "true"
+          true
+        when "no", "n", "0", "false"
+          false
+        end
 
         if boolean_value.nil?
           raise FlowChat::Interrupt::Prompt.new([:text, "Please answer with Yes or No.", {}])
@@ -220,7 +216,7 @@ module FlowChat
           raise ArgumentError, "choices cannot be empty"
         end
 
-        choice_count = choices.is_a?(Array) ? choices.length : choices.length
+        choice_count = choices.length
 
         # WhatsApp supports max 100 total items across all sections
         if choice_count > 100
@@ -248,4 +244,4 @@ module FlowChat
       end
     end
   end
-end 
+end

data/lib/flow_chat/whatsapp/send_job_support.rb

@@ -15,11 +15,11 @@ module FlowChat
       def perform_whatsapp_send(send_data)
         config = resolve_whatsapp_config(send_data)
         client = FlowChat::Whatsapp::Client.new(config)
-        
+
         result = client.send_message(send_data[:msisdn], send_data[:response])
-        
+
         if result
-          Rails.logger.info "WhatsApp message sent successfully: #{result['messages']&.first&.dig('id')}"
+          Rails.logger.info "WhatsApp message sent successfully: #{result["messages"]&.first&.dig("id")}"
           on_whatsapp_send_success(send_data, result)
         else
           Rails.logger.error "Failed to send WhatsApp message to #{send_data[:msisdn]}"
@@ -47,20 +47,20 @@ module FlowChat
       def handle_whatsapp_send_error(error, send_data, config = nil)
         Rails.logger.error "WhatsApp send job error: #{error.message}"
         Rails.logger.error error.backtrace&.join("\n") if error.backtrace
-        
+
         # Try to send error message to user if we have config
         if config
           begin
             client = FlowChat::Whatsapp::Client.new(config)
             client.send_text(
-              send_data[:msisdn], 
+              send_data[:msisdn],
               "⚠️ We're experiencing technical difficulties. Please try again in a few minutes."
             )
           rescue => send_error
             Rails.logger.error "Failed to send error message: #{send_error.message}"
           end
         end
-        
+
         # Re-raise for job retry logic
         raise error
       end
@@ -76,4 +76,4 @@ module FlowChat
       end
     end
   end
-end 
+end

data/lib/flow_chat/whatsapp/template_manager.rb

@@ -16,7 +16,7 @@ module FlowChat
           type: "template",
           template: {
             name: template_name,
-            language: { code: language },
+            language: {code: language},
             components: components
           }
         }
@@ -27,7 +27,7 @@ module FlowChat
       # Common template structures
       def send_welcome_template(to:, name: nil)
         components = []
-        
+
         if name
           components << {
             type: "header",
@@ -87,7 +87,7 @@ module FlowChat
       def create_template(name:, category:, language: "en_US", components: [])
         business_account_id = @config.business_account_id
         uri = URI("https://graph.facebook.com/v18.0/#{business_account_id}/message_templates")
-        
+
         template_data = {
           name: name,
           category: category, # AUTHENTICATION, MARKETING, UTILITY
@@ -111,7 +111,7 @@ module FlowChat
       def list_templates
         business_account_id = @config.business_account_id
         uri = URI("https://graph.facebook.com/v18.0/#{business_account_id}/message_templates")
-        
+
         http = Net::HTTP.new(uri.host, uri.port)
         http.use_ssl = true
 
@@ -125,7 +125,7 @@ module FlowChat
       # Get template status
       def template_status(template_id)
         uri = URI("https://graph.facebook.com/v18.0/#{template_id}")
-        
+
         http = Net::HTTP.new(uri.host, uri.port)
         http.use_ssl = true
 
@@ -149,7 +149,7 @@ module FlowChat
         request.body = message_data.to_json
 
         response = http.request(request)
-        
+
         unless response.is_a?(Net::HTTPSuccess)
           Rails.logger.error "WhatsApp Template API error: #{response.body}"
           return nil
@@ -159,4 +159,4 @@ module FlowChat
       end
     end
   end
-end 
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flow_chat
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Stefan Froelich