rails8_db 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42504354ca6f79a8f68547f242e70e6cda5f8c1ae1d0653ba392759b1290f8f5
-  data.tar.gz: ba9e5243188e8a3a4d11de7bb5615040265f991c605d48840f86514ab736cdc5
+  metadata.gz: 3795fec896fc97941c5cdadbad40c7a12b81471a41503ac58faab7351bdc4278
+  data.tar.gz: 8c29d0fd0c72718d2b7768dff111f462330303c1350b03bbf2f89eb602969858
 SHA512:
-  metadata.gz: 7a9003285e9d62cb0db2e4d193a8c55941df54344ea9d10661aa07169f2b59c464ae455629a5fd3c8a84bf8d0feee268846c97307cd15edfd6515005cb779521
-  data.tar.gz: 9da1d7c9b60d99756a4e30e95e7ad2d8250750b25d9ba8ee314e2d4f811e82d8897cfc71951319053dd4e242dfc2ee5b9a98302fe0282bced59eaf51ed751f4b
+  metadata.gz: 462c34d659e7b04ebc37df4bf2dfde3a023cf98752a9bfa9fd6e4d12eea3d662483351cd0f12e3ab6acc5fc554b75596bb79b84a02f9285b29a7043290f55739
+  data.tar.gz: 80dfe544a5634004b4e5bc343d5ca6845c299f6f3590c7dc586e32da7131d7d8b41e63c63eb2fa71de51eb48a6fd7d4ce1b55b738eaf2d14102a612136fd9679

data/app/javascript/rails_db/application.js

@@ -1,18 +1,31 @@
-// Import all required JavaScript files
-import "../codemirror/codemirror.js"
-import "../codemirror/modes/sql.js"
-import "../codemirror/addons/hint/show-hint.js"
-import "../codemirror/addons/hint/sql-hint.js"
-import "./jquery.js"
-import "./jquery.cookie.js"
-import "./foundation.min.js"
-import "./rails-ujs.js"
-import "./search.js"
-import "./show_hide_columns.js"
-import "./sticky.js"
 
-// Make functions globally available
-window.expand_collapse = function() {
+$(function(){
+  $(document).foundation();
+
+  jQuery.expr[":"].icontains = jQuery.expr.createPseudo(function (arg) {
+    return function (elem) {
+      return jQuery(elem).text().toUpperCase().indexOf(arg.toUpperCase()) >= 0;
+    };
+  });
+
+  $('body').on('change', '.per_page_pagination_select', function() {
+    $(this).parents('form').submit();
+  });
+
+  $('body').on('keyup', '#rails_db_tables_input', function() {
+    value = $(this).val();
+    $("#rails_db_tables a").show();
+    $("#rails_db_tables a:not(:icontains('" + value + "'))").hide();
+  });
+
+  $('body').on('click', '.expand, .collapse', function() {
+    expand_collapse();
+    save_expand_collapse();
+    return false;
+  });
+});
+
+function expand_collapse() {
   $('#main_content').toggleClass('push-3')
   $('#main_content').toggleClass('large-9')
   $('#main_content').toggleClass('large-12')
@@ -21,12 +34,13 @@ window.expand_collapse = function() {
   $('.expand').toggle();
 };
 
-window.save_expand_collapse = function() {
+function save_expand_collapse() {
   $.removeCookie('sidebar_hidden');
   $.cookie('sidebar_hidden', !$('.expand').is(':visible'), { expires: 30, path: '/' });
 };
 
-window.init_sql_editor = function(mime, tables) {
+// https://github.com/codemirror/CodeMirror/blob/master/mode/sql/index.html
+function init_sql_editor(mime, tables) {
   var editor = CodeMirror.fromTextArea($('#sql').get(0), {
       mime: mime,
       hint: CodeMirror.hint.sql,
@@ -54,37 +68,11 @@ window.init_sql_editor = function(mime, tables) {
   editor.focus();
 };
 
-window.set_browser_url = function(url) {
+function set_browser_url(url) {
   if (typeof (history.pushState) != "undefined") {
     window.history.pushState({"path": url}, '', url);
   }
-};
-
-$(function(){
-  $(document).foundation();
-
-  jQuery.expr[":"].icontains = jQuery.expr.createPseudo(function (arg) {
-    return function (elem) {
-      return jQuery(elem).text().toUpperCase().indexOf(arg.toUpperCase()) >= 0;
-    };
-  });
-
-  $('body').on('change', '.per_page_pagination_select', function() {
-    $(this).parents('form').submit();
-  });
-
-  $('body').on('keyup', '#rails_db_tables_input', function() {
-    value = $(this).val();
-    $("#rails_db_tables a").show();
-    $("#rails_db_tables a:not(:icontains('" + value + "'))").hide();
-  });
-
-  $('body').on('click', '.expand, .collapse', function() {
-    expand_collapse();
-    save_expand_collapse();
-    return false;
-  });
-});
+}
 
 $(window).bind('popstate', function(event) {
   if (typeof (history.pushState) != "undefined") {

data/app/views/layouts/rails_db/application.html.erb

@@ -4,7 +4,24 @@
   <title><%= [yield(:title), 'Rails DB'].reject(&:blank?).join(' - ') %></title>
   <%= stylesheet_link_tag "https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css" %>
   <%= stylesheet_link_tag "rails_db/application" %>
-  <%= javascript_include_tag "rails_db/application", type: "module" %>
+  <%= javascript_include_tag "rails_db/application" %>
+
+  <% unless ENV["RAILS_ENV"] == "test" %>
+    <%= javascript_include_tag(
+          "codemirror/codemirror.js",
+          "codemirror/modes/sql.js",
+          "codemirror/addons/hint/show-hint.js",
+          "codemirror/addons/hint/sql-hint.js",
+          "rails_db/jquery.js",
+          "rails_db/jquery.cookie.js",
+          "rails_db/rails-ujs.js",
+          "rails_db/foundation.min.js",
+          "rails_db/sticky.js",
+          "rails_db/show_hide_columns.js",
+          "rails_db/search.js"
+        ) %>
+    <%= javascript_include_tag "rails_db/application" %>
+  <% end %>
 
   <%= csrf_meta_tags %>
 

data/lib/rails_db/engine.rb

@@ -1,49 +1,32 @@
 module RailsDb
   class Engine < ::Rails::Engine
     isolate_namespace RailsDb
-    config.autoload_paths += Dir["#{config.root}/lib"]
+    config.autoload_paths += Dir["#{config.root}/lib"] # For Ruby code, keep this
 
-    initializer 'rails_db.helpers' do
-      ActiveSupport.on_load :action_view do
-        include RailsDb::Helpers
-      end
-    end
-
-    # Configure assets for Propshaft
-    initializer 'rails_db.assets.precompile' do |app|
-      # Add the app/javascript directory to the asset paths
-      app.config.assets.paths << root.join('app', 'javascript')
-      
-      # Configure Propshaft to handle JavaScript modules
-      if app.config.respond_to?(:assets) && app.config.assets.respond_to?(:js_compressor)
-        app.config.assets.js_compressor = nil if app.config.assets.js_compressor == :uglifier
-      end
+    initializer "rails_db.assets" do |app|
+      # Check if the host app uses config.assets.paths (like Propshaft)
+      if app.config.respond_to?(:assets) && app.config.assets.respond_to?(:paths)
+        # Add the engine's app/javascript directory to the host app's asset paths
+        # 'config.root' here refers to the engine's root directory
+        app.config.assets.paths << config.root.join("app/javascript")
 
-      # Add all JavaScript files to precompile
-      app.config.assets.precompile += %w(
-        rails_db/application.js
-        rails_db/jquery.js
-        rails_db/jquery.cookie.js
-        rails_db/foundation.min.js
-        rails_db/rails-ujs.js
-        rails_db/search.js
-        rails_db/show_hide_columns.js
-        rails_db/sticky.js
-        codemirror/codemirror.js
-        codemirror/modes/sql.js
-        codemirror/addons/hint/show-hint.js
-        codemirror/addons/hint/sql-hint.js
-      )
+        # Optional: You might also explicitly add app/assets if needed,
+        # although Rails usually adds app/assets/** from engines automatically.
+        # Explicitly adding might help in some edge cases or ensure precedence.
+        # app.config.assets.paths << config.root.join("app/assets")
 
-      # Configure Propshaft to handle JavaScript modules
-      if app.config.respond_to?(:assets) && app.config.assets.respond_to?(:source_maps)
-        app.config.assets.source_maps = true
+        # Rails.logger.debug "[RailsDb Engine] Added #{config.root.join('app/javascript')} to asset paths"
+      else
+        # Log a warning if the expected configuration isn't found
+        Rails.logger.warn "[RailsDb Engine] Host application's config.assets.paths not found. Cannot automatically add engine's app/javascript path."
       end
+    end
 
-      # Configure Propshaft to handle JavaScript modules
-      if app.config.respond_to?(:assets) && app.config.assets.respond_to?(:compile)
-        app.config.assets.compile = true
+    initializer 'rails_db.helpers' do
+      ActiveSupport.on_load :action_view do
+        include RailsDb::Helpers
       end
     end
+
   end
 end

data/lib/rails_db/version.rb

@@ -1,3 +1,3 @@
 module RailsDb
-  VERSION = "0.0.12"
+  VERSION = "0.0.13"
 end