gm-notepad 0.0.16 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b186d6ae4ff1019ca4e0a1c9beab65a156466928024da4b736c021bc70cfa3e9
-  data.tar.gz: 114b921bd96b0e2c4c2b489cbe9412b1e0bf61515fce5b378f61c38ec87ff79f
+  metadata.gz: 4175bf606855b4c2be432ac4520727705e708f16583cbf9a616d5246e46aa1f2
+  data.tar.gz: 1877cf77a1aef0e1e7697d673d1a021fe907b964ab21c9adbb38c1ecda784428
 SHA512:
-  metadata.gz: 587d8929143a4680253c0c0f45ea4ae482df3956c97b85dd5ff6fbb0113af4bb46961c3511bb1eb59b4e8bb4f916958432349d96dbdc93acccda8cafd428353f
-  data.tar.gz: b5cbba4aaf0778ef19f99dbddec1335d0febafd02075539650a9f922a1ad027fa77709386c7f9e18df2b59fcd9bbe51f95fb70badfab3bb70eec2ddf71523ffa
+  metadata.gz: d6b1d4a852e32922d6c18529584c9eb06645f440f7286b363b87767cb5094a6ae18dbf82f53c227bc2485d739a14b7b540482e0422ba81785db8e8337a92b763
+  data.tar.gz: 33b44cb7f7888c038152cc738ab861734b73509db733c2c5ee451270ad0936f883246735300a6b02ff9f760c119be38bb8209a0d99ca4b7575c25da5229dcb3b

data/README.md

@@ -248,7 +248,7 @@ You can then immediately access the `junk` table, by typing the following: `+jun
 - [X] Handle `{critical[5]}`
 - [X] Allow `{critical[{2d6+1}]}` to roll the dice then lookup the value in the critical table
 - [X] Handle `{critical[{2d6}]} for {2d6} damage`
-- [ ] For `{critical[{2d6+1}]}`, how to handle out of bounds
+- [X] For `{critical[{2d6+1}]}`, how to handle out of bounds
 - [X] Skip table lines that begin with `#`
 - [X] Skip processing input lines that begin with `#`
 - [X] Allow configuration to specify table delimiter
@@ -281,10 +281,10 @@ You can then immediately access the `junk` table, by typing the following: `+jun
 - [ ] Allow configuration to specify colors
 - [ ] Aspiration: Enable `\{\{monster}[ac]}` to pick a random monster and then fetch that monster's AC
 - [ ] Allow option to add a table to memory (instead of writing the table)
-- [ ] Add auto table expansion for "{}"
-- [ ] Add auto table expansion for "+"
+- [X] Add auto table expansion for "{}"
+- [X] Add auto table expansion for "+"
 - [ ] Add auto index expansion for "["
-- [ ] Determine feasibility of adding dice to the `{}` expansion syntax (instead of the `[]` syntax)
+- [X] Determine feasibility of adding dice to the `{}` expansion syntax (instead of the `[]` syntax)
 - [ ] Add force write results to `output`
 - [ ] Add option to dump all tables to the given directory
 - [ ] Add config that expands dice results while including the requested roll

data/Rakefile

@@ -17,7 +17,7 @@ namespace :commitment do
     lastrun_filename = File.expand_path('../coverage/.last_run.json', __FILE__)
     if File.exist?(lastrun_filename)
       coverage_percentage = JSON.parse(File.read(lastrun_filename)).fetch('result').fetch('covered_percent').to_i
-      EXPECTED_COVERAGE_GOAL = 97
+      EXPECTED_COVERAGE_GOAL = 98
       if coverage_percentage < EXPECTED_COVERAGE_GOAL
         abort("ERROR: Code Coverage Goal Not Met:\n\t#{coverage_percentage}%\tExpected\n\t#{EXPECTED_COVERAGE_GOAL}%\tActual")
       else

data/examples/basic_example_file

@@ -5,7 +5,7 @@
 ?
 
 # Should roll the dice
-[2d6] goblins attack
+{2d6} goblins attack
 
 # Should render to interactive the given tables
 +

data/lib/gm/notepad/table.rb

@@ -16,6 +16,8 @@ module Gm
       def initialize(*args)
         super
         @table = {}
+        @or_less = []
+        @or_more = []
         set_null_table_column_set!
         process(lines: lines)
       end
@@ -63,13 +65,27 @@ module Gm
         end
       end
 
+      def set_or_less_entry(table_entry)
+        @or_less = table_entry
+      end
+
+      def set_or_more_entry(table_entry)
+        @or_more = table_entry
+      end
+
       private
 
       def lookup_entry_by(index:)
         begin
           @table.fetch(index.to_s)
         rescue KeyError
-          raise MissingTableEntryError.new(table_name: table_name, index: index.to_s)
+          if @or_less.include?(index.to_s)
+            @or_less
+          elsif @or_more.include?(index.to_s)
+            @or_more
+          else
+            raise MissingTableEntryError.new(table_name: table_name, index: index.to_s)
+          end
         end
       end
 

data/lib/gm/notepad/table_entry.rb

@@ -4,58 +4,95 @@ require 'gm/notepad/container'
 module Gm
   module Notepad
     TABLE_ENTRY_RANGE_MARKER = "-".freeze
-    class TableEntry
-      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
+    module TableEntry
+      OR_LESS_REGEXP = %r{\A(?<floor>\d+) or less}i.freeze
+      OR_MORE_REGEXP = %r{\A(?<ceiling>\d+) or more}i.freeze
+      def self.new(line:, table:, **kwargs)
+        if match = line.match(OR_LESS_REGEXP)
+          OrLess.new(line: line, table: table, floor: match[:floor], **kwargs)
+        elsif match = line.match(OR_MORE_REGEXP)
+          OrMore.new(line: line, table: table, ceiling: match[:ceiling], **kwargs)
+        else
+          Base.new(line: line, table: table, **kwargs)
+        end
       end
+      class Base
+        extend Dry::Initializer
+        option :line, proc(&:to_s)
+        option :table
+        option :column_delimiter, default: -> { Container.resolve(:config).column_delimiter }
 
-      include Comparable
-      def <=>(other)
-        to_str <=> String(other)
-      end
+        def initialize(*args)
+          super
+          row = line.split(column_delimiter)
+          self.index = row.shift
+          self.cells = row
+        end
 
-      def lookup(cell:)
-        index = table.column_index_for(cell: cell)
-        cells[index] || cells[0]
-      end
+        include Comparable
+        def <=>(other)
+          to_str <=> String(other)
+        end
 
-      NUMBER_RANGE_REGEXP = %r{(?<left>\d+) *- *(?<right>\d+)}
-      def lookup_range
-        if match = NUMBER_RANGE_REGEXP.match(index)
-          (match[:left].to_i..match[:right].to_i).map(&:to_s)
-        else
-          [index]
+        def lookup(cell:)
+          index = table.column_index_for(cell: cell)
+          cells[index] || cells[0]
         end
-      end
 
-      attr_reader :index, :cells
+        NUMBER_RANGE_REGEXP = %r{(?<left>\d+) *- *(?<right>\d+)}
+        def lookup_range
+          if match = NUMBER_RANGE_REGEXP.match(index)
+            (match[:left].to_i..match[:right].to_i).map(&:to_s)
+          else
+            [index]
+          end
+        end
 
-      def entry
-        cells.join("\t")
-      end
-      alias entry_column entry
+        attr_reader :index, :cells
 
-      def to_s
-        "[#{index}]\t#{entry}"
-      end
-      alias to_str entry
+        def entry
+          cells.join("\t")
+        end
+        alias entry_column entry
 
-      private
+        def to_s
+          "[#{index}]\t#{entry}"
+        end
+        alias to_str entry
+
+        private
+
+        def index=(input)
+          @index = input.strip.downcase.freeze
+        end
 
-      def index=(input)
-        @index = input.strip.downcase.freeze
+        def cells=(input)
+          @cells = Array(input).map { |i| i.strip.freeze }.freeze
+        end
       end
+      class OrLess < Base
+        def initialize(floor:, **kwargs)
+          super
+          @floor = floor
+          table.set_or_less_entry(self)
+        end
+        attr_reader :floor
 
-      def cells=(input)
-        @cells = Array(input).map { |i| i.strip.freeze }.freeze
+        def include?(index)
+          floor.to_i >= index.to_i
+        end
+      end
+      class OrMore < Base
+        def initialize(ceiling:, **kwargs)
+          super
+          @ceiling = ceiling
+          table.set_or_more_entry(self)
+        end
+        attr_reader :ceiling
+
+        def include?(index)
+          ceiling.to_i <= index.to_i
+        end
       end
     end
   end

data/lib/gm/notepad/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gm-notepad
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
 platform: ruby
 authors:
 - Jeremy Friesen