rfmt 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9981b614b859c7c49e597686b89c79279ba977911b9a62d691aa0b88408eb0f
-  data.tar.gz: 1461e9bcf3ff3b298855963fdf2e6cdd0aca1b3e29bf6f5b9037e62889903469
+  metadata.gz: d42c0061474a8e7ef36fc5cbce1d7bfdad2bc5a9dbbff9b1a2c2b700b373c6ca
+  data.tar.gz: f12d17ab726936fbdf69e4e5aaf3bca55fadf49230aa641adf0cba61c363f5ca
 SHA512:
-  metadata.gz: 0b6aa80fa2df44397d1bdc81a12b860e1446a611f565e3283af8a821e691ca5122041f9622d48e2577740e878d740a1dba95df0a8c6acbea71c8301993f6fb46
-  data.tar.gz: a1f330f17114d738523adf1fdcc9ccc42590b028a754e32304d2d4724f9966d54e5a7467bd50c8884111bc3ff16780b9b9c7591a0a22d8cd1eb17ffa50a856ed
+  metadata.gz: 51948c8616f667de54435f87f7e154209c27777e82a84ada9f73d97c8928f68a063da72c1d7268035ca7d8d6e3eec658e4f6d874770658501edaad68a512ecdf
+  data.tar.gz: e9a794b23d30ba314aa2b0f5fcacb6bbaff7408430bab6623169ef7d76fad53f32f58789e2a0a828a3b9e38dc074ca22bb0c4ff93f023e7c1a8c000081ba66e5

data/CHANGELOG.md

@@ -1,5 +1,23 @@
 ## [Unreleased]
 
+## [0.2.4] - 2025-11-25
+
+### Fixed
+- Fixed if-else expression formatting
+
+## [0.2.3] - 2025-01-25
+
+### Added
+- Configuration file (rfmt.yml) is now automatically loaded and applied during formatting
+- Automatic config file discovery in current directory, parent directories, and home directory
+- Support for custom indent_width and other formatting options via rfmt.yml
+
+### Changed
+- Default config file name changed from .rfmt.yml to rfmt.yml (hidden file to regular file)
+- Backward compatibility maintained: .rfmt.yml is still supported with lower priority
+- Config file search order: rfmt.yml > rfmt.yaml > .rfmt.yml > .rfmt.yaml
+- README updated to remove exaggerated expressions and focus on factual, data-driven descriptions
+
 ## [0.2.2] - 2025-01-25
 
 ### Fixed

data/Cargo.lock

@@ -1219,7 +1219,7 @@ checksum = "caf4aa5b0f434c91fe5c7f1ecb6a5ece2130b02ad2a590589dda5146df959001"
 
 [[package]]
 name = "rfmt"
-version = "0.2.2"
+version = "0.2.4"
 dependencies = [
  "anyhow",
  "clap",

data/README.md

@@ -65,15 +65,36 @@ Built-in logging system:
 - Performance metrics and timing data
 - Debug context information
 
-### Editor Integration
+## Performance Benchmarks
+
+Performance comparison with RuboCop on a Rails project (111 files, 3,231 lines):
+
+### Benchmark Results (Rails Project)
+
+| Scenario | rfmt | RuboCop | Speedup |
+|----------|------|---------|---------|
+| **Single File** | ~190ms | ~1.35s | **7.3x faster** |
+| **Directory (14 files)** | 168ms | 1.67s | **10.0x faster** |
+| **Full Project (111 files)** | 173ms | 10.09s | **58.5x faster** |
+| **Check Mode (CI/CD)** | 172ms | 1.55s | **9.0x faster** |
+
+### Key Metrics
+
+- Single file: Formats in ~190ms
+- Scaling: 58x faster on full project (111 files)
+- CI/CD: Check time reduced from 10.09s to 0.173s (98% reduction)
+- Variance: Low standard deviation across runs
 
-Compatible editors:
+### Throughput Comparison
 
-- Visual Studio Code
-- RubyMine / IntelliJ IDEA
-- Vim / Neovim
-- Emacs
-- Sublime Text
+| Directory | rfmt | RuboCop | Difference |
+|-----------|------|---------|------------|
+| app/models (14 files) | 83.5 files/s | 8.4 files/s | **10x throughput** |
+| test/ (30 files) | 168.1 files/s | 18.1 files/s | **9.3x throughput** |
+
+*Benchmark environment: Apple Silicon (arm64), macOS Darwin 23.6.0, Ruby 3.4.5*
+
+See [detailed benchmark report](docspriv/benchmark_report.md) for full data.
 
 ## Installation
 
@@ -168,7 +189,7 @@ Create a configuration file with default settings:
 rfmt init
 ```
 
-This creates a `.rfmt.yml` file with default settings:
+This creates a `rfmt.yml` file with default settings:
 
 ```yaml
 version: "1.0"
@@ -206,9 +227,9 @@ rfmt init --force
 
 rfmt automatically searches for configuration files in this order:
 
-1. Current directory (`.rfmt.yml` or `.rfmt.yaml`)
+1. Current directory (`rfmt.yml`, `rfmt.yaml`, `.rfmt.yml`, or `.rfmt.yaml`)
 2. Parent directories (up to root)
-3. User home directory (`~/.rfmt.yml` or `~/.rfmt.yaml`)
+3. User home directory (`rfmt.yml`, `rfmt.yaml`, `.rfmt.yml`, or `.rfmt.yaml`)
 4. Default settings (if no file found)
 
 #### Ruby API for Configuration
@@ -217,11 +238,11 @@ rfmt automatically searches for configuration files in this order:
 require 'rfmt'
 
 # Generate configuration file
-Rfmt::Config.init('.rfmt.yml', force: false)
+Rfmt::Config.init('rfmt.yml', force: false)
 
 # Find configuration file
 config_path = Rfmt::Config.find
-# => "/Users/username/project/.rfmt.yml"
+# => "/Users/username/project/rfmt.yml"
 
 # Check if configuration exists
 Rfmt::Config.exists?
@@ -312,37 +333,6 @@ class User < ApplicationRecord
 end
 ```
 
-## Performance Benchmarks
-
-Performance comparison with RuboCop on a Rails project (111 files, 3,231 lines):
-
-### Benchmark Results (Rails Project)
-
-| Scenario | rfmt | RuboCop | Speedup |
-|----------|------|---------|---------|
-| **Single File** | ~190ms | ~1.35s | **7.3x faster** |
-| **Directory (14 files)** | 168ms | 1.67s | **10.0x faster** |
-| **Full Project (111 files)** | 173ms | 10.09s | **58.5x faster** |
-| **Check Mode (CI/CD)** | 172ms | 1.55s | **9.0x faster** |
-
-### Key Metrics
-
-- Single file: Formats in ~190ms
-- Scaling: 58x faster on full project (111 files)
-- CI/CD: Check time reduced from 10.09s to 0.173s (98% reduction)
-- Variance: Low standard deviation across runs
-
-### Throughput Comparison
-
-| Directory | rfmt | RuboCop | Difference |
-|-----------|------|---------|------------|
-| app/models (14 files) | 83.5 files/s | 8.4 files/s | **10x throughput** |
-| test/ (30 files) | 168.1 files/s | 18.1 files/s | **9.3x throughput** |
-
-*Benchmark environment: Apple Silicon (arm64), macOS Darwin 23.6.0, Ruby 3.4.5*
-
-See [detailed benchmark report](docspriv/benchmark_report.md) for full data.
-
 ## Documentation
 
 Documentation is available in the [docs](docs/) directory. See [User Guide](docs/user_guide.md) or [Contributing Guide](CONTRIBUTING.md) for details.
@@ -358,7 +348,7 @@ We welcome contributions! Please see our [Contributing Guide](CONTRIBUTING.md) f
 | Feature | rfmt | RuboCop |
 |---------|------|---------|
 | **Primary Purpose** | Code formatting | Linting + formatting |
-| **Speed** | 58x faster (tested benchmark) | Ruby-based |
+| **Speed** | 58x faster (tested benchmark) | Baseline |
 | **Configuration** | Minimal | Extensive |
 | **Code Quality Checks** | No | Yes |
 | **Bug Detection** | No | Yes |
@@ -377,7 +367,6 @@ Everyone interacting in the rfmt project's codebases, issue trackers, chat rooms
 
 - 📖 [Documentation](docs/)
 - 🐛 [Issues](https://github.com/fujitanisora/rfmt/issues)
-- 💬 [Discussions](https://github.com/fujitanisora/rfmt/discussions)
 - 📧 Email: fujitanisora0414@gmail.com
 
 ## Acknowledgments

data/ext/rfmt/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rfmt"
-version = "0.2.2"
+version = "0.2.4"
 edition = "2021"
 authors = ["fujitani sora <fujitanisora0414@gmail.com>"]
 license = "MIT"

data/ext/rfmt/src/ast/mod.rs

@@ -40,6 +40,7 @@ pub enum NodeType {
     // Expressions
     CallNode,
     IfNode,
+    ElseNode,
     UnlessNode,
 
     // Literals
@@ -83,6 +84,7 @@ impl NodeType {
             "def_node" => Self::DefNode,
             "call_node" => Self::CallNode,
             "if_node" => Self::IfNode,
+            "else_node" => Self::ElseNode,
             "unless_node" => Self::UnlessNode,
             "string_node" => Self::StringNode,
             "integer_node" => Self::IntegerNode,

data/ext/rfmt/src/config/mod.rs

@@ -99,8 +99,45 @@ pub enum TrailingComma {
 }
 
 impl Config {
+    /// Discover configuration file in current directory or parent directories
+    /// Searches in order: rfmt.yml, rfmt.yaml, .rfmt.yml, .rfmt.yaml
+    pub fn discover() -> crate::error::Result<Self> {
+        let config_files = ["rfmt.yml", "rfmt.yaml", ".rfmt.yml", ".rfmt.yaml"];
+
+        // Try current directory and parent directories
+        if let Ok(mut current_dir) = std::env::current_dir() {
+            loop {
+                for filename in &config_files {
+                    let config_path = current_dir.join(filename);
+                    if config_path.exists() {
+                        log::info!("Found config file: {:?}", config_path);
+                        return Self::load_file(&config_path);
+                    }
+                }
+
+                // Move to parent directory
+                if !current_dir.pop() {
+                    break;
+                }
+            }
+        }
+
+        // Try home directory
+        if let Some(home_dir) = dirs::home_dir() {
+            for filename in &config_files {
+                let config_path = home_dir.join(filename);
+                if config_path.exists() {
+                    log::debug!("Found config file in home: {:?}", config_path);
+                    return Self::load_file(&config_path);
+                }
+            }
+        }
+
+        log::info!("No config file found, using defaults");
+        Ok(Config::default())
+    }
+
     /// Load configuration from a YAML file
-    #[cfg(test)]
     pub fn load_file(path: &std::path::Path) -> crate::error::Result<Self> {
         use crate::error::RfmtError;
 
@@ -119,7 +156,6 @@ impl Config {
     }
 
     /// Validate configuration values
-    #[cfg(test)]
     fn validate(&self) -> crate::error::Result<()> {
         use crate::error::RfmtError;
 
@@ -145,7 +181,6 @@ impl Config {
     }
 
     /// Get the indent string based on configuration
-    #[cfg(test)]
     pub fn indent_string(&self) -> String {
         match self.formatting.indent_style {
             IndentStyle::Spaces => " ".repeat(self.formatting.indent_width),

data/ext/rfmt/src/emitter/mod.rs

@@ -113,6 +113,8 @@ impl Emitter {
             NodeType::ClassNode => self.emit_class(node, indent_level)?,
             NodeType::ModuleNode => self.emit_module(node, indent_level)?,
             NodeType::DefNode => self.emit_method(node, indent_level)?,
+            NodeType::IfNode => self.emit_if_unless(node, indent_level, false, "if")?,
+            NodeType::UnlessNode => self.emit_if_unless(node, indent_level, false, "unless")?,
             _ => self.emit_generic(node, indent_level)?,
         }
         Ok(())
@@ -304,6 +306,122 @@ impl Emitter {
         Ok(())
     }
 
+    /// Emit if/unless/elsif/else node
+    /// is_elsif: true if this is an elsif clause (don't emit 'end')
+    /// keyword: "if" or "unless"
+    fn emit_if_unless(&mut self, node: &Node, indent_level: usize, is_elsif: bool, keyword: &str) -> Result<()> {
+        // Check if this is a postfix if (modifier form)
+        // In postfix if, the statements come before the if keyword in source
+        let is_postfix = if let (Some(predicate), Some(statements)) =
+            (node.children.first(), node.children.get(1)) {
+            statements.location.start_offset < predicate.location.start_offset
+        } else {
+            false
+        };
+
+        // Postfix if/unless: "statement if/unless condition"
+        if is_postfix && !is_elsif {
+            self.emit_comments_before(node.location.start_line, indent_level)?;
+            self.emit_indent(indent_level)?;
+
+            // Emit statement
+            if let Some(statements) = node.children.get(1) {
+                if matches!(statements.node_type, NodeType::StatementsNode) {
+                    // Extract the statement text (without extra indentation)
+                    if !self.source.is_empty() {
+                        let start = statements.location.start_offset;
+                        let end = statements.location.end_offset;
+                        if let Some(text) = self.source.get(start..end) {
+                            write!(self.buffer, "{}", text.trim())?;
+                        }
+                    }
+                }
+            }
+
+            write!(self.buffer, " {} ", keyword)?;
+
+            // Emit condition
+            if let Some(predicate) = node.children.first() {
+                if !self.source.is_empty() {
+                    let start = predicate.location.start_offset;
+                    let end = predicate.location.end_offset;
+                    if let Some(text) = self.source.get(start..end) {
+                        write!(self.buffer, "{}", text)?;
+                    }
+                }
+            }
+
+            return Ok(());
+        }
+
+        // Normal if/unless/elsif
+        if !is_elsif {
+            self.emit_comments_before(node.location.start_line, indent_level)?;
+        }
+
+        // Emit 'if'/'unless' or 'elsif' keyword
+        self.emit_indent(indent_level)?;
+        if is_elsif {
+            write!(self.buffer, "elsif ")?;
+        } else {
+            write!(self.buffer, "{} ", keyword)?;
+        }
+
+        // Emit predicate (condition) - first child
+        if let Some(predicate) = node.children.first() {
+            // Extract predicate from source
+            if !self.source.is_empty() {
+                let start = predicate.location.start_offset;
+                let end = predicate.location.end_offset;
+                if let Some(text) = self.source.get(start..end) {
+                    write!(self.buffer, "{}", text)?;
+                }
+            }
+        }
+
+        self.buffer.push('\n');
+
+        // Emit then clause (second child is StatementsNode)
+        if let Some(statements) = node.children.get(1) {
+            if matches!(statements.node_type, NodeType::StatementsNode) {
+                self.emit_statements(statements, indent_level + 1)?;
+                self.buffer.push('\n');
+            }
+        }
+
+        // Check for elsif/else (third child)
+        if let Some(consequent) = node.children.get(2) {
+            match &consequent.node_type {
+                NodeType::IfNode => {
+                    // This is an elsif clause (only valid for if, not unless)
+                    self.emit_if_unless(consequent, indent_level, true, "if")?;
+                }
+                NodeType::ElseNode => {
+                    // This is an else clause
+                    self.emit_indent(indent_level)?;
+                    write!(self.buffer, "else\n")?;
+
+                    // Emit else body (first child of ElseNode)
+                    if let Some(else_statements) = consequent.children.first() {
+                        if matches!(else_statements.node_type, NodeType::StatementsNode) {
+                            self.emit_statements(else_statements, indent_level + 1)?;
+                            self.buffer.push('\n');
+                        }
+                    }
+                }
+                _ => {}
+            }
+        }
+
+        // Only emit 'end' for the outermost if (not for elsif)
+        if !is_elsif {
+            self.emit_indent(indent_level)?;
+            write!(self.buffer, "end")?;
+        }
+
+        Ok(())
+    }
+
     /// Emit generic node by extracting from source
     fn emit_generic(&mut self, node: &Node, indent_level: usize) -> Result<()> {
         // Emit any comments before this node

data/ext/rfmt/src/error/mod.rs

@@ -18,7 +18,6 @@ pub enum RfmtError {
     },
 
     #[error("Configuration error: {message}")]
-    #[cfg(test)]
     ConfigError { message: String },
 }
 
@@ -36,7 +35,6 @@ impl RfmtError {
             RfmtError::PrismError(_) => "PrismError",
             RfmtError::FormatError(_) => "FormatError",
             RfmtError::UnsupportedFeature { .. } => "UnsupportedFeature",
-            #[cfg(test)]
             RfmtError::ConfigError { .. } => "ConfigError",
         };
 

data/ext/rfmt/src/lib.rs

@@ -14,6 +14,7 @@ use magnus::{define_module, function, prelude::*, Error, Ruby};
 use parser::{PrismAdapter, RubyParser};
 
 fn format_ruby_code(ruby: &Ruby, source: String, json: String) -> Result<String, Error> {
+    log::info!("format_ruby_code called");
     let policy = SecurityPolicy::default();
 
     policy
@@ -25,7 +26,10 @@ fn format_ruby_code(ruby: &Ruby, source: String, json: String) -> Result<String,
     let parser = PrismAdapter::new();
     let ast = parser.parse(&json).map_err(|e| e.to_magnus_error(ruby))?;
 
-    let config = Config::default();
+    // Load configuration from file or use defaults
+    log::info!("Attempting to discover config file...");
+    let config = Config::discover().map_err(|e| e.to_magnus_error(ruby))?;
+    log::info!("Config loaded successfully, line_length: {}", config.formatting.line_length);
     let mut emitter = Emitter::with_source(config, source);
 
     let formatted = emitter.emit(&ast).map_err(|e| e.to_magnus_error(ruby))?;

data/ext/rfmt/src/logging/logger.rs

@@ -22,7 +22,11 @@ impl RfmtLogger {
     }
 
     pub fn init() {
-        let logger = Self::new(LevelFilter::Info);
+        let level = std::env::var("RFMT_LOG")
+            .ok()
+            .and_then(|s| s.parse().ok())
+            .unwrap_or(LevelFilter::Info);
+        let logger = Self::new(level);
         log::set_boxed_logger(Box::new(logger)).expect("Failed to initialize logger");
         log::set_max_level(LevelFilter::Trace);
     }

data/lib/rfmt/configuration.rb

@@ -18,7 +18,7 @@ module Rfmt
       'exclude' => ['vendor/**/*', 'tmp/**/*', 'node_modules/**/*']
     }.freeze
 
-    CONFIG_FILES = ['.rfmt.yml', '.rfmt.yaml', 'rfmt.yml', 'rfmt.yaml'].freeze
+    CONFIG_FILES = ['rfmt.yml', 'rfmt.yaml', '.rfmt.yml', '.rfmt.yaml'].freeze
 
     attr_reader :config
 

data/lib/rfmt/prism_bridge.rb

@@ -159,6 +159,8 @@ module Rfmt
                        node.statements,
                        node.consequent
                      ].compact
+                   when Prism::ElseNode
+                     [node.statements].compact
                    when Prism::ArrayNode
                      node.elements || []
                    when Prism::HashNode

data/lib/rfmt/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Rfmt
-  VERSION = '0.2.2'
+  VERSION = '0.2.4'
 end

data/lib/rfmt.rb

@@ -95,10 +95,10 @@ module Rfmt
     YAML
 
     # Generate a default configuration file
-    # @param path [String] Path where to create the config file (default: .rfmt.yml)
+    # @param path [String] Path where to create the config file (default: rfmt.yml)
     # @param force [Boolean] Overwrite existing file if true
     # @return [Boolean] true if file was created, false if already exists
-    def self.init(path = '.rfmt.yml', force: false)
+    def self.init(path = 'rfmt.yml', force: false)
       if File.exist?(path) && !force
         warn "Configuration file already exists: #{path}"
         warn 'Use force: true to overwrite'
@@ -116,7 +116,7 @@ module Rfmt
       current_dir = Dir.pwd
 
       loop do
-        ['.rfmt.yml', '.rfmt.yaml'].each do |filename|
+        ['rfmt.yml', 'rfmt.yaml', '.rfmt.yml', '.rfmt.yaml'].each do |filename|
           config_path = File.join(current_dir, filename)
           return config_path if File.exist?(config_path)
         end
@@ -134,7 +134,7 @@ module Rfmt
         nil
       end
       if home_dir
-        ['.rfmt.yml', '.rfmt.yaml'].each do |filename|
+        ['rfmt.yml', 'rfmt.yaml', '.rfmt.yml', '.rfmt.yaml'].each do |filename|
           config_path = File.join(home_dir, filename)
           return config_path if File.exist?(config_path)
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rfmt
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors:
 - fujitani sora