rails_db 2.4.5 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97bf5db2b70dddcf1da63c417b4e860bd41323397ac8a6d7a1a95476269bcb96
-  data.tar.gz: 72012771a62f581e8674521b2d909ae28e971bbf8f84e3885c8b6809adc445f0
+  metadata.gz: 853f483c3bdb85c1ac0d7886b9918bc19a54a101f12c6f62d862ce08a1bea6fb
+  data.tar.gz: 0fbf7b0d28e81571b406a900254a07795777d883dfc6af19bb5402442dd7c459
 SHA512:
-  metadata.gz: aebba26da9947061cc1a68237edfdb196b5ed90b4b3de029f876da29f8e6511be2d9ef7681efaa26b637bbf8b1c3c656498c3dc075894785acfaa0ea0798fee7
-  data.tar.gz: a97ecc0e26123d658bef30094643d599dcc95bca9419773ea815d3ad65cbeef4f5e0a84ae3e8862c61ce34ab819f23f0d04e21368d784350da7efb756bbfddd3
+  metadata.gz: 8dc44b938aff470f1a0a831532316a747ece19afff8e65e6ccaba3e01fa4cc833a06d05792b0694391d03fdc69ab967ed2fd66445d5907a37fe24e2cf60d2cd7
+  data.tar.gz: d15fcce18076e079ed73e07bb8c9fc6ad20f884dcc20a55a6fdda34ae7f05f6e9ab782aa792aaebd0b0fb3e806fd450d8a59a702aeb55b022a0fd8f0f1d0f16a

data/Gemfile.lock

@@ -1,14 +1,13 @@
 PATH
   remote: .
   specs:
-    rails_db (2.4.5)
+    rails_db (2.5.0)
       activerecord
       csv
       kaminari
       rails (>= 5.0.0)
       ransack (>= 2.3.2)
       simple_form (>= 5.0.1)
-      sprockets-rails
       terminal-table
 
 GEM
@@ -228,13 +227,6 @@ GEM
     simple_form (5.1.0)
       actionpack (>= 5.2)
       activemodel (>= 5.2)
-    sprockets (4.2.1)
-      concurrent-ruby (~> 1.0)
-      rack (>= 2.2.4, < 4)
-    sprockets-rails (3.5.0)
-      actionpack (>= 6.1)
-      activesupport (>= 6.1)
-      sprockets (>= 3.0.0)
     sqlite3 (1.7.3)
       mini_portile2 (~> 2.8.0)
     stringio (3.1.0)

data/app/assets/javascripts/rails_db/application.js

@@ -10,87 +10,4 @@
 //= require rails_db/sticky
 //= require rails_db/show_hide_columns.js
 //= require rails_db/search.js
-
-$(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')
-  $('#sidebar').toggle();
-  $('.collapse').toggle();
-  $('.expand').toggle();
-};
-
-function save_expand_collapse() {
-  $.removeCookie('sidebar_hidden');
-  $.cookie('sidebar_hidden', !$('.expand').is(':visible'), { expires: 30, path: '/' });
-};
-
-// 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,
-      matchBrackets: true,
-      smartIndent: true,
-      autofocus: true,
-      "theme": 'pastel-on-dark',
-      "lineNumbers": true,
-      "mode": "text/x-sql",
-      "tabSize": 4,
-      height: 'auto',
-      extraKeys: {
-        "Esc": 'autocomplete',
-        "Ctrl": 'autocomplete',
-        "Ctrl-Space": 'autocomplete',
-        "Ctrl-Enter": function() {
-          $(editor.getInputField()).parents('form').submit();
-        }
-      },
-      hintOptions: {
-        tables: tables
-      }
-    });
-  editor.setSize('100%', '300');
-  editor.focus();
-};
-
-function set_browser_url(url) {
-  if (typeof (history.pushState) != "undefined") {
-    window.history.pushState({"path": url}, '', url);
-  }
-}
-
-$(window).bind('popstate', function(event) {
-  if (typeof (history.pushState) != "undefined") {
-    var state = event.originalEvent.state;
-    if (state) {
-      window.location = state.path;
-    }
-  }
-});
+//= require rails_db/shared.js

data/app/assets/javascripts/rails_db/shared.js

@@ -0,0 +1,83 @@
+$(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')
+  $('#sidebar').toggle();
+  $('.collapse').toggle();
+  $('.expand').toggle();
+};
+
+function save_expand_collapse() {
+  $.removeCookie('sidebar_hidden');
+  $.cookie('sidebar_hidden', !$('.expand').is(':visible'), { expires: 30, path: '/' });
+};
+
+// 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,
+      matchBrackets: true,
+      smartIndent: true,
+      autofocus: true,
+      "theme": 'pastel-on-dark',
+      "lineNumbers": true,
+      "mode": "text/x-sql",
+      "tabSize": 4,
+      height: 'auto',
+      extraKeys: {
+        "Esc": 'autocomplete',
+        "Ctrl": 'autocomplete',
+        "Ctrl-Space": 'autocomplete',
+        "Ctrl-Enter": function() {
+          $(editor.getInputField()).parents('form').submit();
+        }
+      },
+      hintOptions: {
+        tables: tables
+      }
+    });
+  editor.setSize('100%', '300');
+  editor.focus();
+};
+
+function set_browser_url(url) {
+  if (typeof (history.pushState) != "undefined") {
+    window.history.pushState({"path": url}, '', url);
+  }
+}
+
+$(window).bind('popstate', function(event) {
+  if (typeof (history.pushState) != "undefined") {
+    var state = event.originalEvent.state;
+    if (state) {
+      window.location = state.path;
+    }
+  }
+});

data/app/helpers/rails_db/application_helper.rb

@@ -78,5 +78,53 @@ module RailsDb
         p
       end
     end
+
+    def insert_css_file(file)
+      if using_sprockets?
+        # For Sprockets, use the asset pipeline
+        # Remove .css extension and use the file path as-is for asset pipeline
+        asset_name = file.gsub('.css', '')
+        stylesheet_link_tag asset_name, media: "all"
+      else
+        # For Propshaft/Rails 8 compatibility - inline the CSS
+        css_path = File.expand_path(File.dirname(__FILE__) + "/../../assets/stylesheets/#{file}")
+        if File.exist?(css_path)
+          raw "<style>#{File.read(css_path)}</style>"
+        else
+          ""
+        end
+      end
+    end
+
+    def insert_js_file(file)
+      if using_sprockets?
+        # For Sprockets, use the asset pipeline
+        # Remove .js extension and use the file path as-is for asset pipeline
+        asset_name = file.gsub('.js', '')
+        javascript_include_tag asset_name
+      else
+        # For Propshaft/Rails 8 compatibility - inline the JavaScript
+        js_path = File.expand_path(File.dirname(__FILE__) + "/../../assets/javascripts/#{file}")
+        if File.exist?(js_path)
+          raw "<script>#{File.read(js_path)}</script>"
+        else
+          ""
+        end
+      end
+    end
+
+    private
+
+    def using_sprockets?
+      # Check if sprockets-rails is available and being used
+      return false unless defined?(Sprockets)
+      
+      # Check if Rails.application.assets is a Sprockets environment
+      Rails.application.assets.is_a?(Sprockets::Environment) ||
+      Rails.application.assets.is_a?(Sprockets::Index)
+    rescue
+      # If anything fails, assume we're not using Sprockets
+      false
+    end
   end
 end

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

@@ -3,8 +3,12 @@
 <head>
   <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", media: "all" %>
-  <%= javascript_include_tag "rails_db/application" %>
+  <% if using_sprockets? %>
+    <%= stylesheet_link_tag    "rails_db/application", media: "all" %>
+    <%= javascript_include_tag "rails_db/application" %>
+  <% else %>
+    <%= render 'rails_db/shared/assets' %>
+  <% end %>
   <%= csrf_meta_tags %>
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />

data/app/views/rails_db/shared/_assets.html.erb

@@ -0,0 +1,26 @@
+<!-- CSS Assets -->
+<%= insert_css_file 'rails_db/foundation.min.css' %>
+<%= insert_css_file 'rails_db/foundation_and_overrides.css' %>
+<%= insert_css_file 'codemirror/codemirror.css' %>
+<%= insert_css_file 'codemirror/codemirror/themes/pastel-on-dark.css' %>
+<%= insert_css_file 'codemirror/codemirror/addons/hint/show-hint.css' %>
+<%= insert_css_file 'rails_db/app.css' %>
+<%= insert_css_file 'rails_db/sidebar.css' %>
+<%= insert_css_file 'rails_db/pagination.css' %>
+<%= insert_css_file 'rails_db/table.css' %>
+<%= insert_css_file 'rails_db/forms.css' %>
+<%= insert_css_file 'rails_db/search.css' %>
+
+<!-- JavaScript Assets -->
+<%= insert_js_file 'codemirror/codemirror.js' %>
+<%= insert_js_file 'codemirror/codemirror/modes/sql.js' %>
+<%= insert_js_file 'codemirror/codemirror/addons/hint/show-hint.js' %>
+<%= insert_js_file 'codemirror/codemirror/addons/hint/sql-hint.js' %>
+<%= insert_js_file 'rails_db/jquery.js' %>
+<%= insert_js_file 'rails_db/jquery.cookie.js' %>
+<%= insert_js_file 'rails_db/rails-ujs.js' %>
+<%= insert_js_file 'rails_db/foundation.min.js' %>
+<%= insert_js_file 'rails_db/sticky.js' %>
+<%= insert_js_file 'rails_db/show_hide_columns.js' %>
+<%= insert_js_file 'rails_db/search.js' %>
+<%= insert_js_file 'rails_db/shared.js' %>

data/lib/rails_db/engine.rb

@@ -4,19 +4,22 @@ module RailsDb
     config.autoload_paths += Dir["#{config.root}/lib"]
 
     initializer 'rails_db.assets_precompile', :group => :all do |app|
-      app.config.assets.precompile += [
-        'rails_db/application.js', 
-        'rails_db/application.css',
-        'rails_db/logo.png',
-        'rails_db/logo_mini.png',
-        'rails_db/data_table_code.png',
-        'rails_db/data_table.png',
-        'rails_db/railsdb.png',
-        'rails_db/runsql.png',
-        'rails_db/*.png', 
-        'codemirror/*', 
-        'codemirror/**/*'
-      ]
+      # Only configure asset precompilation if Sprockets is available
+      if defined?(Sprockets) && app.config.respond_to?(:assets)
+        app.config.assets.precompile += [
+          'rails_db/application.js', 
+          'rails_db/application.css',
+          'rails_db/logo.png',
+          'rails_db/logo_mini.png',
+          'rails_db/data_table_code.png',
+          'rails_db/data_table.png',
+          'rails_db/railsdb.png',
+          'rails_db/runsql.png',
+          'rails_db/*.png', 
+          'codemirror/*', 
+          'codemirror/**/*'
+        ]
+      end
     end
 
     initializer 'rails_db.helpers' do

data/lib/rails_db/version.rb

@@ -1,3 +1,3 @@
 module RailsDb
-  VERSION = "2.4.5"
+  VERSION = "2.5.0"
 end

data/lib/rails_db.rb

@@ -5,7 +5,13 @@ require 'simple_form'
 require 'active_record'
 require 'ransack'
 require 'kaminari'
-require 'sprockets/rails'
+
+# Only require sprockets/rails if it's available
+begin
+  require 'sprockets/rails'
+rescue LoadError
+  # sprockets-rails is not available, continue without it
+end
 
 module RailsDb
   # Custom require relative that work with older rubies also

data/rails_db.gemspec

@@ -23,7 +23,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'activerecord'
   s.add_dependency 'ransack', '>= 2.3.2'
   s.add_dependency 'kaminari'
-  s.add_dependency 'sprockets-rails'
   s.add_dependency 'csv'
 
   s.add_development_dependency "launchy"