rubyn 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da809f272fcbe6c989b0a09ff5917f4aa91db8b345dd29b85d2229bfe2227421
-  data.tar.gz: 78a8fb3249fb87a9696d73f8d4622e9421dd0d4254732eb292cb4e9f11c07f59
+  metadata.gz: 4a406bccd1e8bba621fd7465b792b8630c2dd586118d9116e1ad178061fe39dd
+  data.tar.gz: a49480476f8293d38a2998a0df0f6b1144ccc477dec6982ac853038a93866d0a
 SHA512:
-  metadata.gz: 1ca7d13fd823a0089510cb255ed082ee1213beb066c435374013848305102ecb95bf14b5b31f285da9029a1cc84a0071a8925a772348c7626254f38317f78980
-  data.tar.gz: b9a529dea633b3e2ab4ee0a92b6cb7dec54c8466a4458de65365498a14a13e06b795c7c1b6a0896d85ab135ce8f9700ebb7c1b11d23d58b4670774d4c89c4695
+  metadata.gz: a68aa5fac1c7c708e678976e89818bc0cc108ab1b4e902d6f32ec82d71872ddea82f060db656d9829fa095cba6655b9de3b24464ec8d151fcfbf4846fde8fe83
+  data.tar.gz: edb357abf5f2e8e0c106fe35a22866db7c4a70dda97d5edc9b90ff8c93077d99d1e148f780346b5ba90b7b88cdb9ba900ef8e610e0b62186dbdb4703258af8d6

data/lib/rubyn/commands/refactor.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "fileutils"
-
 module Rubyn
   module Commands
     class Refactor < Base
@@ -35,150 +33,18 @@ module Rubyn
           formatter.newline
           formatter.credit_usage(result["credits_used"], nil) if result["credits_used"]
           formatter.newline
-          prompt_apply(file, file_content, full_response, formatter)
+
+          file_blocks = Context::ResponseParser.extract_file_blocks(full_response)
+          if file_blocks.any?
+            applier = Context::FileApplier.new(original_file: file, formatter: formatter)
+            applier.apply(file_blocks)
+          end
         rescue Rubyn::AuthenticationError => e
           formatter.error("Authentication failed: #{e.message}")
         rescue Rubyn::APIError => e
           formatter.error(e.message)
         end
       end
-
-      private
-
-      def prompt_apply(file, original, response, formatter)
-        file_blocks = extract_file_blocks(response)
-        return if file_blocks.empty?
-
-        if file_blocks.length == 1 && file_blocks.first[:tag].nil?
-          prompt_apply_single(file, original, file_blocks.first[:code], formatter)
-        else
-          prompt_apply_multi(file, original, file_blocks, formatter)
-        end
-      end
-
-      def extract_file_blocks(response)
-        blocks = []
-
-        # Split response around code blocks, keeping surrounding text for path detection
-        parts = response.split(/(```ruby\n.*?```)/m)
-
-        parts.each_with_index do |part, i|
-          next unless part.start_with?("```ruby\n")
-
-          code = part.sub(/\A```ruby\n/, "").sub(/```\z/, "")
-          preceding_text = i > 0 ? parts[i - 1] : ""
-
-          # Strategy 1: Path in bold header above code block
-          # **New file: app/services/foo.rb** or **app/services/foo.rb**
-          path = preceding_text.match(/\*\*(?:New file:\s*|Modified:\s*)?([a-zA-Z0-9_\/\.\-]+\.rb)\*\*/i)&.dig(1)
-
-          # Strategy 2: Path as backtick-wrapped line above code block
-          path ||= preceding_text.match(/`([a-zA-Z0-9_\/\.\-]+\.rb)`\s*\z/)&.dig(1)
-
-          # Strategy 3: Path as comment on first line inside code block
-          path ||= code.lines.first&.strip&.match(/^#\s*([a-zA-Z0-9_\/\.\-]+\.rb)/)&.dig(1)
-
-          blocks << { path: path, code: code }
-        end
-
-        blocks
-      end
-
-      def prompt_apply_single(file, original, new_content, formatter)
-        print "\nApply changes? (y/n/diff) "
-        choice = $stdin.gets&.strip&.downcase
-
-        case choice
-        when "y"
-          File.write(file, new_content)
-          formatter.success("Changes applied to #{file}")
-        when "diff"
-          Rubyn::Output::DiffRenderer.render(original: original, modified: new_content)
-          print "\nApply changes? (y/n) "
-          if $stdin.gets&.strip&.downcase == "y"
-            File.write(file, new_content)
-            formatter.success("Changes applied to #{file}")
-          else
-            formatter.info("Changes discarded.")
-          end
-        else
-          formatter.info("Changes discarded.")
-        end
-      end
-
-      def prompt_apply_multi(file, original, file_blocks, formatter)
-        formatter.newline
-        formatter.info("This refactor produces #{file_blocks.length} file(s):")
-        file_blocks.each do |block|
-          path = block[:path] || file
-          is_new = path != file && !path.end_with?("/#{file}") && !file.end_with?("/#{path}")
-          label = is_new ? "NEW" : "MODIFIED"
-          formatter.info("  [#{label}] #{path}")
-        end
-
-        print "\nApply all changes? (y/n/select) "
-        choice = $stdin.gets&.strip&.downcase
-
-        case choice
-        when "y"
-          apply_all_blocks(file, original, file_blocks, formatter)
-        when "select"
-          apply_selected_blocks(file, original, file_blocks, formatter)
-        else
-          formatter.info("All changes discarded.")
-        end
-      end
-
-      def apply_all_blocks(file, original, file_blocks, formatter)
-        file_blocks.each do |block|
-          write_block(file, block, formatter)
-        end
-      end
-
-      def apply_selected_blocks(file, original, file_blocks, formatter)
-        file_blocks.each do |block|
-          path = block[:path] || file
-          is_new = path != file && !path.end_with?("/#{file}") && !file.end_with?("/#{path}")
-          label = is_new ? "NEW" : "MODIFIED"
-          print "  Apply [#{label}] #{path}? (y/n/diff) "
-          choice = $stdin.gets&.strip&.downcase
-
-          case choice
-          when "y"
-            write_block(file, block, formatter)
-          when "diff"
-            existing = is_new ? "" : File.read(resolve_path(file, block))
-            Rubyn::Output::DiffRenderer.render(original: existing, modified: block[:code])
-            print "  Apply? (y/n) "
-            if $stdin.gets&.strip&.downcase == "y"
-              write_block(file, block, formatter)
-            else
-              formatter.info("  Skipped #{path}")
-            end
-          else
-            formatter.info("  Skipped #{path}")
-          end
-        end
-      end
-
-      def write_block(original_file, block, formatter)
-        target = resolve_path(original_file, block)
-        dir = File.dirname(target)
-        FileUtils.mkdir_p(dir) unless File.directory?(dir)
-        File.write(target, block[:code])
-        label = block[:tag] == "NEW" ? "Created" : "Updated"
-        formatter.success("#{label} #{target}")
-      end
-
-      def resolve_path(original_file, block)
-        return original_file unless block[:path]
-
-        if block[:path].start_with?("/")
-          block[:path]
-        else
-          File.join(Dir.pwd, block[:path])
-        end
-      end
     end
   end
 end

data/lib/rubyn/context/file_applier.rb

@@ -0,0 +1,114 @@
+# frozen_string_literal: true
+
+require "fileutils"
+
+module Rubyn
+  module Context
+    class FileApplier
+      def initialize(original_file:, formatter:)
+        @original_file = original_file
+        @formatter = formatter
+      end
+
+      def apply(file_blocks)
+        if file_blocks.length == 1 && file_blocks.first[:path].nil?
+          apply_single(file_blocks.first[:code])
+        else
+          apply_multi(file_blocks)
+        end
+      end
+
+      def new_file?(path)
+        return false unless path
+
+        path != @original_file &&
+          !path.end_with?("/#{@original_file}") &&
+          !@original_file.end_with?("/#{path}")
+      end
+
+      private
+
+      def apply_single(code)
+        print "\nApply changes? (y/n/diff) "
+        choice = $stdin.gets&.strip&.downcase
+
+        case choice
+        when "y"
+          write_file(@original_file, code)
+        when "diff"
+          original_content = File.read(@original_file)
+          Rubyn::Output::DiffRenderer.render(original: original_content, modified: code)
+          print "\nApply changes? (y/n) "
+          write_file(@original_file, code) if $stdin.gets&.strip&.downcase == "y"
+        else
+          @formatter.info("Changes discarded.")
+        end
+      end
+
+      def apply_multi(file_blocks)
+        @formatter.newline
+        @formatter.info("This refactor produces #{file_blocks.length} file(s):")
+        file_blocks.each do |block|
+          path = block[:path] || @original_file
+          label = new_file?(path) ? "NEW" : "MODIFIED"
+          @formatter.info("  [#{label}] #{path}")
+        end
+
+        print "\nApply all changes? (y/n/select) "
+        choice = $stdin.gets&.strip&.downcase
+
+        case choice
+        when "y"
+          file_blocks.each { |block| write_block(block) }
+        when "select"
+          file_blocks.each { |block| apply_selected(block) }
+        else
+          @formatter.info("All changes discarded.")
+        end
+      end
+
+      def apply_selected(block)
+        path = block[:path] || @original_file
+        label = new_file?(path) ? "NEW" : "MODIFIED"
+        print "  Apply [#{label}] #{path}? (y/n/diff) "
+        choice = $stdin.gets&.strip&.downcase
+
+        case choice
+        when "y"
+          write_block(block)
+        when "diff"
+          existing = new_file?(path) ? "" : File.read(resolve_path(block))
+          Rubyn::Output::DiffRenderer.render(original: existing, modified: block[:code])
+          print "  Apply? (y/n) "
+          write_block(block) if $stdin.gets&.strip&.downcase == "y"
+        else
+          @formatter.info("  Skipped #{path}")
+        end
+      end
+
+      def write_block(block)
+        target = resolve_path(block)
+        write_file(target, block[:code])
+      end
+
+      def write_file(path, code)
+        dir = File.dirname(path)
+        FileUtils.mkdir_p(dir) unless File.directory?(dir)
+        created = !File.exist?(path)
+        File.write(path, code)
+        label = created ? "Created" : "Updated"
+        @formatter.success("#{label} #{path}")
+      end
+
+      def resolve_path(block)
+        return @original_file unless block[:path]
+
+        if block[:path].start_with?("/")
+          block[:path]
+        else
+          File.join(Dir.pwd, block[:path])
+        end
+      end
+    end
+  end
+end

data/lib/rubyn/context/response_parser.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+module Rubyn
+  module Context
+    class ResponseParser
+      BOLD_HEADER = /\*\*(?:New|Updated|Modified)\s*(?:file)?:\s*([a-zA-Z0-9_\/\.\-]+\.rb)\*\*/i
+      BACKTICK_PATH = /`([a-zA-Z0-9_\/\.\-]+\.rb)`\s*\z/
+      INLINE_COMMENT = /^#\s*([a-zA-Z0-9_\/\.\-]+\.rb)/
+
+      def self.extract_file_blocks(response)
+        new(response).extract
+      end
+
+      def initialize(response)
+        @response = response
+      end
+
+      def extract
+        blocks = []
+        parts = @response.split(/(```ruby\n.*?```)/m)
+
+        parts.each_with_index do |part, i|
+          next unless part.start_with?("```ruby\n")
+
+          code = part.sub(/\A```ruby\n/, "").sub(/```\z/, "")
+          preceding = i > 0 ? parts[i - 1] : ""
+          path = detect_path(preceding, code)
+
+          blocks << { path: path, code: code }
+        end
+
+        blocks
+      end
+
+      private
+
+      def detect_path(preceding_text, code)
+        match_bold_header(preceding_text) ||
+          match_backtick_path(preceding_text) ||
+          match_inline_comment(code)
+      end
+
+      def match_bold_header(text)
+        text.match(BOLD_HEADER)&.[](1)
+      end
+
+      def match_backtick_path(text)
+        text.match(BACKTICK_PATH)&.[](1)
+      end
+
+      def match_inline_comment(code)
+        code.lines.first&.strip&.match(INLINE_COMMENT)&.[](1)
+      end
+    end
+  end
+end

data/lib/rubyn/engine/app/assets/javascripts/rubyn/application.js

@@ -296,8 +296,8 @@
     // Determine NEW vs MODIFIED by comparing path against the original file
     var fileChanges = codeBlocks.map(function(code, i) {
       var header = fileHeaders[i];
-      var path = header ? header.path : file;
-      var isNew = path !== file && !path.endsWith("/" + file) && !file.endsWith("/" + path);
+      var path = (header && header.path) ? header.path : file;
+      var isNew = !!(path && file && path !== file && path.indexOf(file) === -1 && file.indexOf(path) === -1);
       return {
         path: path,
         isNew: isNew,
@@ -489,18 +489,18 @@
       var preceding = i > 0 ? parts[i - 1] : "";
       var path = null;
 
-      // Strategy 1: Bold header above code block
-      // **New file: path.rb** or **path.rb**
-      var boldMatch = preceding.match(/\*\*(?:New file:\s*|Modified:\s*)?([a-zA-Z0-9_\/\.\-]+\.rb)\*\*/i);
+      // Strategy 1: Bold header (**New file: path.rb**, **Updated file: path.rb**)
+      // Only match when preceded by New/Updated/Modified to avoid matching bold .rb references in prose
+      var boldMatch = preceding.match(/\*\*(?:New|Updated|Modified)\s*(?:file)?:\s*([a-zA-Z0-9_\/\.\-]+\.rb)\*\*/i);
       if (boldMatch) path = boldMatch[1];
 
-      // Strategy 2: Backtick-wrapped path above code block
+      // Strategy 3: Backtick-wrapped path above code block
       if (!path) {
         var tickMatch = preceding.match(/`([a-zA-Z0-9_\/\.\-]+\.rb)`\s*$/);
         if (tickMatch) path = tickMatch[1];
       }
 
-      // Strategy 3: Path as comment on first line inside code block
+      // Strategy 4: Path as comment on first line inside code block
       if (!path) {
         var firstLine = code.split("\n")[0].trim();
         var commentMatch = firstLine.match(/^#\s*([a-zA-Z0-9_\/\.\-]+\.rb)/);

data/lib/rubyn/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Rubyn
-  VERSION = "0.1.1"
+  VERSION = "0.1.3"
 end

data/lib/rubyn.rb

@@ -52,6 +52,8 @@ require_relative "rubyn/context/project_scanner"
 require_relative "rubyn/context/file_resolver"
 require_relative "rubyn/context/context_builder"
 require_relative "rubyn/context/codebase_indexer"
+require_relative "rubyn/context/response_parser"
+require_relative "rubyn/context/file_applier"
 require_relative "rubyn/output/formatter"
 require_relative "rubyn/output/diff_renderer"
 require_relative "rubyn/output/spinner"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubyn
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - matthewsuttles
@@ -297,8 +297,10 @@ files:
 - lib/rubyn/config/settings.rb
 - lib/rubyn/context/codebase_indexer.rb
 - lib/rubyn/context/context_builder.rb
+- lib/rubyn/context/file_applier.rb
 - lib/rubyn/context/file_resolver.rb
 - lib/rubyn/context/project_scanner.rb
+- lib/rubyn/context/response_parser.rb
 - lib/rubyn/engine/app/assets/images/rubyn/RubynLogo.png
 - lib/rubyn/engine/app/assets/javascripts/rubyn/application.js
 - lib/rubyn/engine/app/assets/stylesheets/rubyn/application.css