rails_db 2.4.2 → 2.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dee313935ad14adcc8ca643b170046da2445f480e5fc96a3735bd501be119b23
-  data.tar.gz: 69577452b70fdd0293ba5cbbb5a681c83ddc510f0f260b9b2efb1412ac7dedd9
+  metadata.gz: 0ee4e15109735de715f61c0048bf07359add53d6b3c15fec24b9fd9dee52ef8f
+  data.tar.gz: '0019d884186de9381b244fa96c281397236503bdf6690b4928c6bbbc3fb73319'
 SHA512:
-  metadata.gz: 0a2ab7702d142b2d2caf0c218d6f8dd008ab399f4114d374b7aaa586c4ad961113ff095cadcf8e17178e62ae3fe9a8104f14efc98e6d997108343db264fab7cf
-  data.tar.gz: 0d7ec014f6a4419977e40234e4e3b6dfc79eee990ddffef1bd92a2094ab661efa212ed99ded592ce4315d09146a314db8934720784692d895b1b262d0d8c01d6
+  metadata.gz: 074640a153c009aa57536d74c41dd30d800a92389865381173ce7a9a8de656c6b27befcf0faffe9708bda24ad5a29574e6db640217c8711036a135d82109ab11
+  data.tar.gz: 2862b8b055b5b91514cf6917f4ec4739947d7e881a30396780b37b1618440e6f9de5e8e1aa02c79df4addf5cc2d30c8a777c79709f7d11998d37be4ab8321b51

data/Gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'rails'
+gem 'rails', '7.1.2'
 gem 'terminal-table'
 gem 'simple_form', '>= 5.0.1'
 gem 'ransack', '>= 2.3.2'
@@ -23,4 +23,4 @@ end
 
 gem 'will_paginate'
 
-gem 'paranoia'
+gem 'paranoia'

data/Gemfile.lock

@@ -1,78 +1,96 @@
 PATH
   remote: .
   specs:
-    rails_db (2.4.2)
+    rails_db (2.4.3)
       activerecord
       kaminari
       rails (>= 5.0.0)
       ransack (>= 2.3.2)
       simple_form (>= 5.0.1)
+      sprockets-rails
       terminal-table
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.1.7.3)
-      actionpack (= 6.1.7.3)
-      activesupport (= 6.1.7.3)
+    actioncable (7.1.2)
+      actionpack (= 7.1.2)
+      activesupport (= 7.1.2)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.7.3)
-      actionpack (= 6.1.7.3)
-      activejob (= 6.1.7.3)
-      activerecord (= 6.1.7.3)
-      activestorage (= 6.1.7.3)
-      activesupport (= 6.1.7.3)
+      zeitwerk (~> 2.6)
+    actionmailbox (7.1.2)
+      actionpack (= 7.1.2)
+      activejob (= 7.1.2)
+      activerecord (= 7.1.2)
+      activestorage (= 7.1.2)
+      activesupport (= 7.1.2)
       mail (>= 2.7.1)
-    actionmailer (6.1.7.3)
-      actionpack (= 6.1.7.3)
-      actionview (= 6.1.7.3)
-      activejob (= 6.1.7.3)
-      activesupport (= 6.1.7.3)
+      net-imap
+      net-pop
+      net-smtp
+    actionmailer (7.1.2)
+      actionpack (= 7.1.2)
+      actionview (= 7.1.2)
+      activejob (= 7.1.2)
+      activesupport (= 7.1.2)
       mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 2.0)
-    actionpack (6.1.7.3)
-      actionview (= 6.1.7.3)
-      activesupport (= 6.1.7.3)
-      rack (~> 2.0, >= 2.0.9)
+      net-imap
+      net-pop
+      net-smtp
+      rails-dom-testing (~> 2.2)
+    actionpack (7.1.2)
+      actionview (= 7.1.2)
+      activesupport (= 7.1.2)
+      nokogiri (>= 1.8.5)
+      racc
+      rack (>= 2.2.4)
+      rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.1.7.3)
-      actionpack (= 6.1.7.3)
-      activerecord (= 6.1.7.3)
-      activestorage (= 6.1.7.3)
-      activesupport (= 6.1.7.3)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    actiontext (7.1.2)
+      actionpack (= 7.1.2)
+      activerecord (= 7.1.2)
+      activestorage (= 7.1.2)
+      activesupport (= 7.1.2)
+      globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (6.1.7.3)
-      activesupport (= 6.1.7.3)
+    actionview (7.1.2)
+      activesupport (= 7.1.2)
       builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.1.7.3)
-      activesupport (= 6.1.7.3)
+      erubi (~> 1.11)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    activejob (7.1.2)
+      activesupport (= 7.1.2)
       globalid (>= 0.3.6)
-    activemodel (6.1.7.3)
-      activesupport (= 6.1.7.3)
-    activerecord (6.1.7.3)
-      activemodel (= 6.1.7.3)
-      activesupport (= 6.1.7.3)
-    activestorage (6.1.7.3)
-      actionpack (= 6.1.7.3)
-      activejob (= 6.1.7.3)
-      activerecord (= 6.1.7.3)
-      activesupport (= 6.1.7.3)
+    activemodel (7.1.2)
+      activesupport (= 7.1.2)
+    activerecord (7.1.2)
+      activemodel (= 7.1.2)
+      activesupport (= 7.1.2)
+      timeout (>= 0.4.0)
+    activestorage (7.1.2)
+      actionpack (= 7.1.2)
+      activejob (= 7.1.2)
+      activerecord (= 7.1.2)
+      activesupport (= 7.1.2)
       marcel (~> 1.0)
-      mini_mime (>= 1.1.0)
-    activesupport (6.1.7.3)
+    activesupport (7.1.2)
+      base64
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
+      mutex_m
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
+    base64 (0.2.0)
+    bigdecimal (3.1.8)
     builder (3.2.4)
     caxlsx (3.1.0)
       htmlentities (~> 4.3, >= 4.3.4)
@@ -83,15 +101,22 @@ GEM
       actionpack (>= 3.1)
       caxlsx (>= 3.0)
     coderay (1.1.3)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.3.1)
+    connection_pool (2.4.1)
     crass (1.0.6)
-    erubi (1.10.0)
+    date (3.3.4)
+    drb (2.2.1)
+    erubi (1.12.0)
     execjs (2.8.1)
-    globalid (0.4.2)
-      activesupport (>= 4.2.0)
+    globalid (1.2.1)
+      activesupport (>= 6.1)
     htmlentities (4.3.4)
-    i18n (1.8.10)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
+    io-console (0.7.2)
+    irb (1.13.1)
+      rdoc (>= 4.0.0)
+      reline (>= 0.4.2)
     kaminari (1.2.1)
       activesupport (>= 4.1.0)
       kaminari-actionview (= 1.2.1)
@@ -106,91 +131,125 @@ GEM
     kaminari-core (1.2.1)
     launchy (2.5.0)
       addressable (~> 2.7)
-    loofah (2.10.0)
+    loofah (2.22.0)
       crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    mail (2.7.1)
+      nokogiri (>= 1.12.0)
+    mail (2.8.1)
       mini_mime (>= 0.1.1)
-    marcel (1.0.1)
-    method_source (1.0.0)
-    mime-types (2.99.3)
-    mini_mime (1.1.2)
-    mini_portile2 (2.8.2)
-    minitest (5.14.4)
-    mysql2 (0.5.5)
-    nio4r (2.5.7)
-    nokogiri (1.13.10)
-      mini_portile2 (~> 2.8.0)
+      net-imap
+      net-pop
+      net-smtp
+    marcel (1.0.4)
+    method_source (1.1.0)
+    mime-types (3.5.2)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2024.0604)
+    mini_mime (1.1.5)
+    mini_portile2 (2.8.7)
+    minitest (5.23.1)
+    mutex_m (0.2.0)
+    mysql2 (0.5.6)
+    net-imap (0.4.12)
+      date
+      net-protocol
+    net-pop (0.1.2)
+      net-protocol
+    net-protocol (0.2.2)
+      timeout
+    net-smtp (0.5.0)
+      net-protocol
+    nio4r (2.7.3)
+    nokogiri (1.16.5)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    paranoia (2.6.1)
-      activerecord (>= 5.1, < 7.1)
+    paranoia (2.6.3)
+      activerecord (>= 5.1, < 7.2)
     pg (1.2.3)
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
     pry-rails (0.3.9)
       pry (>= 0.10.4)
+    psych (5.1.2)
+      stringio
     public_suffix (4.0.6)
-    racc (1.6.2)
-    rack (2.2.3)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    rails (6.1.7.3)
-      actioncable (= 6.1.7.3)
-      actionmailbox (= 6.1.7.3)
-      actionmailer (= 6.1.7.3)
-      actionpack (= 6.1.7.3)
-      actiontext (= 6.1.7.3)
-      actionview (= 6.1.7.3)
-      activejob (= 6.1.7.3)
-      activemodel (= 6.1.7.3)
-      activerecord (= 6.1.7.3)
-      activestorage (= 6.1.7.3)
-      activesupport (= 6.1.7.3)
+    puma (6.3.0)
+      nio4r (~> 2.0)
+    racc (1.8.0)
+    rack (2.2.9)
+    rack-session (1.0.2)
+      rack (< 3)
+    rack-test (2.1.0)
+      rack (>= 1.3)
+    rackup (1.0.0)
+      rack (< 3)
+      webrick
+    rails (7.1.2)
+      actioncable (= 7.1.2)
+      actionmailbox (= 7.1.2)
+      actionmailer (= 7.1.2)
+      actionpack (= 7.1.2)
+      actiontext (= 7.1.2)
+      actionview (= 7.1.2)
+      activejob (= 7.1.2)
+      activemodel (= 7.1.2)
+      activerecord (= 7.1.2)
+      activestorage (= 7.1.2)
+      activesupport (= 7.1.2)
       bundler (>= 1.15.0)
-      railties (= 6.1.7.3)
-      sprockets-rails (>= 2.0.0)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
+      railties (= 7.1.2)
+    rails-dom-testing (2.2.0)
+      activesupport (>= 5.0.0)
+      minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.3.0)
-      loofah (~> 2.3)
-    railties (6.1.7.3)
-      actionpack (= 6.1.7.3)
-      activesupport (= 6.1.7.3)
-      method_source
+    rails-html-sanitizer (1.6.0)
+      loofah (~> 2.21)
+      nokogiri (~> 1.14)
+    railties (7.1.2)
+      actionpack (= 7.1.2)
+      activesupport (= 7.1.2)
+      irb
+      rackup (>= 1.0.0)
       rake (>= 12.2)
-      thor (~> 1.0)
-    rake (13.0.3)
+      thor (~> 1.0, >= 1.2.2)
+      zeitwerk (~> 2.6)
+    rake (13.2.1)
     ransack (4.0.0)
       activerecord (>= 6.1.5)
       activesupport (>= 6.1.5)
       i18n
+    rdoc (6.7.0)
+      psych (>= 4.0.0)
+    reline (0.5.8)
+      io-console (~> 0.5)
     rubyzip (2.3.0)
     simple_form (5.1.0)
       actionpack (>= 5.2)
       activemodel (>= 5.2)
-    sprockets (4.0.2)
+    sprockets (4.2.1)
       concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.2.2)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
+      rack (>= 2.2.4, < 4)
+    sprockets-rails (3.5.0)
+      actionpack (>= 6.1)
+      activesupport (>= 6.1)
       sprockets (>= 3.0.0)
     sqlite3 (1.4.2)
+    stringio (3.1.0)
     terminal-table (3.0.1)
       unicode-display_width (>= 1.1.1, < 3)
-    thor (1.1.0)
-    tzinfo (2.0.4)
+    thor (1.3.1)
+    timeout (0.4.1)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
     unicode-display_width (2.0.0)
-    websocket-driver (0.7.4)
+    webrick (1.8.1)
+    websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     will_paginate (3.3.0)
-    zeitwerk (2.6.8)
+    zeitwerk (2.6.15)
 
 PLATFORMS
   ruby
@@ -200,12 +259,13 @@ DEPENDENCIES
   caxlsx_rails
   kaminari (>= 0.17.0)
   launchy
-  mime-types (< 3.0)
-  mysql2 (= 0.5.5)
+  mime-types
+  mysql2 (= 0.5.6)
   paranoia
   pg
   pry-rails
-  rails
+  puma
+  rails (= 7.1.2)
   rails_db!
   ransack (>= 2.3.2)
   rubyzip (>= 1.2.1)

data/app/controllers/rails_db/tables_controller.rb

@@ -1,6 +1,6 @@
 module RailsDb
   class TablesController < RailsDb::ApplicationController
-    LOAD_TABLE_ACTIONS = [:show, :data, :csv, :truncate, :destroy, :edit, :update, :xlsx, :search, :new, :create]
+    LOAD_TABLE_ACTIONS = [:show, :data, :csv, :truncate, :destroy, :edit, :update, :xlsx, :new, :create]
 
     before_action :find_table, only: LOAD_TABLE_ACTIONS
 

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

@@ -1,10 +1,10 @@
 <div class="large-12 columns">
   <hr/>
   <div class="row">
-    <div class="large-6 columns">
+    <div class="large-4 columns">
       <p>© Rails DB  <span class='red'><%= fa_icon 'heart' %></span>  <%= link_to 'https://github.com/igorkasyanchuk/rails_db', 'https://github.com/igorkasyanchuk/rails_db', target: '_blank' %></p>
     </div>
-    <div class="large-6 columns">
+    <div class="large-8 columns">
       <ul class="inline-list right">
         <% if defined?  main_app.root_url %>
         <li>
@@ -54,4 +54,4 @@
     </div>
   </div>
   <%= render '/rails_db/shared/gems' %>
-</div>
+</div>

data/lib/generators/templates/rails_db.rb

@@ -21,10 +21,10 @@ if Object.const_defined?('RailsDb')
     # # Enable http basic authentication
     # config.http_basic_authentication_password = 'password'
 
-    # # Enable http basic authentication
+    # # Enable verify access proc
     # config.verify_access_proc = proc { |controller| true }
 
     # # Sandbox mode (only read-only operations)
     # config.sandbox = false
   end
-end
+end

data/lib/rails_db/adapters/base_adapter.rb

@@ -59,7 +59,7 @@ module RailsDb
 
       def self.delete(table_name, pk_name, pk_id)
         case pk_id
-          when Fixnum, Bignum then
+          when Integer then
             execute("DELETE FROM #{table_name} WHERE #{pk_name} = #{pk_id};")
           else
             execute("DELETE FROM #{table_name} WHERE #{pk_name} = '#{pk_id}';")

data/lib/rails_db/sql_import.rb

@@ -23,4 +23,4 @@ module RailsDb
     end
 
   end
-end
+end

data/lib/rails_db/table.rb

@@ -72,7 +72,11 @@ module RailsDb
 
     def add_ransack_methods(klass)
       klass.define_singleton_method(:ransackable_attributes) do |auth_object = nil|
-        column_names.map(&:to_sym)
+        column_names.map(&:to_sym) + column_names
+      end
+
+      klass.define_singleton_method(:ransortable_attributes) do |auth_object = nil|
+        column_names.map(&:to_sym) + column_names
       end
 
       klass.define_singleton_method(:ransackable_associations) do |auth_object = nil|

data/lib/rails_db/version.rb

@@ -1,3 +1,3 @@
 module RailsDb
-  VERSION = "2.4.2"
+  VERSION = "2.4.3"
 end

data/lib/rails_db.rb

@@ -5,6 +5,7 @@ require 'simple_form'
 require 'active_record'
 require 'ransack'
 require 'kaminari'
+require 'sprockets/rails'
 
 module RailsDb
   # Custom require relative that work with older rubies also

data/rails_db.gemspec

@@ -23,16 +23,18 @@ 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_development_dependency "launchy"
   s.add_development_dependency "sqlite3", '~> 1.4'
-  s.add_development_dependency "mysql2", '0.5.5'
+  s.add_development_dependency "mysql2", '0.5.6'
   s.add_development_dependency "pg"
   s.add_development_dependency "caxlsx_rails"
   s.add_development_dependency 'will_paginate', '>= 3.1.0'
-  s.add_development_dependency 'mime-types', '< 3.0'
+  s.add_development_dependency 'mime-types'
   s.add_development_dependency 'paranoia'
   s.add_development_dependency 'pry-rails'
+  s.add_development_dependency 'puma'
   # s.add_development_dependency 'populator'
   # s.add_development_dependency 'faker'
   # s.add_development_dependency 'pry'

data/test/dummy/config/database.yml

@@ -7,6 +7,7 @@ mysql: &mysql
   username: root
   password:
   database: rails_db
+  port: 3307
 
 postgresql: &postgresql
   adapter: postgresql
@@ -23,11 +24,10 @@ defaults: &defaults
 
 development:
   <<: *defaults
-  database: db/rails_db_dev.sqlite3
 
 test:
   <<: *defaults
-  database: <%= ENV['TRAVIS'] ? '":memory:"' : 'db/test.sqlite3' %>
+  database: <%= ENV['TRAVIS'] ? '":memory:"' : (ENV['DATABASE_NAME'] || 'db/test.sqlite3') %>
 
 production:
   <<: *defaults

data/test/dummy/db/schema.rb

@@ -10,28 +10,27 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2021_06_26_083314) do
-
+ActiveRecord::Schema[7.1].define(version: 2021_06_26_083314) do
   create_table "accounts", force: :cascade do |t|
     t.string "name"
     t.integer "users_count"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
   end
 
   create_table "comments", force: :cascade do |t|
     t.text "comment"
     t.integer "user_id"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
   end
 
   create_table "contacts", force: :cascade do |t|
     t.string "name"
     t.string "email"
     t.text "message"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.index ["name", "email"], name: "index_contacts_on_name_and_email"
   end
 
@@ -42,8 +41,8 @@ ActiveRecord::Schema.define(version: 2021_06_26_083314) do
   create_table "payments", force: :cascade do |t|
     t.decimal "amount"
     t.integer "project_id"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.index ["project_id"], name: "index_payments_on_project_id"
   end
 
@@ -89,9 +88,9 @@ ActiveRecord::Schema.define(version: 2021_06_26_083314) do
     t.integer "amount_433505"
     t.integer "amount_160749"
     t.integer "amount_723751"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.datetime "deleted_at"
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
+    t.datetime "deleted_at", precision: nil
     t.index ["deleted_at"], name: "index_projects_on_deleted_at"
   end
 
@@ -107,8 +106,8 @@ ActiveRecord::Schema.define(version: 2021_06_26_083314) do
     t.integer "age"
     t.decimal "salary"
     t.text "bio"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.integer "account_id"
     t.date "dob"
     t.boolean "active", default: true