gm-notepad 0.0.15 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23c9253d91c1ef03c4db29751924f0fbb45e13497aaa9f4625a629a8b5d66ca0
-  data.tar.gz: 7f9d487042f838d415012a43e5cbb840c820bf256fd322cba313f8610fee3d5c
+  metadata.gz: b186d6ae4ff1019ca4e0a1c9beab65a156466928024da4b736c021bc70cfa3e9
+  data.tar.gz: 114b921bd96b0e2c4c2b489cbe9412b1e0bf61515fce5b378f61c38ec87ff79f
 SHA512:
-  metadata.gz: 013b9c64ade3b19008f1bfda2686df131db92051e0c376de64f9c441ad09368d3b64712a87ab2c82dea69f5e3fd66d0710ef5b59c4190a435c2df2f89f1ce73e
-  data.tar.gz: e9ae058f45ba1979e75fef183ba0c62c8f184ec6638d76a7d2ae4c28bbae1f286de5c8730118bbc4169dd708f793b386acdc98929790aba8f45c5ae86a1111ad
+  metadata.gz: 587d8929143a4680253c0c0f45ea4ae482df3956c97b85dd5ff6fbb0113af4bb46961c3511bb1eb59b4e8bb4f916958432349d96dbdc93acccda8cafd428353f
+  data.tar.gz: b5cbba4aaf0778ef19f99dbddec1335d0febafd02075539650a9f922a1ad027fa77709386c7f9e18df2b59fcd9bbe51f95fb70badfab3bb70eec2ddf71523ffa

data/README.md

@@ -208,8 +208,8 @@ numbers. And you can mix numbers and text. This example introduces the idea of
 columns. _I am still working on retrieving by column names as well as rendering column names_.
 
 ```console
-=>	[grell]	Grell	15	12D12
-=>	[jehat]	Jehat	19	14D6
+[grell]	Grell	15	12D12
+[jehat]	Jehat	19	14D6
 ```
 
 You can write a new table, without exiting `gm-notepad`, by doing the following:
@@ -241,6 +241,7 @@ You can then immediately access the `junk` table, by typing the following: `+jun
 
 ## Todo
 
+- [ ] When printing tables, also print column names/indices
 - [X] Colorize puts to `interactive` buffer
 - [X] Disable colors as a configuration option
 - [ ] Write expected interface document

data/lib/gm/notepad/readline.rb

@@ -4,10 +4,28 @@ module Gm
     # A configuration module for the Readline module
     module Readline
 
-      # Check history for existing matches
-      completion_function = proc do |string|
+      QUERY_TABLE_NAMES_PREFIX = /^\+(?<table_name>.*)/.freeze
+      TABLE_EXPANSION_REGEXP = %r{(?<table_container>\{(?<table_name>.*))}.freeze
+      def self.completion_function(string, table_registry: Container.resolve(:table_registry))
+        entries = []
+        if match = string.match(QUERY_TABLE_NAMES_PREFIX)
+          entries += table_registry.table_names.grep(/^#{Regexp.escape(match[:table_name])}/).map { |name| "+#{name}" }
+        end
+        if match = string.match(TABLE_EXPANSION_REGEXP)
+          test_string = string.sub(match[:table_container], "{")
+          entries += table_registry.table_names.grep(/^#{Regexp.escape(match[:table_name])}/).map { |name| "#{test_string}#{name}}"}
+        end
+        entries += history_for(string)
+        entries.uniq.sort
+      end
+
+      def self.history_for(string)
         ::Readline::HISTORY.grep(/^#{Regexp.escape(string)}/)
       end
+
+      # Check history for existing matches
+      completion_function = method(:completion_function)
+
       if ::Readline.respond_to?("basic_word_break_characters=")
         ::Readline.basic_word_break_characters= " \t\n`><=;|&{("
       end

data/lib/gm/notepad/version.rb

@@ -1,5 +1,5 @@
 module Gm
   module Notepad
-    VERSION = "0.0.15"
+    VERSION = "0.0.16"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gm-notepad
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors:
 - Jeremy Friesen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-06 00:00:00.000000000 Z
+date: 2019-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dice_parser