rails_db 0.2.1 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 240afd88975878a7c26d487a1c775603a9c3981c
-  data.tar.gz: 3634aeeb3e100057af58edfcd2771a59daaa76a2
+  metadata.gz: a8e9ecb8d230baa2466daaee93a58094976b676f
+  data.tar.gz: 87f60fdf7efe5a80284b68038852ffe6a9d323fe
 SHA512:
-  metadata.gz: ae1fe4efe3bb8d842de4c95dea731c77413773eee9df9a37b074d11a1730ece17ee594a52c632965124f7103dde7425ddce0b9516b1525e4d0370a95b980d8cb
-  data.tar.gz: 8f42f8f736cc1eb9c1010ed0fa8897ce9c808c8c14466857035997f5837ff6a5500cb815e85fa848fcd576a81f106a011c6e17cd1d69c592448e44e5c2216b7e
+  metadata.gz: c2a6f37a8c0d16976c40998776a75d289e7f5bf14660b951d04b5e0c54c368bf2d150e1c3f3b9c404f68d6b366d2c29b54a743b83b757fed522c4e2db1fa9533
+  data.tar.gz: da2d7ddc91ebae29af73bb53ac268f2c14ed049b59661b716dfde33f8319d74931369624e13595c7041939fe1f457b7096a46624f2b8fe7fd111b1da08948409

data/Rakefile

@@ -21,7 +21,6 @@ load 'rails/tasks/engine.rake'
 load 'rails/tasks/statistics.rake'
 
 
-
 Bundler::GemHelper.install_tasks
 
 require 'rake/testtask'
@@ -29,7 +28,7 @@ require 'rake/testtask'
 Rake::TestTask.new(:test) do |t|
   t.libs << 'lib'
   t.libs << 'test'
-  t.pattern = '**/*_test.rb'
+  t.pattern = '*/*_test.rb'
   t.verbose = false
 end
 

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

@@ -2,6 +2,7 @@
 //= require jquery_ujs
 //= require foundation
 //= require rails_db/sticky
+//= require rails_db/jquery.cookie
 //= require codemirror
 //= require codemirror/modes/sql
 
@@ -23,4 +24,17 @@ $(function(){
     $("#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: '/' });
+    return false;
+  });
+
 });

data/app/assets/javascripts/rails_db/jquery.cookie.js

@@ -0,0 +1,114 @@
+/*!
+ * jQuery Cookie Plugin v1.4.1
+ * https://github.com/carhartl/jquery-cookie
+ *
+ * Copyright 2006, 2014 Klaus Hartl
+ * Released under the MIT license
+ */
+(function (factory) {
+	if (typeof define === 'function' && define.amd) {
+		// AMD (Register as an anonymous module)
+		define(['jquery'], factory);
+	} else if (typeof exports === 'object') {
+		// Node/CommonJS
+		module.exports = factory(require('jquery'));
+	} else {
+		// Browser globals
+		factory(jQuery);
+	}
+}(function ($) {
+
+	var pluses = /\+/g;
+
+	function encode(s) {
+		return config.raw ? s : encodeURIComponent(s);
+	}
+
+	function decode(s) {
+		return config.raw ? s : decodeURIComponent(s);
+	}
+
+	function stringifyCookieValue(value) {
+		return encode(config.json ? JSON.stringify(value) : String(value));
+	}
+
+	function parseCookieValue(s) {
+		if (s.indexOf('"') === 0) {
+			// This is a quoted cookie as according to RFC2068, unescape...
+			s = s.slice(1, -1).replace(/\\"/g, '"').replace(/\\\\/g, '\\');
+		}
+
+		try {
+			// Replace server-side written pluses with spaces.
+			// If we can't decode the cookie, ignore it, it's unusable.
+			// If we can't parse the cookie, ignore it, it's unusable.
+			s = decodeURIComponent(s.replace(pluses, ' '));
+			return config.json ? JSON.parse(s) : s;
+		} catch(e) {}
+	}
+
+	function read(s, converter) {
+		var value = config.raw ? s : parseCookieValue(s);
+		return $.isFunction(converter) ? converter(value) : value;
+	}
+
+	var config = $.cookie = function (key, value, options) {
+
+		// Write
+
+		if (arguments.length > 1 && !$.isFunction(value)) {
+			options = $.extend({}, config.defaults, options);
+
+			if (typeof options.expires === 'number') {
+				var days = options.expires, t = options.expires = new Date();
+				t.setMilliseconds(t.getMilliseconds() + days * 864e+5);
+			}
+
+			return (document.cookie = [
+				encode(key), '=', stringifyCookieValue(value),
+				options.expires ? '; expires=' + options.expires.toUTCString() : '', // use expires attribute, max-age is not supported by IE
+				options.path    ? '; path=' + options.path : '',
+				options.domain  ? '; domain=' + options.domain : '',
+				options.secure  ? '; secure' : ''
+			].join(''));
+		}
+
+		// Read
+
+		var result = key ? undefined : {},
+			// To prevent the for loop in the first place assign an empty array
+			// in case there are no cookies at all. Also prevents odd result when
+			// calling $.cookie().
+			cookies = document.cookie ? document.cookie.split('; ') : [],
+			i = 0,
+			l = cookies.length;
+
+		for (; i < l; i++) {
+			var parts = cookies[i].split('='),
+				name = decode(parts.shift()),
+				cookie = parts.join('=');
+
+			if (key === name) {
+				// If second argument (value) is a function it's a converter...
+				result = read(cookie, value);
+				break;
+			}
+
+			// Prevent storing a cookie that we couldn't decode.
+			if (!key && (cookie = read(cookie)) !== undefined) {
+				result[name] = cookie;
+			}
+		}
+
+		return result;
+	};
+
+	config.defaults = {};
+
+	$.removeCookie = function (key, options) {
+		// Must not alter options, thus extending a fresh object...
+		$.cookie(key, '', $.extend({}, options, { expires: -1 }));
+		return !$.cookie(key);
+	};
+
+}));

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

@@ -64,4 +64,27 @@ table {
 
 .warning.label a {
   color: white;
+}
+
+.expanded {
+  .collapse {
+    display: inline;
+  }
+  .expand {
+    display: none;
+  }
+}
+
+.collapsed {
+  .collapse {
+    display: none;
+  }
+  .expand {
+    display: inline;
+  }
+}
+
+.sql_exp_col {
+  padding-top: 8px;
+  padding-left: 26px;
 }

data/app/controllers/rails_db/application_controller.rb

@@ -1,4 +1,11 @@
 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
+      end
+
   end
 end
+

data/app/controllers/rails_db/tables_controller.rb

@@ -2,7 +2,7 @@ module RailsDb
   class TablesController < RailsDb::ApplicationController
 
     def index
-      @tables = ActiveRecord::Base.connection.tables.sort
+      @tables = RailsDb::Database.accessible_tables
     end
 
     def show

data/app/helpers/rails_db/application_helper.rb

@@ -3,7 +3,28 @@ module RailsDb
     include ::FontAwesome::Rails::IconHelper
 
     def rails_db_tables
-      Database.tables
+      RailsDb::Database.accessible_tables
+    end
+
+    def sidebar_classes
+      if show_sidebar?
+        'large-3 pull-9 columns'
+      else
+        'large-3 pull-9 columns hide'
+      end
+    end
+
+    def main_content_classes
+      if show_sidebar?
+        'large-9 push-3 columns collapsed'
+      else
+        'large-12 push-0 columns expanded'
+      end
+    end
+
+    def show_sidebar?
+      return true if controller_name == 'dashboard' && action_name == 'index'
+      cookies['sidebar_visible'] == 'true'
     end
 
     def title(str)

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

@@ -11,16 +11,20 @@
 
 <body>
   <%= display_flash_messages %>
-  <%= render 'rails_db/shared/header' %>
-  <div class="row">
-    <div class="large-9 push-3 columns">
-      <%= yield %>
+  <% if RailsDb.enabled %>
+    <%= render 'rails_db/shared/header' %>
+    <div class="row">
+      <div id='main_content' class="<%= main_content_classes %>">
+        <%= yield %>
+      </div>
+      <div id='sidebar' class="<%= sidebar_classes %>">
+        <%= render 'rails_db/shared/sidebar' %>
+      </div>
     </div>
-    <div id='sidebar' class="large-3 pull-9 columns">
-      <%= render 'rails_db/shared/sidebar' %>
-    </div>
-  </div>
-  <footer class="row">
-    <%= render 'rails_db/shared/footer' %>
-  </footer>
+    <footer class="row">
+      <%= render 'rails_db/shared/footer' %>
+    </footer>
+  <% else %>
+    <p>RailsDB is disabled. Please enable it in config/initializers/rails_db.rb</p>
+  <% end %>
 </body>

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

@@ -14,6 +14,10 @@
   <li>see EXPLAIN results for your queries</li>
   <li>export data to CSV</li>
   <li>import SQL files</li>
+  <li>expand/collapse sidebar</li>
+  <li>added HTTP_BASIC auth for Rails DB</li>
+  <li>ability to turn on/off using initializer</li>
+  <li>white/black lists</li>
   <li>visualize SQL schema (future)</li>
   <li>data-tables inside your app (future)</li>
   <li>ajax-ify Rails DB (future)</li>

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

@@ -0,0 +1,2 @@
+<a href='#' class='expand'><%= fa_icon('expand') %> Expand</a>
+<a href='#' class='collapse'><%= fa_icon('compress') %> Collapse</a>

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

@@ -1,47 +1,44 @@
 <% if sql_query.data.count > 0 %>
-  <div class='row'>
-    <div class="large-11">
-      <h4>Results</h4>
-      <p>
-        <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>
-      </p>
-      <hr>
-      <%= render 'explain', sql_query: sql_query, sql: sql %>
-      <div class='scrollable'>
-        <table>
-          <thead>
+  <div class="large-11">
+    <h4>Results</h4>
+    <p>
+      <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>
+    </p>
+    <hr>
+    <%= render 'explain', sql_query: sql_query, sql: sql %>
+    <div class='scrollable'>
+      <table>
+        <thead>
+          <tr>
+            <% sql_query.data.columns.each do |column| %>
+              <th><%= titleize_column(column) %></th>
+            <% end %>
+          </tr>
+        </thead>
+        <tbody>
+          <% sql_query.data.rows.each do |row| %>
+            <tr>
+              <% row.each do |item| %>
+                <td class='query_result'><%= item %></td>
+              <% end %>
+            </tr>
+          <% end %>
+        </tbody>
+        <% if sql_query.data.count > 10 %>
+          <tfoot>
             <tr>
               <% sql_query.data.columns.each do |column| %>
                 <th><%= titleize_column(column) %></th>
               <% end %>
             </tr>
-          </thead>
-          <tbody>
-            <% sql_query.data.rows.each do |row| %>
-              <tr>
-                <% row.each do |item| %>
-                  <td class='query_result'><%= item %></td>
-                <% end %>
-              </tr>
-            <% end %>
-          </tbody>
-          <% if sql_query.data.count > 10 %>
-            <tfoot>
-              <tr>
-                <% sql_query.data.columns.each do |column| %>
-                  <th><%= titleize_column(column) %></th>
-                <% end %>
-              </tr>
-            </tfoot>
-          <% end %>
-        </table>
-      </div>
+          </tfoot>
+        <% end %>
+      </table>
     </div>
   </div>
-
 <% else %>
   <p>
     <span class="radius success label">SQL command successfully executed</span>

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

@@ -3,36 +3,30 @@
 <%= form_tag :sql_start_import, multipart: true do %>
   <h3>Import SQL File</h3>
 
-  <div class='row'>
-    <div class="large-11">
-      <label>
-        File
-        <%= file_field_tag :file %>
-      </label>
-    </div>
+  <div class="large-11">
+    <label>
+      File
+      <%= file_field_tag :file %>
+    </label>
   </div>
 
-  <div class="row">
-    <div class="large-11">
-      <p><span class="radius secondary label">* <%= RailsDb::Adapters::BaseAdapter::MULTI_STATEMENT_HELP_TEXT %></span></p>
-      <%= submit_tag raw("&rarr; Import"), class: 'button small' %>
-      &nbsp;
-      &mdash;
-      &nbsp;
-      <a href="#" data-reveal-id="sample_modal" id='sample_modal_link'><%= fa_icon('bars') %> Sample</a></span>
-      <%= render 'import_sample' %>
-    </div>
+  <div class="large-11">
+    <p><span class="radius secondary label">* <%= RailsDb::Adapters::BaseAdapter::MULTI_STATEMENT_HELP_TEXT %></span></p>
+    <%= submit_tag raw("&rarr; Import"), class: 'button small' %>
+    &nbsp;
+    &mdash;
+    &nbsp;
+    <a href="#" data-reveal-id="sample_modal" id='sample_modal_link'><%= fa_icon('bars') %> Sample</a></span>
+    <%= render 'import_sample' %>
   </div>
 
   <% if @importer && @importer.result.ok? %>
-    <div class='row'>
-      <div class="large-11">
-        <h4>Results</h4>
-        <p>
-          <span class="radius success label">File was successfully imported</span>
-          <span class="radius info label">Time: <%= @importer.time %> seconds</span>
-        </p>
-      </div>
+    <div class="large-11">
+      <h4>Results</h4>
+      <p>
+        <span class="radius success label">File was successfully imported</span>
+        <span class="radius info label">Time: <%= @importer.time %> seconds</span>
+      </p>
     </div>
   <% end %>
 

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

@@ -1,39 +1,46 @@
 <% title "SQL Editor" %>
 
 <%= form_tag :sql_execute do %>
-  <h3>Execute SQL</h3>
-
-  <div class='row'>
-    <% if @sql_query.valid? %>
-      <% if @sql_query.data.is_error? %>
-        <div class="large-11">
-          <div class='alert-box alert'>
-            <%= @sql_query.data.error.message %>
-          </div>
-        </div>
-      <% end %>
-    <% end %>
 
-    <div class="large-11">
-      <textarea name='sql' id="sql" cols="120" rows="60"><%= @sql %></textarea>
+  <div class="large-11">
+    <div class='left'>
+      <h3>Execute SQL</h3>
+    </div>
+
+    <div class='left sql_exp_col'>
+      <%= render '/rails_db/shared/exp_col' %>
     </div>
   </div>
 
-  <div class="row">
-    <div class="large-11">
-      <div class='panel execute_panel'>
-        <p><span class="radius secondary label">* be careful with your SQL. You may corrupt your DB. Make sure you have DB backup if doing modifications.</span></p>
-        <%= submit_tag raw("&rarr; Execute"), class: 'button small' %>
-        &nbsp;
-        &mdash;
-        &nbsp;
-        <%= link_to raw("#{fa_icon('undo')} Reset"), :sql, data: {confirm: "Are you sure?"}, confirm: "Are you sure?" %>
-        &nbsp;
-        &mdash;
-        &nbsp;
-        <a href="#" data-reveal-id="history_modal" id='history_modal_link'><%= fa_icon('bars') %> History</a></span>
-        <%= render 'history' %>
+  <div class='clear'></div>
+
+  <% if @sql_query.valid? %>
+    <% if @sql_query.data.is_error? %>
+      <div class="large-11">
+        <div class='alert-box alert'>
+          <%= @sql_query.data.error.message %>
+        </div>
       </div>
+    <% end %>
+  <% end %>
+
+  <div class="large-11">
+    <textarea name='sql' id="sql" cols="120" rows="60"><%= @sql %></textarea>
+  </div>
+
+  <div class="large-11">
+    <div class='panel execute_panel'>
+      <p><span class="radius secondary label">* be careful with your SQL. You may corrupt your DB. Make sure you have DB backup if doing modifications.</span></p>
+      <%= submit_tag raw("&rarr; Execute"), class: 'button small' %>
+      &nbsp;
+      &mdash;
+      &nbsp;
+      <%= link_to raw("#{fa_icon('undo')} Reset"), :sql, data: {confirm: "Are you sure?"}, confirm: "Are you sure?" %>
+      &nbsp;
+      &mdash;
+      &nbsp;
+      <a href="#" data-reveal-id="history_modal" id='history_modal_link'><%= fa_icon('bars') %> History</a></span>
+      <%= render 'history' %>
     </div>
   </div>