mbeditor 0.7.2 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c88d7e8236553061b81b5f828261a5fdfdbf77992b8c1b46c662e49d187b3bac
-  data.tar.gz: 5b7ae20d67ed9e1e3b63f393252dc94b001331fcc8a7073add6e767ec440ef06
+  metadata.gz: dd301d5fbcf6d107417270314be0561ac408505b9fc5d9c3862077ce17c68d10
+  data.tar.gz: 60bf4c608bf64ee929bde7c1ba537c4d07b26374e35233fdc2c0563b350eb20d
 SHA512:
-  metadata.gz: 0e0841e9552fb15f688ca19f54767283ec338eb26b2a2476eadfc69986c62a940738538120eb3fe9ed3687ed21178710f45976747fcfcb5480694541b09f597f
-  data.tar.gz: 96577d3f9f1293a66ec5b70fc81a322eddf11a5e50cdaef3d7965fb8d69a02411dbe0cbb6782c144f87f42aee66fd21fb731ebafd154de9155d3a24ac2e6b19b
+  metadata.gz: eb42152a396ec834bf84207e1e9c6a77a5a21c11d6a3c63be839c19f48856cdd08b95e3921ad6acf843a0f2d0debefc6e769ef14a1813c162d02a5912d3691cb
+  data.tar.gz: ffe883ef2af226e85c53978f4165c04bbe62cf83364f4a6b25bdf7cbbdcc7b52d984733b0ed549e2a978b953366153ca944f4df184c0cb69c80c40b6ad3fd1a2

data/CHANGELOG.md

@@ -5,6 +5,24 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.7.4] - 2026-06-03
+
+### Fixed
+- **Custom path reverse lookup (frontend)** — the v0.7.3 backend fix was complete, but the frontend's `resourceLabelFromPath` still returned `null` for paths under `app/` that weren't `controllers|models|views|helpers`, so custom paths like `app/assets/javascripts/…` were never recognized. Moved the custom-path check to the top of the function, matching the backend approach.
+
+---
+
+## [0.7.3] - 2026-06-03
+
+### Fixed
+- **Custom path reverse lookup (backend)** — moved the custom-path check in `extract_resource_names` before the `case` statement so paths under `app/assets/`, `app/javascript/`, etc. are handled. Stripped `_controller`/`_model`/`_helper`/`_service` suffixes from custom-path filenames for consistent label/grouping.
+- **Schema modal `self.table_name` support** — reads `self.table_name` from the model file before falling back to `ActiveSupport::Inflector.tableize`, enabling custom table names.
+- **Structure.sql broader schema-prefix regex** — handles quoted schemas, non-public schemas, and no prefix.
+- **PostgreSQL type coverage** — expanded `sql_type_to_rails` with full PostgreSQL type coverage (timestamptz, double precision, citext, hstore, geometric types, etc.).
+- **Schema read error handling** — broadened rescue in `try_schema_rb`/`try_structure_sql` to catch encoding errors.
+
+---
+
 ## [0.7.2] - 2026-06-03
 
 ### Changed

data/app/assets/javascripts/mbeditor/components/MbeditorApp.js

@@ -1610,6 +1610,26 @@ var MbeditorApp = function MbeditorApp() {
 
   var resourceLabelFromPath = function(p) {
     if (!p) return null;
+
+    // Custom paths are checked first so they work regardless of top-level prefix.
+    // Paths under app/assets/, app/javascript/, etc. never match standard
+    // app/controllers|models|views|helpers, so the check must happen first.
+    var customPaths = customPathsRef.current;
+    for (var ci = 0; ci < customPaths.length; ci++) {
+      var base = customPaths[ci];
+      if (p.startsWith(base + '/')) {
+        var rest = p.slice(base.length + 1);
+        var resource = rest.split('/')[0].replace(/\.[^.]+$/, '');
+        resource = resource.replace(/_(controller|model|helper|service)$/, '');
+        if (resource) {
+          var seg = resource.replace(/ies$/, 'y')
+            .replace(/([^aeiou])es$/, '$1')
+            .replace(/([^s])s$/, '$1');
+          return seg.replace(/_/g, ' ').replace(/\b\w/g, function(c) { return c.toUpperCase(); });
+        }
+      }
+    }
+
     var parts = p.split('/');
     var file = parts[parts.length - 1];
     var name;
@@ -1624,23 +1644,9 @@ var MbeditorApp = function MbeditorApp() {
       else if (parts[1] === 'models') name = file.replace(/_(test|spec)\.rb$/, '');
       else return null;
     } else {
-      // Check custom paths
-      var customPaths = customPathsRef.current;
-      for (var ci = 0; ci < customPaths.length; ci++) {
-        var base = customPaths[ci];
-        if (p.startsWith(base + '/')) {
-          var rest = p.slice(base.length + 1);
-          var resource = rest.split('/')[0].replace(/\.[^.]+$/, '');
-          if (resource) {
-            var seg = resource.replace(/_/g, ' ').replace(/\b\w/g, function(c) { return c.toUpperCase(); });
-            return seg;
-          }
-        }
-      }
       return null;
     }
     var seg = (name || '').split('/').pop() || name || '';
-    // Normalize plural→singular so views/users and models/user share one group
     seg = seg.replace(/ies$/, 'y')
              .replace(/([^aeiou])es$/, '$1')
              .replace(/([^s])s$/, '$1');

data/app/services/mbeditor/rails_related_files_service.rb

@@ -124,6 +124,20 @@ module Mbeditor
       parts = relative_path.to_s.split("/")
       return nil unless parts.length >= 2
 
+      # Custom paths are checked first so they work regardless of top-level prefix.
+      # Paths under app/assets/, app/javascript/, etc. never reach the standard
+      # "app" branch, so the check must happen before the case statement.
+      Array(custom_paths).each do |base|
+        base = base.to_s.strip
+        next if base.empty?
+        next unless relative_path.start_with?("#{base}/")
+        rest = relative_path.delete_prefix("#{base}/")
+        resource = rest.split('/').first.to_s.sub(/\.[^.]+$/, '') # first segment, no extension
+        resource = resource.sub(/_(controller|model|helper|service)$/, '') # strip Rails suffixes
+        next if resource.empty?
+        return [pluralize(resource), singularize(resource)]
+      end
+
       case parts[0]
       when "app"
         case parts[1]
@@ -230,16 +244,6 @@ module Mbeditor
         end
 
       else
-        # Custom path fallback — must be last
-        Array(custom_paths).each do |base|
-          base = base.to_s.strip
-          next if base.empty?
-          next unless relative_path.start_with?("#{base}/")
-          rest = relative_path.delete_prefix("#{base}/")
-          resource = rest.split('/').first.to_s.sub(/\.[^.]+$/, '')  # first path segment, no extension
-          next if resource.empty?
-          return [pluralize(resource), singularize(resource)]
-        end
         nil
       end
     end

data/app/services/mbeditor/schema_service.rb

@@ -40,8 +40,25 @@ module Mbeditor
     private
 
     # "User" → "users", "OrderItem" → "order_items", "Order Item" → "order_items"
+    # Also checks the model file for an explicit `self.table_name = "..."` declaration.
     def derive_table_name(model_name)
       normalized = model_name.delete(" ")
+
+      # Check model file for an explicit table_name override
+      singular = ActiveSupport::Inflector.underscore(normalized)
+      model_file = File.join(@workspace_root, "app", "models", "#{singular}.rb")
+      if File.exist?(model_file)
+        begin
+          source = File.read(model_file, encoding: "utf-8")
+          # Matches: self.table_name = "name"  or  = :name  or  = 'name'
+          if (m = source.match(/self\.table_name\s*=\s*[:"']([^"'\s]+)["']?/))
+            return m[1]
+          end
+        rescue StandardError
+          # fall through to default derivation
+        end
+      end
+
       ActiveSupport::Inflector.tableize(normalized)
     end
 
@@ -53,7 +70,7 @@ module Mbeditor
       begin
         content = File.read(schema_path, encoding: "utf-8")
         parse_schema_rb(content, table_name)
-      rescue Errno::ENOENT, Errno::EACCES => e
+      rescue StandardError => e
         Rails.logger.debug("SchemaService: failed to read #{schema_path}: #{e.message}")
         nil
       end
@@ -67,7 +84,7 @@ module Mbeditor
       begin
         content = File.read(schema_path, encoding: "utf-8")
         parse_structure_sql(content, table_name)
-      rescue Errno::ENOENT, Errno::EACCES => e
+      rescue StandardError => e
         Rails.logger.debug("SchemaService: failed to read #{schema_path}: #{e.message}")
         nil
       end
@@ -145,11 +162,13 @@ module Mbeditor
       # Handles: PostgreSQL, MySQL, SQLite with quoted/unquoted names
       # Ends with different delimiters: ); ENGINE...; or just );
       quoted_name = Regexp.escape(table_name)
+      # Schema prefix pattern: matches public., "public"., myschema., "myschema". or nothing.
+      schema_prefix = /(?:(?:"[^"]+"|`[^`]+`|\w+)\.)?/
       patterns = [
-        # PostgreSQL with public schema: CREATE TABLE public."users" ( ... );
-        /CREATE\s+TABLE\s+(?:IF\s+NOT\s+EXISTS\s+)?(?:public\.)?["`]?#{quoted_name}["`]?\s*\(([\s\S]*?)\)\s*;/mi,
-        # MySQL with ENGINE: CREATE TABLE `users` ( ... ) ENGINE=...;
-        /CREATE\s+TABLE\s+(?:IF\s+NOT\s+EXISTS\s+)?["`]?#{quoted_name}["`]?\s*\(([\s\S]*?)\)\s*(?:ENGINE|DEFAULT)/mi
+        # PostgreSQL: CREATE TABLE [schema.]table ( ... );
+        /CREATE\s+TABLE\s+(?:IF\s+NOT\s+EXISTS\s+)?#{schema_prefix}["`]?#{quoted_name}["`]?\s*\(([\s\S]*?)\)\s*;/mi,
+        # MySQL: CREATE TABLE [schema.]`table` ( ... ) ENGINE=...;
+        /CREATE\s+TABLE\s+(?:IF\s+NOT\s+EXISTS\s+)?#{schema_prefix}["`]?#{quoted_name}["`]?\s*\(([\s\S]*?)\)\s*(?:ENGINE|DEFAULT)/mi
       ]
 
       table_def = nil
@@ -240,6 +259,9 @@ module Mbeditor
       type_map = {
         'integer' => 'integer',
         'int' => 'integer',
+        'int4' => 'integer',
+        'int2' => 'integer',
+        'int8' => 'bigint',
         'bigint' => 'bigint',
         'smallint' => 'integer',
         'bigserial' => 'bigint',
@@ -247,21 +269,50 @@ module Mbeditor
         'varchar' => 'string',
         'character varying' => 'string',
         'character' => 'string',
+        'char' => 'string',
         'text' => 'text',
+        'citext' => 'string',
         'boolean' => 'boolean',
         'bool' => 'boolean',
         'decimal' => 'decimal',
         'numeric' => 'decimal',
+        'real' => 'float',
         'float' => 'float',
+        'float4' => 'float',
+        'float8' => 'float',
+        'double precision' => 'float',
         'double' => 'float',
+        'money' => 'decimal',
         'timestamp' => 'datetime',
+        'timestamp without time zone' => 'datetime',
+        'timestamp with time zone' => 'datetime',
+        'timestamptz' => 'datetime',
         'datetime' => 'datetime',
         'date' => 'date',
         'time' => 'time',
+        'time without time zone' => 'time',
+        'time with time zone' => 'time',
+        'interval' => 'string',
         'json' => 'json',
         'jsonb' => 'jsonb',
         'uuid' => 'uuid',
-        'bytea' => 'binary'
+        'bytea' => 'binary',
+        'bit' => 'string',
+        'bit varying' => 'string',
+        'inet' => 'string',
+        'cidr' => 'string',
+        'macaddr' => 'string',
+        'xml' => 'string',
+        'hstore' => 'hstore',
+        'tsvector' => 'string',
+        'ltree' => 'string',
+        'point' => 'string',
+        'line' => 'string',
+        'lseg' => 'string',
+        'box' => 'string',
+        'path' => 'string',
+        'polygon' => 'string',
+        'circle' => 'string'
       }
 
       type_map[sql_type.downcase] || sql_type

data/lib/mbeditor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Mbeditor
-  VERSION = "0.7.2"
+  VERSION = "0.7.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mbeditor
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.4
 platform: ruby
 authors:
 - Oliver Noonan