db-gui 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38eb8b2669f281d3dddb78945f259d5fe8dea12eb31b51f5761ce4ced71381e9
-  data.tar.gz: a0cb8959b31975f176302f20404011e3a8115d5e597461de0f90fe57a5305cf3
+  metadata.gz: 9e8f8e99fbe6234688995ab9ba3c043520735be325f436d6a77b6645c000f949
+  data.tar.gz: ff6bbf33071bb6820260f6d583c448d218c448b9b304f242c2a448f197262c8c
 SHA512:
-  metadata.gz: b664e4ed31d076e644451b58bd809dc9e9f58b8526d96d052d41eef238c4f293413f886eb0b4fe7f0d9fe19b66eba563d7d98f936fad43d0032b0e4f590ed9ec
-  data.tar.gz: 43696e4a6cb8ecd26363a5dc9f33588b1b88895aa5c16a63a88caa6fce393c9d2907f05e52b9ce66ecc3e35d6de8549e85e29f34af1191b81a1fda5b03e8cf5e
+  metadata.gz: cb7ca28a2bc3c176c364e2708b8c2793d2b1cb0bb13e117511b83d4c35a021b76a47621a43cd6e41dacc3995c8d1e2e326946205dcd879a89e882560a01923ef
+  data.tar.gz: 9266bf6fe826ca5045f0c0819c8a9a673d5cb654465f5fa0366c3103e27f3fd7d896d3ee47a2f533ff734bc1a41c93b5d0e728b7ed4ffb9e7aba94e062fbdb10

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Change Log
 
+## 0.2.3
+
+- Edit -> Copy Table (with query & headers) menu item to copy table data with query (e.g. SQL) & headers as a formatted string to the clipboard
+
+## 0.2.2
+
+- Edit -> Copy Table (with headers) menu item to copy table data with headers as a formatted string to the clipboard
+- Edit -> Copy Selected Row  (with headers) menu item to copy selected row data with headers as a formatted string to the clipboard
+
 ## 0.2.1
 
 - Fix bug in 0.2.0 with crashing whenever running a DB query for the second time.

data/README.md

@@ -1,4 +1,4 @@
-# DB GUI (Database Graphical User Interface) 0.2.1
+# DB GUI (Database Graphical User Interface) 0.2.3
 ## [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=40 /> Glimmer DSL for LibUI Application](https://github.com/AndyObtiva/glimmer-dsl-libui)
 [![Gem Version](https://badge.fury.io/rb/db-gui.svg)](http://badge.fury.io/rb/db-gui)
 
@@ -12,7 +12,7 @@ It currently supports PostgreSQL as a start, with the potential of supporting ma
 
 Run:
 ```
-gem install db-gui -v0.2.1
+gem install db-gui -v0.2.3
 ```
 
 ## Usage
@@ -32,10 +32,22 @@ Note that it stores the last connection details under `~/.db_gui`, and will auto
 
 Click on this menu item to copy the table data as a formatted string to the clipboard.
 
+**Edit -> Copy Table (with headers)**
+
+Click on this menu item to copy the table data with headers as a formatted string to the clipboard.
+
+**Edit -> Copy Table (with query & headers)**
+
+Click on this menu item to copy the table data with query (e.g. SQL) & headers as a formatted string to the clipboard.
+
 **Edit -> Copy Selected Row**
 
 Click on this menu item to copy the selected row data as a formatted string to the clipboard.
 
+**Edit -> Copy Selected Row (with headers)**
+
+Click on this menu item to copy the selected row data with headers as a formatted string to the clipboard.
+
 ## Change Log
 
 [CHANGELOG.md](/CHANGELOG.md)

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.3

data/app/db_gui/model/db.rb

@@ -103,23 +103,45 @@ class DbGui
         Clipboard.copy(formatted_table_string)
       end
       
+      def copy_table_with_headers
+        return if db_command_result_rows.empty?
+        Clipboard.copy(formatted_table_string(include_headers: true))
+      end
+      
+      def copy_table_with_query_and_headers
+        return if db_command_result_rows.empty?
+        Clipboard.copy(formatted_table_string(include_query: true, include_headers: true))
+      end
+      
       def copy_selected_row
         return if db_command_result_rows.empty?
         Clipboard.copy(formatted_selected_row_string)
       end
       
-      def formatted_table_string
-        column_max_lengths = db_command_result_column_max_lengths
-        db_command_result_rows.map do |row|
+      def copy_selected_row_with_headers
+        return if db_command_result_rows.empty?
+        Clipboard.copy(formatted_selected_row_string(include_headers: true))
+      end
+      
+      def formatted_table_string(rows = nil, include_query: false, include_headers: false)
+        rows ||= db_command_result_rows
+        rows = rows.dup
+        rows.prepend(db_command_result_headers) if include_headers
+        column_max_lengths = row_column_max_lengths(rows) # TODO calculate those after prepending headers
+        formatted_string = rows.map do |row|
           row.each_with_index.map do |data, column_index|
             data.ljust(column_max_lengths[column_index])
           end.join(" | ")
         end.join(NEW_LINE)
+        formatted_string.prepend("#{db_command}\n\n") if include_query
+        formatted_string
       end
       
-      def formatted_selected_row_string
+      def formatted_selected_row_string(include_headers: false)
         selected_row = db_command_result_rows[db_command_result_selection]
         selected_row.join(' | ')
+        rows = [selected_row]
+        formatted_table_string(rows, include_headers:)
       end
       
       private
@@ -203,10 +225,11 @@ class DbGui
         [count, headers, rows]
       end
       
-      def db_command_result_column_max_lengths
-        column_count = db_command_result_rows.first.size
+      def row_column_max_lengths(rows = nil)
+        rows ||= db_command_result_rows
+        column_count = rows.first.size
         column_max_lengths = []
-        db_command_result_rows.each do |row|
+        rows.each do |row|
           row.each_with_index do |value, column_index|
             column_max_lengths[column_index] ||= 0
             column_max_lengths[column_index] = [column_max_lengths[column_index], value.size].max

data/app/db_gui/view/db_gui_application.rb

@@ -1,5 +1,6 @@
 require 'db_gui/model/db'
 
+require 'db_gui/view/db_gui_menu_bar'
 require 'db_gui/view/db_config_form'
 require 'db_gui/view/db_command_form'
 require 'db_gui/view/db_command_result_table'
@@ -13,7 +14,7 @@ class DbGui
           
       before_body do
         @db = Model::Db.new
-        menu_bar
+        db_gui_menu_bar(db:)
       end
   
       body {
@@ -34,72 +35,6 @@ class DbGui
           }
         }
       }
-  
-      def menu_bar
-        menu('Edit') {
-          menu_item('Copy Table') {
-            enabled <= [db, :db_command_result_rows, computed_by: :db_command_result, on_read: -> (data) { !data.empty? }]
-            
-            on_clicked do
-              db.copy_table
-            end
-          }
-
-          menu_item('Copy Selected Row') {
-            enabled <= [db, :db_command_result_rows, computed_by: :db_command_result, on_read: -> (data) { !data.empty? }]
-            
-            on_clicked do
-              db.copy_selected_row
-            end
-          }
-
-          quit_menu_item if OS.mac?
-        }
-        menu('Help') {
-          if OS.mac?
-            about_menu_item {
-              on_clicked do
-                display_about_dialog
-              end
-            }
-          end
-
-          menu_item('About') {
-            on_clicked do
-              display_about_dialog
-            end
-          }
-        }
-      end
-
-      def display_about_dialog
-        message = "DB GUI #{VERSION}\n\n#{LICENSE}"
-        msg_box('About', message)
-      end
-
-#       def display_preferences_dialog
-#         window {
-#           title 'Preferences'
-#           content_size 200, 100
-#
-#           margined true
-#
-#           vertical_box {
-#             padded true
-#
-#             label('Greeting:') {
-#               stretchy false
-#             }
-#
-#             radio_buttons {
-#               stretchy false
-#
-#               items Model::Greeting::GREETINGS
-#               selected <=> [@greeting, :text_index]
-#             }
-#           }
-#         }.show
-#       end
     end
   end
 end

data/app/db_gui/view/db_gui_menu_bar.rb

@@ -0,0 +1,83 @@
+class DbGui
+  module View
+    class DbGuiMenuBar
+      include Glimmer::LibUI::CustomControl
+  
+      option :db
+  
+      body {
+        menu('Query') {
+          menu_item('Run') {
+            on_clicked do
+              db.run_db_command
+            end
+          }
+        }
+        
+        menu('Edit') {
+          menu_item('Copy Table') {
+            enabled <= [db, :db_command_result_rows, computed_by: :db_command_result, on_read: -> (data) { !data.empty? }]
+            
+            on_clicked do
+              db.copy_table
+            end
+          }
+
+          menu_item('Copy Table (with headers)') {
+            enabled <= [db, :db_command_result_rows, computed_by: :db_command_result, on_read: -> (data) { !data.empty? }]
+            
+            on_clicked do
+              db.copy_table_with_headers
+            end
+          }
+
+          menu_item('Copy Table (with query & headers)') {
+            enabled <= [db, :db_command_result_rows, computed_by: :db_command_result, on_read: -> (data) { !data.empty? }]
+            
+            on_clicked do
+              db.copy_table_with_query_and_headers
+            end
+          }
+
+          menu_item('Copy Selected Row') {
+            enabled <= [db, :db_command_result_rows, computed_by: :db_command_result, on_read: -> (data) { !data.empty? }]
+            
+            on_clicked do
+              db.copy_selected_row
+            end
+          }
+
+          menu_item('Copy Selected Row (with headers)') {
+            enabled <= [db, :db_command_result_rows, computed_by: :db_command_result, on_read: -> (data) { !data.empty? }]
+            
+            on_clicked do
+              db.copy_selected_row_with_headers
+            end
+          }
+
+          quit_menu_item if OS.mac?
+        }
+        menu('Help') {
+          if OS.mac?
+            about_menu_item {
+              on_clicked do
+                display_about_dialog
+              end
+            }
+          end
+
+          menu_item('About') {
+            on_clicked do
+              display_about_dialog
+            end
+          }
+        }
+      }
+    end
+  
+    def display_about_dialog
+      message = "DB GUI #{VERSION}\n\n#{LICENSE}"
+      msg_box('About', message)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: db-gui
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
 platform: ruby
 authors:
 - Andy Maleh
@@ -104,6 +104,7 @@ files:
 - app/db_gui/view/db_command_result_table.rb
 - app/db_gui/view/db_config_form.rb
 - app/db_gui/view/db_gui_application.rb
+- app/db_gui/view/db_gui_menu_bar.rb
 - bin/db-gui
 - bin/db-ui
 - bin/dbgui