rails_db 0.7.2 → 0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6b56dd1eb7a49cc7c77519b6f5679bd55987b03
-  data.tar.gz: cc7a02d441486ac40934af7fb03bc3bcab17b9c2
+  metadata.gz: 549de677a4e83f22444e963e0ab6ca6c35066b77
+  data.tar.gz: 30a2294ea9e10ed00b3801ad9e4bd63a2d9eaeef
 SHA512:
-  metadata.gz: 6260b0ef99dcccbef87987f9226a74033b0f3a8cddbf60acdfcb972260f3cd2ab4eb0066aee014c8f271d726543755cc32a6ad697ab0d03699974bd9f4d4427f
-  data.tar.gz: ef67819e6f10057129450fccab2e54a44c0ebbc074dad5035aa0d7d8f98c2cb573201dda79b71a1172823896fdaff7902c9e21db86896833ecef2d9854dce5ee
+  metadata.gz: 3d6ba65479b6f329d53a04d6bd2bc663aec5ab9737cb87bfee3de43b5858106669d023d06c7be9ec2a0ebc4194ca7e35aadfb6bb24e8512eff309cbe43717253
+  data.tar.gz: f76cc094514cff3e4c4604dada282b9a364d38a7866ccff5691a65014ae66e698621fa29680fc1ded01bdbd8cf107b7d12019709d6070a53d10945f684e9b9db

data/Gemfile

@@ -8,6 +8,7 @@ gem 'jquery-rails'
 gem 'font-awesome-rails'
 gem 'codemirror-rails'
 gem 'terminal-table'
+gem 'axlsx_rails'
 
 group :assets do
   gem 'sass-rails'

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    rails_db (0.7.1)
+    rails_db (0.8)
+      axlsx_rails
       codemirror-rails
       font-awesome-rails
       jquery-rails
@@ -51,6 +52,13 @@ GEM
       tzinfo (~> 1.1)
     addressable (2.3.8)
     arel (6.0.3)
+    axlsx (2.0.1)
+      htmlentities (~> 4.3.1)
+      nokogiri (>= 1.4.1)
+      rubyzip (~> 1.0.0)
+    axlsx_rails (0.4.0)
+      axlsx (>= 2.0.1)
+      rails (>= 3.1)
     builder (3.2.2)
     codemirror-rails (5.6)
       railties (>= 3.0, < 5)
@@ -60,6 +68,7 @@ GEM
       railties (>= 3.2, < 5.0)
     globalid (0.3.6)
       activesupport (>= 4.1.0)
+    htmlentities (4.3.4)
     i18n (0.7.0)
     jquery-rails (4.0.5)
       rails-dom-testing (~> 1.0)
@@ -107,6 +116,7 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.4.2)
+    rubyzip (1.0.0)
     sass (3.4.19)
     sass-rails (5.0.4)
       railties (>= 4.0.0, < 5.0)
@@ -135,6 +145,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  axlsx_rails
   codemirror-rails
   font-awesome-rails
   jquery-rails

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

@@ -1,13 +1,29 @@
 //= require jquery
 //= require jquery_ujs
+//= require rails_db/foundation/foundation.abide
+//= require rails_db/foundation/foundation.accordion
+//= require rails_db/foundation/foundation.alert
+//= require rails_db/foundation/foundation.clearing
+//= require rails_db/foundation/foundation.dropdown
+//= require rails_db/foundation/foundation.equalizer
+//= require rails_db/foundation/foundation.interchange
+//= require rails_db/foundation/foundation.joyride
 //= require rails_db/foundation.min
-//= require_tree ../rails_db/foundation/
+//= require rails_db/foundation/foundation.magellan
+//= require rails_db/foundation/foundation.offcanvas
+//= require rails_db/foundation/foundation.orbit
+//= require rails_db/foundation/foundation.reveal
+//= require rails_db/foundation/foundation.slider
+//= require rails_db/foundation/foundation.tab
+//= require rails_db/foundation/foundation.tooltip
+//= require rails_db/foundation/foundation.topbar
 //= require rails_db/sticky
 //= require rails_db/jquery.cookie
 //= require codemirror
 //= require codemirror/modes/sql
 //= require codemirror/addons/hint/show-hint.js
 //= require codemirror/addons/hint/sql-hint.js
+//= require rails_db/show_hide_columns.js
 
 $(function(){
   $(document).foundation();
@@ -76,4 +92,4 @@ function init_sql_editor(mime, tables) {
     });
   editor.setSize('100%', '300');
   editor.focus();
-};
+};

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

@@ -0,0 +1,54 @@
+$(function(){
+
+  $('body').on('click', '.settings-link', function() {
+    $('.rails-db-settings').toggle();
+  });
+
+  $('body').on('click', '.column-name input', function() {
+    table_name = 'Table: ' + $('a[table_name]').attr('table_name');
+    column_name = $(this).prop('name');
+    if($(this).prop('checked') == false) {
+      write_column_to_cookie(table_name, column_name);
+    } else {
+      remove_column_from_cookie(table_name, column_name);
+    }
+    switch_column_visibility(column_name);
+    toggle_columns();
+  });
+
+});
+
+function write_column_to_cookie(table_name, column_name) {
+  column_names = get_column_names_from_cookie(table_name);
+  $.cookie(table_name, column_names += ',' + column_name);
+};
+
+function remove_column_from_cookie(table_name, column_name) {
+  column_names = get_column_names_from_cookie(table_name);
+  $.cookie(table_name, column_names.replace(',' + column_name, ''));
+};
+
+function get_column_names_from_cookie(table_name) {
+  cookie = $.cookie(table_name);
+  if(cookie == undefined) {
+    return '';
+  } else {
+    return cookie;
+  }
+};
+
+function switch_column_visibility(column_name) {
+  $('th.column_' + column_name).toggle();
+  $('td.column_' + column_name).toggle();
+};
+
+function toggle_columns() {
+  if($('.column-name input:checked').length == 0) {
+    $('.column-name input[type=checkbox]').each(function() {
+      column_name = $(this).prop('name');
+      $(this).prop("checked", true);
+      remove_column_from_cookie(table_name, column_name);
+      switch_column_visibility(column_name);
+    });
+  }
+};

data/app/assets/stylesheets/rails_db/table.css.scss

@@ -4,4 +4,9 @@ span.pk {
 
 .delete_td {
   width: 24px;
+}
+
+.column-name {
+  float: left;
+  width: 20%;
 }

data/app/controllers/rails_db/sql_controller.rb

@@ -15,6 +15,11 @@ module RailsDb
       send_data(@sql_query.to_csv, type: 'text/csv; charset=utf-8; header=present', filename: 'results.csv')
     end
 
+    def xls
+      load_query
+      render xlsx: 'xls', filename: 'results.xlsx'
+    end
+
     def import
     end
 

data/app/controllers/rails_db/tables_controller.rb

@@ -41,5 +41,10 @@ module RailsDb
       end
     end
 
+    def xlsx
+      @table = RailsDb::Table.new(params[:table_id])
+      render xlsx: 'table', filename: "#{@table.name}.xlsx"
+    end
+
   end
 end

data/app/helpers/rails_db/tables_helper.rb

@@ -43,5 +43,17 @@ module RailsDb
       params.merge({action: :data})
     end
 
+    def column_is_checked?(table_name, column_name)
+      if cookies["Table: #{table_name}"].present?
+        !cookies["Table: #{table_name}"].split(',').include?(column_name)
+      else
+        true
+      end
+    end
+
+    def display_style_column(table_name, column_name)
+      column_is_checked?(table_name, column_name) ? 'display' : 'display:none'
+    end
+
   end
 end

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

@@ -14,7 +14,8 @@
   <li>filter tables for easier navigation</li>
   <li>use history of your SQL queries</li>
   <li>see EXPLAIN results for your queries</li>
-  <li>export data to CSV</li>
+  <li>export data to CSV and Excel</li>
+  <li>hide/show columns</li>
   <li>import SQL files</li>
   <li>expand/collapse sidebar</li>
   <li>experience added HTTP_BASIC auth for Rails DB</li>

data/app/views/rails_db/sql/_results.html.erb

@@ -5,7 +5,8 @@
       <span class="radius success label">Total: <%= pluralize sql_query.data.count, 'record' %></span>
       <span class="radius info label">Time: <%= sql_query.data.time %> seconds</span>
       <span class="radius secondary label"><a href="#" data-reveal-id="explain_modal" id='explain_modal_link'>Explain</a></span>
-      <span class="radius warning label"><%= link_to raw("#{fa_icon('file-excel-o')} Export"), sql_csv_path(sql: sql), method: :post %></span>
+      <span class="radius warning label"><%= link_to raw("#{fa_icon('file-text-o')} Export to CSV"), sql_csv_path(sql: sql, format: 'csv'), method: :post %></span>
+      <span class="radius warning label"><%= link_to raw("#{fa_icon('file-excel-o')} Export to Excel"), sql_xls_path(sql: sql, format: 'xls'), method: :post %></span>
     </p>
     <hr>
     <%= render 'explain', sql_query: sql_query, sql: sql %>

data/app/views/rails_db/sql/xls.xls.axlsx

@@ -0,0 +1,9 @@
+wb = xlsx_package.workbook
+
+wb.add_worksheet(name: 'Results') do |sheet|
+  sheet.add_row @sql_query.data.columns
+
+  @sql_query.data.rows.each do |row|
+    sheet.add_row row
+  end
+end

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

@@ -11,26 +11,45 @@
   <dd class="active"><%= link_to raw("#{fa_icon('table')} Records"), table_data_path(@table), remote: true %></dd>
   <dd><%= link_to raw("#{fa_icon('tasks')} Schema"), table_path(@table), remote: true %></dd>
   <dd><%= select_top_from_table(@table.name) %></dd>
-  <dd><%= link_to raw("#{fa_icon('file-excel-o')} Export"), table_csv_path(@table) %></dd>
+  <dd>
+    <a href="#" data-options="align: bottom" data-dropdown="download-files"><%= fa_icon 'download' %> Export</a>
+  </dd>
   <dd>
     <a href="#" data-options="align: bottom" data-dropdown="drop"><%= fa_icon 'th-large' %> Functions</a>
   </dd>
+  <dd class="right"><%= link_to raw("#{fa_icon('cogs')} Settings"), '#', :class => 'settings-link', :table_name => "#{@table.name}" %></dd>
 </dl>
+<div class="clearfix"></div>
+
 
 <ul id="drop" class="f-dropdown" data-dropdown-content>
-  <li><%= link_to raw("#{fa_icon('trash-o')} Truncate Table"), table_truncate_path(@table), remote: true, confirm: 'Are you sure?', data: {confirm: 'Are you sure?'} %></a></li>
+  <li><%= link_to raw("#{fa_icon('trash-o')} Truncate Table"), table_truncate_path(@table), data: {confirm: 'Are you sure?'} %></li>
+</ul>
+
+<ul id="download-files" class="f-dropdown" data-dropdown-content>
+  <li><%= link_to raw("#{fa_icon('file-text-o')} Export to CSV"), table_csv_path(@table) %></li>
+  <li><%= link_to raw("#{fa_icon('file-excel-o')} Export to Excel"), table_xlsx_path(@table, format: 'xls') %></li>
 </ul>
 
 <div class='scrollable'>
-  <table>
+  <div class='rails-db-settings' style="display:none">
+    <h6>Settings</h6>
+    <% @table.columns.each do |column| %>
+      <label class='column-name'>
+        <%= check_box_tag(column.name, nil, column_is_checked?(@table.name, column.name), class: "#{column.name}") %>
+        <%= column.name %>
+      </label>
+    <% end %>
+  </div>
 
+  <table>
     <thead>
       <tr>
         <% if @table.primary_key.present? %>
           <th class='delete_td'></th>
         <% end %>
         <% @table.columns.each do |column| %>
-          <th>
+          <th class="column_<%= column.name %>" style=<%= display_style_column(@table.name, column.name) %>>
             <%= sortable column.name %>
           </th>
         <% end %>
@@ -49,7 +68,7 @@
           <% end %>
 
           <% @table.columns.each do |column| %>
-            <td>
+            <td class="column_<%= column.name %>" style=<%= display_style_column(@table.name, column.name) %>>
               <% name = column.name %>
               <%= format_value(column, record[name]) %>
             </td>

data/app/views/rails_db/tables/table.xls.axlsx

@@ -0,0 +1,9 @@
+wb = xlsx_package.workbook
+
+wb.add_worksheet(name: @table.name) do |sheet|
+  sheet.add_row @table.columns.map(&:name)
+
+  @table.data.each do |row|
+    sheet.add_row row.values
+  end
+end

data/config/initializers/mime_types.rb

@@ -0,0 +1 @@
+Mime::Type.register "application/vnd.ms-excel", :xls unless Mime::Type.lookup_by_extension(:xls)

data/config/routes.rb

@@ -6,12 +6,15 @@ RailsDb::Engine.routes.draw do
     get 'csv'
     get 'truncate'
     get 'destroy' # to handle opens in new window (GET)
+    get 'xlsx'
   end
 
   get '/sql' => 'sql#index', as: :sql
   get '/import' => 'sql#import', as: :sql_import
+
   post '/execute' => 'sql#execute', as: :sql_execute
   post '/sql-csv' => 'sql#csv', as: :sql_csv
+  post '/sql-xls' => 'sql#xls', as: :sql_xls
   post '/import-start' => 'sql#import_start', as: :sql_start_import
 
   get '/data-table' => 'dashboard#data_table', as: :data_table

data/lib/rails_db.rb

@@ -6,6 +6,7 @@ require "jquery-rails"
 require 'codemirror-rails'
 require 'terminal-table'
 require 'csv'
+require 'axlsx_rails'
 
 module RailsDb
   # Custom require relative that work with older rubies also

data/lib/rails_db/version.rb

@@ -1,3 +1,3 @@
 module RailsDb
-  VERSION = "0.7.2"
+  VERSION = "0.8"
 end

data/rails_db.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.email       = ["igorkasyanchuk@gmail.com"]
   s.homepage    = "https://github.com/igorkasyanchuk/rails_db"
   s.summary     = "Inspect your Rails DB (table content viewer, execute sql queries, export & import data"
-  s.description = "Quick way to inspect your Rails database, see content of tables, export them to CSV, EXPLAIN SQL and run SQL queries."
+  s.description = "Quick way to inspect your Rails database, see content of tables, filter, export them to CSV, Excel, EXPLAIN SQL and run SQL queries."
   s.license     = "MIT"
 
   s.files = Dir["{app,config,lib,test}/**/*", "rails_db.gemspec", "Gemfile", "Gemfile.lock", "MIT-LICENSE", "Rakefile", "README.rdoc", "bin/rails_db", "bin/railsdb", "bin/runsql"]
@@ -25,8 +25,11 @@ Gem::Specification.new do |s|
   s.add_dependency 'codemirror-rails'
   s.add_dependency 'launchy'
   s.add_dependency 'terminal-table'
+  s.add_dependency 'axlsx_rails'
 
   s.add_development_dependency "sqlite3"
   s.add_development_dependency "mysql2", '<= 0.3.20'
   s.add_development_dependency "pg"
-end
+  # s.add_development_dependency 'populator'
+  # s.add_development_dependency 'faker'
+end

data/test/dashboard_controller_test.rb

@@ -43,11 +43,23 @@ class DashboardControllerTest < ActionDispatch::IntegrationTest
     assert_equal 302, status
     assert_equal 0, User.count
 
-    get '/rails/db/tables/accounts/csv'
+    get '/rails/db/tables/users/csv'
     assert_equal 200, status
 
     get '/rails/db/standalone'
     assert_equal 200, status
+
+    get '/rails/db/tables/users/xlsx.xls'
+    assert_equal 200, status
+
+    get '/rails/db/sql?sql=select+%2A+from+users+limit+10'
+    assert_equal 200, status
+
+    post '/rails/db/sql-csv.csv?sql=select+%2A+from+users+limit+10'
+    assert_equal 200, status
+
+    post '/rails/db/sql-xls.xls?sql=select+%2A+from+users+limit+10'
+    assert_equal 200, status
   end
 
 end

data/test/standalone/Gemfile

@@ -6,6 +6,7 @@ gem 'jquery-rails'
 gem 'font-awesome-rails'
 gem 'codemirror-rails'
 gem 'terminal-table'
+gem 'axlsx_rails'
 
 group :assets do
   gem 'sass-rails'

data/test/tables_helper_test.rb

@@ -0,0 +1,39 @@
+require 'test_helper'
+
+class TablesHelperTest < ActionView::TestCase
+  include RailsDb::TablesHelper
+
+  def setup
+    clean_db
+  end
+
+  test "method column_is_checked? returns true for checkbox status if cookie does not contain hash_key for this table" do
+    status = column_is_checked?('users', 'created_at')
+    assert_equal true, status
+  end
+
+  test "method column_is_checked? returns true for checkbox status if cookie does not contain record for this table:column" do
+    cookies['Table: users'] = 'created_at,'
+    status = column_is_checked?('users', 'name')
+    assert_equal true, status
+  end
+
+  test "method column_is_checked? returns false for checkbox status if cookie contains record for this table:column" do
+    cookies['Table: users'] = 'created_at,'
+    status = column_is_checked?('users', 'created_at')
+    assert_equal false, status
+  end
+
+  test "method display_style_column returns 'display:none' if cookie contains record for this table:column" do
+    cookies['Table: users'] = 'created_at,'
+    style = display_style_column('users', 'created_at')
+    assert_equal 'display:none', style
+  end
+
+  test "method display_style_column returns 'display' if cookie does not contain record for this table:column" do
+    cookies['Table: users'] = 'created_at,'
+    style = display_style_column('users', 'name')
+    assert_equal 'display', style
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_db
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: '0.8'
 platform: ruby
 authors:
 - Igor Kasyanchuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-05 00:00:00.000000000 Z
+date: 2015-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -122,6 +122,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: axlsx_rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -164,8 +178,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Quick way to inspect your Rails database, see content of tables, export
-  them to CSV, EXPLAIN SQL and run SQL queries.
+description: Quick way to inspect your Rails database, see content of tables, filter,
+  export them to CSV, Excel, EXPLAIN SQL and run SQL queries.
 email:
 - igorkasyanchuk@gmail.com
 executables:
@@ -207,6 +221,7 @@ files:
 - app/assets/javascripts/rails_db/foundation/foundation.tooltip.js
 - app/assets/javascripts/rails_db/foundation/foundation.topbar.js
 - app/assets/javascripts/rails_db/jquery.cookie.js
+- app/assets/javascripts/rails_db/show_hide_columns.js
 - app/assets/javascripts/rails_db/sticky.js
 - app/assets/javascripts/rails_db/vendor/fastclick.js
 - app/assets/javascripts/rails_db/vendor/jquery.cookie.js
@@ -247,6 +262,7 @@ files:
 - app/views/rails_db/sql/_results.html.erb
 - app/views/rails_db/sql/import.html.erb
 - app/views/rails_db/sql/index.html.erb
+- app/views/rails_db/sql/xls.xls.axlsx
 - app/views/rails_db/tables/_data.html.erb
 - app/views/rails_db/tables/_show.html.erb
 - app/views/rails_db/tables/data.html.erb
@@ -255,10 +271,12 @@ files:
 - app/views/rails_db/tables/index.html.erb
 - app/views/rails_db/tables/show.html.erb
 - app/views/rails_db/tables/show.js.erb
+- app/views/rails_db/tables/table.xls.axlsx
 - bin/rails_db
 - bin/railsdb
 - bin/runsql
 - config/database.travis.yml
+- config/initializers/mime_types.rb
 - config/routes.rb
 - lib/ext/string_ext.rb
 - lib/generators/USAGE
@@ -425,6 +443,7 @@ files:
 - test/standalone/public/500.html
 - test/standalone/public/favicon.ico
 - test/table_test.rb
+- test/tables_helper_test.rb
 - test/test_helper.rb
 - test/test_sql_mysql.sql
 - test/test_sql_postgres.sql
@@ -590,6 +609,7 @@ test_files:
 - test/standalone/Rakefile
 - test/standalone/README.rdoc
 - test/table_test.rb
+- test/tables_helper_test.rb
 - test/test_helper.rb
 - test/test_sql_mysql.sql
 - test/test_sql_postgres.sql