gm-notepad 0.0.10 → 0.0.11

data/lib/gm/notepad/table_column_set.rb

@@ -1,5 +1,5 @@
-require "gm/notepad/exceptions"
-require "gm/notepad/configuration"
+require 'dry-initializer'
+require 'gm/notepad/container'
 
 module Gm
   module Notepad
@@ -10,23 +10,36 @@ module Gm
         def names
           []
         end
+
+        def column_index_for(cell:)
+          cell.to_i
+        end
       end
 
-      Configuration.init!(target: self, additional_params: [:table, :line], from_config: [:column_delimiter]) do
-        @columns = []
-        @index =
+      extend Dry::Initializer
+      option :line, proc(&:to_s)
+      option :table
+      option :column_delimiter, default: -> { Container.resolve(:config).column_delimiter }
+
+      def initialize(*args)
+        super
         process_line!
       end
 
       def names
-        @columns.map(&:to_s)
+        @column_registry.map(&:to_s)
       end
 
+      def column_index_for(cell:)
+        @column_registry.index(cell.downcase)
+      end
+
+
       private
       def process_line!
         columns = line.split(column_delimiter)
         @index = columns.shift
-        @columns = columns.map {|c| c.strip.downcase }
+        @column_registry = columns.map {|c| c.strip.downcase }
       end
     end
   end

data/lib/gm/notepad/table_entry.rb

@@ -1,9 +1,17 @@
-require 'gm/notepad/defaults'
+require 'dry-initializer'
+require 'gm/notepad/container'
+
 module Gm
   module Notepad
     TABLE_ENTRY_RANGE_MARKER = "-".freeze
     class TableEntry
-      Configuration.init!(target: self, from_config: [:column_delimiter], additional_params: [:line, :table]) do
+      extend Dry::Initializer
+      option :line, proc(&:to_s)
+      option :table
+      option :column_delimiter, default: -> { Container.resolve(:config).column_delimiter }
+
+      def initialize(*args)
+        super
         row = line.split(column_delimiter)
         self.index = row.shift
         self.cells = row
@@ -15,8 +23,8 @@ module Gm
       end
 
       def lookup(cell:)
-        # TODO: Need to deal with named columns
-        cells[cell.to_i]
+        index = table.column_index_for(cell: cell)
+        cells[index] || cells[0]
       end
 
       NUMBER_RANGE_REGEXP = %r{(?<left>\d+) *- *(?<right>\d+)}

data/lib/gm/notepad/table_registry.rb

@@ -1,29 +1,27 @@
+require 'dry-initializer'
 require "gm/notepad/table"
 require "gm/notepad/exceptions"
 require 'gm/notepad/line_evaluator'
+require 'gm/notepad/container'
 
 module Gm
   module Notepad
     # Responsible for loading and registering all of the named tables
     class TableRegistry
-      def self.load_for(config:)
-        table_registry = new(config: config)
-        table_registry.load!
-        table_registry
+      def self.build_and_load
+        new { load! }
       end
 
-      Configuration.init!(target: self, from_config: [:paths, :table_extension, :filesystem_directory]) do
-        @registry = {}
-        @line_evaluator = LineEvaluator.new(table_registry: self)
-      end
+      extend Dry::Initializer
+      option :paths, default: -> { Container.resolve(:config).paths }
+      option :table_extension, default: -> { Container.resolve(:config).table_extension }
+      option :filesystem_directory, default: -> { Container.resolve(:config).filesystem_directory }
+      option :registry, default: -> { Hash.new }
+      option :line_evaluator, default: -> { LineEvaluator.new(table_registry: self) }
 
-      def load!
-        paths.each do |path|
-          Dir.glob(File.join(path, "**/*#{table_extension}")).each do |filename|
-            table_name = File.basename(filename, table_extension)
-            register_by_filename(table_name: table_name, filename: filename)
-          end
-        end
+      def initialize(*args, &block)
+        super
+        instance_exec(&block) if block_given?
       end
 
       attr_reader :line_evaluator, :registry
@@ -71,10 +69,19 @@ module Gm
 
       private
 
+      def load!
+        paths.each do |path|
+          Dir.glob(File.join(path, "**/*#{table_extension}")).each do |filename|
+            table_name = File.basename(filename, table_extension)
+            register_by_filename(table_name: table_name, filename: filename)
+          end
+        end
+      end
+
       def register(table_name:, lines:, filename: nil)
         table_name = table_name.downcase
         raise DuplicateKeyError.new(key: table_name, object: self) if registry.key?(table_name.downcase)
-        registry[table_name] = Table.new(config: config, table_name: table_name, lines: lines, filename: filename)
+        registry[table_name] = Table.new(table_name: table_name, lines: lines, filename: filename)
       end
     end
   end

data/lib/gm/notepad/throughput_text.rb

@@ -0,0 +1,80 @@
+require 'dry-initializer'
+module Gm
+  module Notepad
+    # Keep the original text close to the text that we are changing.
+    # This way we can dump the original text as a comment.
+    class ThroughputText
+      extend Dry::Initializer
+      option :original_text, proc(&:strip)
+      option :table_registry, default: -> { Container.resolve(:table_registry) }, reader: :private
+      option :lines_for_rendering, default: -> { [] }, reader: :private
+      def initialize(*args)
+        super
+        self.text_to_evaluate = original_text.strip
+        original_text.freeze
+      end
+
+      attr_reader :text_to_evaluate
+
+      def match(regexp)
+        text_to_evaluate.match(regexp)
+      end
+
+      def sub!(from, to)
+        @text_to_evaluate = text_to_evaluate.sub(from, to)
+      end
+
+      def [](*args)
+        @text_to_evaluate[*args]
+      end
+
+      def to_str
+        @text_to_evaluate.to_str
+      end
+
+      def to_s
+        @text_to_evaluate.to_s
+      end
+
+      attr_writer :text_to_evaluate
+
+      def for_rendering(text:, **kwargs)
+        @lines_for_rendering << LineForRendering.new(text: text, table_registry: table_registry, **kwargs)
+      end
+
+      def render_current_text(**kwargs)
+        for_rendering(text: text_to_evaluate, **kwargs)
+      end
+
+      def evaluate!
+        lines_for_rendering.each do |line|
+          line.expand!
+        end
+      end
+
+      def lines_for_rendering
+        @lines_for_rendering
+      end
+
+      alias lines lines_for_rendering
+    end
+
+    class LineForRendering
+      extend Dry::Initializer
+      option :text, proc(&:to_s)
+      option :to_interactive
+      option :to_output
+      option :to_filesystem, default: -> { false }
+      option :expand_line, default: -> { true }
+      option :table_registry, default: -> { Container.resolve(:table_registry) }, reader: :private
+
+      alias to_s text
+      alias to_str text
+
+      def expand!
+        return false unless expand_line
+        instance_variable_set("@text", table_registry.evaluate(line: text).to_s)
+      end
+    end
+  end
+end

data/lib/gm/notepad/version.rb

@@ -1,5 +1,5 @@
 module Gm
   module Notepad
-    VERSION = "0.0.10"
+    VERSION = "0.0.11"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gm-notepad
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Jeremy Friesen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-28 00:00:00.000000000 Z
+date: 2019-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dice_parser
@@ -24,6 +24,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: dry-configurable
+  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: dry-container
+  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: dry-initializer
+  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: term-ansicolor
   requirement: !ruby/object:Gem::Requirement
@@ -144,8 +186,10 @@ files:
 - exe/gm-notepad
 - gm-notepad.gemspec
 - lib/gm/notepad.rb
-- lib/gm/notepad/configuration.rb
-- lib/gm/notepad/defaults.rb
+- lib/gm/notepad/app.rb
+- lib/gm/notepad/buffer_wrapper.rb
+- lib/gm/notepad/config.rb
+- lib/gm/notepad/container.rb
 - lib/gm/notepad/evaluators/dice_evaluator.rb
 - lib/gm/notepad/exceptions.rb
 - lib/gm/notepad/input_handler_registry.rb
@@ -159,13 +203,13 @@ files:
 - lib/gm/notepad/input_processor.rb
 - lib/gm/notepad/line_evaluator.rb
 - lib/gm/notepad/line_renderer.rb
-- lib/gm/notepad/pad.rb
 - lib/gm/notepad/parameters/table_lookup.rb
 - lib/gm/notepad/readline.rb
 - lib/gm/notepad/table.rb
 - lib/gm/notepad/table_column_set.rb
 - lib/gm/notepad/table_entry.rb
 - lib/gm/notepad/table_registry.rb
+- lib/gm/notepad/throughput_text.rb
 - lib/gm/notepad/version.rb
 homepage: https://github.com/jeremyf/gm-notepad
 licenses:

data/lib/gm/notepad/configuration.rb

@@ -1,138 +0,0 @@
-require 'gm/notepad/defaults'
-module Gm
-  module Notepad
-    # Global configuration values
-    class Configuration
-      CLI_CONFIG_DEFAULTS = {
-        report_config: false,
-        defer_output: false,
-        filesystem_directory: '.',
-        index_entry_prefix: "index",
-        interactive_buffer: $stderr,
-        interactive_color: true,
-        output_color: false,
-        list_tables: false,
-        output_buffer: $stdout,
-        paths: [],
-        column_delimiter: Gm::Notepad::DEFAULT_COLUMN_DELIMITER,
-        skip_readlines: false,
-        table_extension: '.txt',
-        with_timestamp: false
-      }
-
-      # NOTE: ORDER MATTERS! I have a temporal dependency in these
-      # defaults
-      INTERNAL_CONFIG_DEFAULTS_METHOD_NAMES = [
-        :table_registry,
-        :input_handler_registry,
-        :input_processor,
-        :renderer,
-      ]
-
-      def self.init!(target:, from_config: [], additional_params: [], &block)
-        # Need to rebind the parameter
-        _additional_params = additional_params
-        target.define_method(:initialize) do |config: nil, **params|
-          @config = config || CLI_CONFIG_DEFAULTS
-          from_config.each do |method_name|
-            send("#{method_name}=", @config[method_name])
-          end
-          _additional_params.each do |key|
-            send("#{key}=", params.fetch(key))
-          end
-          instance_exec(&block) if block
-        end
-        from_config.each do |method_name|
-          target.module_exec do
-            attr_accessor(method_name)
-            protected "#{method_name}="
-          end
-        end
-        _additional_params.each do |method_name|
-          target.module_exec do
-            attr_accessor(method_name)
-            protected "#{method_name}="
-          end
-        end
-        target.attr_reader :config
-      end
-
-      def initialize(input_handler_registry: nil, table_registry: nil, renderer: nil, input_processor: nil, **overrides)
-        CLI_CONFIG_DEFAULTS.each_pair do |key, default_value|
-          value = overrides.fetch(key, default_value)
-          if !value.is_a?(IO)
-            value = value.clone
-            value.freeze
-          end
-          self.send("#{key}=", value)
-        end
-        self.table_registry = (table_registry || default_table_registry)
-        self.input_handler_registry = (input_handler_registry || default_input_handler_registry)
-        self.renderer = (renderer || default_renderer)
-        self.input_processor = (input_processor || default_input_processor)
-      end
-      attr_reader(*CLI_CONFIG_DEFAULTS.keys)
-      attr_reader(*INTERNAL_CONFIG_DEFAULTS_METHOD_NAMES)
-
-      def to_hash
-        config = CLI_CONFIG_DEFAULTS.keys.each_with_object({}) do |key, mem|
-          mem[key] = send(key)
-        end
-        INTERNAL_CONFIG_DEFAULTS_METHOD_NAMES.each_with_object(config) do |key, mem|
-          mem[key] = send(key)
-        end
-      end
-
-      def [](value)
-        public_send(value)
-      end
-
-      private
-      attr_writer(*CLI_CONFIG_DEFAULTS.keys)
-      attr_writer(*INTERNAL_CONFIG_DEFAULTS_METHOD_NAMES)
-
-      def paths=(input)
-        if input.empty?
-          @paths = ["."]
-        else
-          @paths = Array(input)
-        end
-      end
-
-      def default_input_processor
-        require "gm/notepad/input_processor"
-        InputProcessor.new(config: self)
-      end
-
-      def default_table_registry
-        require "gm/notepad/table_registry"
-        TableRegistry.load_for(config: self)
-      end
-
-      def default_renderer
-        require 'gm/notepad/line_renderer'
-        LineRenderer.new(config: self)
-      end
-
-      def default_input_handler_registry
-        # Order matters. The first registered will be the first to
-        # answer "Can you handle the input?"
-        require "gm/notepad/input_handler_registry"
-        require "gm/notepad/input_handlers/help_handler"
-        require "gm/notepad/input_handlers/comment_handler"
-        require "gm/notepad/input_handlers/query_table_handler"
-        require "gm/notepad/input_handlers/query_table_names_handler"
-        require "gm/notepad/input_handlers/write_to_table_handler"
-        require "gm/notepad/input_handlers/write_line_handler"
-        InputHandlerRegistry.new do |registry|
-          registry.register(handler: InputHandlers::HelpHandler)
-          registry.register(handler: InputHandlers::CommentHandler)
-          registry.register(handler: InputHandlers::QueryTableHandler)
-          registry.register(handler: InputHandlers::QueryTableNamesHandler)
-          registry.register(handler: InputHandlers::WriteToTableHandler)
-          registry.register(handler: InputHandlers::WriteLineHandler)
-        end
-      end
-    end
-  end
-end