dbbrowser 0.1.0 → 0.1.1

data/Manifest.txt

@@ -12,6 +12,7 @@ lib/dbbrowser/views/debug.erb
 lib/dbbrowser/views/index.erb
 lib/dbbrowser/views/layout.erb
 lib/dbbrowser/views/shared/_debug.erb
+lib/dbbrowser/views/shared/_spec.erb
 lib/dbbrowser/views/shared/_table_def.erb
 lib/dbbrowser/views/shared/_tables.erb
 lib/dbbrowser/views/shared/_version.erb

data/lib/dbbrowser/connection.rb

@@ -7,13 +7,17 @@ class ConnectionMan  # connection manager
   #    ActiveRecord::Base.configurations.keys
   #  end
 
-  def connection( key='std' )
-    if key == 'std'
-      # -- use/try 'standard/default' connection
-      con = ActiveRecord::Base.connection
-    else
-      con = AbstractModel.connection_for( key )
-    end
+  CONNECTS = {}  # cache connections
+
+  def connection_for( key )
+    # cache connections - needed? why? why not??
+    con = CONNECTS[ key ] ||= AbstractModel.connection_for( key )
+
+    # note: make sure connection is active?
+    #  use verify!  - will try active? followed by reconnect!
+    # - todo: check ourselves if active? - why? why not??
+    con.verify!
+
     # wrap ActiveRecord connection in our own connection class
     Connection.new( con, key )
   end
@@ -22,13 +26,11 @@ class ConnectionMan  # connection manager
   class AbstractModel < ActiveRecord::Base
     self.abstract_class = true   # no table; class just used for getting db connection
 
-    CONNECTS = {}  # cache connections
     def self.connection_for( key )
-      CONNECTS[ key ] ||= begin
-        establish_connection( key )
-        connection
-      end
+      establish_connection( key )
+      connection
     end
+
   end # class AbstractModel
 
 
@@ -42,9 +44,13 @@ class ConnectionMan  # connection manager
     attr_reader  :connection
     attr_reader  :key
 
-    delegate :select_value, :select_all,
+    delegate :select_value, :select_all, :adapter_name,
              :to => :connection
 
+    def class_name
+      @connection.class.name
+    end
+
   #    delegate :quote_table_name, :quote_column_name, :quote,
   #             :update, :insert, :delete,
   #             :add_limit_offset!,

data/lib/dbbrowser/server.rb

@@ -52,6 +52,13 @@ class Server < Sinatra::Base
     Rack::Utils.escape_html(text)
   end
 
+  def render_spec_for( key, opts={} )
+    # render connection spec(ification) aka configuration
+    spec = ActiveRecord::Base.configurations[ key ]
+    erb( 'shared/_spec'.to_sym,
+         layout: false,
+         locals: { spec: spec })
+  end
 
   def render_table_def( table, opts={} )
     erb( 'shared/_table_def'.to_sym,
@@ -66,7 +73,7 @@ class Server < Sinatra::Base
   end
 
   def render_tables_for( key, opts={} )
-    con = settings.man.connection( key )
+    con = settings.man.connection_for( key )
     erb( 'shared/_tables'.to_sym,
          layout: false,
          locals: { tables: con.tables } )
@@ -81,13 +88,13 @@ class Server < Sinatra::Base
   end
 
   get '/db/:key/:table_name' do |key,table_name|
-    con = settings.man.connection( key )
+    con = settings.man.connection_for( key )
     erb :table, locals: { table: con.table( table_name ) }
   end
 
   get '/db/:key' do |key|
-    con = settings.man.connection( key )
-    erb :db, locals: { key: key, tables: con.tables }
+    con = settings.man.connection_for( key )
+    erb :db, locals: { key: key, tables: con.tables, con: con }
   end
 
   get '/d*' do

data/lib/dbbrowser/version.rb

@@ -1,4 +1,4 @@
 
 module DbBrowser
-   VERSION = '0.1.0'
+   VERSION = '0.1.1'
 end

data/lib/dbbrowser/views/db.erb

@@ -1,9 +1,13 @@
 
 <h2>## <%= key %> ##</h2>
 
-<pre>
-<%= ActiveRecord::Base.configurations[key].inspect %>
-</pre>
+<h3>Adapter Info</h3>
+<table>
+  <tr><td>adapter name</td><td><%= con.adapter_name %></td></tr>
+  <tr><td>class name</td><td><%= con.class_name %></td></tr>
+</table>
+
+<%= render_spec_for( key ) %>
 
 
 <%= render_tables( tables ) %>
@@ -14,3 +18,5 @@
 
 <%= render_table_def( table ) %>
 <% end %>
+
+<!-- todo: add indexes, check for primary keys - how?? -->

data/lib/dbbrowser/views/debug.erb

@@ -1,7 +1,16 @@
+<h3>ActiveRecord Configurations</h3>
+
+<pre>
+  ActiveRecord::Base.configurations:
+  <%= ActiveRecord::Base.configurations.inspect %>
+</pre>
+
+
 <h3>Named Route Helpers</h3>
 
 <pre>
   root_path:    <%= root_path %>
 </pre>
 
+
 <%= erb :'shared/_debug' %>

data/lib/dbbrowser/views/index.erb

@@ -2,9 +2,8 @@
 <% ActiveRecord::Base.configurations.keys.each do |key| %>
 
 <h2>## <%= key %> ##</h2>
-<pre>
-<%= ActiveRecord::Base.configurations[key].inspect %>
-</pre>
+
+<%= render_spec_for( key ) %>
 
 <%= render_tables_for( key ) %> 
 

data/lib/dbbrowser/views/shared/_spec.erb

@@ -0,0 +1,17 @@
+
+<h3>Connection Spec</h3>
+
+<table>
+<% spec.each do |key,value| %>
+  <tr>
+    <td><%= key %></td>
+    <td>
+      <% if key.to_s =~ /password/i %>
+         *********
+      <% else %>
+        <%= value %>
+      <% end %>
+    </td>
+  </tr>
+<% end %>
+</table>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dbbrowser
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-13 00:00:00.000000000 Z
+date: 2013-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logutils
-  requirement: &69669750 !ruby/object:Gem::Requirement
+  requirement: &73238970 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0.5'
   type: :runtime
   prerelease: false
-  version_requirements: *69669750
+  version_requirements: *73238970
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &69669480 !ruby/object:Gem::Requirement
+  requirement: &73238710 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *69669480
+  version_requirements: *73238710
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &69669210 !ruby/object:Gem::Requirement
+  requirement: &73238390 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: '3.3'
   type: :development
   prerelease: false
-  version_requirements: *69669210
+  version_requirements: *73238390
 description: dbbrowser - database browser (connections, schema, tables, records, etc.)
   as mountable web app
 email: webslideshow@googlegroups.com
@@ -66,6 +66,7 @@ files:
 - lib/dbbrowser/views/index.erb
 - lib/dbbrowser/views/layout.erb
 - lib/dbbrowser/views/shared/_debug.erb
+- lib/dbbrowser/views/shared/_spec.erb
 - lib/dbbrowser/views/shared/_table_def.erb
 - lib/dbbrowser/views/shared/_tables.erb
 - lib/dbbrowser/views/shared/_version.erb