rubyn-code 0.1.0 → 0.2.0

data/lib/rubyn_code/tools/schema.rb

@@ -4,17 +4,17 @@ module RubynCode
   module Tools
     module Schema
       TYPE_MAP = {
-        string: "string",
-        integer: "integer",
-        number: "number",
-        boolean: "boolean",
-        array: "array",
-        object: "object"
+        string: 'string',
+        integer: 'integer',
+        number: 'number',
+        boolean: 'boolean',
+        array: 'array',
+        object: 'object'
       }.freeze
 
       class << self
         def build(params_hash)
-          return { type: "object", properties: {}, required: [] } if params_hash.empty?
+          return { type: 'object', properties: {}, required: [] } if params_hash.empty?
 
           properties = {}
           required = []
@@ -28,7 +28,7 @@ module RubynCode
           end
 
           schema = {
-            type: "object",
+            type: 'object',
             properties: properties
           }
           schema[:required] = required unless required.empty?
@@ -47,9 +47,7 @@ module RubynCode
           prop[:default] = spec[:default] if spec.key?(:default)
           prop[:enum] = spec[:enum] if spec[:enum]
 
-          if spec[:items]
-            prop[:items] = build_property(spec[:items])
-          end
+          prop[:items] = build_property(spec[:items]) if spec[:items]
 
           prop
         end

data/lib/rubyn_code/tools/send_message.rb

@@ -1,18 +1,18 @@
 # frozen_string_literal: true
 
-require_relative "base"
-require_relative "registry"
+require_relative 'base'
+require_relative 'registry'
 
 module RubynCode
   module Tools
     # Tool for sending messages to teammates via the team mailbox.
     class SendMessage < Base
-      TOOL_NAME = "send_message"
-      DESCRIPTION = "Sends a message to a teammate. Used for inter-agent communication within a team."
+      TOOL_NAME = 'send_message'
+      DESCRIPTION = 'Sends a message to a teammate. Used for inter-agent communication within a team.'
       PARAMETERS = {
-        to: { type: :string, required: true, description: "Name of the recipient teammate" },
-        content: { type: :string, required: true, description: "Message content to send" },
-        message_type: { type: :string, required: false, default: "message",
+        to: { type: :string, required: true, description: 'Name of the recipient teammate' },
+        content: { type: :string, required: true, description: 'Message content to send' },
+        message_type: { type: :string, required: false, default: 'message',
                         description: 'Type of message (default: "message")' }
       }.freeze
       RISK_LEVEL = :write
@@ -33,9 +33,9 @@ module RubynCode
       # @param content [String] message body
       # @param message_type [String] type of message
       # @return [String] confirmation with the message id
-      def execute(to:, content:, message_type: "message")
-        raise Error, "Recipient name is required" if to.nil? || to.strip.empty?
-        raise Error, "Message content is required" if content.nil? || content.strip.empty?
+      def execute(to:, content:, message_type: 'message')
+        raise Error, 'Recipient name is required' if to.nil? || to.strip.empty?
+        raise Error, 'Message content is required' if content.nil? || content.strip.empty?
 
         message_id = @mailbox.send(
           from: @sender_name,

data/lib/rubyn_code/tools/spawn_agent.rb

@@ -1,19 +1,19 @@
 # frozen_string_literal: true
 
-require_relative "base"
-require_relative "registry"
+require_relative 'base'
+require_relative 'registry'
 
 module RubynCode
   module Tools
     class SpawnAgent < Base
-      TOOL_NAME = "spawn_agent"
-      DESCRIPTION = "Spawn an isolated sub-agent to handle a task. The sub-agent gets its own fresh context, " \
+      TOOL_NAME = 'spawn_agent'
+      DESCRIPTION = 'Spawn an isolated sub-agent to handle a task. The sub-agent gets its own fresh context, ' \
                     "works independently, and returns only a summary. Use 'explore' type for research/reading, " \
                     "'worker' type for writing code/files. The sub-agent shares the filesystem but not your conversation."
       PARAMETERS = {
         prompt: {
           type: :string,
-          description: "The task for the sub-agent to perform",
+          description: 'The task for the sub-agent to perform',
           required: true
         },
         agent_type: {
@@ -28,7 +28,7 @@ module RubynCode
       # These get injected by the executor or the REPL
       attr_writer :llm_client, :on_status
 
-      def execute(prompt:, agent_type: "explore")
+      def execute(prompt:, agent_type: 'explore')
         type = agent_type.to_sym
         callback = @on_status || method(:default_status)
         @tool_count = 0
@@ -37,25 +37,53 @@ module RubynCode
 
         tools = tools_for_type(type)
 
-        result = run_sub_agent(prompt: prompt, tools: tools, type: type, callback: callback)
+        result, hit_limit = run_sub_agent(prompt: prompt, tools: tools, type: type, callback: callback)
 
         callback.call(:done, "Agent finished (#{@tool_count} tool calls).")
 
         summary = RubynCode::SubAgents::Summarizer.call(result, max_length: 3000)
-        "## Sub-Agent Result (#{type})\n\n#{summary}"
+
+        if hit_limit
+          "## Sub-Agent Result (#{type}) — INCOMPLETE (reached #{@tool_count} tool calls)\n\n" \
+            "The sub-agent ran out of turns before finishing. Here is what it accomplished so far:\n\n#{summary}"
+        else
+          "## Sub-Agent Result (#{type})\n\n#{summary}"
+        end
       end
 
       private
 
+      # Returns [result_text, hit_limit] tuple
       def run_sub_agent(prompt:, tools:, type:, callback:)
         conversation = RubynCode::Agent::Conversation.new
         conversation.add_user_message(prompt)
 
-        max_iterations = type == :explore ? 20 : 30
+        max_iterations = if type == :explore
+                           Config::Defaults::MAX_EXPLORE_AGENT_ITERATIONS
+                         else
+                           Config::Defaults::MAX_SUB_AGENT_ITERATIONS
+                         end
         iteration = 0
+        last_text = nil
 
         loop do
-          break if iteration >= max_iterations
+          if iteration >= max_iterations
+            # Ask the LLM for a final summary of what it accomplished so far
+            conversation.add_user_message(
+              'You have reached your turn limit. Summarize everything you found or accomplished so far. ' \
+              'Be thorough — this is your last chance to report back.'
+            )
+            response = @llm_client.chat(
+              messages: conversation.to_api_format,
+              tools: [],
+              system: sub_agent_system_prompt(type)
+            )
+            content = response.respond_to?(:content) ? Array(response.content) : []
+            text_blocks = content.select { |b| b.respond_to?(:type) && b.type == 'text' }
+            summary = text_blocks.map(&:text).join("\n")
+
+            return [summary.empty? ? (last_text || '') : summary, true]
+          end
 
           response = @llm_client.chat(
             messages: conversation.to_api_format,
@@ -64,14 +92,15 @@ module RubynCode
           )
 
           content = response.respond_to?(:content) ? Array(response.content) : []
-          tool_calls = content.select { |b| b.respond_to?(:type) && b.type == "tool_use" }
+          tool_calls = content.select { |b| b.respond_to?(:type) && b.type == 'tool_use' }
+
+          # Track the latest text output for partial results
+          text_blocks = content.select { |b| b.respond_to?(:type) && b.type == 'text' }
+          last_text = text_blocks.map(&:text).join("\n") unless text_blocks.empty?
 
           if tool_calls.empty?
-            # Final text response
-            text = content.select { |b| b.respond_to?(:type) && b.type == "text" }
-                          .map(&:text).join("\n")
             conversation.add_assistant_message(content)
-            return text
+            return [last_text || '', false]
           end
 
           # Add assistant message with tool calls
@@ -84,20 +113,21 @@ module RubynCode
             id = tc.respond_to?(:id) ? tc.id : tc[:id]
 
             @tool_count += 1
-            callback.call(:tool, "#{name}")
+            callback.call(:tool, name.to_s)
 
             begin
               tool_class = RubynCode::Tools::Registry.get(name)
 
               # Block recursive spawning
               if %w[spawn_agent].include?(name)
-                conversation.add_tool_result(id, name, "Error: Sub-agents cannot spawn other agents.", is_error: true)
+                conversation.add_tool_result(id, name, 'Error: Sub-agents cannot spawn other agents.', is_error: true)
                 next
               end
 
               # Block write tools for explore agents
               if type == :explore && tool_class.risk_level != :read
-                conversation.add_tool_result(id, name, "Error: Explore agents can only use read-only tools.", is_error: true)
+                conversation.add_tool_result(id, name, 'Error: Explore agents can only use read-only tools.',
+                                             is_error: true)
                 next
               end
 
@@ -113,8 +143,6 @@ module RubynCode
 
           iteration += 1
         end
-
-        "Sub-agent reached iteration limit (#{max_iterations})."
       end
 
       def tools_for_type(type)
@@ -132,7 +160,7 @@ module RubynCode
       end
 
       def sub_agent_system_prompt(type)
-        base = "You are a Rubyn sub-agent. Complete your task efficiently and return a clear summary of what you found or did."
+        base = 'You are a Rubyn sub-agent. Complete your task efficiently and return a clear summary of what you found or did.'
 
         case type
         when :explore
@@ -144,8 +172,8 @@ module RubynCode
         end
       end
 
-      def default_status(type, message)
-        $stderr.puts "[sub-agent] #{message}" if ENV["RUBYN_DEBUG"]
+      def default_status(_type, message)
+        RubynCode::Debug.agent("sub-agent: #{message}")
       end
     end
 

data/lib/rubyn_code/tools/spawn_teammate.rb

@@ -1,19 +1,19 @@
 # frozen_string_literal: true
 
-require_relative "base"
-require_relative "registry"
+require_relative 'base'
+require_relative 'registry'
 
 module RubynCode
   module Tools
     class SpawnTeammate < Base
-      TOOL_NAME = "spawn_teammate"
-      DESCRIPTION = "Spawn a persistent named teammate agent with a role and an initial task. " \
-                    "The teammate gets its own conversation, processes the initial prompt, and " \
-                    "remains available via the mailbox for further messages."
+      TOOL_NAME = 'spawn_teammate'
+      DESCRIPTION = 'Spawn a persistent named teammate agent with a role and an initial task. ' \
+                    'The teammate gets its own conversation, processes the initial prompt, and ' \
+                    'remains available via the mailbox for further messages.'
       PARAMETERS = {
         name: {
           type: :string,
-          description: "Unique name for the teammate",
+          description: 'Unique name for the teammate',
           required: true
         },
         role: {
@@ -23,7 +23,7 @@ module RubynCode
         },
         prompt: {
           type: :string,
-          description: "Initial task or instruction for the teammate",
+          description: 'Initial task or instruction for the teammate',
           required: true
         }
       }.freeze
@@ -34,8 +34,8 @@ module RubynCode
       def execute(name:, role:, prompt:)
         callback = @on_status || method(:default_status)
 
-        raise Error, "LLM client not available" unless @llm_client
-        raise Error, "Database not available" unless @db
+        raise Error, 'LLM client not available' unless @llm_client
+        raise Error, 'Database not available' unless @db
 
         mailbox = Teams::Mailbox.new(@db)
         manager = Teams::Manager.new(@db, mailbox: mailbox)
@@ -58,8 +58,8 @@ module RubynCode
         conversation.add_user_message(initial_prompt)
 
         system_prompt = "You are #{teammate.name}, a #{teammate.role} teammate agent. " \
-                        "Complete tasks efficiently. Use tools when needed. " \
-                        "When done, provide a clear summary of what you accomplished."
+                        'Complete tasks efficiently. Use tools when needed. ' \
+                        'When done, provide a clear summary of what you accomplished.'
 
         tools = tools_for_teammate
         max_iterations = Config::Defaults::MAX_SUB_AGENT_ITERATIONS
@@ -72,16 +72,16 @@ module RubynCode
           )
 
           content = response.respond_to?(:content) ? Array(response.content) : []
-          tool_calls = content.select { |b| b.respond_to?(:type) && b.type == "tool_use" }
+          tool_calls = content.select { |b| b.respond_to?(:type) && b.type == 'tool_use' }
 
           if tool_calls.empty?
-            text = content.select { |b| b.respond_to?(:type) && b.type == "text" }
+            text = content.select { |b| b.respond_to?(:type) && b.type == 'text' }
                           .map(&:text).join("\n")
             conversation.add_assistant_message(content)
             callback.call(:done, "Teammate '#{teammate.name}' finished initial task.")
 
             # Send result back to main agent inbox
-            mailbox.send(from: teammate.name, to: "rubyn", content: text)
+            mailbox.send(from: teammate.name, to: 'rubyn', content: text)
 
             # Now loop waiting for new messages
             poll_inbox(teammate, conversation, tools, system_prompt, mailbox, callback)
@@ -95,10 +95,10 @@ module RubynCode
         callback.call(:done, "Teammate '#{teammate.name}' reached iteration limit.")
       rescue StandardError => e
         callback.call(:done, "Teammate '#{teammate.name}' error: #{e.message}")
-        $stderr.puts "[Teammate #{teammate.name}] Error: #{e.class}: #{e.message}" if ENV["RUBYN_DEBUG"]
+        RubynCode::Debug.agent("Teammate #{teammate.name} error: #{e.class}: #{e.message}")
       end
 
-      def poll_inbox(teammate, conversation, tools, system_prompt, mailbox, callback)
+      def poll_inbox(teammate, conversation, tools, system_prompt, mailbox, _callback)
         loop do
           sleep Config::Defaults::POLL_INTERVAL
 
@@ -117,13 +117,13 @@ module RubynCode
             content = response.respond_to?(:content) ? Array(response.content) : []
             conversation.add_assistant_message(content)
 
-            text = content.select { |b| b.respond_to?(:type) && b.type == "text" }
+            text = content.select { |b| b.respond_to?(:type) && b.type == 'text' }
                           .map(&:text).join("\n")
             mailbox.send(from: teammate.name, to: msg[:from], content: text) unless text.empty?
           end
         end
       rescue StandardError => e
-        $stderr.puts "[Teammate #{teammate.name}] Poll error: #{e.message}" if ENV["RUBYN_DEBUG"]
+        RubynCode::Debug.agent("Teammate #{teammate.name} poll error: #{e.message}")
       end
 
       def execute_tool_calls(tool_calls, conversation, callback)
@@ -137,7 +137,7 @@ module RubynCode
           begin
             # Block recursive spawning
             if %w[spawn_agent spawn_teammate].include?(name)
-              conversation.add_tool_result(id, name, "Error: Teammates cannot spawn other agents.", is_error: true)
+              conversation.add_tool_result(id, name, 'Error: Teammates cannot spawn other agents.', is_error: true)
               next
             end
 
@@ -159,7 +159,7 @@ module RubynCode
       end
 
       def default_status(_type, message)
-        $stderr.puts "[spawn_teammate] #{message}" if ENV["RUBYN_DEBUG"]
+        RubynCode::Debug.agent("spawn_teammate: #{message}")
       end
     end
 

data/lib/rubyn_code/tools/task.rb

@@ -1,53 +1,53 @@
 # frozen_string_literal: true
 
-require_relative "base"
-require_relative "registry"
+require_relative 'base'
+require_relative 'registry'
 
 module RubynCode
   module Tools
     class Task < Base
-      TOOL_NAME = "task"
-      DESCRIPTION = "Manage tasks: create, update, complete, list, or get tasks for tracking work items and dependencies."
+      TOOL_NAME = 'task'
+      DESCRIPTION = 'Manage tasks: create, update, complete, list, or get tasks for tracking work items and dependencies.'
       PARAMETERS = {
         action: {
           type: :string, required: true,
-          description: "Action to perform: create, update, complete, list, get"
+          description: 'Action to perform: create, update, complete, list, get'
         },
         title: {
           type: :string, required: false,
-          description: "Task title (required for create)"
+          description: 'Task title (required for create)'
         },
         description: {
           type: :string, required: false,
-          description: "Task description"
+          description: 'Task description'
         },
         task_id: {
           type: :string, required: false,
-          description: "Task ID (required for update, complete, get)"
+          description: 'Task ID (required for update, complete, get)'
         },
         status: {
           type: :string, required: false,
-          description: "Filter by status (for list) or set status (for update)"
+          description: 'Filter by status (for list) or set status (for update)'
         },
         session_id: {
           type: :string, required: false,
-          description: "Session ID for scoping tasks"
+          description: 'Session ID for scoping tasks'
         },
         priority: {
           type: :integer, required: false,
-          description: "Task priority (higher = more important)"
+          description: 'Task priority (higher = more important)'
         },
         blocked_by: {
           type: :array, required: false,
-          description: "Array of task IDs this task depends on (for create)"
+          description: 'Array of task IDs this task depends on (for create)'
         },
         result: {
           type: :string, required: false,
-          description: "Result text (for complete)"
+          description: 'Result text (for complete)'
         },
         owner: {
           type: :string, required: false,
-          description: "Owner identifier (for update)"
+          description: 'Owner identifier (for update)'
         }
       }.freeze
       RISK_LEVEL = :write
@@ -57,11 +57,11 @@ module RubynCode
         manager = Tasks::Manager.new(DB::Connection.instance)
 
         case action
-        when "create"  then execute_create(manager, **params)
-        when "update"  then execute_update(manager, **params)
-        when "complete" then execute_complete(manager, **params)
-        when "list"    then execute_list(manager, **params)
-        when "get"     then execute_get(manager, **params)
+        when 'create'  then execute_create(manager, **params)
+        when 'update'  then execute_update(manager, **params)
+        when 'complete' then execute_complete(manager, **params)
+        when 'list'    then execute_list(manager, **params)
+        when 'get'     then execute_get(manager, **params)
         else
           raise Error, "Unknown task action: #{action}. Valid actions: create, update, complete, list, get"
         end
@@ -70,7 +70,7 @@ module RubynCode
       private
 
       def execute_create(manager, title: nil, description: nil, session_id: nil, blocked_by: [], priority: 0, **)
-        raise Error, "title is required for create" if title.nil? || title.empty?
+        raise Error, 'title is required for create' if title.nil? || title.empty?
 
         task = manager.create(
           title: title,
@@ -80,11 +80,11 @@ module RubynCode
           priority: priority.to_i
         )
 
-        format_task(task, prefix: "Created task")
+        format_task(task, prefix: 'Created task')
       end
 
       def execute_update(manager, task_id: nil, **params)
-        raise Error, "task_id is required for update" if task_id.nil? || task_id.empty?
+        raise Error, 'task_id is required for update' if task_id.nil? || task_id.empty?
 
         attrs = params.slice(:status, :priority, :owner, :result, :description, :title, :metadata)
         attrs[:priority] = attrs[:priority].to_i if attrs.key?(:priority)
@@ -92,29 +92,29 @@ module RubynCode
         task = manager.update(task_id, **attrs)
         raise Error, "Task not found: #{task_id}" if task.nil?
 
-        format_task(task, prefix: "Updated task")
+        format_task(task, prefix: 'Updated task')
       end
 
       def execute_complete(manager, task_id: nil, result: nil, **)
-        raise Error, "task_id is required for complete" if task_id.nil? || task_id.empty?
+        raise Error, 'task_id is required for complete' if task_id.nil? || task_id.empty?
 
         task = manager.complete(task_id, result: result)
         raise Error, "Task not found: #{task_id}" if task.nil?
 
-        format_task(task, prefix: "Completed task")
+        format_task(task, prefix: 'Completed task')
       end
 
       def execute_list(manager, status: nil, session_id: nil, **)
         tasks = manager.list(status: status, session_id: session_id)
 
-        return "No tasks found." if tasks.empty?
+        return 'No tasks found.' if tasks.empty?
 
         lines = tasks.map { |t| format_task_line(t) }
         "Found #{tasks.size} task(s):\n\n#{lines.join("\n")}"
       end
 
       def execute_get(manager, task_id: nil, **)
-        raise Error, "task_id is required for get" if task_id.nil? || task_id.empty?
+        raise Error, 'task_id is required for get' if task_id.nil? || task_id.empty?
 
         task = manager.get(task_id)
         raise Error, "Task not found: #{task_id}" if task.nil?
@@ -138,7 +138,7 @@ module RubynCode
       end
 
       def format_task_line(task)
-        owner_part = task.owner ? " (#{task.owner})" : ""
+        owner_part = task.owner ? " (#{task.owner})" : ''
         "[#{task.status}] #{task.title} (#{task.id[0, 8]}...)#{owner_part} priority=#{task.priority}"
       end
     end

data/lib/rubyn_code/tools/web_fetch.rb

@@ -1,17 +1,18 @@
 # frozen_string_literal: true
 
-require "faraday"
-require_relative "base"
-require_relative "registry"
+require 'faraday'
+require_relative 'base'
+require_relative 'registry'
 
 module RubynCode
   module Tools
     class WebFetch < Base
-      TOOL_NAME = "web_fetch"
-      DESCRIPTION = "Fetch the content of a web page and return it as text. Useful for reading documentation, READMEs, or API docs."
+      TOOL_NAME = 'web_fetch'
+      DESCRIPTION = 'Fetch the content of a web page and return it as text. Useful for reading documentation, READMEs, or API docs.'
       PARAMETERS = {
-        url: { type: :string, required: true, description: "The URL to fetch (must start with http:// or https://)" },
-        max_length: { type: :integer, required: false, default: 10_000, description: "Maximum number of characters to return (default: 10000)" }
+        url: { type: :string, required: true, description: 'The URL to fetch (must start with http:// or https://)' },
+        max_length: { type: :integer, required: false, default: 10_000,
+                      description: 'Maximum number of characters to return (default: 10000)' }
       }.freeze
       RISK_LEVEL = :external
       REQUIRES_CONFIRMATION = true
@@ -27,9 +28,14 @@ module RubynCode
         if text.strip.empty?
           "Fetched #{url} but no readable text content was found."
         else
-          header = "Content from: #{url}\n#{"=" * 60}\n\n"
+          header = "Content from: #{url}\n#{'=' * 60}\n\n"
           available = max_length - header.length
-          content = text.length > available ? "#{text[0, available]}\n\n... [truncated at #{max_length} characters]" : text
+          content = if text.length > available
+                      "#{text[0,
+                              available]}\n\n... [truncated at #{max_length} characters]"
+                    else
+                      text
+                    end
           "#{header}#{content}"
         end
       end
@@ -37,26 +43,35 @@ module RubynCode
       private
 
       def validate_url!(url)
-        unless url.match?(%r{\Ahttps?://}i)
-          raise Error, "Invalid URL: must start with http:// or https:// — got: #{url}"
-        end
+        return if url.match?(%r{\Ahttps?://}i)
+
+        raise Error, "Invalid URL: must start with http:// or https:// — got: #{url}"
       end
 
-      def fetch_page(url)
+      MAX_REDIRECTS = 5
+
+      def fetch_page(url, redirects: 0)
         conn = Faraday.new do |f|
           f.options.timeout = 30
           f.options.open_timeout = 10
-          f.headers["User-Agent"] = "Mozilla/5.0 (compatible; RubynCode/1.0)"
-          f.headers["Accept"] = "text/html,application/xhtml+xml,text/plain,*/*"
-          f.response :follow_redirects, limit: 5
+          f.headers['User-Agent'] = 'Mozilla/5.0 (compatible; RubynCode/1.0)'
+          f.headers['Accept'] = 'text/html,application/xhtml+xml,text/plain,*/*'
         end
 
         response = conn.get(url)
 
-        unless response.success?
-          raise Error, "HTTP #{response.status} fetching #{url}"
+        if [301, 302, 303, 307, 308].include?(response.status)
+          raise Error, "Too many redirects fetching #{url}" if redirects >= MAX_REDIRECTS
+
+          location = response.headers['location']
+          raise Error, "Redirect with no Location header from #{url}" unless location
+
+          location = URI.join(url, location).to_s unless location.start_with?('http')
+          return fetch_page(location, redirects: redirects + 1)
         end
 
+        raise Error, "HTTP #{response.status} fetching #{url}" unless response.success?
+
         response
       rescue Faraday::TimeoutError
         raise Error, "Request timed out after 30 seconds fetching #{url}"
@@ -67,37 +82,37 @@ module RubynCode
       end
 
       def html_to_text(html)
-        return "" if html.nil? || html.empty?
+        return '' if html.nil? || html.empty?
 
         text = html.dup
 
         # Remove script and style blocks entirely
-        text.gsub!(%r{<script[^>]*>.*?</script>}mi, "")
-        text.gsub!(%r{<style[^>]*>.*?</style>}mi, "")
+        text.gsub!(%r{<script[^>]*>.*?</script>}mi, '')
+        text.gsub!(%r{<style[^>]*>.*?</style>}mi, '')
 
         # Convert common block elements to newlines
         text.gsub!(%r{<br\s*/?>}i, "\n")
         text.gsub!(%r{</(p|div|h[1-6]|li|tr|blockquote|pre)>}i, "\n")
-        text.gsub!(%r{<(p|div|h[1-6]|li|tr|blockquote|pre)[^>]*>}i, "\n")
+        text.gsub!(/<(p|div|h[1-6]|li|tr|blockquote|pre)[^>]*>/i, "\n")
 
         # Strip all remaining HTML tags
-        text.gsub!(/<[^>]*>/, "")
+        text.gsub!(/<[^>]*>/, '')
 
         # Decode common HTML entities
-        text.gsub!("&amp;", "&")
-        text.gsub!("&lt;", "<")
-        text.gsub!("&gt;", ">")
-        text.gsub!("&quot;", '"')
-        text.gsub!("&#39;", "'")
-        text.gsub!("&nbsp;", " ")
-        text.gsub!(/&#(\d+);/) { [$1.to_i].pack("U") }
+        text.gsub!('&amp;', '&')
+        text.gsub!('&lt;', '<')
+        text.gsub!('&gt;', '>')
+        text.gsub!('&quot;', '"')
+        text.gsub!('&#39;', "'")
+        text.gsub!('&nbsp;', ' ')
+        text.gsub!(/&#(\d+);/) { [::Regexp.last_match(1).to_i].pack('U') }
 
         text
       end
 
       def collapse_whitespace(text)
         # Collapse runs of spaces/tabs on each line, then collapse 3+ newlines into 2
-        text.gsub(/[^\S\n]+/, " ")
+        text.gsub(/[^\S\n]+/, ' ')
             .gsub(/\n{3,}/, "\n\n")
             .strip
       end