rubyn 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a406bccd1e8bba621fd7465b792b8630c2dd586118d9116e1ad178061fe39dd
-  data.tar.gz: a49480476f8293d38a2998a0df0f6b1144ccc477dec6982ac853038a93866d0a
+  metadata.gz: 16ab57a500ce5c84a9b0b365492f000f5abb7e2e7e692b111aea9af8d003a811
+  data.tar.gz: 623e6e54abcd15c518a51185360dd1dc15aac752d744071590f55dfc8579f103
 SHA512:
-  metadata.gz: a68aa5fac1c7c708e678976e89818bc0cc108ab1b4e902d6f32ec82d71872ddea82f060db656d9829fa095cba6655b9de3b24464ec8d151fcfbf4846fde8fe83
-  data.tar.gz: edb357abf5f2e8e0c106fe35a22866db7c4a70dda97d5edc9b90ff8c93077d99d1e148f780346b5ba90b7b88cdb9ba900ef8e610e0b62186dbdb4703258af8d6
+  metadata.gz: 12b03663f2ec51a1d750e42fa378ddc544f1e4e0548686921df2e9680aea698313fbe5de8e117fe22f58d3feeb68e0b7a8b2d468c8026bf6477f1a36ee5c2810
+  data.tar.gz: '00826e6c27136e1d50638008975c9afaf942458885e1587c8b627df0e6b0f04a3e0a9d9185d1de31a6a054d523ffb92847a15c279ac0edbd6a406c6fe092fab0'

data/lib/rubyn/context/file_applier.rb

@@ -18,14 +18,6 @@ module Rubyn
         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)
@@ -50,7 +42,7 @@ module Rubyn
         @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"
+          label = block[:tag] == "new" ? "NEW" : "MODIFIED"
           @formatter.info("  [#{label}] #{path}")
         end
 
@@ -69,7 +61,7 @@ module Rubyn
 
       def apply_selected(block)
         path = block[:path] || @original_file
-        label = new_file?(path) ? "NEW" : "MODIFIED"
+        label = block[:tag] == "new" ? "NEW" : "MODIFIED"
         print "  Apply [#{label}] #{path}? (y/n/diff) "
         choice = $stdin.gets&.strip&.downcase
 
@@ -77,7 +69,7 @@ module Rubyn
         when "y"
           write_block(block)
         when "diff"
-          existing = new_file?(path) ? "" : File.read(resolve_path(block))
+          existing = block[:tag] == "new" ? "" : 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"

data/lib/rubyn/context/response_parser.rb

@@ -3,7 +3,7 @@
 module Rubyn
   module Context
     class ResponseParser
-      BOLD_HEADER = /\*\*(?:New|Updated|Modified)\s*(?:file)?:\s*([a-zA-Z0-9_\/\.\-]+\.rb)\*\*/i
+      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)/
 
@@ -24,9 +24,9 @@ module Rubyn
 
           code = part.sub(/\A```ruby\n/, "").sub(/```\z/, "")
           preceding = i > 0 ? parts[i - 1] : ""
-          path = detect_path(preceding, code)
+          result = detect_path(preceding, code)
 
-          blocks << { path: path, code: code }
+          blocks << { path: result[:path], tag: result[:tag], code: code }
         end
 
         blocks
@@ -37,19 +37,29 @@ module Rubyn
       def detect_path(preceding_text, code)
         match_bold_header(preceding_text) ||
           match_backtick_path(preceding_text) ||
-          match_inline_comment(code)
+          match_inline_comment(code) ||
+          { path: nil, tag: nil }
       end
 
       def match_bold_header(text)
-        text.match(BOLD_HEADER)&.[](1)
+        m = text.match(BOLD_HEADER)
+        return nil unless m
+
+        { path: m[2], tag: m[1].downcase }
       end
 
       def match_backtick_path(text)
-        text.match(BACKTICK_PATH)&.[](1)
+        m = text.match(BACKTICK_PATH)
+        return nil unless m
+
+        { path: m[1], tag: nil }
       end
 
       def match_inline_comment(code)
-        code.lines.first&.strip&.match(INLINE_COMMENT)&.[](1)
+        m = code.lines.first&.strip&.match(INLINE_COMMENT)
+        return nil unless m
+
+        { path: m[1], tag: nil }
       end
     end
   end

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

@@ -297,7 +297,7 @@
     var fileChanges = codeBlocks.map(function(code, i) {
       var header = fileHeaders[i];
       var path = (header && header.path) ? header.path : file;
-      var isNew = !!(path && file && path !== file && path.indexOf(file) === -1 && file.indexOf(path) === -1);
+      var isNew = header && header.tag === "new";
       return {
         path: path,
         isNew: isNew,
@@ -488,11 +488,12 @@
       var code = parts[i].replace(/^```ruby\n/, "").replace(/```$/, "");
       var preceding = i > 0 ? parts[i - 1] : "";
       var path = null;
+      var tag = null;
 
       // 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];
+      var boldMatch = preceding.match(/\*\*(New|Updated|Modified)\s*(?:file)?:\s*([a-zA-Z0-9_\/\.\-]+\.rb)\*\*/i);
+      if (boldMatch) { tag = boldMatch[1].toLowerCase(); path = boldMatch[2]; }
 
       // Strategy 3: Backtick-wrapped path above code block
       if (!path) {
@@ -507,7 +508,7 @@
         if (commentMatch) path = commentMatch[1];
       }
 
-      headers.push({ path: path });
+      headers.push({ path: path, tag: tag });
     }
 
     return headers;

data/lib/rubyn/version.rb

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

metadata

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