db_admin 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6088beb0959e56e8da0a7da89afc2777b51787c858fa3dfbbc1cb28000c2863
-  data.tar.gz: ed3c59335703f4c9f73791729f78036336a4bceec777293a5cfd1ffde5adc4ea
+  metadata.gz: dab650953c43a0af84a9b7eb9fc7bff6c2a9b5b47e264237eb3c5c4e25dd08fc
+  data.tar.gz: 86815bc0a74f7b0ad80e373470af42cb01e0e6eb319684de6dc8d5fcc3bfd194
 SHA512:
-  metadata.gz: 0d52e3976234eb2944119fc22c75a16dc611e811eacd66c0bceb0cd9bdec5b6b7310f2396614e490fc6bc6d39ad079bb15159a2eafb4363abfc8fcab32b15f64
-  data.tar.gz: 0a031caf04fe329413fed852de84aa9be4ee27fb748a15c8b0bfc817c4336dfc508192f94fd436507cb853951236fd7661d0038989389a6b163d5b3bca3058cc
+  metadata.gz: 2ab1d7ffda6ae04f8b54a07ad8691e5d7b542f43057e1890d1c4a5387e47d49c2dc976d80d2982732e3b8a4c9c0a98f5de173617757a1bdb8d875e224573bbba
+  data.tar.gz: 5651d43ed1a38535dd71b57ffdc2bf0b96b67b4daabb10f02f316d0caeac64864a871575ce625102d6630312a4c3218bb9dc0aaad1241bcd8c5b10642b7baf74

data/README.md

@@ -1,13 +1,12 @@
 ## Ruby Database Admin
 A gem based on [Sinatra](https://github.com/sinatra/sinatra) and [Sequel](https://github.com/jeremyevans/sequel).
-
 You can use it to manage multiple databases at the same time.
 
 Rails user can also use it because it is just a gem. Here are some demo pictures.
 
 ![Demo home](./lib/public/demo_home.png)
 
-![Demo operations](./lib/public/demo_oprations.png)
+![Demo operations](./lib/public/demo_operations.png)
 
 ![Demo hover](./lib/public/demo_hover.png)
 
@@ -15,12 +14,12 @@ Rails user can also use it because it is just a gem. Here are some demo pictures
 ~~~bash
 $ gem install db_admin
 ~~~
-Or add `gem 'db_admin'` to `Gemfile`, then `$ bundle install`.
+Or modify `Gemfile` as below, then `$ bundle install`.
 ~~~ruby
 group :development do 
   # A Web UI for database admin. Run `$ db_admin` and then
   # visit http://localhost:4567
-  gem 'db_admin'
+  gem 'db_admin', require: false
 end
 ~~~
 
@@ -41,7 +40,9 @@ $ ruby db_admin/lib/db_admin.rb # Then visit http://localhost:4567
 ~~~
 
 ### Debugging
-Uncomment the below line in `db_admin/lib/db_admin.rb` to auto-reload changed files.
+You need to restart Web Server when you made a change. 
+
+Uncomment the below line in `./lib/db_admin.rb` to auto-reload changed files.
 ~~~ruby
-require 'sinatra/reloader' if development? # `gem install sinatra-reloader` first. 
+require 'sinatra/reloader' if development? # `$ gem install sinatra-reloader` first. 
 ~~~

data/bin/db_admin

@@ -1,6 +1,3 @@
 #!/usr/bin/env ruby
 
 require 'db_admin'
-
-puts "hello world in db_admin bin"
-

data/lib/db_admin.rb

@@ -3,31 +3,18 @@ require 'sequel'
 require 'json'
 
 class RubyDatabaseAdmin < Sinatra::Base
-  # require 'sinatra/reloader' if development? # `gem install sinatra-reloader` first if you want to debug this project by auto-reloading changed files.
+  # require 'sinatra/reloader' if development? # `$ gem install sinatra-reloader` first if you want to debug this project by auto-reloading changed files.
 
   use Rack::MethodOverride
 
   DBs = []
   DB = nil
 
-  # Below are direct connect examples. Try to uncomment a line to use it.
-  #
-  # DB = Sequel.sqlite('sqlite_example.db') # Connect SQLite db located at './sqlite_example.db'.
-  #
-  # Connect PostgreSQL.
+  # 'adapter' can be 'postgres', 'mysql2', 'sqlite', 'oracle', etc.
   # DB = Sequel.connect({ adapter: 'postgres',
   #                       host: 'hostname_or_ip',
   #                       database: 'database_name',
   #                       user: 'user',
-  #                       password: '',
-  #                       port: 5432 })
-  #
-  # 'adapter' can also be 'mysql2', 'postgres', 'sqlite', 'oracle', 'sqlanywhere', 'db2', 'informix', etc.
-  # We will use default port if port is nil.
-  # DB = Sequel.connect({ adapter: 'mysql2',
-  #                       host: 'hostname_or_ip',
-  #                       database: 'database_name',
-  #                       user: 'user',
   #                       password: '' })
 
   DBs << DB unless DB.nil?
@@ -80,7 +67,9 @@ class RubyDatabaseAdmin < Sinatra::Base
 
   get '/switch_db/:i' do
     begin
-      DB = DBs[params[:i].to_i] if DBs[params[:i].to_i].test_connection
+      if should_switch_db?(DBs[params[:i].to_i])
+        DB = DBs[params[:i].to_i]
+      end
     rescue Exception => e
       session[:error] = e.message
     end
@@ -295,9 +284,9 @@ class RubyDatabaseAdmin < Sinatra::Base
     eval(/{.*}/.match(DB.inspect)[0])
   end
 
-  # def select_sql?(sql)
-  #   sql[0..5].upcase == 'SELECT'
-  # end
+  def should_switch_db?(new_db)
+    new_db.test_connection && new_db != DB
+  end
 end
 
 RubyDatabaseAdmin.run!

data/lib/views/home.erb

@@ -5,7 +5,6 @@
 
   <form action='connect_another_db' method="post">
     <select name='adapter'>
-      <% puts adapter_hash %>
       <% adapter_hash.reject!{ |k| k == :mysql }.each do |adapter_key, adapter_value| %>
         <option value='<%= adapter_key %>' <%= 'selected' if database_adapter == adapter_value || adapter_key == params[:adapter] %>><%= adapter_value %></option>
       <% end %>
@@ -38,4 +37,4 @@
   <br>
 </div>
 
-<a href='https://github.com/gazeldx/ruby-db-admin' target='_blank'>ruby-db-admin</a>@github
+<a href='https://github.com/gazeldx/db_admin' target='_blank'>db_admin</a>@github

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: db_admin
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Lane Zhang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-30 00:00:00.000000000 Z
+date: 2019-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -52,7 +52,7 @@ files:
 - lib/public/css/bootstrap.min.css
 - lib/public/demo_home.png
 - lib/public/demo_hover.png
-- lib/public/demo_oprations.png
+- lib/public/demo_operations.png
 - lib/public/js/bootstrap.min.js
 - lib/public/js/jquery.min.js
 - lib/views/_execute_sql.erb