rails_db 0.3 → 0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8e9ecb8d230baa2466daaee93a58094976b676f
-  data.tar.gz: 87f60fdf7efe5a80284b68038852ffe6a9d323fe
+  metadata.gz: fd26a8f1445aa88837250fd1f7132f4b47ff1b14
+  data.tar.gz: f0aa0cbbe217250943b67ba33bf6600835b34394
 SHA512:
-  metadata.gz: c2a6f37a8c0d16976c40998776a75d289e7f5bf14660b951d04b5e0c54c368bf2d150e1c3f3b9c404f68d6b366d2c29b54a743b83b757fed522c4e2db1fa9533
-  data.tar.gz: da2d7ddc91ebae29af73bb53ac268f2c14ed049b59661b716dfde33f8319d74931369624e13595c7041939fe1f457b7096a46624f2b8fe7fd111b1da08948409
+  metadata.gz: 7fe41a7b8e4f617e9aa7db2b6971fbf8daba183cc03a0fb30c91c079af9f838ad176e71fd6ebd941c5f1173839f566300f5861fa6beb50655d6317bbf6592630
+  data.tar.gz: efadeff2de9ed34aae83e50138957c2e0f9c73081f81f4e89621c536a38da62421b766910fd82a492218a9f6722e68bdb2872acdf4fa150cdd932bb5bfe6fa22

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

@@ -5,36 +5,74 @@
 //= 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
 
 $(function(){
   $(document).foundation();
 
   jQuery.expr[":"].icontains = jQuery.expr.createPseudo(function (arg) {
     return function (elem) {
-        return jQuery(elem).text().toUpperCase().indexOf(arg.toUpperCase()) >= 0;
+      return jQuery(elem).text().toUpperCase().indexOf(arg.toUpperCase()) >= 0;
     };
   });
 
-  $('.per_page_pagination_select').on('change', function() {
+  $('body').on('change', '.per_page_pagination_select', function() {
     $(this).parents('form').submit();
   });
 
-  $('#rails_db_tables_input').on('keyup', function() {
+  $('body').on('keyup', '#rails_db_tables_input', function() {
     value = $(this).val();
     $("#rails_db_tables a").show();
     $("#rails_db_tables a:not(:icontains('" + value + "'))").hide();
   });
 
-  $('.expand, .collapse').on('click', function() {
-    $('#main_content').toggleClass('push-3')
-    $('#main_content').toggleClass('large-9')
-    $('#main_content').toggleClass('large-12')
-    $('#sidebar').toggle();
-    $('.collapse').toggle();
-    $('.expand').toggle();
-    $.removeCookie('sidebar_visible');
-    $.cookie('sidebar_visible', $('.expand').is(':visible'), { expires: 30, path: '/' });
+  $('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_visible');
+  $.cookie('sidebar_visible', $('.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();
+};

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

@@ -6,6 +6,10 @@ body {
   height: auto;
 }
 
+.clear {
+  clear: both;
+}
+
 .sub-nav {
   background: #f2f2f2;
   padding: 10px 10px 10px 0;

data/app/assets/stylesheets/rails_db/application.css

@@ -3,6 +3,7 @@
  *= require rails_db/foundation_and_overrides
  *= require codemirror
  *= require codemirror/themes/pastel-on-dark.css
+ *= require codemirror/addons/hint/show-hint.css
  *= require rails_db/app
  *= require rails_db/sidebar
  *= require rails_db/pagination

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

@@ -5,6 +5,9 @@
     margin-left: 3px;
     a {
       padding: 2px 4px;
+      &.selected {
+        font-weight: bold;
+      }
     }
   }
 }

data/app/controllers/rails_db/application_controller.rb

@@ -2,8 +2,8 @@ module RailsDb
   class ApplicationController < ActionController::Base
 
       if RailsDb.http_basic_authentication_enabled
-        http_basic_authenticate_with :name => RailsDb.http_basic_authentication_user_name,
-                                     :password => RailsDb.http_basic_authentication_password
+        http_basic_authenticate_with name: RailsDb.http_basic_authentication_user_name,
+                                     password: RailsDb.http_basic_authentication_password
       end
 
   end

data/app/controllers/rails_db/sql_controller.rb

@@ -12,7 +12,7 @@ module RailsDb
 
     def csv
       load_query
-      send_data(@sql_query.to_csv, :type => 'text/csv; charset=utf-8; header=present', :filename => "results.csv")
+      send_data(@sql_query.to_csv, type: 'text/csv; charset=utf-8; header=present', filename: 'results.csv')
     end
 
     def import
@@ -24,7 +24,7 @@ module RailsDb
       if result.ok?
         flash[:notice] = 'File was successfully imported'
       else
-        flash[:alert] = "Error occured during import: #{result.error.message}"
+        flash[:alert] = "Error occurred during import: #{result.error.message}"
       end
       render :import
     end

data/app/controllers/rails_db/tables_controller.rb

@@ -10,17 +10,17 @@ module RailsDb
     end
 
     def data
+      per_page = params[:per_page] || session[:per_page]
+      session[:per_page] = per_page
       @table   = RailsDb::Table.new(params[:table_id]).paginate :page => params[:page],
                                                                 :sort_column => params[:sort_column],
                                                                 :sort_order => params[:sort_order],
-                                                                :per_page => params[:per_page]
+                                                                :per_page => per_page
     end
 
     def csv
       @table = RailsDb::Table.new(params[:table_id])
-      send_data(@table.to_csv, :type => 'text/csv; charset=utf-8; header=present', :filename => "#{@table.name}.csv")
+      send_data(@table.to_csv, type: 'text/csv; charset=utf-8; header=present', filename: "#{@table.name}.csv")
     end
-
-
   end
 end

data/app/helpers/rails_db/application_helper.rb

@@ -40,11 +40,11 @@ module RailsDb
 
       html = '<div class="pagination">'
       if entries.previous_page
-        html << link_to(prev_page_text, params.merge({:page => entries.previous_page}), {class: 'page'})
+        html << link_to(prev_page_text, params.merge({ page: entries.previous_page }), { remote: true, class: 'page' })
       end
       html << "#{page_links_for_pagination(entries)}"
       if entries.next_page
-        html << link_to(next_page_text, params.merge({:page => entries.next_page}), {class: 'page'})
+        html << link_to(next_page_text, params.merge({ page: entries.next_page }), { remote: true, class: 'page' })
       end
       html << '</div>'
 
@@ -59,11 +59,11 @@ module RailsDb
 
       pages.each_with_index do |page,index|
         if page == entries.current_page
-          links << content_tag(:b, page, {class: 'page current'})
+          links << content_tag(:b, page, { class: 'page current' })
         else
-          links << link_to(page, params.merge({:page => page}), {class: 'page'})
+          links << link_to(page, params.merge({ page: page}), { remote: true, class: 'page' })
         end
-        links << " ... " if page != pages.last && (page + 1) != pages[index+1]
+        links << ' ... ' if page != pages.last && (page + 1) != pages[index+1]
       end
 
       links.join(' ')
@@ -84,5 +84,13 @@ module RailsDb
       pages.uniq.select { |p| p > 0 && p <= last_page }
     end
 
+    def db_hint_options
+      result = {}
+      RailsDb::Database.accessible_tables.each do |table_name|
+        result[table_name] = RailsDb::Table.new(table_name).columns.inject({}) {|res, e| res[e.name] = nil; res }
+      end
+      result
+    end
+
   end
 end

data/app/helpers/rails_db/flash_messages_helper.rb

@@ -30,14 +30,14 @@ module RailsDb
   private
 
     def alert_box(value, alert_class)
-      content_tag :div, :data => { :alert => "" }, :class => "alert-box #{alert_class}" do
+      content_tag :div, data: { alert: '' }, class: "alert-box #{alert_class}" do
         concat value
         concat close_link
       end
     end
 
     def close_link
-      link_to("×".html_safe, "#", :class => :close)
+      link_to("×".html_safe, '#', class: :close)
     end
 
   end

data/app/helpers/rails_db/rails_db_data_table_helper.rb

@@ -0,0 +1,75 @@
+module RailsDb
+  module RailsDbDataTableHelper
+    # TODO check styles
+    STYLES = {
+      default: {
+        table: 'table',
+        tr: 'table_tr',
+        th: 'table_th',
+        td: 'table_td',
+        thead: 'table_thead',
+        tfoot: 'table_tfoot'
+      },
+      bootstrap: {
+        table: 'table table-bordered table-striped table-hover',
+        tr: 'table_tr',
+        th: 'table_th',
+        td: 'table_td',
+        thead: 'table_thead',
+        tfoot: 'table_tfoot'
+      },
+      foundation: {
+        table: 'table',
+        tr: 'table_tr',
+        th: 'table_th',
+        td: 'table_td',
+        thead: 'table_thead',
+        tfoot: 'table_tfoot'
+      }
+    }
+
+    def rails_db_data_table(options)
+      table_name = options[:table]
+      options.reverse_merge!(
+        style: :default,
+        header: true,
+        footer: false,
+        columns: [],
+        limit: nil,
+        order_by: nil,
+        order: :asc
+      )
+      table = RailsDb::Table.new(table_name)
+        .limit(options[:limit])
+        .order_by(options[:order_by])
+        .select(options[:columns])
+        .order(options[:order])
+
+      render '/rails_db/shared/data_table', table: table,
+                                            header: options[:header],
+                                            footer: options[:footer],
+                                            style:  options[:style]
+    end
+
+    def rails_db_data_table_sql(options)
+      options.reverse_merge!(
+        style: :default,
+        header: true,
+        footer: false,
+      )
+      sql        = "#{options[:sql]}".strip
+      sql_query  = RailsDb::SqlQuery.new(sql, false).execute
+
+      render '/rails_db/shared/sql_result', sql_query: sql_query,
+                                            header: options[:header],
+                                            footer: options[:footer],
+                                            style:  options[:style]
+    end
+
+    def rails_db_table_style(tag, style)
+      style = STYLES[style] || STYLES[:default]
+      style[tag.to_sym]
+    end
+
+  end
+end

data/app/helpers/rails_db/tables_helper.rb

@@ -18,8 +18,8 @@ module RailsDb
     def sortable(column, title = nil)
       title = titleize_column(column, title)
       css_class  = (column == params[:sort_column]) ? "current #{params[:sort_order]}" : nil
-      sort_order = (column == params[:sort_column] && params[:sort_order] == "asc") ? "desc" : "asc"
-      link_to title, params.merge({:sort_column => column, :sort_order => sort_order}), { :class => css_class }
+      sort_order = (column == params[:sort_column] && params[:sort_order] == 'asc') ? 'desc' : 'asc'
+      link_to title, params.merge({ sort_column: column, sort_order: sort_order }), {remote: true, class: css_class }
     end
 
     def titleize_column(column, title = nil)

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

@@ -0,0 +1,15 @@
+<h1>Data Table</h1>
+
+<p>
+  You can add easily data-tables into your App with content from DB.
+  <br/>
+  You can build data tables for whole Table, Table with specific columns or based on SQL query.
+</p>
+
+<h3>With Following Code:</h3>
+
+<p><%= image_tag 'rails_db/data_table_code.png' %></p>
+
+<h3>You will get:</h3>
+
+<p><%= image_tag 'rails_db/data_table.png' %></p>

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

@@ -9,6 +9,7 @@
   <li>view content of DB tables</li>
   <li>sort content of DB tables</li>
   <li>execute SQL queries</li>
+  <li>autocomplete for your SQL queries</li>
   <li>filter tables for easier navigation</li>
   <li>use history of you SQL queries</li>
   <li>see EXPLAIN results for your queries</li>
@@ -18,9 +19,9 @@
   <li>added HTTP_BASIC auth for Rails DB</li>
   <li>ability to turn on/off using initializer</li>
   <li>white/black lists</li>
+  <li>data-tables inside your app</li>
+  <li>ajax-ify Rails DB</li>
   <li>visualize SQL schema (future)</li>
-  <li>data-tables inside your app (future)</li>
-  <li>ajax-ify Rails DB (future)</li>
   <li>CRUD for table records (future)</li>
 </ul>
 

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

@@ -0,0 +1,32 @@
+<table class="rails_db_data_table <%= rails_db_table_style(:table, style) %>">
+
+  <% if header %>
+    <thead class="<%= rails_db_table_style(:thead, style) %>">
+      <tr class="<%= rails_db_table_style(:tr, style) %>">
+        <% table.columns.each do |column| %>
+          <th class="<%= rails_db_table_style(:th, style) %>"><%= column %></th>
+        <% end %>
+      </tr>
+    </thead>
+  <% end %>
+
+  <tbody class="<%= rails_db_table_style(:tbody, style) %>">
+    <% table.data.each do |record| %>
+      <tr class="<%= rails_db_table_style(:tr, style)%>">
+        <% table.columns.each do |column| %>
+          <td class="<%= rails_db_table_style(:td, style)%>"><%= record[column.to_s] %></td>
+        <% end %>
+      </tr>
+    <% end %>
+  </tbody>
+
+  <% if footer %>
+    <tfoot class="<%= rails_db_table_style(:tfoot, style)%>">
+      <tr class="<%= rails_db_table_style(:tr, style)%>">
+        <% table.columns.each do |column| %>
+          <th class="<%= rails_db_table_style(:th, style)%>"><%= column %></th>
+        <% end %>
+      </tr>
+    </tfoot>
+  <% end %>
+</table>

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

@@ -33,6 +33,21 @@
           Import
         <% end %>
       </li>
+      <li>|</li>
+      <li>
+        <%= link_to rails_db.data_table_path do %>
+          <%= fa_icon 'table' %>
+          Data Table
+        <% end %>
+      </li>
+      <li>|</li>
+      <li>
+        <a data-reveal-id="more_gems_modal">
+          <%= fa_icon 'heart' %>
+          More Gems
+        </a>
+        <%= render '/rails_db/shared/gems' %>
+      </li>
       </ul>
     </div>
   </div>

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

@@ -0,0 +1,15 @@
+<div id="more_gems_modal" class="reveal-modal" data-reveal aria-labelledby="modalTitle" aria-hidden="true" role="dialog">
+  <h2 id="modalTitle">More Cool Gems</h2>
+  <div class='scrollable sql_history_items'>
+
+    <h3><%= link_to 'AnyLogin', 'https://github.com/igorkasyanchuk/any_login', target: '_blank'%> - Easy way to login as any user in system</h3>
+
+    <h3><%= link_to 'RailsDB', 'https://github.com/igorkasyanchuk/rails_db', target: '_blank'%> - Rails Database Viewer and SQL Query Runner</h3>
+
+    <h3><%= link_to 'Transactify', 'https://github.com/igorkasyanchuk/transactify', target: '_blank'%> - Wrap your methods in DB Transactions</h3>
+
+    <h3><%= link_to 'Benchmark Methods', 'https://github.com/igorkasyanchuk/benchmark_methods', target: '_blank'%> - Benchmark and measure execution time your Ruby methods without an additional code changes</h3>
+
+  </div>
+  <a class="close-reveal-modal" aria-label="Close">&#215;</a>
+</div>