dbbrowser 0.1.3 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c03dfe89bdee6580f1ed6421d66fd4558895428f
+  data.tar.gz: 85da6c87bcc2876d87c76b589d5366038f2f717e
+SHA512:
+  metadata.gz: df5bdb91c09985a18a113b0e6c84f6797633b19b973a3bbe524dd773d55599265277ec69785dc398b9af568aa3f3f82a4868f78648931e2c6b5209cbcf8e9d83
+  data.tar.gz: 30d2eda5dc410f0347366228296be179afbace07ff96fceff8adcfc8b61d2d4a6dc2f24d88e6752fdadc18ad490a8f93ae2a730978f0e329a62eda5117c69e00

data/Manifest.txt

@@ -3,7 +3,6 @@ Manifest.txt
 README.md
 Rakefile
 lib/dbbrowser.rb
-lib/dbbrowser/connection.rb
 lib/dbbrowser/public/jquery-2.0.3.min.js
 lib/dbbrowser/public/jquery.tabs.js
 lib/dbbrowser/public/style.css

data/README.md

@@ -14,7 +14,7 @@ database browser (connections, schema, tables, records, etc.) as mountable web a
 In your rack configuration (`config.ru`) mount the databrowser app; add the line:
 
 ~~~
-map '/browse' { run DbBrowser::Server  }
+map('/browse') { run DbBrowser::Server  }
 ~~~
 
 

data/Rakefile

@@ -18,14 +18,17 @@ Hoe.spec 'dbbrowser' do
   self.history_file = 'History.md'
 
   self.extra_deps = [
-    ['logutils', '>= 0.5']
+    ## ['logutils', '>= 0.5'],  # already part of textutils - remove ???
+    ['textutils'],
+    ['activerecord'],
+    ['activerecord-utils', '>= 0.4.0'],
+    ['sinatra']
   ]
 
   self.licenses = ['Public Domain']
 
   self.spec_extras = {
-   :required_ruby_version => '>= 1.9.2'
+   required_ruby_version: '>= 1.9.2'
   }
 
-
-end
+end

data/lib/dbbrowser.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 
 require 'pp'
 
@@ -7,18 +9,15 @@ require 'pp'
 require 'textutils'
 
 require 'active_record'
+require 'activerecord/utils'    ## pull in browser support
 
 
 # our own code
 
 require 'dbbrowser/version'  # let it always go first
-require 'dbbrowser/connection'
 
-module DbBrowser
 
-  def self.root
-    "#{File.expand_path( File.dirname(File.dirname(__FILE__)) )}"
-  end
+module DbBrowser
 
 
   ### helper for DATABASE_URL for ActiveRecord

data/lib/dbbrowser/server.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 
 
 # 3rd party libs/gems
@@ -25,7 +26,7 @@ class Server < Sinatra::Base
   set :static, true # set up static file routing
 
 
-  set :man, ConnectionMan.new
+  set :browser, ActiveRecordUtils::Browser.new
 
   #################
   # Helpers
@@ -73,7 +74,7 @@ class Server < Sinatra::Base
   end
 
   def render_tables_for( key, opts={} )
-    con = settings.man.connection_for( key )
+    con = settings.browser.connection_for( key )
     erb( 'shared/_tables'.to_sym,
          layout: false,
          locals: { tables: con.tables } )
@@ -103,7 +104,7 @@ class Server < Sinatra::Base
   end
 
   get '/db/:key/:table_name' do |key,table_name|
-    con   = settings.man.connection_for( key )
+    con   = settings.browser.connection_for( key )
     table  = con.table( table_name )
 
     query_opts = {}
@@ -118,7 +119,7 @@ class Server < Sinatra::Base
   end
 
   get '/db/:key' do |key|
-    con = settings.man.connection_for( key )
+    con = settings.browser.connection_for( key )
     erb :db, locals: { key: key, tables: con.tables, con: con }
   end
 

data/lib/dbbrowser/version.rb

@@ -1,4 +1,13 @@
+# encoding: utf-8
 
 module DbBrowser
-   VERSION = '0.1.3'
+
+  VERSION = '0.2.0'
+
+  def self.root
+    "#{File.expand_path( File.dirname(File.dirname(File.dirname(__FILE__))) )}"
+  end
+
 end
+
+

metadata

@@ -1,63 +1,114 @@
 --- !ruby/object:Gem::Specification
 name: dbbrowser
 version: !ruby/object:Gem::Version
-  version: 0.1.3
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-01 00:00:00.000000000 Z
+date: 2015-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: logutils
-  requirement: &73390850 !ruby/object:Gem::Requirement
-    none: false
+  name: textutils
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *73390850
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  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: activerecord-utils
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.0
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  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: rdoc
-  requirement: &73390620 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '4.0'
   type: :development
   prerelease: false
-  version_requirements: *73390620
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &73390260 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.13'
   type: :development
   prerelease: false
-  version_requirements: *73390260
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.13'
 description: dbbrowser - database browser (connections, schema, tables, records, etc.)
   as mountable web app
 email: webslideshow@googlegroups.com
 executables: []
 extensions: []
 extra_rdoc_files:
+- History.md
 - Manifest.txt
+- README.md
 files:
 - History.md
 - Manifest.txt
 - README.md
 - Rakefile
 - lib/dbbrowser.rb
-- lib/dbbrowser/connection.rb
 - lib/dbbrowser/public/jquery-2.0.3.min.js
 - lib/dbbrowser/public/jquery.tabs.js
 - lib/dbbrowser/public/style.css
@@ -76,29 +127,28 @@ files:
 homepage: https://github.com/rubylibs/dbbrowser
 licenses:
 - Public Domain
+metadata: {}
 post_install_message: 
 rdoc_options:
-- --main
+- "--main"
 - README.md
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: dbbrowser
-rubygems_version: 1.8.17
+rubyforge_project: 
+rubygems_version: 2.4.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: dbbrowser - database browser (connections, schema, tables, records, etc.)
   as mountable web app
 test_files: []

data/lib/dbbrowser/connection.rb

@@ -1,275 +0,0 @@
-module DbBrowser
-
-class ConnectionMan  # connection manager
-  
-  # get connection names
-  #  def connection_names
-  #    ActiveRecord::Base.configurations.keys
-  #  end
-
-  CONNECTS = {}  # cache connections
-
-  def connection_for( key )
-    # cache connections - needed? why? why not??
-
-    #  hack: for now only use cached connection if still active
-    #   if not; get a new one to avoid connection closed errors in rails
-    con = CONNECTS[ key ]
-    if con
-      puts "[ConnectionMan] cached connection found; con.active? #{con.active?}"
-      unless con.active?
-        puts "[ConnectionMan] *** reset cached connection (reason: connection stale/closed/not active)"
-        con = CONNECTS[ key ] = nil
-      end
-    end
-
-    if con.nil?
-      con = CONNECTS[ key ] =  AbstractModel.connection_for( key )
-    end
-
-    # note: make sure connection is active?
-    #  use verify!  - will try active? followed by reconnect!
-    # - todo: check ourselves if active? - why? why not??
-    #  -- not working w/ rails - after verify! still getting error w/ closed connection
-    # -- con.verify!
-
-    # wrap ActiveRecord connection in our own connection class
-    Connection.new( con, key )
-  end
-
-
-  class AbstractModel < ActiveRecord::Base
-    self.abstract_class = true   # no table; class just used for getting db connection
-
-    def self.connection_for( key )
-      establish_connection( key )
-      connection
-    end
-
-  end # class AbstractModel
-
-
-  class Connection
-
-    def initialize( connection, key )
-      @connection = connection
-      @key        = key
-    end
-
-    attr_reader  :connection
-    attr_reader  :key
-
-    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!,
-  #             :to => :connection
-
-    def tables
-      @tables ||= fetch_table_defs
-    end
-
-    def table( name )
-      tables.find { |t| t.name.downcase == name.downcase }
-    end
-
-    # getting list of column definitions
-    # and order them to be more human readable
-    def table_columns( name )
-      cols = fetch_table_column_defs( name )
-      ### fix/to be done
-      # cols.sort_by{|col|
-      #    [
-      #      fields_to_head.index(col.name) || 1e6,
-      #      -(fields_to_tail.index(col.name) || 1e6),
-      #      col.name
-      #    ]
-      #  }
-      cols
-    end
-
-    def fetch_table_defs
-      @connection.tables.sort.map do |name|
-        Table.new( self, name )
-      end
-    end
-
-    def fetch_table_column_defs( name )
-      ### fix/todo: add reference to table_def
-      @connection.columns( name ).map do |col|
-        Column.new( col.name, col.sql_type, col.default, col.null )
-      end
-    end
-
-
-    def fetch_table_select_all( name, opts={} )
-      limit =  (opts[:limit] || 33).to_i # 33 records limit/per page (for now default)
-      limit =  33   if limit == 0   # use default page size if limit 0 (from not a number para)
-      
-      offset = (opts[:offset] || 0).to_i
-
-      sql = "select * from #{name} limit #{limit}"
-
-      sql << " offset #{offset}"   if offset > 0     # add offset if present (e.g greater zero)
-
-      # page = (opts[:page] || 1 ).try(:to_i)
-      # fields = opts[:fields] || nil
-     
-      # rez = { :fields => fields }
-      # if sql =~ /\s*select/i && per_page > 0
-      #  rez[:count] = select_value("select count(*) from (#{sql}) as t").to_i
-      #  rez[:pages] = (rez[:count].to_f / per_page).ceil
-      #  sql = "select * from (#{sql}) as t"
-      #  add_limit_offset!( sql,
-      #                        :limit => per_page,
-      #                        :offset => per_page * (page - 1))
-      # end
-
-      result = {}
-      result[ :sql  ] = sql    # note: lets also always add sql query to result too
-      result[ :rows ] = select_all( sql )
-
-      #    unless rez[:rows].blank?
-      #      rez[:fields] ||= []
-      #      rez[:fields].concat( self.sort_fields(rez[:rows].first.keys) - rez[:fields] )
-      #    end
-
-      Result.new( result )
-    rescue StandardError => ex
-      Result.new( error: ex )
-    end  # fetch_table
-
-
-=begin
-      def column_names(table)
-        columns(table).map{|c| c.name}
-      end
-
-      # fields to see first
-      def fields_to_head
-        @fields_to_head ||= %w{id name login value}
-      end
-
-      # fields to see last
-      def fields_to_tail
-        @fields_to_tail ||= %w{created_at created_on updated_at updated_on}
-      end
-
-      attr_writer :fields_to_head, :fields_to_tail
-
-      # sort field names in a rezult
-      def sort_fields(fields)
-        fields = (fields_to_head & fields) | (fields - fields_to_head)
-        fields = (fields - fields_to_tail) | (fields_to_tail & fields)
-        fields
-      end
-
-      # performs query with appropriate method
-      def query(sql, opts={})
-        per_page = (opts[:perpage] || nil).to_i
-        page = (opts[:page] || 1 ).try(:to_i)
-        fields = opts[:fields] || nil
-        case sql
-        when /\s*select/i , /\s*(update|insert|delete).+returning/im
-          rez = {:fields => fields}
-          if sql =~ /\s*select/i && per_page > 0
-            rez[:count] = select_value("select count(*) from (#{sql}) as t").to_i
-            rez[:pages] = (rez[:count].to_f / per_page).ceil
-            sql = "select * from (#{sql}) as t"
-            add_limit_offset!( sql,
-                              :limit => per_page,
-                              :offset => per_page * (page - 1))
-          end
-
-          rez[:rows] = select_all( sql )
-
-          unless rez[:rows].blank?
-            rez[:fields] ||= []
-            rez[:fields].concat( self.sort_fields(rez[:rows].first.keys) - rez[:fields] )
-          end
-
-          Result.new(rez)
-        when /\s*update/i
-          Result.new :value => update( sql )
-        when /\s*insert/i
-          Result.new :value => insert( sql )
-        when /\s*delete/i
-          Result.new :value => delete( sql )
-        end
-      rescue StandardError => e
-        Result.new :error => e
-      end
-
-=end
-      
-  end # class Connection
-
-
-  class Table
-
-    def initialize(connection, name)
-      @connection = connection
-      @name       = name
-    end
-
-    attr_reader :connection
-    attr_reader :name
-
-    def count
-      @connection.select_value( "select count(*) from #{name}").to_i
-    end
-
-    def columns
-      # load columns on demand for now (cache on first lookup)
-      @columns ||= @connection.table_columns( @name )
-    end
-
-    def query( opts={})
-      @connection.fetch_table_select_all( @name, opts )
-    end
-
-  end # class Table
-
-
-  class Column
-    def initialize(name, type, default, null)
-      @name    = name
-      @type    = type   # note: is sql_type
-      @default = default
-      @null    = null   # note: true|false depending if NOT NULL or not
-    end
-
-    attr_reader :name, :type, :default, :null
-  end # class Column
-
-
-  class Result
-    def initialize( opts={} )
-      @sql = opts[:sql]  # sql statement as a string
-
-      if opts[:error]
-        @error = opts[:error]
-      else
-        @rows = opts[:rows]
-        # @count = opts[:count] || @rows.size
-        # @pages = opts[:pages] || 1
-        # @fields = opts[:fields]
-      end
-    end
-
-    attr_reader :sql, :rows, :error   ### to be done :count, :pages, :fields, 
-
-    def error?()  @error.present?;       end
-    def rows?()   @rows != nil;          end
-  end # class Result
-
-
-end # class  ConnectionMan
-
-end # module DbBrowser