rubyn 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b1ca55e10bd9ae4ec17fbdbfa196577fda468788c083905679a2c1e7e782181
-  data.tar.gz: f82e928da5975b754dca641f00488bb6360ffbd4cd45d538909348a4b1ff6b05
+  metadata.gz: da809f272fcbe6c989b0a09ff5917f4aa91db8b345dd29b85d2229bfe2227421
+  data.tar.gz: 78a8fb3249fb87a9696d73f8d4622e9421dd0d4254732eb292cb4e9f11c07f59
 SHA512:
-  metadata.gz: da671165752719684baaf371f4c1a47d7a9f3e8604af37360b106827d15c08a1508219b7fc47ae859a1c8f54f9e756a7e7a459c66fff4cbb718e70610eb4684a
-  data.tar.gz: 7f6f19c30b1ba42e74aeb0f3b0ec936d8f14ac63b6d52949d87c0714fce3b76c041c3cc8bf67a8eb07c36453b6d7602ae35736c46b1771646ce71bcebac748b4
+  metadata.gz: 1ca7d13fd823a0089510cb255ed082ee1213beb066c435374013848305102ecb95bf14b5b31f285da9029a1cc84a0071a8925a772348c7626254f38317f78980
+  data.tar.gz: b9a529dea633b3e2ab4ee0a92b6cb7dec54c8466a4458de65365498a14a13e06b795c7c1b6a0896d85ab135ce8f9700ebb7c1b11d23d58b4670774d4c89c4695

data/lib/rubyn/commands/refactor.rb

@@ -59,19 +59,26 @@ module Rubyn
       def extract_file_blocks(response)
         blocks = []
 
-        # Match path header lines directly above ```ruby blocks
-        # Handles: `[NEW] path.rb`, `path.rb`, backtick-wrapped or plain
-        response.scan(/(?:\[NEW\]\s*)?`?([a-zA-Z0-9_\/\.\-]+\.rb)`?\s*\n```ruby\n(.*?)```/m) do
-          path = $1
-          code = $2
-          is_new = $~[0].include?("[NEW]")
-          blocks << { tag: is_new ? "NEW" : nil, path: path, code: code }
-        end
+        # 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)
 
-        # Fallback: no path headers found, grab first code block
-        if blocks.empty?
-          code_match = response.match(/```ruby\n(.*?)```/m)
-          blocks << { tag: nil, path: nil, code: code_match[1] } if code_match
+          blocks << { path: path, code: code }
         end
 
         blocks
@@ -103,8 +110,9 @@ module Rubyn
         formatter.newline
         formatter.info("This refactor produces #{file_blocks.length} file(s):")
         file_blocks.each do |block|
-          label = block[:tag] == "NEW" ? "NEW" : "MODIFIED"
           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
 
@@ -129,8 +137,9 @@ module Rubyn
 
       def apply_selected_blocks(file, original, file_blocks, formatter)
         file_blocks.each do |block|
-          label = block[:tag] == "NEW" ? "NEW" : "MODIFIED"
           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
 
@@ -138,7 +147,7 @@ module Rubyn
           when "y"
             write_block(file, block, formatter)
           when "diff"
-            existing = block[:tag] == "NEW" ? "" : File.read(resolve_path(file, block))
+            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"

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

@@ -293,22 +293,24 @@
 
     // Build the file-to-code mapping
     // Headers and code blocks are in the same order — zip them together
+    // 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);
       return {
-        path: header ? header.path : file,
-        tag: header ? header.tag : null,
+        path: path,
+        isNew: isNew,
         code: code
       };
     });
 
-    // Show each code block with its file path, tag, and individual apply button
+    // Show each code block with its file path and NEW badge if applicable
     fileChanges.forEach(function(change, i) {
       html += '<div class="rubyn-code-block">';
       html += '<div class="rubyn-code-block-header">';
-      if (change.tag) {
-        var tagClass = change.tag === "NEW" ? "rubyn-tag-new" : "rubyn-tag-modified";
-        html += '<span class="rubyn-file-tag ' + tagClass + '">' + change.tag + '</span>';
+      if (change.isNew) {
+        html += '<span class="rubyn-file-tag rubyn-tag-new">NEW</span>';
       }
       html += '<span class="rubyn-tool-filepath">' + escapeHtml(change.path) + '</span>';
       html += '<div class="rubyn-code-block-actions">';
@@ -478,14 +480,34 @@
 
   function extractFileHeaders(text) {
     var headers = [];
+    var parts = text.split(/(```ruby\n[\s\S]*?```)/g);
 
-    // Match path headers directly above ```ruby blocks
-    // Handles: `[NEW] path.rb`, `path.rb`, #### path.rb, etc.
-    var regex = /(?:\[NEW\]\s*)?`?([a-zA-Z0-9_\/\.\-]+\.rb)`?\s*\n```ruby/g;
-    var match;
-    while ((match = regex.exec(text)) !== null) {
-      var isNew = match[0].indexOf("[NEW]") !== -1;
-      headers.push({ tag: isNew ? "NEW" : null, path: match[1] });
+    for (var i = 0; i < parts.length; i++) {
+      if (parts[i].indexOf("```ruby\n") !== 0) continue;
+
+      var code = parts[i].replace(/^```ruby\n/, "").replace(/```$/, "");
+      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);
+      if (boldMatch) path = boldMatch[1];
+
+      // Strategy 2: 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
+      if (!path) {
+        var firstLine = code.split("\n")[0].trim();
+        var commentMatch = firstLine.match(/^#\s*([a-zA-Z0-9_\/\.\-]+\.rb)/);
+        if (commentMatch) path = commentMatch[1];
+      }
+
+      headers.push({ path: path });
     }
 
     return headers;

data/lib/rubyn/engine/app/assets/stylesheets/rubyn/application.css

@@ -735,6 +735,7 @@ body {
   color: var(--rubyn-success);
 }
 
+
 .rubyn-code-block .rubyn-tool-output {
   margin: 0;
   padding: 1rem;

data/lib/rubyn/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubyn
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - matthewsuttles