rails_db 1.0 → 1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b8edcd55cb5deaa338dde74868d85c838906507
-  data.tar.gz: 4f641001dc8e886869ed8644a6a7e9dff4575ae9
+  metadata.gz: cdad8252f17bfd7452ecc2f92a7c3a8fdcabf4fa
+  data.tar.gz: 634067ced3e8d805c85bd24c533ccc4ea773bed2
 SHA512:
-  metadata.gz: 48b2dc79959b7f7682f43cf6577b784db747aa8df3ad45325ca0922c65105ddca9b532bf5aabc62be1f9bf17c69e6044a5cb26ff136850c3b1166f9129049ae0
-  data.tar.gz: 553f9b1c71c073a75c3dd4f7c773dfaae90cc7d9def1b6a8e7ef589e70610cbc979b9d0cae92d755a5a456b0b6fbb28c8fff3e177282a4e14392187ee2c24cbe
+  metadata.gz: 89c8513bb443d3b9d4fe76e3b38ca733e6bfe6f68dafe7b75d73755c1fcb76ef7f8d37570eb923ecd4ad17dda4cbf8cca62e7229b544587bb633d918cd27e141
+  data.tar.gz: 741d3bc568a8003bcc0a6c923e183ad81384e49c63eedc3c7b874ccc9961754c0c6af658215c11f6802b397de040dc27e947ced6ad74b2c5bd5e9c5c9f106ec5

data/Gemfile

@@ -8,7 +8,6 @@ gem 'jquery-rails'
 gem 'font-awesome-rails'
 gem 'codemirror-rails'
 gem 'terminal-table'
-gem 'axlsx_rails'
 gem 'simple_form'
 gem 'ransack'
 gem 'kaminari'

data/Gemfile.lock

@@ -1,8 +1,7 @@
 PATH
   remote: .
   specs:
-    rails_db (1.0)
-      axlsx_rails
+    rails_db (1.1)
       codemirror-rails
       font-awesome-rails
       jquery-rails
@@ -53,7 +52,7 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.3.8)
+    addressable (2.4.0)
     arel (6.0.3)
     axlsx (2.0.1)
       htmlentities (~> 4.3.1)
@@ -178,3 +177,6 @@ DEPENDENCIES
   sqlite3
   terminal-table
   uglifier
+
+BUNDLED WITH
+   1.10.6

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

@@ -1,9 +1,9 @@
-.date_or_time {
-  display: inline;
+select.datetime, select.date, select.time {
+  padding-right: 25px;
   width: auto;
 }
 
 .scrollable_form {
   max-height: 600px;
   overflow: scroll;
-}
+}

data/app/controllers/rails_db/tables_controller.rb

@@ -43,7 +43,11 @@ module RailsDb
     end
 
     def xlsx
-      render xlsx: 'table', filename: "#{@table.name}.xlsx"
+      if defined? Axlsx
+        render xlsx: 'table', filename: "#{@table.name}.xlsx"
+      else
+        raise 'RailsDb could not find Axlsx, please add it to your Gemfile: "gem \'axlsx_rails\'"'
+      end
     end
 
     def truncate

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

@@ -16,7 +16,7 @@
   <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 and Excel</li>
+  <li>export data to CSV and Excel (see documentation)</li>
   <li>hide/show columns</li>
   <li>import SQL files</li>
   <li>expand/collapse sidebar</li>

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

@@ -41,7 +41,7 @@
     </ul>
     <ul class="inline-list right main_nav">
       <li>
-        <%= link_to '/' do %>
+        <%= link_to main_app.root_url do %>
           <%= fa_icon 'home' %>
           Home
         <% end %>

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

@@ -6,7 +6,9 @@
       <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-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>
+      <% if defined? Axlsx %>
+        <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>
+      <% end %>
     </p>
     <hr>
     <%= render 'explain', sql_query: sql_query, sql: sql %>

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

@@ -31,7 +31,9 @@
 
 <ul id="download-files" class="f-dropdown" data-dropdown-content>
   <li><%= link_to raw("#{fa_icon('file-text-o')} Export table to CSV"), table_csv_path(@table) %></li>
-  <li><%= link_to raw("#{fa_icon('file-excel-o')} Export table to Excel"), table_xlsx_path(@table, format: 'xls') %></li>
+  <% if defined? Axlsx %>
+    <li><%= link_to raw("#{fa_icon('file-excel-o')} Export table to Excel"), table_xlsx_path(@table, format: 'xls') %></li>
+  <% end %>
 </ul>
 
 <div class='scrollable'>

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

@@ -7,15 +7,7 @@
       <% @record.class.columns.each do |column| %>
         <% name = column.name %>
         <% next if name == @table.primary_key %>
-
-        <% if ['datetime', 'date', 'time'].include?(column.sql_type) %>
-          <div class='form-inline'>
-            <%= form.input name, label: name, input_html: {class: 'date_or_time'} %>
-          </div>
-
-        <% else %>
-          <%= form.input name, label: name %>
-        <% end %>
+        <%= form.input name, label: name %>
       <% end %>
     </div>
     <%= form.submit 'SAVE', class: 'button small' %>

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

@@ -7,15 +7,7 @@
       <% @record.class.columns.each do |column| %>
         <% name = column.name %>
         <% next if [@table.primary_key, 'created_at', 'updated_at'].include?(column.name) %>
-
-        <% if ['datetime', 'date', 'time'].include?(column.sql_type) %>
-          <div class='form-inline'>
-            <%= form.input name, label: name, input_html: {class: 'date_or_time'} %>
-          </div>
-
-        <% else %>
-          <%= form.input name, label: name %>
-        <% end %>
+        <%= form.input name, label: name %>
       <% end %>
     </div>
     <%= form.submit 'SAVE', class: 'button small' %>

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

@@ -28,7 +28,9 @@
 
 <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>
+  <% if defined? Axlsx %>
+    <li><%= link_to raw("#{fa_icon('file-excel-o')} Export to Excel"), table_xlsx_path(@table, format: 'xls') %></li>
+  <% end %>
 </ul>
 
 <%= search_form_for @q, url: table_search_path(@table), method: :get, remote: true, html: { id: 'search_form', class: search_form_class } do |f| %>

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

@@ -19,7 +19,9 @@
 
 <ul id="download-files" class="f-dropdown" data-dropdown-content>
   <li><%= link_to raw("#{fa_icon('file-text-o')} Export table to CSV"), table_csv_path(@table) %></li>
-  <li><%= link_to raw("#{fa_icon('file-excel-o')} Export table to Excel"), table_xlsx_path(@table, format: 'xls') %></li>
+  <% if defined? Axlsx %>
+    <li><%= link_to raw("#{fa_icon('file-excel-o')} Export table to Excel"), table_xlsx_path(@table, format: 'xls') %></li>
+  <% end %>
 </ul>
 
 <ul id="drop" class="f-dropdown" data-dropdown-content>

data/lib/rails_db.rb

@@ -6,7 +6,6 @@ require "jquery-rails"
 require 'codemirror-rails'
 require 'terminal-table'
 require 'csv'
-require 'axlsx_rails'
 require 'simple_form'
 require 'ransack'
 require 'kaminari'
@@ -57,7 +56,7 @@ module RailsDb
   def self.use_default_configuration!
     self.enabled                            = true
     self.automatic_routes_mount             = true
-    self.black_list_tables                  = white_list_tables = []
+    self.black_list_tables                  = self.white_list_tables = []
     self.http_basic_authentication_enabled  = false
     self.verify_access_proc                 = proc { |controller| true }
   end

data/lib/rails_db/engine.rb

@@ -4,7 +4,7 @@ module RailsDb
     config.autoload_paths += Dir["#{config.root}/lib"]
 
     initializer 'any_login.assets_precompile', :group => :all do |app|
-      app.config.assets.precompile += ['vendor/modernizr.js', 'rails_db/up_arrow.gif', 'rails_db/down_arrow.gif']
+      app.config.assets.precompile += ['rails_db/logo_mini.png', 'rails_db/*', 'vendor/modernizr.js', 'rails_db/up_arrow.gif', 'rails_db/down_arrow.gif', 'rails_db/logo.png']
       app.config.assets.precompile += ["codemirror*", "codemirror/**/*"]
     end
 

data/lib/rails_db/version.rb

@@ -1,3 +1,3 @@
 module RailsDb
-  VERSION = "1.0"
+  VERSION = "1.1"
 end

data/rails_db.gemspec

@@ -25,7 +25,6 @@ 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_dependency 'simple_form'
   s.add_dependency 'ransack'
   s.add_dependency 'kaminari'
@@ -33,6 +32,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "sqlite3"
   s.add_development_dependency "mysql2", '<= 0.3.20'
   s.add_development_dependency "pg"
+  s.add_development_dependency "axlsx_rails"
   # s.add_development_dependency 'populator'
   # s.add_development_dependency 'faker'
   # s.add_development_dependency 'pry'

data/test/dashboard_controller_test.rb

@@ -1,4 +1,5 @@
 require 'test_helper'
+require 'axlsx_rails'
 
 class DashboardControllerTest < ActionDispatch::IntegrationTest
 
@@ -8,7 +9,6 @@ class DashboardControllerTest < ActionDispatch::IntegrationTest
 
     user = User.create(name: 'Igor')
     edit_user = User.create(name: 'Edit')
-    account = Account.create(name: 'Igor')
 
     get '/rails/db'
     assert_equal 200, status

data/test/dummy/app/models/account.rb

@@ -10,4 +10,10 @@
 #
 
 class Account < ActiveRecord::Base
+
+  # to test search
+  def self.search(name)
+    where('1=1')
+  end
+
 end

data/test/dummy/app/models/contact.rb

@@ -11,4 +11,5 @@
 #
 
 class Contact < ActiveRecord::Base
+  scope :search, -> { where('1=1') }
 end

data/test/dummy/config/application.rb

@@ -3,8 +3,11 @@ require File.expand_path('../boot', __FILE__)
 require 'rails/all'
 
 Bundler.require(*Rails.groups)
+
 require "rails_db"
 
+Ransack::Adapters::ActiveRecord::Base.class_eval('remove_method :search')
+
 module Dummy
   class Application < Rails::Application
     # Settings in config/environments/* take precedence over those specified here.

data/test/dummy/db/schema.rb

@@ -52,46 +52,46 @@ ActiveRecord::Schema.define(version: 20151121125538) do
 
   create_table "projects", force: :cascade do |t|
     t.string   "name"
-    t.string   "description_880941"
-    t.string   "description_609312"
-    t.string   "description_45120"
-    t.string   "description_646956"
-    t.string   "description_359190"
-    t.string   "description_414526"
-    t.string   "description_126104"
-    t.string   "description_21394"
-    t.string   "description_200553"
-    t.string   "description_47383"
-    t.string   "description_817819"
-    t.string   "description_297200"
-    t.string   "description_732496"
-    t.string   "description_578733"
-    t.string   "description_181448"
-    t.string   "description_591849"
-    t.string   "description_29523"
-    t.string   "description_859516"
-    t.string   "description_607626"
-    t.string   "description_634417"
-    t.integer  "amount_96786"
-    t.integer  "amount_118208"
-    t.integer  "amount_354589"
-    t.integer  "amount_529364"
-    t.integer  "amount_2748"
-    t.integer  "amount_265448"
-    t.integer  "amount_87259"
-    t.integer  "amount_69192"
-    t.integer  "amount_400320"
-    t.integer  "amount_981344"
-    t.integer  "amount_724725"
-    t.integer  "amount_233529"
-    t.integer  "amount_10548"
-    t.integer  "amount_918245"
-    t.integer  "amount_400389"
-    t.integer  "amount_630390"
-    t.integer  "amount_183655"
-    t.integer  "amount_83287"
-    t.integer  "amount_252578"
-    t.integer  "amount_147921"
+    t.string   "description_911132"
+    t.string   "description_782996"
+    t.string   "description_824956"
+    t.string   "description_241581"
+    t.string   "description_725539"
+    t.string   "description_340145"
+    t.string   "description_243765"
+    t.string   "description_430455"
+    t.string   "description_163298"
+    t.string   "description_670015"
+    t.string   "description_64256"
+    t.string   "description_825795"
+    t.string   "description_130920"
+    t.string   "description_546951"
+    t.string   "description_678246"
+    t.string   "description_372493"
+    t.string   "description_413167"
+    t.string   "description_399716"
+    t.string   "description_605912"
+    t.string   "description_179385"
+    t.integer  "amount_346083"
+    t.integer  "amount_295343"
+    t.integer  "amount_478538"
+    t.integer  "amount_356409"
+    t.integer  "amount_798898"
+    t.integer  "amount_300244"
+    t.integer  "amount_963504"
+    t.integer  "amount_83801"
+    t.integer  "amount_272106"
+    t.integer  "amount_852037"
+    t.integer  "amount_35283"
+    t.integer  "amount_803382"
+    t.integer  "amount_218786"
+    t.integer  "amount_230333"
+    t.integer  "amount_357044"
+    t.integer  "amount_984738"
+    t.integer  "amount_172195"
+    t.integer  "amount_249998"
+    t.integer  "amount_349304"
+    t.integer  "amount_792944"
     t.datetime "created_at",         null: false
     t.datetime "updated_at",         null: false
   end

data/test/standalone/config/application.rb

@@ -7,6 +7,8 @@ require 'sprockets/railtie'
 
 require "rails_db"
 
+Ransack::Adapters::ActiveRecord::Base.class_eval('remove_method :search')
+
 module OverideDatabaseYmlPath
   def paths
     @paths ||= begin

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_db
 version: !ruby/object:Gem::Version
-  version: '1.0'
+  version: '1.1'
 platform: ruby
 authors:
 - Igor Kasyanchuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-02 00:00:00.000000000 Z
+date: 2015-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -122,20 +122,6 @@ 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: simple_form
   requirement: !ruby/object:Gem::Requirement
@@ -220,6 +206,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: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 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:
@@ -430,7 +430,6 @@ files:
 - test/dummy/db/rails_db.sqlite3
 - test/dummy/db/rails_db_dev.sqlite3
 - test/dummy/db/schema.rb
-- test/dummy/db/test.sqlite3
 - test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html
@@ -595,7 +594,6 @@ test_files:
 - test/dummy/db/rails_db.sqlite3
 - test/dummy/db/rails_db_dev.sqlite3
 - test/dummy/db/schema.rb
-- test/dummy/db/test.sqlite3
 - test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html