rails_db 1.6.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38ee5e7a2a449a75b5dee2890bfacb34e3600a73
-  data.tar.gz: 8cc216088bd7d1cf9b7ebff56a32fd46cebb3854
+  metadata.gz: d344f8033229abb378e3078dbda79b5888a56c33
+  data.tar.gz: e59e2ac708f3011aaada3c31e947189eb09e3d78
 SHA512:
-  metadata.gz: fe5053a606b1f0924b48a82514eb6a21d98d69012056e3b40fe446b4ce1918dc08a4929ba63519bf6b40300da3923236e80bc445b8a4016b4efeb05e5226dfcd
-  data.tar.gz: ad341d49365dec5f75ee722b7420784278a2262971a68aed655c202d73f6d12d7715c3a2663388cf7f80e875d5e913f524ed4088bd101ee2ac771d9e51f5cb37
+  metadata.gz: 320b1a28ac55849a4272ec7860a0ff285857ec36c1446884912fd308e915c734cb22ecb8484aa59a8f308763358eac78467bee7b39a2cf661fbd6d42cc58b163
+  data.tar.gz: c6b279415bea449da156068ef716dd9da118ae106663425b19813c88174c9b128f5f0ecd7d10e0434f4130127d8044ab76753ca5015670ed6cf16a8ff1860fb3

data/Gemfile

@@ -2,13 +2,18 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'rails'
+gem 'rails', '5.1.6'
 gem 'codemirror-rails'
 gem 'terminal-table'
 gem 'simple_form'
-gem 'ransack'
+gem 'ransack', '1.8.8'
 gem 'kaminari', '>= 0.17.0'
 
+# for Rails 5+
+gem 'rubyzip', '>= 1.2.1'
+gem 'axlsx', git: 'https://github.com/randym/axlsx.git', ref: 'c8ac844'
+gem 'axlsx_rails'
+
 group :assets do
   gem 'uglifier'
 end

data/Gemfile.lock

@@ -1,10 +1,21 @@
+GIT
+  remote: https://github.com/randym/axlsx.git
+  revision: c8ac844572b25fda358cc01d2104720c4c42f450
+  ref: c8ac844
+  specs:
+    axlsx (2.1.0.pre)
+      htmlentities (~> 4.3.4)
+      mimemagic (~> 0.3)
+      nokogiri (>= 1.6.6)
+      rubyzip (>= 1.2.1)
+
 PATH
   remote: .
   specs:
-    rails_db (1.5.0)
+    rails_db (2.0.0)
       codemirror-rails
       kaminari
-      rails (>= 3.1.0)
+      rails (>= 5.0.0)
       ransack
       simple_form
       terminal-table
@@ -12,138 +23,158 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.8)
-      actionpack (= 4.2.8)
-      actionview (= 4.2.8)
-      activejob (= 4.2.8)
+    actioncable (5.1.6)
+      actionpack (= 5.1.6)
+      nio4r (~> 2.0)
+      websocket-driver (~> 0.6.1)
+    actionmailer (5.1.6)
+      actionpack (= 5.1.6)
+      actionview (= 5.1.6)
+      activejob (= 5.1.6)
       mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.8)
-      actionview (= 4.2.8)
-      activesupport (= 4.2.8)
-      rack (~> 1.6)
-      rack-test (~> 0.6.2)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.1.6)
+      actionview (= 5.1.6)
+      activesupport (= 5.1.6)
+      rack (~> 2.0)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.8)
-      activesupport (= 4.2.8)
+    actionview (5.1.6)
+      activesupport (= 5.1.6)
       builder (~> 3.1)
-      erubis (~> 2.7.0)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (4.2.8)
-      activesupport (= 4.2.8)
-      globalid (>= 0.3.0)
-    activemodel (4.2.8)
-      activesupport (= 4.2.8)
-      builder (~> 3.1)
-    activerecord (4.2.8)
-      activemodel (= 4.2.8)
-      activesupport (= 4.2.8)
-      arel (~> 6.0)
-    activesupport (4.2.8)
-      i18n (~> 0.7)
+    activejob (5.1.6)
+      activesupport (= 5.1.6)
+      globalid (>= 0.3.6)
+    activemodel (5.1.6)
+      activesupport (= 5.1.6)
+    activerecord (5.1.6)
+      activemodel (= 5.1.6)
+      activesupport (= 5.1.6)
+      arel (~> 8.0)
+    activesupport (5.1.6)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.4.0)
-    arel (6.0.4)
-    axlsx (2.0.1)
-      htmlentities (~> 4.3.1)
-      nokogiri (>= 1.4.1)
-      rubyzip (~> 1.0.0)
-    axlsx_rails (0.4.0)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
+    arel (8.0.0)
+    axlsx_rails (0.5.2)
+      actionpack (>= 3.1)
       axlsx (>= 2.0.1)
-      rails (>= 3.1)
     builder (3.2.3)
-    codemirror-rails (5.6)
-      railties (>= 3.0, < 5)
+    codemirror-rails (5.16.0)
+      railties (>= 3.0, < 6.0)
     concurrent-ruby (1.0.5)
-    erubis (2.7.0)
-    execjs (2.6.0)
-    globalid (0.4.0)
+    crass (1.0.4)
+    erubi (1.7.1)
+    execjs (2.7.0)
+    globalid (0.4.1)
       activesupport (>= 4.2.0)
     htmlentities (4.3.4)
-    i18n (0.8.1)
-    json (2.1.0)
-    kaminari (0.17.0)
-      actionpack (>= 3.0.0)
-      activesupport (>= 3.0.0)
+    i18n (1.0.1)
+      concurrent-ruby (~> 1.0)
+    kaminari (1.1.1)
+      activesupport (>= 4.1.0)
+      kaminari-actionview (= 1.1.1)
+      kaminari-activerecord (= 1.1.1)
+      kaminari-core (= 1.1.1)
+    kaminari-actionview (1.1.1)
+      actionview
+      kaminari-core (= 1.1.1)
+    kaminari-activerecord (1.1.1)
+      activerecord
+      kaminari-core (= 1.1.1)
+    kaminari-core (1.1.1)
     launchy (2.4.3)
       addressable (~> 2.3)
-    loofah (2.0.3)
+    loofah (2.2.2)
+      crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.6.5)
-      mime-types (>= 1.16, < 4)
+    mail (2.7.0)
+      mini_mime (>= 0.1.1)
+    method_source (0.9.0)
     mime-types (2.99.3)
-    mini_portile2 (2.1.0)
-    minitest (5.10.1)
+    mimemagic (0.3.2)
+    mini_mime (1.0.0)
+    mini_portile2 (2.3.0)
+    minitest (5.11.3)
     mysql2 (0.3.20)
-    nokogiri (1.7.1)
-      mini_portile2 (~> 2.1.0)
-    pg (0.18.3)
-    polyamorous (1.3.1)
+    nio4r (2.3.1)
+    nokogiri (1.8.2)
+      mini_portile2 (~> 2.3.0)
+    pg (1.0.0)
+    polyamorous (1.3.3)
       activerecord (>= 3.0)
-    rack (1.6.5)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails (4.2.8)
-      actionmailer (= 4.2.8)
-      actionpack (= 4.2.8)
-      actionview (= 4.2.8)
-      activejob (= 4.2.8)
-      activemodel (= 4.2.8)
-      activerecord (= 4.2.8)
-      activesupport (= 4.2.8)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.8)
-      sprockets-rails
-    rails-deprecated_sanitizer (1.0.3)
-      activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.8)
-      activesupport (>= 4.2.0.beta, < 5.0)
-      nokogiri (~> 1.6)
-      rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
-    railties (4.2.8)
-      actionpack (= 4.2.8)
-      activesupport (= 4.2.8)
+    public_suffix (3.0.2)
+    rack (2.0.5)
+    rack-test (1.0.0)
+      rack (>= 1.0, < 3)
+    rails (5.1.6)
+      actioncable (= 5.1.6)
+      actionmailer (= 5.1.6)
+      actionpack (= 5.1.6)
+      actionview (= 5.1.6)
+      activejob (= 5.1.6)
+      activemodel (= 5.1.6)
+      activerecord (= 5.1.6)
+      activesupport (= 5.1.6)
+      bundler (>= 1.3.0)
+      railties (= 5.1.6)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
+    railties (5.1.6)
+      actionpack (= 5.1.6)
+      activesupport (= 5.1.6)
+      method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (12.0.0)
-    ransack (1.8.2)
+    rake (12.3.1)
+    ransack (1.8.8)
       actionpack (>= 3.0)
       activerecord (>= 3.0)
       activesupport (>= 3.0)
       i18n
-      polyamorous (~> 1.3)
-    rubyzip (1.0.0)
-    simple_form (3.2.0)
-      actionpack (~> 4.0)
-      activemodel (~> 4.0)
+      polyamorous (~> 1.3.2)
+    rubyzip (1.2.1)
+    simple_form (4.0.0)
+      actionpack (> 4)
+      activemodel (> 4)
     sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.0)
+    sprockets-rails (3.2.1)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    sqlite3 (1.3.11)
-    terminal-table (1.5.2)
-    thor (0.19.4)
+    sqlite3 (1.3.13)
+    terminal-table (1.8.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
+    thor (0.20.0)
     thread_safe (0.3.6)
-    tzinfo (1.2.3)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    uglifier (2.7.2)
-      execjs (>= 0.3.0)
-      json (>= 1.8.0)
-    will_paginate (3.0.7)
+    uglifier (4.1.10)
+      execjs (>= 0.3.0, < 3)
+    unicode-display_width (1.3.2)
+    websocket-driver (0.6.5)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.3)
+    will_paginate (3.0.12)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  axlsx!
   axlsx_rails
   codemirror-rails
   kaminari (>= 0.17.0)
@@ -151,9 +182,10 @@ DEPENDENCIES
   mime-types (< 3.0)
   mysql2 (<= 0.3.20)
   pg
-  rails
+  rails (= 5.1.6)
   rails_db!
-  ransack
+  ransack (= 1.8.8)
+  rubyzip (>= 1.2.1)
   simple_form
   sqlite3
   terminal-table
@@ -161,4 +193,4 @@ DEPENDENCIES
   will_paginate (~> 3.0.6)
 
 BUNDLED WITH
-   1.14.3
+   1.16.1

data/app/controllers/rails_db/application_controller.rb

@@ -3,11 +3,7 @@ module RailsDb
     helper :all
     helper_method :per_page
 
-    if Rails::VERSION::MAJOR >= 4
-      before_action :verify_access
-    else
-      before_filter :verify_access
-    end
+    before_action :verify_access
 
     if RailsDb.http_basic_authentication_enabled
       http_basic_authenticate_with name: RailsDb.http_basic_authentication_user_name,

data/app/controllers/rails_db/sql_controller.rb

@@ -1,10 +1,6 @@
 module RailsDb
   class SqlController < RailsDb::ApplicationController
-    if Rails::VERSION::MAJOR >= 4
-      before_action :load_query, only: [:index, :execute, :csv, :xls]
-    else
-      before_filter :load_query
-    end
+    before_action :load_query, only: [:index, :execute, :csv, :xls]
 
     def index
     end

data/app/controllers/rails_db/tables_controller.rb

@@ -2,11 +2,7 @@ module RailsDb
   class TablesController < RailsDb::ApplicationController
     LOAD_TABLE_ACTIONS = [:show, :data, :csv, :truncate, :destroy, :edit, :update, :xlsx, :search, :new, :create]
 
-    if Rails::VERSION::MAJOR >= 4
-      before_action :find_table, only: LOAD_TABLE_ACTIONS
-    else
-      before_filter :find_table, only: LOAD_TABLE_ACTIONS
-    end
+    before_action :find_table, only: LOAD_TABLE_ACTIONS
 
     def index
       @tables = RailsDb::Database.accessible_tables
@@ -101,11 +97,7 @@ module RailsDb
     end
 
     def record_attributes
-      if Rails::VERSION::MAJOR >= 4
-        params[:record].permit!
-      else
-        params[:record]
-      end
+      params[:record].permit!
     end
 
     def find_table

data/app/helpers/rails_db/tables_helper.rb

@@ -24,10 +24,11 @@ module RailsDb
     end
 
     def delete_row_path(table, record)
+      options = params.permit!
       table_destroy_path(table,
         pk_id: record[table.primary_key],
-        page: params[:page],
-        q: params[:q])
+        page: options[:page],
+        q: options[:q])
     end
 
     def table_pagination_path
@@ -48,7 +49,11 @@ module RailsDb
     end
 
     def search_form_class
-      params[:q].present? ? '' : 'hide'
+      hash = params.permit!.to_hash.fetch('q', {})
+      keys = hash.keys
+      return 'hide' if keys.empty?
+      return 'hide' if keys == ['s']
+      nil
     end
 
   end

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

@@ -2,7 +2,7 @@
 <html>
 <head>
   <title><%= [yield(:title), 'Rails DB'].reject(&:blank?).join(' - ') %></title>
-  <%= stylesheet_link_tag    "//cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css" %>
+  <%= 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" %>
   <%= csrf_meta_tags %>

data/app/views/rails_db/dashboard/data_table.html.erb

@@ -16,4 +16,4 @@
 
 <br/>
 
-<p><%= link_to 'More Options for Data Tables ==>', 'https://github.com/igorkasyanchuk/rails_db/blob/master/app/helpers/rails_db/rails_db_data_table_helper.rb' %></p>
+<p><%= link_to 'More Options for Data Tables ==>', 'https://github.com/igorkasyanchuk/rails_db/blob/master/app/helpers/rails_db/rails_db_data_table_helper.rb' %></p>

data/app/views/rails_db/tables/_data.html.erb

@@ -1,4 +1,4 @@
-<% title "'#{@table.name}'"%>
+<% title "\"#{@table.name}\" Data"%>
 
 <h2 class='left'>Table: <%= @table.name %></h2>
 <div class='right'>

data/app/views/rails_db/tables/_search.html.erb

@@ -1,4 +1,4 @@
-<% title "'#{@table.name}'"%>
+<% title "\"#{@table.name}\" Search"%>
 
 <h2>Table: <%= @table.name %></h2>
 

data/app/views/rails_db/tables/_show.html.erb

@@ -1,4 +1,4 @@
-<% title "'#{@table.name}' Schema" %>
+<% title "\"#{@table.name}\" Schema"%>
 
 <h2>Table: <%= @table.name %></h2>
 
@@ -76,11 +76,9 @@
       <th>Columns</th>
       <th>Length</th>
       <th>Orders</th>
-      <% if Rails::VERSION::MAJOR >= 4 %>
-        <th>Where</th>
-        <th>Type</th>
-        <th>Using</th>
-      <% end %>
+      <th>Where</th>
+      <th>Type</th>
+      <th>Using</th>
     </tr>
   </thead>
   <tbody>
@@ -91,11 +89,9 @@
       <td><%= index.columns %></td>
       <td><%= index.lengths %></td>
       <td><%= index.orders %></td>
-      <% if Rails::VERSION::MAJOR >= 4 %>
-        <td><%= index.where %></td>
-        <td><%= index.type %></td>
-        <td><%= index.using %></td>
-      <% end %>
+      <td><%= index.where %></td>
+      <td><%= index.type %></td>
+      <td><%= index.using %></td>
      </tr>
     <% end %>
     <% if @table.indexes.none? %>